TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

controlclient/direct: fix a race condition accessing auth keys.

Browse Source 
Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
This commit is contained in:
Avery Pennarun 2020-05-19 02:51:27 -04:00
parent 1013cda799
commit d03de31404
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
control/controlclient/auto_test.go
View File

@ -74,10 +74,12 @@ func runSub(t *testing.T, name string, fn func(t *testing.T)) {
} }
func fatal(t *testing.T, args ...interface{}) { func fatal(t *testing.T, args ...interface{}) {
t.Helper()
t.Fatal("FAILED: ", fmt.Sprint(args...)) t.Fatal("FAILED: ", fmt.Sprint(args...))
} }
func fatalf(t *testing.T, s string, args ...interface{}) { func fatalf(t *testing.T, s string, args ...interface{}) {
t.Helper()
t.Fatalf("FAILED: "+s, args...) t.Fatalf("FAILED: "+s, args...)
} }
@ -813,7 +815,10 @@ func TestAuthKey(t *testing.T) {
c1.Login(nil, 0) c1.Login(nil, 0)
c1.waitStatus(t, stateURLVisitRequired) c1.waitStatus(t, stateURLVisitRequired)
c1.direct.mu.Lock()
c1.direct.authKey = string(key) c1.direct.authKey = string(key)
c1.direct.mu.Unlock()
c1.Login(nil, 0) c1.Login(nil, 0)
c1.waitStatus(t, stateAuthenticated) c1.waitStatus(t, stateAuthenticated)
c1.waitStatus(t, stateSynchronized) c1.waitStatus(t, stateSynchronized)

3
control/controlclient/direct.go
View File

@ -257,6 +257,7 @@ func (c *Direct) doLogin(ctx context.Context, t *oauth2.Token, flags LoginFlags,
persist := c.persist persist := c.persist
tryingNewKey := c.tryingNewKey tryingNewKey := c.tryingNewKey
serverKey := c.serverKey serverKey := c.serverKey
authKey := c.authKey
expired := c.expiry != nil && !c.expiry.IsZero() && c.expiry.Before(c.timeNow()) expired := c.expiry != nil && !c.expiry.IsZero() && c.expiry.Before(c.timeNow())
c.mu.Unlock() c.mu.Unlock()
@ -330,7 +331,7 @@ func (c *Direct) doLogin(ctx context.Context, t *oauth2.Token, flags LoginFlags,
request.Auth.Oauth2Token = t request.Auth.Oauth2Token = t
request.Auth.Provider = persist.Provider request.Auth.Provider = persist.Provider
request.Auth.LoginName = persist.LoginName request.Auth.LoginName = persist.LoginName
request.Auth.AuthKey = c.authKey request.Auth.AuthKey = authKey
bodyData, err := encode(request, &serverKey, &persist.PrivateMachineKey) bodyData, err := encode(request, &serverKey, &persist.PrivateMachineKey)
if err != nil { if err != nil {
return regen, url, err return regen, url, err