gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 03:46:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
abhishek9686 2025-03-06 22:48:46 +04:00
parent bb25739bd9
commit 0e4f163f1f
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
logic/acls.go
View file

@ -1268,12 +1268,21 @@ func getUserAclRulesForNode(targetnode *models.Node,
continue continue
} }
dstTags := convAclTagToValueMap(acl.Dst) dstTags := convAclTagToValueMap(acl.Dst)
for nodeTag := range targetNodeTags { _, all := dstTags["*"]
if _, ok := dstTags[nodeTag.String()]; !ok { addUsers := false
if _, ok = dstTags[targetnode.ID.String()]; !ok { if !all {
continue for nodeTag := range targetNodeTags {
if _, ok := dstTags[nodeTag.String()]; !ok {
if _, ok = dstTags[targetnode.ID.String()]; !ok {
break
}
} }
} }
} else {
addUsers = true
}
if addUsers {
// get all src tags // get all src tags
for _, srcAcl := range acl.Src { for _, srcAcl := range acl.Src {
if srcAcl.ID == models.UserAclID { if srcAcl.ID == models.UserAclID {
@ -1288,6 +1297,7 @@ func getUserAclRulesForNode(targetnode *models.Node,
} }
} }
} }
} }
for _, userNode := range userNodes { for _, userNode := range userNodes {