From 623926a25d8709f7d3dee154d367b5e295896af2 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Tue, 3 Oct 2023 11:49:31 +0200 Subject: [PATCH] cmd/tailscale: add --posture-checking flag to set Updates #5902 Signed-off-by: Kristoffer Dalby --- cmd/tailscale/cli/set.go | 4 ++++ cmd/tailscale/cli/up.go | 2 ++ 2 files changed, 6 insertions(+) diff --git a/cmd/tailscale/cli/set.go b/cmd/tailscale/cli/set.go index d589da3ae..faa2a1ec2 100644 --- a/cmd/tailscale/cli/set.go +++ b/cmd/tailscale/cli/set.go @@ -49,6 +49,7 @@ type setArgsT struct { forceDaemon bool updateCheck bool updateApply bool + postureChecking bool } func newSetFlagSet(goos string, setArgs *setArgsT) *flag.FlagSet { @@ -66,6 +67,8 @@ func newSetFlagSet(goos string, setArgs *setArgsT) *flag.FlagSet { setf.BoolVar(&setArgs.advertiseDefaultRoute, "advertise-exit-node", false, "offer to be an exit node for internet traffic for the tailnet") setf.BoolVar(&setArgs.updateCheck, "update-check", true, "HIDDEN: notify about available Tailscale updates") setf.BoolVar(&setArgs.updateApply, "auto-update", false, "HIDDEN: automatically update to the latest available version") + setf.BoolVar(&setArgs.postureChecking, "posture-checking", false, "HIDDEN: allow management plane to gather device posture information") + if safesocket.GOOSUsesPeerCreds(goos) { setf.StringVar(&setArgs.opUser, "operator", "", "Unix username to allow to operate on tailscaled without sudo") } @@ -108,6 +111,7 @@ func runSet(ctx context.Context, args []string) (retErr error) { Check: setArgs.updateCheck, Apply: setArgs.updateApply, }, + PostureChecking: setArgs.postureChecking, }, } diff --git a/cmd/tailscale/cli/up.go b/cmd/tailscale/cli/up.go index 850a56cf2..8dab79e9f 100644 --- a/cmd/tailscale/cli/up.go +++ b/cmd/tailscale/cli/up.go @@ -114,6 +114,7 @@ func newUpFlagSet(goos string, upArgs *upArgsT, cmd string) *flag.FlagSet { upf.StringVar(&upArgs.hostname, "hostname", "", "hostname to use instead of the one provided by the OS") upf.StringVar(&upArgs.advertiseRoutes, "advertise-routes", "", "routes to advertise to other nodes (comma-separated, e.g. \"10.0.0.0/8,192.168.0.0/24\") or empty string to not advertise routes") upf.BoolVar(&upArgs.advertiseDefaultRoute, "advertise-exit-node", false, "offer to be an exit node for internet traffic for the tailnet") + if safesocket.GOOSUsesPeerCreds(goos) { upf.StringVar(&upArgs.opUser, "operator", "", "Unix username to allow to operate on tailscaled without sudo") } @@ -725,6 +726,7 @@ func init() { addPrefFlagMapping("nickname", "ProfileName") addPrefFlagMapping("update-check", "AutoUpdate") addPrefFlagMapping("auto-update", "AutoUpdate") + addPrefFlagMapping("posture-checking", "PostureChecking") } func addPrefFlagMapping(flagName string, prefNames ...string) {