Add forced approval of a node if it is registered via CLI

hopleus · Oct 7, 2024 · 3a7d361 · 3a7d361
1 parent 2bf5519
commit 3a7d361
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/hscontrol/auth.go b/hscontrol/auth.go
@@ -352,7 +352,7 @@ func (h *Headscale) handleAuthKey(
 		ctx := types.NotifyCtx(context.Background(), "handle-authkey", "na")
 		h.nodeNotifier.NotifyAll(ctx, types.StateUpdate{Type: types.StatePeerChanged, ChangeNodes: []types.NodeID{node.ID}})
 	} else {
-		now := time.Now().UTC()
+		now := time.Now()
 		var authorize *time.Time
 
 		if pak.Preauthorized {

diff --git a/hscontrol/db/node.go b/hscontrol/db/node.go
@@ -371,6 +371,11 @@ func (hsdb *HSDatabase) RegisterNodeFromAuthCallback(
 				node.Expiry = nodeExpiry
 			}
 
+			if registrationMethod == util.RegisterMethodCLI && node.Authorize == nil {
+				now := time.Now()
+				node.Authorize = &now
+			}
+
 			node, err := RegisterNode(
 				tx,
 				node,