TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-18 14:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix sighup issue with empty acl (#2296)

Browse Source 
Fixes #2291

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-12-16 07:48:19 +01:00 committed by GitHub
parent e00b9d9a91
commit ec8729b772
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hscontrol/app.go
View File

@ -838,6 +838,10 @@ func (h *Headscale) Serve() error {
Str("signal", sig.String()). Str("signal", sig.String()).
Msg("Received SIGHUP, reloading ACL and Config") Msg("Received SIGHUP, reloading ACL and Config")
if h.cfg.Policy.IsEmpty() {
continue
}
if err := h.loadPolicyManager(); err != nil { if err := h.loadPolicyManager(); err != nil {
log.Error().Err(err).Msg("failed to reload Policy") log.Error().Err(err).Msg("failed to reload Policy")
} }
@ -1102,6 +1106,10 @@ func (h *Headscale) policyBytes() ([]byte, error) {
return nil, err return nil, err
} }
if p.Data == "" {
return nil, nil
}
return []byte(p.Data), err return []byte(p.Data), err
} }

4
hscontrol/policy/pm.go
View File

@ -122,6 +122,10 @@ func (pm *PolicyManagerV1) SSHPolicy(node *types.Node) (*tailcfg.SSHPolicy, erro
} }
func (pm *PolicyManagerV1) SetPolicy(polB []byte) (bool, error) { func (pm *PolicyManagerV1) SetPolicy(polB []byte) (bool, error) {
if len(polB) == 0 {
return false, nil
}
pol, err := LoadACLPolicyFromBytes(polB) pol, err := LoadACLPolicyFromBytes(polB)
if err != nil { if err != nil {
return false, fmt.Errorf("parsing policy: %w", err) return false, fmt.Errorf("parsing policy: %w", err)

4
hscontrol/types/config.go
View File

@ -211,6 +211,10 @@ type PolicyConfig struct {
Mode PolicyMode Mode PolicyMode
} }
func (p *PolicyConfig) IsEmpty() bool {
return p.Mode == PolicyModeFile && p.Path == ""
}
type LogConfig struct { type LogConfig struct {
Format string Format string
Level zerolog.Level Level zerolog.Level