feat: set default key expiry

This commit is contained in:
Johan Siebens
2022-05-28 14:56:31 +02:00
parent 9df514036e
commit 1654680cab
+6 -5
View File
@@ -189,6 +189,7 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
var user *domain.User
var ephemeral bool
var tags = []string{}
var expiresAt *time.Time
if authKeyParam != "" {
authKey, err := h.repository.LoadAuthKey(ctx, authKeyParam)
@@ -235,6 +236,8 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
}
ephemeral = false
keyExpiry := time.Now().Add(180 * 24 * time.Hour).UTC()
expiresAt = &keyExpiry
}
var m *domain.Machine
@@ -274,15 +277,12 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
RegisteredTags: registeredTags,
Tags: domain.SanitizeTags(tags),
CreatedAt: now,
ExpiresAt: expiresAt,
User: *user,
Tailnet: *tailnet,
}
if !req.Expiry.IsZero() {
m.ExpiresAt = &req.Expiry
}
ipv4, ipv6, err := addr.SelectIP(checkIP(ctx, h.repository.CountMachinesWithIPv4))
if err != nil {
return err
@@ -299,6 +299,7 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
if err != nil {
return err
}
expiresAt = nil
}
sanitizeHostname := dnsname.SanitizeHostname(req.Hostinfo.Hostname)
@@ -318,7 +319,7 @@ func (h *AuthenticationHandlers) endMachineRegistrationFlow(c echo.Context, regi
m.User = *user
m.TailnetID = tailnet.ID
m.Tailnet = *tailnet
m.ExpiresAt = nil
m.ExpiresAt = expiresAt
}
err = h.repository.Transaction(func(rp domain.Repository) error {