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

Merge branch 'main' into kradalby-patch-2

Browse source
This commit is contained in:
Kristoffer Dalby 2021-11-27 20:30:27 +00:00 committed by GitHub
commit ef81845deb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app.go
View file

@ -48,7 +48,7 @@ import (
const ( const (
AuthPrefix = "Bearer " AuthPrefix = "Bearer "
Postgres = "postgresql" Postgres = "postgres"
Sqlite = "sqlite3" Sqlite = "sqlite3"
updateInterval = 5000 updateInterval = 5000
HTTPReadTimeout = 30 * time.Second HTTPReadTimeout = 30 * time.Second

12
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() {