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

check for custom all policies

Browse source
This commit is contained in:
abhishek9686 2024-10-31 15:13:29 +04:00
parent 42b8a03660
commit df3662f0cc
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
logic/acls.go
View file

@ -54,10 +54,6 @@ func CreateDefaultAclNetworkPolicies(netID models.NetworkID) {
ID: models.UserAclID, ID: models.UserAclID,
Value: "*", Value: "*",
}, },
{
ID: models.UserGroupAclID,
Value: "*",
},
}, },
Dst: []models.AclPolicyTag{{ Dst: []models.AclPolicyTag{{
ID: models.DeviceAclID, ID: models.DeviceAclID,
@ -285,6 +281,27 @@ func GetDefaultPolicy(netID models.NetworkID, ruleType models.AclPolicyType) (mo
if err != nil { if err != nil {
return models.Acl{}, errors.New("default rule not found") return models.Acl{}, errors.New("default rule not found")
} }
if acl.Enabled {
return acl, nil
}
// check if there are any custom all policies
policies, _ := ListAcls(netID)
for _, policy := range policies {
if !policy.Enabled {
continue
}
if policy.RuleType == ruleType {
dstMap := convAclTagToValueMap(policy.Dst)
srcMap := convAclTagToValueMap(policy.Dst)
if _, ok := srcMap["*"]; ok {
if _, ok := dstMap["*"]; ok {
return policy, nil
}
}
}
}
return acl, nil return acl, nil
} }
@ -467,11 +484,6 @@ func IsNodeAllowedToCommunicate(node, peer models.Node) bool {
// fmt.Printf("\n======> DSTMAP: %+v\n", dstMap) // fmt.Printf("\n======> DSTMAP: %+v\n", dstMap)
// fmt.Printf("\n======> node Tags: %+v\n", node.Tags) // fmt.Printf("\n======> node Tags: %+v\n", node.Tags)
// fmt.Printf("\n======> peer Tags: %+v\n", peer.Tags) // fmt.Printf("\n======> peer Tags: %+v\n", peer.Tags)
if _, ok := srcMap["*"]; ok {
if _, ok := dstMap["*"]; ok {
return true
}
}
for tagID := range node.Tags { for tagID := range node.Tags {
if _, ok := dstMap[tagID.String()]; ok { if _, ok := dstMap[tagID.String()]; ok {
if _, ok := srcMap["*"]; ok { if _, ok := srcMap["*"]; ok {