TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-27 02:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ssh/tailssh: fix deadlock in expandDelegateURL

Browse Source 
Also rename it to expandDelegateURLLocked, previously it was trying
to acquire the mutex while holding the mutex.

Fixes #5235

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-08-02 12:21:32 -07:00 committed by Maisem Ali
parent e1309e1323
commit 02a765743e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh/tailssh/tailssh.go
View File

@ -696,7 +696,7 @@ func (c *conn) resolveTerminalActionLocked(s ssh.Session, cr *contextReader) (ac
} }
}() }()
}) })
url = c.expandDelegateURL(url) url = c.expandDelegateURLLocked(url)
var err error var err error
action, err = c.fetchSSHAction(ctx, url) action, err = c.fetchSSHAction(ctx, url)
if err != nil { if err != nil {
@ -711,12 +711,10 @@ func (c *conn) resolveTerminalActionLocked(s ssh.Session, cr *contextReader) (ac
} }
} }
func (c *conn) expandDelegateURL(actionURL string) string { func (c *conn) expandDelegateURLLocked(actionURL string) string {
nm := c.srv.lb.NetMap() nm := c.srv.lb.NetMap()
c.mu.Lock()
ci := c.info ci := c.info
lu := c.localUser lu := c.localUser
c.mu.Unlock()
var dstNodeID string var dstNodeID string
if nm != nil { if nm != nil {
dstNodeID = fmt.Sprint(int64(nm.SelfNode.ID)) dstNodeID = fmt.Sprint(int64(nm.SelfNode.ID))