Move handle expired machine to the end of registration

This commit is contained in:
Kristoffer Dalby 2021-11-21 21:14:13 +00:00
parent bda2d9c3b0
commit fd5f42c2e6
No known key found for this signature in database
GPG key ID: 09F62DC067465735

10
api.go
View file

@ -138,11 +138,6 @@ func (h *Headscale) RegistrationHandler(ctx *gin.Context) {
return return
} }
// The machine has expired
h.handleMachineExpired(ctx, machineKey, req, *machine)
return
} }
// The NodeKey we have matches OldNodeKey, which means this is a refresh after a key expiration // The NodeKey we have matches OldNodeKey, which means this is a refresh after a key expiration
@ -152,6 +147,11 @@ func (h *Headscale) RegistrationHandler(ctx *gin.Context) {
return return
} }
// The machine has expired
h.handleMachineExpired(ctx, machineKey, req, *machine)
return
} }
// If the machine has AuthKey set, handle registration via PreAuthKeys // If the machine has AuthKey set, handle registration via PreAuthKeys