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

Remove expiry logic, this needs to be redone

Browse source
This commit is contained in:
Kristoffer Dalby 2021-11-19 09:02:29 +00:00
parent 106b1e7e8d
commit 9aac1fb255
5 changed files with 22 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

16
api.go
View file

@ -369,13 +369,9 @@ func (h *Headscale) handleMachineExpired(
strings.TrimSuffix(h.cfg.ServerURL, "/"), idKey.HexString())
}
// When a client connects, it may request a specific expiry time in its
// RegisterRequest (https://github.com/tailscale/tailscale/blob/main/tailcfg/tailcfg.go#L634)
// RequestedExpiry is used to store the clients requested expiry time since the authentication flow is broken
// into two steps (which cant pass arbitrary data between them easily) and needs to be
// retrieved again after the user has authenticated. After the authentication flow
// completes, RequestedExpiry is copied into Expiry.
machine.RequestedExpiry = &reqisterRequest.Expiry
if !reqisterRequest.Expiry.IsZero() {
machine.Expiry = &reqisterRequest.Expiry
}
h.db.Save(&machine)
@ -450,8 +446,10 @@ func (h *Headscale) handleMachineRegistrationNew(
strings.TrimSuffix(h.cfg.ServerURL, "/"), idKey.HexString())
}
// save the requested expiry time for retrieval later in the authentication flow
machine.RequestedExpiry = &reqisterRequest.Expiry
if !reqisterRequest.Expiry.IsZero() {
machine.Expiry = &reqisterRequest.Expiry
}
machine.NodeKey = wgkey.Key(reqisterRequest.NodeKey).HexString() // save the NodeKey
h.db.Save(&machine)