Skip to content

Accept service routes and allow other tunnels #5

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vkz wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Accept service routes and allow other tunnels #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e79cd80
Improve ts-unplug-proxy routing
vkz Aug 5, 2026
fca81ac
Restore tsnet proxy routing
vkz Aug 5, 2026
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
2 changes: 2 additions & 0 deletions cmd/ts-unplug-proxy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ Proxy clients provide the remote destination, so this command does not take a po

Use `-v` to log proxy connections. Use `-vv` to include `tsnet.Server` debug logs.

Use `-accept-routes` when reaching subnet routes or Tailscale Services advertised by other nodes. On macOS, use `-disable-interface-binding` when another network tunnel controls the system's interface and route selection.

## Documentation

See **[docs/ts-unplug-proxy.md](../../docs/ts-unplug-proxy.md)** for complete documentation.
60 changes: 46 additions & 14 deletions cmd/ts-unplug-proxy/ts-unplug-proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ import (
"slices"
"strings"
"syscall"
"time"

"golang.org/x/net/dns/dnsmessage"
"tailscale.com/client/local"
"tailscale.com/ipn"
"tailscale.com/ipn/ipnstate"
"tailscale.com/net/netns"
"tailscale.com/net/proxymux"
"tailscale.com/net/socks5"
"tailscale.com/tsnet"
Expand All @@ -29,12 +31,14 @@ import (
const tsnetHostname = "tsunplug-proxy"

var (
flagDir = flag.String("dir", "", "tsnet server directory")
flagVerboseProxy = flag.Bool("v", false, "log proxy connections")
flagVerboseTSNet = flag.Bool("vv", false, "log proxy connections and tsnet debug info")
flagSOCKS5Addr = flag.String("socks5", "", "SOCKS5 proxy listen address")
flagHTTPAddr = flag.String("http", "", "HTTP proxy listen address")
flagNoExitNode = flag.Bool("disable-exit-node", false, "disable automatic tailnet exit node use")
flagDir = flag.String("dir", "", "tsnet server directory")
flagVerboseProxy = flag.Bool("v", false, "log proxy connections")
flagVerboseTSNet = flag.Bool("vv", false, "log proxy connections and tsnet debug info")
flagSOCKS5Addr = flag.String("socks5", "", "SOCKS5 proxy listen address")
flagHTTPAddr = flag.String("http", "", "HTTP proxy listen address")
flagNoExitNode = flag.Bool("disable-exit-node", false, "disable automatic tailnet exit node use")
flagDisableInterfaceBinding = flag.Bool("disable-interface-binding", false, "disable Tailscale's macOS network namespace integration")
flagAcceptRoutes = flag.Bool("accept-routes", false, "accept advertised subnet and Service routes")
)

type serveResult struct {
Expand Down Expand Up @@ -103,6 +107,12 @@ func main() {
slog.Debug(fmt.Sprintf(format, args...))
}
}
if *flagDisableInterfaceBinding {
// tsnet's network namespace can bind outbound connections to the
// macOS default interface. Disable it when another tunnel controls
// the system's interface and route selection.
netns.SetEnabled(false)
}

st, err := ts.Up(ctx)
if err != nil {
Expand All @@ -122,6 +132,16 @@ func main() {
slog.Error("failed to get tsnet local client", slog.Any("error", err))
os.Exit(1)
}
if *flagAcceptRoutes {
if _, err := lc.EditPrefs(ctx, &ipn.MaskedPrefs{
Prefs: ipn.Prefs{RouteAll: true},
RouteAllSet: true,
}); err != nil {
slog.Error("failed to enable advertised routes", slog.Any("error", err))
os.Exit(1)
}
slog.Info("advertised subnet and Service routes enabled")
}
if !*flagNoExitNode {
if err := useExitNodeIfAvailable(ctx, lc); err != nil {
slog.Warn("failed to configure tailnet exit node", slog.Any("error", err))
Expand Down Expand Up @@ -219,7 +239,10 @@ func useExitNodeIfAvailable(ctx context.Context, lc *local.Client) error {
}

func (d *tailnetDialer) Dial(ctx context.Context, network, addr string) (net.Conn, error) {
resolvedAddr, resolved, err := d.resolveAddr(ctx, network, addr)
dialCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()

resolvedAddr, resolved, err := d.resolveAddr(dialCtx, network, addr)
if err != nil {
return nil, err
}
Expand All @@ -228,14 +251,14 @@ func (d *tailnetDialer) Dial(ctx context.Context, network, addr string) (net.Con
slog.String("network", network),
slog.String("addr", addr),
)
return d.ts.Dial(ctx, network, addr)
return d.ts.Dial(dialCtx, network, addr)
}
slog.Debug("dialing through tailnet",
slog.String("network", network),
slog.String("addr", addr),
slog.String("resolved_addr", resolvedAddr),
)
return d.ts.Dial(ctx, network, resolvedAddr)
return d.ts.Dial(dialCtx, network, resolvedAddr)
}

func (d *tailnetDialer) resolveAddr(ctx context.Context, network, addr string) (resolvedAddr string, resolved bool, err error) {
Expand All @@ -247,13 +270,22 @@ func (d *tailnetDialer) resolveAddr(ctx context.Context, network, addr string) (
return net.JoinHostPort(ip.String(), port), true, nil
}

status, err := d.lc.Status(ctx)
if err != nil {
slog.Debug("tailnet status lookup failed", slog.String("host", host), slog.Any("error", err))
status, statusErr := d.lc.Status(ctx)
if statusErr != nil {
slog.Debug("tailnet status lookup failed", slog.String("host", host), slog.Any("error", statusErr))
}
ips := lookupMagicDNS(status, network, host)

// Query Tailscale DNS before using peer status aliases. A Tailscale Service
// name can intentionally collide with a host name (for example, the
// service "example" hosted by the peer "example"). Peer status then
// contains the host IP, while Tailscale DNS contains the Service VIP.
ips, lookupErr := d.lookupIP(ctx, network, host)
err = lookupErr
if len(ips) == 0 {
ips, err = d.lookupIP(ctx, network, host)
ips = lookupMagicDNS(status, network, host)
if len(ips) > 0 {
err = nil
}
}
if err != nil {
if isStrictTailnetHost(status, host) {
Expand Down
8 changes: 6 additions & 2 deletions docs/ts-unplug-proxy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ ts-unplug-proxy -dir ./state -socks5 localhost:1080 -http localhost:1080
ts-unplug-proxy -dir ./state -vv -socks5 localhost:1080
```

- `-accept-routes` - Accept subnet and Tailscale Service routes advertised by other nodes

- `-disable-interface-binding` - On macOS, disable Tailscale's network namespace integration, including physical-interface binding. Use this when another network tunnel controls the system's interface and route selection.

## Examples

### SOCKS5 With curl
Expand Down Expand Up @@ -140,8 +144,8 @@ ts-unplug-proxy:
1. Connects a `tsnet.Server` to your tailnet
2. Listens locally for SOCKS5 and/or HTTP proxy connections
3. Receives each requested destination from the proxy client
4. Resolves MagicDNS peer names from Tailscale status, including short names like `sippy`
5. Falls back to Tailscale DNS via `LocalClient.QueryDNS` for other DNS records
4. Resolves destinations through Tailscale DNS via `LocalClient.QueryDNS`
5. Falls back to MagicDNS peer names from Tailscale status, including short names like `sippy`
6. Falls back to normal `tsnet.Server.Dial` for non-tailnet public names such as `www.google.ca`
7. Dials resolved IPs with `tsnet.Server.Dial`
8. Relays traffic between the client and the destination
Expand Down