mirror of
https://github.com/gravitl/netmaker.git
synced 2025-09-06 13:14:24 +08:00
fix merge conflicts
This commit is contained in:
parent
bb25739bd9
commit
0e4f163f1f
1 changed files with 14 additions and 4 deletions
|
@ -1268,12 +1268,21 @@ func getUserAclRulesForNode(targetnode *models.Node,
|
|||
continue
|
||||
}
|
||||
dstTags := convAclTagToValueMap(acl.Dst)
|
||||
for nodeTag := range targetNodeTags {
|
||||
if _, ok := dstTags[nodeTag.String()]; !ok {
|
||||
if _, ok = dstTags[targetnode.ID.String()]; !ok {
|
||||
continue
|
||||
_, all := dstTags["*"]
|
||||
addUsers := false
|
||||
if !all {
|
||||
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
|
||||
for _, srcAcl := range acl.Src {
|
||||
if srcAcl.ID == models.UserAclID {
|
||||
|
@ -1288,6 +1297,7 @@ func getUserAclRulesForNode(targetnode *models.Node,
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
for _, userNode := range userNodes {
|
||||
|
|
Loading…
Add table
Reference in a new issue