mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-05-05 20:26:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: add ts2021 debug flag to set a dial plan

Browse Source 
Updates tailscale/corp#32534

Change-Id: Ief4ee0a263ea1edbf652b74d8c335c1e5ee209d7
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
(cherry picked from commit d7ec043306ed128e5c5f540e944371a98474f36c)
This commit is contained in:
Brad Fitzpatrick 2025-09-20 15:55:33 -07:00 committed by Brad Fitzpatrick
parent 585248ec5d
commit c99901ef6b
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/tailscale/cli/debug.go
View File

@ -287,6 +287,7 @@ func debugCmd() *ffcli.Command {
fs.StringVar(&ts2021Args.host, "host", "controlplane.tailscale.com", "hostname of control plane")
fs.IntVar(&ts2021Args.version, "version", int(tailcfg.CurrentCapabilityVersion), "protocol version")
fs.BoolVar(&ts2021Args.verbose, "verbose", false, "be extra verbose")
fs.StringVar(&ts2021Args.dialPlanJSONFile, "dial-plan", "", "if non-empty, use this JSON file to configure the dial plan")
return fs
})(),
},
@ -975,9 +976,10 @@ func runVia(ctx context.Context, args []string) error {
}
var ts2021Args struct {
host string // "controlplane.tailscale.com"
version int // 27 or whatever
verbose bool
host string // "controlplane.tailscale.com"
version int // 27 or whatever
verbose bool
dialPlanJSONFile string // if non-empty, path to JSON file [tailcfg.ControlDialPlan] JSON
}
func runTS2021(ctx context.Context, args []string) error {
@ -1055,6 +1057,18 @@ func runTS2021(ctx context.Context, args []string) error {
return fmt.Errorf("creating netmon: %w", err)
}
var dialPlan *tailcfg.ControlDialPlan
if ts2021Args.dialPlanJSONFile != "" {
b, err := os.ReadFile(ts2021Args.dialPlanJSONFile)
if err != nil {
return fmt.Errorf("reading dial plan JSON file: %w", err)
}
dialPlan = new(tailcfg.ControlDialPlan)
if err := json.Unmarshal(b, dialPlan); err != nil {
return fmt.Errorf("unmarshaling dial plan JSON file: %w", err)
}
}
noiseDialer := &controlhttp.Dialer{
Hostname: ts2021Args.host,
HTTPPort: "80",
@ -1062,6 +1076,7 @@ func runTS2021(ctx context.Context, args []string) error {
MachineKey: machinePrivate,
ControlKey: keys.PublicKey,
ProtocolVersion: uint16(ts2021Args.version),
DialPlan: dialPlan,
Dialer: dialFunc,
Logf: logf,
NetMon: netMon,