Skip to content

fix(ssh): forward custom DERP map to ProxyCommand - #22

Open
zukka77 wants to merge 1 commit into
tailscale:mainfrom
zukka77:fix/ssh_proxy_custom_derp
Open

fix(ssh): forward custom DERP map to ProxyCommand#22
zukka77 wants to merge 1 commit into
tailscale:mainfrom
zukka77:fix/ssh_proxy_custom_derp

Conversation

@zukka77

@zukka77 zukka77 commented Aug 29, 2026

Copy link
Copy Markdown

Fix tailcat ssh with custom --derpmap-url

Summary

Fixes an issue where tailcat ssh could not connect using a short, RegionID-based token when --derpmap-url specified a custom DERP map.

tailcat ssh launches OpenSSH with a ProxyCommand that invokes tailcat again. That internal tailcat command forwarded --key, but not --derpmap-url, so it fell back to the default DERP map and could not resolve custom
RegionIDs.

Change

When a non-default DERP map URL is configured, the generated ProxyCommand now includes it:

tailcat --key=... --derpmap-url=https://derp.example.com/derpmap.json 22

Default-map behavior remains unchanged.

Test coverage

Added unit coverage verifying that:

  • A custom DERP map URL is included in the SSH ProxyCommand.
  • The default DERP map URL is not unnecessarily included.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant