mirror of
https://github.com/tailscale/tailscale.git
synced 2025-03-17 02:41:00 +00:00
ipn/ipnlocal: include web client port in setTCPPortsIntercepted
Updates tailscale/corp#14335 Signed-off-by: Sonia Appasamy <sonia@tailscale.com>
This commit is contained in:
parent
da31ce3a64
commit
aa5af06165
@ -4210,6 +4210,9 @@ func (b *LocalBackend) ResetForClientDisconnect() {
|
|||||||
|
|
||||||
func (b *LocalBackend) ShouldRunSSH() bool { return b.sshAtomicBool.Load() && envknob.CanSSHD() }
|
func (b *LocalBackend) ShouldRunSSH() bool { return b.sshAtomicBool.Load() && envknob.CanSSHD() }
|
||||||
|
|
||||||
|
// ShouldRunWebClient reports whether the web client is being run
|
||||||
|
// within this tailscaled instance. ShouldRunWebClient is safe to
|
||||||
|
// call regardless of whether b.mu is held or not.
|
||||||
func (b *LocalBackend) ShouldRunWebClient() bool { return b.webClientAtomicBool.Load() }
|
func (b *LocalBackend) ShouldRunWebClient() bool { return b.webClientAtomicBool.Load() }
|
||||||
|
|
||||||
func (b *LocalBackend) setWebClientAtomicBoolLocked(nm *netmap.NetworkMap, prefs ipn.PrefsView) {
|
func (b *LocalBackend) setWebClientAtomicBoolLocked(nm *netmap.NetworkMap, prefs ipn.PrefsView) {
|
||||||
@ -4467,6 +4470,9 @@ func (b *LocalBackend) setTCPPortsInterceptedFromNetmapAndPrefsLocked(prefs ipn.
|
|||||||
if prefs.Valid() && prefs.RunSSH() && envknob.CanSSHD() {
|
if prefs.Valid() && prefs.RunSSH() && envknob.CanSSHD() {
|
||||||
handlePorts = append(handlePorts, 22)
|
handlePorts = append(handlePorts, 22)
|
||||||
}
|
}
|
||||||
|
if b.ShouldRunWebClient() {
|
||||||
|
handlePorts = append(handlePorts, 5252)
|
||||||
|
}
|
||||||
|
|
||||||
b.reloadServeConfigLocked(prefs)
|
b.reloadServeConfigLocked(prefs)
|
||||||
if b.serveConfig.Valid() {
|
if b.serveConfig.Valid() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user