public/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-09-20 07:14:54 +09:00
Code Issues Packages Projects Releases Wiki Activity

state: make any-user machine-key lookup deterministic

Browse Source 
The lookup returned the first map match, so re-auth branch choice varied
with map order once a machine key had more than one node. Prefer the tagged
node, else the lowest node ID.

Updates #3312
This commit is contained in:
Kristoffer Dalby
2026-06-15 11:07:26 +00:00
committed by Kristoffer Dalby
parent a73d38bb3f
commit fd08b8fa8c
2 changed files with 71 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hscontrol/state/node_store.go
+15 -6
View File
@@ -804,12 +804,15 @@ func (s *NodeStore) GetNodeByMachineKey(machineKey key.MachinePublic, userID typ
return types.NodeView{}, false
}
// GetNodeByMachineKeyAnyUser returns the first node with the given machine key,
// GetNodeByMachineKeyAnyUser returns a node with the given machine key,
// regardless of which user it belongs to. This is useful for scenarios like
// transferring a node to a different user when re-authenticating with a
// different user's auth key.
// If multiple nodes exist with the same machine key (different users), the
// first one found is returned (order is not guaranteed).
//
// When more than one node shares the machine key (e.g. a tagged node and a
// user-owned node), the choice is deterministic: the tagged node is preferred,
// otherwise the node with the lowest ID. A stable pick keeps re-auth branch
// selection (convert vs create) from depending on map iteration order.
func (s *NodeStore) GetNodeByMachineKeyAnyUser(machineKey key.MachinePublic) (types.NodeView, bool) {
timer := prometheus.NewTimer(nodeStoreOperationDuration.WithLabelValues("get_by_machine_key_any_user"))
defer timer.ObserveDuration()
@@ -817,14 +820,20 @@ func (s *NodeStore) GetNodeByMachineKeyAnyUser(machineKey key.MachinePublic) (ty
nodeStoreOperations.WithLabelValues("get_by_machine_key_any_user").Inc()
snapshot := s.data.Load()
var best types.NodeView
if userMap, exists := snapshot.nodesByMachineKey[machineKey]; exists {
// Return the first node found (order not guaranteed due to map iteration)
for _, node := range userMap {
return node, true
if !best.Valid() ||
(node.IsTagged() && !best.IsTagged()) ||
(node.IsTagged() == best.IsTagged() && node.ID() < best.ID()) {
best = node
}
}
}
return types.NodeView{}, false
return best, best.Valid()
}
// DebugString returns debug information about the [NodeStore].