mirror of
https://github.com/juanfont/headscale.git
synced 2024-11-27 12:05:26 +00:00
Use correct machinekey format for oidc reg
This commit is contained in:
parent
86ade72c19
commit
ec4dc68524
8
oidc.go
8
oidc.go
@ -193,10 +193,12 @@ func (h *Headscale) OIDCCallback(ctx *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
machineKeyStr, machineKeyOK := machineKeyIf.(string)
|
machineKeyFromCache, machineKeyOK := machineKeyIf.(string)
|
||||||
|
|
||||||
var machineKey key.MachinePublic
|
var machineKey key.MachinePublic
|
||||||
err = machineKey.UnmarshalText([]byte(MachinePublicKeyEnsurePrefix(machineKeyStr)))
|
err = machineKey.UnmarshalText(
|
||||||
|
[]byte(MachinePublicKeyEnsurePrefix(machineKeyFromCache)),
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().
|
log.Error().
|
||||||
Msg("could not parse machine public key")
|
Msg("could not parse machine public key")
|
||||||
@ -295,6 +297,8 @@ func (h *Headscale) OIDCCallback(ctx *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
machineKeyStr := MachinePublicKeyStripPrefix(machineKey)
|
||||||
|
|
||||||
_, err = h.RegisterMachineFromAuthCallback(
|
_, err = h.RegisterMachineFromAuthCallback(
|
||||||
machineKeyStr,
|
machineKeyStr,
|
||||||
namespace.Name,
|
namespace.Name,
|
||||||
|
Loading…
Reference in New Issue
Block a user