myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fixed minor linting things

Browse source
This commit is contained in:
Juan Font Alonso 2022-08-19 14:27:40 +02:00
parent 43ad0d4416
commit b6e3cd81c6
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
protocol_common.go
View file

@ -100,11 +100,9 @@ func (h *Headscale) handleRegisterCommon(
registerRequest tailcfg.RegisterRequest, registerRequest tailcfg.RegisterRequest,
machineKey key.MachinePublic, machineKey key.MachinePublic,
) { ) {
now := time.Now().UTC() now := time.Now().UTC()
machine, err := h.GetMachineByAnyNodeKey(registerRequest.NodeKey, registerRequest.OldNodeKey) machine, err := h.GetMachineByAnyNodeKey(registerRequest.NodeKey, registerRequest.OldNodeKey)
if errors.Is(err, gorm.ErrRecordNotFound) { if errors.Is(err, gorm.ErrRecordNotFound) {
// If the machine has AuthKey set, handle registration via PreAuthKeys // If the machine has AuthKey set, handle registration via PreAuthKeys
if registerRequest.Auth.AuthKey != "" { if registerRequest.Auth.AuthKey != "" {
h.handleAuthKeyCommon(writer, req, registerRequest, machineKey) h.handleAuthKeyCommon(writer, req, registerRequest, machineKey)
@ -242,7 +240,6 @@ func (h *Headscale) handleRegisterCommon(
return return
} }
} }
// handleAuthKeyCommon contains the logic to manage auth key client registration // handleAuthKeyCommon contains the logic to manage auth key client registration
@ -676,7 +673,6 @@ func (h *Headscale) handleMachineRefreshKeyCommon(
Str("old_node_key", registerRequest.OldNodeKey.ShortString()). Str("old_node_key", registerRequest.OldNodeKey.ShortString()).
Str("machine", machine.Hostname). Str("machine", machine.Hostname).
Msg("Machine successfully refreshed") Msg("Machine successfully refreshed")
} }
func (h *Headscale) handleMachineExpiredCommon( func (h *Headscale) handleMachineExpiredCommon(

1
protocol_legacy.go
View file

@ -55,5 +55,4 @@ func (h *Headscale) RegistrationHandler(
} }
h.handleRegisterCommon(writer, req, registerRequest, machineKey) h.handleRegisterCommon(writer, req, registerRequest, machineKey)
} }