Skip to content

feat: add tailscale proxy param #30

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
leo-notte merged 2 commits into from
Apr 23, 2026
Merged

feat: add tailscale proxy param #30

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
7af4d87
feat: add tailscale proxy param
leo-notte Apr 23, 2026
84560be
feat: expose external and tailnet proxies via typed CLI flags
leo-notte Apr 23, 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
71 changes: 71 additions & 0 deletions internal/api/client.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 60 additions & 8 deletions internal/cmd/sessions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@ import (

// Manual flags for proxies and extra headers (union types not auto-generated)
var (
sessionsStartProxy bool
sessionsStartProxyCountry string
sessionsStartExtraHttpHeaders string
sessionsStartProxy bool
sessionsStartProxyCountry string
sessionsStartProxyExtServer string
sessionsStartProxyExtUsername string
sessionsStartProxyExtPassword string
sessionsStartProxyTailClientID string
sessionsStartProxyTailClientSecret string
sessionsStartExtraHttpHeaders string
)

var (
Expand Down Expand Up @@ -339,6 +344,11 @@ func init() {
// Manual flags for proxies (union type: bool | array of proxy objects)
sessionsStartCmd.Flags().BoolVar(&sessionsStartProxy, "proxy", false, "Use default proxies")
sessionsStartCmd.Flags().StringVar(&sessionsStartProxyCountry, "proxy-country", "", "Proxy country code (e.g. us, gb, fr). Implies --proxy")
sessionsStartCmd.Flags().StringVar(&sessionsStartProxyExtServer, "proxy-external-server", "", "External proxy server URL (e.g. http://proxy:8080). Enables external proxy")
sessionsStartCmd.Flags().StringVar(&sessionsStartProxyExtUsername, "proxy-external-username", "", "External proxy username")
sessionsStartCmd.Flags().StringVar(&sessionsStartProxyExtPassword, "proxy-external-password", "", "External proxy password")
sessionsStartCmd.Flags().StringVar(&sessionsStartProxyTailClientID, "proxy-tailnet-client-id", "", "Tailnet OAuth client ID. Enables Tailscale proxy")
sessionsStartCmd.Flags().StringVar(&sessionsStartProxyTailClientSecret, "proxy-tailnet-client-secret", "", "Tailnet OAuth client secret")
// Manual flag for extra HTTP headers (map type not auto-generated)
sessionsStartCmd.Flags().StringVar(&sessionsStartExtraHttpHeaders, "extra-http-headers", "", `Extra HTTP headers as JSON (e.g. '{"Authorization": "Bearer xxx"}')`)

Expand Down Expand Up @@ -494,18 +504,60 @@ func runSessionsStart(cmd *cobra.Command, args []string) error {
return err
}

// Handle proxies manually (union type: bool | array of proxy objects)
// --proxy-country takes precedence over --proxy
// Handle proxies manually (union type: bool | array of proxy objects).
// At most one proxy kind may be selected per call.
var setProxyFlags []string
for _, name := range []string{"proxy", "proxy-country", "proxy-external-server", "proxy-tailnet-client-id"} {
if cmd.Flags().Changed(name) {
setProxyFlags = append(setProxyFlags, "--"+name)
}
}
if len(setProxyFlags) > 1 {
return fmt.Errorf("proxy flags are mutually exclusive, got: %s", strings.Join(setProxyFlags, ", "))
}

var proxyItems api.ApiSessionStartRequestProxies0

if cmd.Flags().Changed("proxy-country") {
country := api.ProxyGeolocationCountry(sessionsStartProxyCountry)
notteProxy := api.NotteProxy{Country: &country}
var item api.ApiSessionStartRequest_Proxies_0_Item
if err := item.FromNotteProxy(notteProxy); err != nil {
return fmt.Errorf("failed to create proxy: %w", err)
return fmt.Errorf("failed to create notte proxy: %w", err)
}
proxyItems = append(proxyItems, item)
}

if cmd.Flags().Changed("proxy-external-server") {
ext := api.ExternalProxy{Server: sessionsStartProxyExtServer}
if cmd.Flags().Changed("proxy-external-username") {
ext.Username = &sessionsStartProxyExtUsername
}
if cmd.Flags().Changed("proxy-external-password") {
ext.Password = &sessionsStartProxyExtPassword
}
proxyList := api.ApiSessionStartRequestProxies0{item}
var item api.ApiSessionStartRequest_Proxies_0_Item
if err := item.FromExternalProxy(ext); err != nil {
return fmt.Errorf("failed to create external proxy: %w", err)
}
proxyItems = append(proxyItems, item)
}

if cmd.Flags().Changed("proxy-tailnet-client-id") {
tail := api.TailnetProxy{OauthClientId: sessionsStartProxyTailClientID}
if cmd.Flags().Changed("proxy-tailnet-client-secret") {
tail.OauthClientSecret = &sessionsStartProxyTailClientSecret
}
var item api.ApiSessionStartRequest_Proxies_0_Item
if err := item.FromTailnetProxy(tail); err != nil {
return fmt.Errorf("failed to create tailnet proxy: %w", err)
}
proxyItems = append(proxyItems, item)
}

if len(proxyItems) > 0 {
var proxies api.ApiSessionStartRequest_Proxies
if err := proxies.FromApiSessionStartRequestProxies0(proxyList); err != nil {
if err := proxies.FromApiSessionStartRequestProxies0(proxyItems); err != nil {
return fmt.Errorf("failed to set proxies: %w", err)
}
body.Proxies = &proxies
Expand Down
Loading