TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/containerboot: reapply known args on restart

Browse Source 
Previously we would not reapply changes to TS_HOSTNAME etc when
then the container restarted and TS_AUTH_ONCE was enabled.

This splits those into two steps login and set, allowing us to
only rerun the set step on restarts.

Updates #502

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-08-23 19:08:24 -04:00 committed by Maisem Ali
parent d45af7c66f
commit a61a9ab087
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cmd/containerboot/main.go
View File

@ -17,7 +17,8 @@
// - TS_DEST_IP: proxy all incoming Tailscale traffic to the given // - TS_DEST_IP: proxy all incoming Tailscale traffic to the given
// destination. // destination.
// - TS_TAILSCALED_EXTRA_ARGS: extra arguments to 'tailscaled'. // - TS_TAILSCALED_EXTRA_ARGS: extra arguments to 'tailscaled'.
// - TS_EXTRA_ARGS: extra arguments to 'tailscale up'. // - TS_EXTRA_ARGS: extra arguments to 'tailscale login', these are not
// reset on restart.
// - TS_USERSPACE: run with userspace networking (the default) // - TS_USERSPACE: run with userspace networking (the default)
// instead of kernel networking. // instead of kernel networking.
// - TS_STATE_DIR: the directory in which to store tailscaled // - TS_STATE_DIR: the directory in which to store tailscaled
@ -177,7 +178,7 @@ func main() {
} }
didLogin = true didLogin = true
w.Close() w.Close()
if err := tailscaleUp(ctx, cfg); err != nil { if err := tailscaleLogin(ctx, cfg); err != nil {
return fmt.Errorf("failed to auth tailscale: %v", err) return fmt.Errorf("failed to auth tailscale: %v", err)
} }
w, err = client.WatchIPNBus(ctx, ipn.NotifyInitialNetMap|ipn.NotifyInitialState) w, err = client.WatchIPNBus(ctx, ipn.NotifyInitialNetMap|ipn.NotifyInitialState)
@ -209,6 +210,12 @@ func main() {
case ipn.NeedsMachineAuth: case ipn.NeedsMachineAuth:
log.Printf("machine authorization required, please visit the admin panel") log.Printf("machine authorization required, please visit the admin panel")
case ipn.Running: case ipn.Running:
// Now that we are authenticated, we can set/reset any of the
// settings that we need to.
if err := tailscaleSet(ctx, cfg); err != nil {
log.Fatalf("failed to auth tailscale: %v", err)
}
// Technically, all we want is to keep monitoring the bus for // Technically, all we want is to keep monitoring the bus for
// netmap updates. However, in order to make the container crash // netmap updates. However, in order to make the container crash
// if tailscale doesn't initially come up, the watch has a // if tailscale doesn't initially come up, the watch has a
@ -385,32 +392,48 @@ func tailscaledArgs(cfg *settings) []string {
return args return args
} }
// tailscaleUp uses cfg to run 'tailscale up'. // tailscaleLogin uses cfg to run 'tailscale login' everytime containerboot
func tailscaleUp(ctx context.Context, cfg *settings) error { // starts, or if TS_AUTH_ONCE is set, only the first time containerboot starts.
args := []string{"--socket=" + cfg.Socket, "up"} func tailscaleLogin(ctx context.Context, cfg *settings) error {
args := []string{"--socket=" + cfg.Socket, "login"}
if cfg.AuthKey != "" {
args = append(args, "--authkey="+cfg.AuthKey)
}
if cfg.ExtraArgs != "" {
args = append(args, strings.Fields(cfg.ExtraArgs)...)
}
log.Printf("Running 'tailscale login'")
cmd := exec.CommandContext(ctx, "tailscale", args...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return fmt.Errorf("tailscale login failed: %v", err)
}
return nil
}
// tailscaleSet uses cfg to run 'tailscale set' to set any known configuration
// options that are passed in via environment variables. This is run after the
// node is in Running state.
func tailscaleSet(ctx context.Context, cfg *settings) error {
args := []string{"--socket=" + cfg.Socket, "set"}
if cfg.AcceptDNS { if cfg.AcceptDNS {
args = append(args, "--accept-dns=true") args = append(args, "--accept-dns=true")
} else { } else {
args = append(args, "--accept-dns=false") args = append(args, "--accept-dns=false")
} }
if cfg.AuthKey != "" {
args = append(args, "--authkey="+cfg.AuthKey)
}
if cfg.Routes != "" { if cfg.Routes != "" {
args = append(args, "--advertise-routes="+cfg.Routes) args = append(args, "--advertise-routes="+cfg.Routes)
} }
if cfg.Hostname != "" { if cfg.Hostname != "" {
args = append(args, "--hostname="+cfg.Hostname) args = append(args, "--hostname="+cfg.Hostname)
} }
if cfg.ExtraArgs != "" { log.Printf("Running 'tailscale set'")
args = append(args, strings.Fields(cfg.ExtraArgs)...)
}
log.Printf("Running 'tailscale up'")
cmd := exec.CommandContext(ctx, "tailscale", args...) cmd := exec.CommandContext(ctx, "tailscale", args...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return fmt.Errorf("tailscale up failed: %v", err) return fmt.Errorf("tailscale set failed: %v", err)
} }
return nil return nil
} }