Skip to content

fix: make generate-ticket create ID-only tickets #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2025
Merged

fix: make generate-ticket create ID-only tickets #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub enum Commands {
///
/// This command only really makes sense when you are providing dumbpipe with a
/// secret key.
GenerateTicket(GenerateTicketArgs),
GenerateTicket,

/// Listen on an endpoint and forward stdin/stdout to the first incoming
/// bidi stream.
Expand Down Expand Up @@ -155,12 +155,6 @@ fn parse_alpn(alpn: &str) -> Result<Vec<u8>> {
})
}

#[derive(Parser, Debug)]
pub struct GenerateTicketArgs {
#[clap(flatten)]
pub common: CommonArgs,
}

#[derive(Parser, Debug)]
pub struct ListenArgs {
/// Immediately close our sending side, indicating that we will not transmit any data
Expand Down Expand Up @@ -836,14 +830,12 @@ async fn connect_unix(args: ConnectUnixArgs) -> Result<()> {
Ok(())
}

async fn generate_ticket(args: GenerateTicketArgs) -> Result<()> {
async fn generate_ticket() -> Result<()> {
let secret_key = get_or_create_secret()?;
let endpoint = create_endpoint(secret_key, &args.common, vec![args.common.alpn()?]).await?;
// wait for the endpoint to figure out its home relay and addresses before making a ticket
endpoint.online().await;
let addr = endpoint.addr();
let short = create_short_ticket(&addr);
println!("{}", short);
let public_key = secret_key.public();
let addr = EndpointAddr::new(public_key);
let ticket = EndpointTicket::new(addr);
println!("{}", ticket);
Ok(())
}

Expand All @@ -852,7 +844,7 @@ async fn main() -> Result<()> {
tracing_subscriber::fmt::init();
let args = Args::parse();
let res = match args.command {
Commands::GenerateTicket(args) => generate_ticket(args).await,
Commands::GenerateTicket => generate_ticket().await,
Commands::Listen(args) => listen_stdio(args).await,
Commands::ListenTcp(args) => listen_tcp(args).await,
Commands::Connect(args) => connect_stdio(args).await,
Expand Down