leviathonbeast/ionscale
1
0
Fork 0
mirror of https://github.com/jsiebens/ionscale.git synced 2026-04-05 12:32:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: disable and enable key expiry

Browse Source
This commit is contained in:
Johan Siebens
2022-06-12 08:31:04 +02:00
parent 090e5c3c88
commit d5f71224f6
11 changed files with 465 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/handlers/authentication.go
+18 -13
View File
@@ -330,7 +330,8 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
var user *domain.User
var ephemeral bool
var tags = []string{}
var expiresAt *time.Time
var expiresAt time.Time
var expiryDisabled bool
if authKeyParam != "" {
authKey, err := h.repository.LoadAuthKey(ctx, authKeyParam)
@@ -378,7 +379,8 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
ephemeral = false
keyExpiry := time.Now().Add(180 * 24 * time.Hour).UTC()
expiresAt = &keyExpiry
expiresAt = keyExpiry
expiryDisabled = false
}
var m *domain.Machine
@@ -396,6 +398,7 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
tags := append(registeredTags, advertisedTags...)
if len(tags) != 0 {
expiryDisabled = true
user, _, err = h.repository.GetOrCreateServiceUser(ctx, tailnet)
if err != nil {
return err
@@ -409,16 +412,17 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
}
m = &domain.Machine{
ID: util.NextID(),
Name: sanitizeHostname,
NameIdx: nameIdx,
MachineKey: machineKey,
NodeKey: nodeKey,
Ephemeral: ephemeral,
RegisteredTags: registeredTags,
Tags: domain.SanitizeTags(tags),
CreatedAt: now,
ExpiresAt: expiresAt,
ID: util.NextID(),
Name: sanitizeHostname,
NameIdx: nameIdx,
MachineKey: machineKey,
NodeKey: nodeKey,
Ephemeral: ephemeral,
RegisteredTags: registeredTags,
Tags: domain.SanitizeTags(tags),
CreatedAt: now,
ExpiresAt: expiresAt,
KeyExpiryDisabled: expiryDisabled,
User: *user,
Tailnet: *tailnet,
@@ -436,11 +440,11 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
tags := append(registeredTags, advertisedTags...)
if len(tags) != 0 {
expiryDisabled = true
user, _, err = h.repository.GetOrCreateServiceUser(ctx, tailnet)
if err != nil {
return err
}
expiresAt = nil
}
sanitizeHostname := dnsname.SanitizeHostname(req.Hostinfo.Hostname)
@@ -461,6 +465,7 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
m.TailnetID = tailnet.ID
m.Tailnet = *tailnet
m.ExpiresAt = expiresAt
m.KeyExpiryDisabled = expiryDisabled
}
err = h.repository.Transaction(func(rp domain.Repository) error {