devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-01-19 10:20:05 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add missing iff to handle expired preauthkey machines

Browse source
This commit is contained in:
Kristoffer Dalby 2021-11-24 12:15:32 +00:00
parent 9968992be0
commit fdd64d98c8
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
api.go
View file

@ -364,15 +364,21 @@ func (h *Headscale) handleMachineExpired(
Str("machine", machine.Name). Str("machine", machine.Name).
Msg("Machine registration has expired. Sending a authurl to register") Msg("Machine registration has expired. Sending a authurl to register")
if h.cfg.OIDC.Issuer != "" { if registerRequest.Auth.AuthKey != "" {
resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s", h.handleAuthKey(ctx, machineKey, registerRequest, machine)
strings.TrimSuffix(h.cfg.ServerURL, "/"), idKey.HexString())
} else { return
resp.AuthURL = fmt.Sprintf("%s/register?key=%s",
strings.TrimSuffix(h.cfg.ServerURL, "/"), idKey.HexString())
} }
respBody, err := encode(resp, &idKey, h.privateKey) if h.cfg.OIDC.Issuer != "" {
resp.AuthURL = fmt.Sprintf("%s/oidc/register/%s",
strings.TrimSuffix(h.cfg.ServerURL, "/"), machineKey.HexString())
} else {
resp.AuthURL = fmt.Sprintf("%s/register?key=%s",
strings.TrimSuffix(h.cfg.ServerURL, "/"), machineKey.HexString())
}
respBody, err := encode(resp, &machineKey, h.privateKey)
if err != nil { if err != nil {
log.Error(). log.Error().
Str("handler", "Registration"). Str("handler", "Registration").