diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 8a5736b6f..aee9a9f87 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -4508,8 +4508,13 @@ func (b *LocalBackend) ShouldRunSSH() bool { return b.sshAtomicBool.Load() && en // call regardless of whether b.mu is held or not. func (b *LocalBackend) ShouldRunWebClient() bool { return b.webClientAtomicBool.Load() } +// setWebClientAtomicBoolLocked sets webClientAtomicBool based on whether +// the RunWebClient pref is set, and whether tailcfg.NodeAttrDisableWebClient +// has been set in the netmap.NetworkMap. +// +// b.mu must be held. func (b *LocalBackend) setWebClientAtomicBoolLocked(nm *netmap.NetworkMap, prefs ipn.PrefsView) { - shouldRun := prefs.Valid() && prefs.RunWebClient() + shouldRun := prefs.Valid() && prefs.RunWebClient() && !hasCapability(nm, tailcfg.NodeAttrDisableWebClient) wasRunning := b.webClientAtomicBool.Swap(shouldRun) if wasRunning && !shouldRun { go b.webClientShutdown() // stop web client diff --git a/tailcfg/tailcfg.go b/tailcfg/tailcfg.go index aeb41ce7e..8af421e77 100644 --- a/tailcfg/tailcfg.go +++ b/tailcfg/tailcfg.go @@ -2219,6 +2219,9 @@ type Oauth2Token struct { // NodeAttrSuggestExitNode is applied to each exit node which the control plane has determined // is a recommended exit node. NodeAttrSuggestExitNode NodeCapability = "suggest-exit-node" + + // NodeAttrDisableWebClient disables using the web client. + NodeAttrDisableWebClient NodeCapability = "disable-web-client" ) // SetDNSRequest is a request to add a DNS record.