Refresh expired machine on re-auth - closes
@@ -568,8 +568,13 @@ func (h *Headscale) handleAuthKey(
Str("func", "handleAuthKey").
Str("machine", registerRequest.Hostinfo.Hostname).
Msg("Failed authentication via AuthKey")
+
+ if pak != nil {
machineRegistrations.WithLabelValues("new", RegisterMethodAuthKey, "error", pak.Namespace.Name).
Inc()
+ } else {
+ machineRegistrations.WithLabelValues("new", RegisterMethodAuthKey, "error").Inc()
+ }
return
}
@@ -580,8 +585,25 @@ func (h *Headscale) handleAuthKey(
Msg("Authentication key was valid, proceeding to acquire IP addresses")
nodeKey := NodePublicKeyStripPrefix(registerRequest.NodeKey)
- now := time.Now().UTC()
+ // retrieve machine information if it exist
+ // The error is not important, because if it does not
+ // exist, then this is a new machine and we will move
+ // on to registration.
+ machine, _ := h.GetMachineByMachineKey(machineKey)
+ if machine != nil {
+ log.Trace().
+ Caller().
+ Str("machine", machine.Name).
+ Msg("machine already registered, refreshing with new auth key")
+
+ machine.NodeKey = nodeKey
+ machine.AuthKeyID = uint(pak.ID)
+ h.RefreshMachine(machine, registerRequest.Expiry)
+
+ } else {
+
+ now := time.Now().UTC()
machineToRegister := Machine{
Name: registerRequest.Hostinfo.Hostname,
NamespaceID: pak.Namespace.ID,
@@ -593,7 +615,7 @@ func (h *Headscale) handleAuthKey(
AuthKeyID: uint(pak.ID),
}
- machine, err := h.RegisterMachine(
+ machine, err = h.RegisterMachine(
machineToRegister,
)
if err != nil {
@@ -610,6 +632,7 @@ func (h *Headscale) handleAuthKey(
return
}
+ }
h.UsePreAuthKey(pak)
