devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-26 08:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: apply fmt and fix missing name changes

Browse source
This commit is contained in:
Adrien Raffin-Caboisse 2022-03-07 23:20:30 +01:00
parent 2b68c90778
commit 41efe98953
No known key found for this signature in database
GPG key ID: 7FB60532DEBEAD6A
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acls.go
View file

@ -444,7 +444,7 @@ func expandGroup(
errInvalidGroup, errInvalidGroup,
) )
} }
grp, err := NormalizeName(group, stripEmailDomain) grp, err := NormalizeToFQDNRules(group, stripEmailDomain)
if err != nil { if err != nil {
return []string{}, fmt.Errorf( return []string{}, fmt.Errorf(
"failed to normalize group %q, err: %w", "failed to normalize group %q, err: %w",

1
api.go
View file

@ -144,6 +144,7 @@ func (h *Headscale) RegistrationHandler(ctx *gin.Context) {
Str("func", "RegistrationHandler"). Str("func", "RegistrationHandler").
Str("hostinfo.name", req.Hostinfo.Hostname). Str("hostinfo.name", req.Hostinfo.Hostname).
Err(err) Err(err)
return return
} }

2
poll.go
View file

@ -83,7 +83,7 @@ func (h *Headscale) PollNetMapHandler(ctx *gin.Context) {
Str("machine", machine.Name). Str("machine", machine.Name).
Msg("Found machine in database") Msg("Found machine in database")
hname, err := NormalizeName( hname, err := NormalizeToFQDNRules(
req.Hostinfo.Hostname, req.Hostinfo.Hostname,
h.cfg.OIDC.StripEmaildomain, h.cfg.OIDC.StripEmaildomain,
) )