Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-09-02 13:47:00 +02:00
Code Issues Projects Releases Wiki Activity

Use env variable TZ to set timezone, fallback to UTC

Browse Source
This commit is contained in:
Deon Thomas 2022-05-08 23:29:00 -04:00
parent 6ed79b7bb8
commit 5dd32acc6a
No known key found for this signature in database
GPG Key ID: 0FF7DAE12CA62D67
9 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api.go
View File

@ -15,6 +15,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/klauspost/compress/zstd"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
"gorm.io/gorm"
"tailscale.com/tailcfg"
"tailscale.com/types/key"
@ -120,7 +121,8 @@ func (h *Headscale) RegistrationHandler(ctx *gin.Context) {
return
}
now := time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
now := time.Now().In(location)
machine, err := h.GetMachineByMachineKey(machineKey)
if errors.Is(err, gorm.ErrRecordNotFound) {
log.Info().Str("machine", req.Hostinfo.Hostname).Msg("New machine")
@ -189,7 +191,7 @@ func (h *Headscale) RegistrationHandler(ctx *gin.Context) {
if machine.NodeKey == NodePublicKeyStripPrefix(req.NodeKey) {
// The client sends an Expiry in the past if the client is requesting to expire the key (aka logout)
// https://github.com/tailscale/tailscale/blob/main/tailcfg/tailcfg.go#L648
if !req.Expiry.IsZero() && req.Expiry.UTC().Before(now) {
if !req.Expiry.IsZero() && req.Expiry.In(location).Before(now) {
h.handleMachineLogOut(ctx, machineKey, *machine)
return
@ -601,7 +603,8 @@ func (h *Headscale) handleAuthKey(
machine.AuthKeyID = uint(pak.ID)
h.RefreshMachine(machine, registerRequest.Expiry)
} else {
now := time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
now := time.Now().In(location)
machineToRegister := Machine{
Name: registerRequest.Hostinfo.Hostname,
NamespaceID: pak.Namespace.ID,

7
app.go
View File

@ -27,6 +27,7 @@ import (
zerolog "github.com/philip-bui/grpc-zerolog"
zl "github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
ginprometheus "github.com/zsais/go-gin-prometheus"
"golang.org/x/crypto/acme"
"golang.org/x/crypto/acme/autocert"
@ -791,7 +792,8 @@ func (h *Headscale) getTLSSettings() (*tls.Config, error) {
}
func (h *Headscale) setLastStateChangeToNow(namespace string) {
now := time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
now := time.Now().In(location)
lastStateUpdate.WithLabelValues("", "headscale").Set(float64(now.Unix()))
h.lastStateChange.Store(namespace, now)
}
@ -814,7 +816,8 @@ func (h *Headscale) getLastStateChange(namespaces ...string) time.Time {
log.Trace().Msgf("Latest times %#v", times)
if len(times) == 0 {
return time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
return time.Now().In(location)
} else {
return times[0]
}

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

@ -10,6 +10,7 @@ import (
"github.com/pterm/pterm"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"google.golang.org/protobuf/types/known/timestamppb"
)
@ -119,7 +120,8 @@ If you loose a key, create a new one and revoke (expire) the old one.`,
request := &v1.CreateApiKeyRequest{}
duration, _ := cmd.Flags().GetDuration("expiration")
expiration := time.Now().UTC().Add(duration)
location, _ := time.LoadLocation(viper.GetString("TZ"))
expiration := time.Now().In(location).Add(duration)
log.Trace().Dur("expiration", duration).Msg("expiration has been set")

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

@ -12,6 +12,7 @@ import (
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
"github.com/pterm/pterm"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"google.golang.org/grpc/status"
"inet.af/netaddr"
"tailscale.com/types/key"
@ -413,7 +414,8 @@ func nodesToPtables(
var lastSeen time.Time
var lastSeenTime string
if machine.LastSeen != nil {
lastSeen = machine.LastSeen.AsTime()
location, _ := time.LoadLocation(viper.GetString("TZ"))
lastSeen = machine.LastSeen.AsTime().In(location)
lastSeenTime = lastSeen.Format("2006-01-02 15:04:05")
}

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

@ -9,6 +9,7 @@ import (
"github.com/pterm/pterm"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"google.golang.org/protobuf/types/known/timestamppb"
)
@ -149,7 +150,8 @@ var createPreAuthKeyCmd = &cobra.Command{
}
duration, _ := cmd.Flags().GetDuration("expiration")
expiration := time.Now().UTC().Add(duration)
location, _ := time.LoadLocation(viper.GetString("TZ"))
expiration := time.Now().In(location).Add(duration)
log.Trace().Dur("expiration", duration).Msg("expiration has been set")

14
cmd/headscale/headscale.go
View File

@ -36,7 +36,19 @@ func main() {
colors = false
}
zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
viper.SetDefault("TZ", "UTC")
if tz := os.Getenv("TZ"); tz != "" {
_, err := time.LoadLocation(tz)
if err == nil {
viper.SetDefault("TZ", tz)
}
}
zerolog.TimestampFunc = func() time.Time {
location, _ := time.LoadLocation(viper.GetString("TZ"))
return time.Now().In(location)
}
log.Logger = log.Output(zerolog.ConsoleWriter{
Out: os.Stdout,
TimeFormat: time.RFC3339,

4
machine.go
View File

@ -11,6 +11,7 @@ import (
"github.com/fatih/set"
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
"google.golang.org/protobuf/types/known/timestamppb"
"inet.af/netaddr"
"tailscale.com/tailcfg"
@ -116,8 +117,9 @@ func (machine Machine) isExpired() bool {
if machine.Expiry == nil || machine.Expiry.IsZero() {
return false
}
location, _ := time.LoadLocation(viper.GetString("TZ"))
return time.Now().UTC().After(*machine.Expiry)
return time.Now().In(location).After(*machine.Expiry)
}
func containsAddresses(inputs []string, addrs []string) bool {

17
poll.go
View File

@ -10,6 +10,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
"gorm.io/gorm"
"tailscale.com/tailcfg"
"tailscale.com/types/key"
@ -97,7 +98,8 @@ func (h *Headscale) PollNetMapHandler(ctx *gin.Context) {
machine.Name = hname
machine.HostInfo = HostInfo(*req.Hostinfo)
machine.DiscoKey = DiscoPublicKeyStripPrefix(req.DiscoKey)
now := time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
now := time.Now().In(location)
// update ACLRules with peer informations (to update server tags if necessary)
if h.aclPolicy != nil {
@ -339,7 +341,8 @@ func (h *Headscale) PollNetMapStream(
// since the stream opened, terminate connection.
return false
}
now := time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
now := time.Now().In(location)
machine.LastSeen = &now
lastStateUpdate.WithLabelValues(machine.Namespace.Name, machine.Name).
@ -405,7 +408,8 @@ func (h *Headscale) PollNetMapStream(
// since the stream opened, terminate connection.
return false
}
now := time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
now := time.Now().In(location)
machine.LastSeen = &now
err = h.TouchMachine(machine)
if err != nil {
@ -495,7 +499,8 @@ func (h *Headscale) PollNetMapStream(
// since the stream opened, terminate connection.
return false
}
now := time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
now := time.Now().In(location)
lastStateUpdate.WithLabelValues(machine.Namespace.Name, machine.Name).
Set(float64(now.Unix()))
@ -546,7 +551,9 @@ func (h *Headscale) PollNetMapStream(
// since the stream opened, terminate connection.
return false
}
now := time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
now := time.Now().In(location)
machine.LastSeen = &now
err = h.TouchMachine(machine)
if err != nil {

4
preauth_keys.go
View File

@ -8,6 +8,7 @@ import (
"time"
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
"github.com/spf13/viper"
"google.golang.org/protobuf/types/known/timestamppb"
"gorm.io/gorm"
)
@ -45,7 +46,8 @@ func (h *Headscale) CreatePreAuthKey(
return nil, err
}
now := time.Now().UTC()
location, _ := time.LoadLocation(viper.GetString("TZ"))
now := time.Now().In(location)
kstr, err := h.generateKey()
if err != nil {
return nil, err