Browse Source

fixed default node acl logic

0xdcarns 2 years ago
parent
commit
f5a20ffcca
1 changed files with 3 additions and 3 deletions
  1. 3 3
      logic/pro/proacls/nodes.go

+ 3 - 3
logic/pro/proacls/nodes.go

@@ -23,10 +23,10 @@ func AdjustNodeAcls(node *models.Node, networkNodes []models.Node) error {
 		// 2 cases
 		// 2 cases
 		// both allow - allow
 		// both allow - allow
 		// either 1 denies - deny
 		// either 1 denies - deny
-		if node.DoesACLAllow() {
-			currentACLs.ChangeAccess(acls.AclID(nodeID), acls.AclID(currentNodeID), acls.Allowed)
-		} else if node.DoesACLDeny() {
+		if node.DoesACLDeny() || networkNodes[i].DoesACLDeny() {
 			currentACLs.ChangeAccess(acls.AclID(nodeID), acls.AclID(currentNodeID), acls.NotAllowed)
 			currentACLs.ChangeAccess(acls.AclID(nodeID), acls.AclID(currentNodeID), acls.NotAllowed)
+		} else if node.DoesACLAllow() || networkNodes[i].DoesACLAllow() {
+			currentACLs.ChangeAccess(acls.AclID(nodeID), acls.AclID(currentNodeID), acls.Allowed)
 		}
 		}
 	}
 	}