rsp2k/headscale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

state: disable key expiry for nodes with approved advertise-tags

Browse Source 
Extends #2971 fix to also cover nodes that authenticate as users but
become tagged immediately via --advertise-tags. When RequestTags are
approved by policy, the node's expiry is now disabled, consistent with
nodes registered via tagged PreAuthKeys.
This commit is contained in:
Kristoffer Dalby 2026-01-09 10:41:06 +00:00
parent 1d9900273e
commit 00f22a8443
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hscontrol/state/state.go
View File

@ -1188,6 +1188,10 @@ func (s *State) createAndSaveNewNode(params newNodeParams) (types.NodeView, erro
nodeToRegister.Tags = approvedTags nodeToRegister.Tags = approvedTags
slices.Sort(nodeToRegister.Tags) slices.Sort(nodeToRegister.Tags)
nodeToRegister.Tags = slices.Compact(nodeToRegister.Tags) nodeToRegister.Tags = slices.Compact(nodeToRegister.Tags)
// Tagged nodes have key expiry disabled.
nodeToRegister.Expiry = nil
log.Info(). log.Info().
Str("node.name", nodeToRegister.Hostname). Str("node.name", nodeToRegister.Hostname).
Strs("tags", nodeToRegister.Tags). Strs("tags", nodeToRegister.Tags).