TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-24 02:25:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #237 from cure/preauthkeys-fix-default-expiration

Browse Source 
Fix default preauthkey expiration
This commit is contained in:
Ward Vandewege 2021-11-26 11:09:43 -05:00 committed by GitHub
commit d944aa6e79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/headscale/cli/preauthkeys.go
View File

@ -13,7 +13,7 @@ import (
) )
const ( const (
DefaultPreAuthKeyExpiry = 24 * time.Hour DefaultPreAuthKeyExpiry = 1 * time.Hour
) )
func init() { func init() {
@ -145,14 +145,12 @@ var createPreAuthKeyCmd = &cobra.Command{
Ephemeral: ephemeral, Ephemeral: ephemeral,
} }
if cmd.Flags().Changed("expiration") {
duration, _ := cmd.Flags().GetDuration("expiration") duration, _ := cmd.Flags().GetDuration("expiration")
expiration := time.Now().UTC().Add(duration) expiration := time.Now().UTC().Add(duration)
log.Trace().Dur("expiration", duration).Msg("expiration has been set") log.Trace().Dur("expiration", duration).Msg("expiration has been set")
request.Expiration = timestamppb.New(expiration) request.Expiration = timestamppb.New(expiration)
}
ctx, client, conn, cancel := getHeadscaleCLIClient() ctx, client, conn, cancel := getHeadscaleCLIClient()
defer cancel() defer cancel()

7
integration_cli_test.go
View File

@ -426,7 +426,12 @@ func (s *IntegrationCLITestSuite) TestPreAuthKeyCommandWithoutExpiry() {
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
assert.Len(s.T(), listedPreAuthKeys, 1) assert.Len(s.T(), listedPreAuthKeys, 1)
assert.True(s.T(), time.Time{}.Equal(listedPreAuthKeys[0].Expiration.AsTime()))
assert.True(s.T(), listedPreAuthKeys[0].Expiration.AsTime().After(time.Now()))
assert.True(
s.T(),
listedPreAuthKeys[0].Expiration.AsTime().Before(time.Now().Add(time.Minute*70)),
)
} }
func (s *IntegrationCLITestSuite) TestPreAuthKeyCommandReusableEphemeral() { func (s *IntegrationCLITestSuite) TestPreAuthKeyCommandReusableEphemeral() {