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

Merge pull request #384 from restanrm/fix-issue-with-empty-namespace-and-acl-evaluation

Browse source
This commit is contained in:
Kristoffer Dalby 2022-03-03 08:43:37 +00:00 committed by GitHub
commit f2ea6fb30f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
acls.go
View file

@ -230,6 +230,10 @@ func expandAlias(
return []string{"*"}, nil return []string{"*"}, nil
} }
log.Debug().
Str("alias", alias).
Msg("Expanding")
if strings.HasPrefix(alias, "group:") { if strings.HasPrefix(alias, "group:") {
namespaces, err := expandGroup(aclPolicy, alias, stripEmailDomain) namespaces, err := expandGroup(aclPolicy, alias, stripEmailDomain)
if err != nil { if err != nil {
@ -293,7 +297,9 @@ func expandAlias(
return []string{cidr.String()}, nil return []string{cidr.String()}, nil
} }
return ips, errInvalidUserSection log.Warn().Msgf("No IPs found with the alias %v", alias)
return ips, nil
} }
// excludeCorrectlyTaggedNodes will remove from the list of input nodes the ones // excludeCorrectlyTaggedNodes will remove from the list of input nodes the ones