TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-05 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: use presence of NodeID to identify logins

Browse Source 
The profileManager was using the LoginName as a proxy to figure out if the profile
had logged in, however the LoginName is not present if the node was created with an
Auth Key that does not have an associated user.

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-02-06 21:18:21 -08:00 committed by Maisem Ali
parent 2a094181df
commit 0fd2f71a1e
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/profiles.go
View File

@ -185,7 +185,7 @@ func init() {
func (pm *profileManager) SetPrefs(prefsIn ipn.PrefsView) error {
prefs := prefsIn.AsStruct().View()
newPersist := prefs.Persist().AsStruct()
if newPersist == nil || newPersist.LoginName == "" {
if newPersist == nil || newPersist.NodeID == "" {
return pm.setPrefsLocked(prefs)
}
up := newPersist.UserProfile

2
ipn/ipnlocal/profiles_test.go
View File

@ -5,6 +5,7 @@
import (
"fmt"
"strconv"
"testing"
"tailscale.com/ipn"
@ -337,6 +338,7 @@ func TestProfileManagementWindows(t *testing.T) {
ID: id,
LoginName: loginName,
},
NodeID: tailcfg.StableNodeID(strconv.Itoa(int(id))),
}
if err := pm.SetPrefs(p.View()); err != nil {
t.Fatal(err)

3
ipn/ipnlocal/state_test.go
View File

@ -473,6 +473,7 @@ func TestStateMachine(t *testing.T) {
notifies.expect(3)
cc.persist.LoginName = "user1"
cc.persist.UserProfile.LoginName = "user1"
cc.persist.NodeID = "node1"
cc.send(nil, "", true, &netmap.NetworkMap{})
{
nn := notifies.drain(3)
@ -699,6 +700,7 @@ func TestStateMachine(t *testing.T) {
notifies.expect(3)
cc.persist.LoginName = "user2"
cc.persist.UserProfile.LoginName = "user2"
cc.persist.NodeID = "node2"
cc.send(nil, "", true, &netmap.NetworkMap{
MachineStatus: tailcfg.MachineAuthorized,
})
@ -835,6 +837,7 @@ func TestStateMachine(t *testing.T) {
notifies.expect(3)
cc.persist.LoginName = "user3"
cc.persist.UserProfile.LoginName = "user3"
cc.persist.NodeID = "node3"
cc.send(nil, "", true, &netmap.NetworkMap{
MachineStatus: tailcfg.MachineAuthorized,
})