|
@@ -4,6 +4,7 @@ import (
|
|
|
"encoding/json"
|
|
|
"errors"
|
|
|
"fmt"
|
|
|
+ "maps"
|
|
|
"sort"
|
|
|
"sync"
|
|
|
"time"
|
|
@@ -576,6 +577,8 @@ func IsUserAllowedToCommunicate(userName string, peer models.Node) (bool, []mode
|
|
|
|
|
|
// IsPeerAllowed - checks if peer needs to be added to the interface
|
|
|
func IsPeerAllowed(node, peer models.Node, checkDefaultPolicy bool) bool {
|
|
|
+ peerTags := maps.Clone(peer.Tags)
|
|
|
+ nodeTags := maps.Clone(node.Tags)
|
|
|
if node.IsStatic {
|
|
|
node = node.StaticNode.ConvertToStaticNode()
|
|
|
}
|
|
@@ -606,12 +609,12 @@ func IsPeerAllowed(node, peer models.Node, checkDefaultPolicy bool) bool {
|
|
|
}
|
|
|
srcMap = convAclTagToValueMap(policy.Src)
|
|
|
dstMap = convAclTagToValueMap(policy.Dst)
|
|
|
- for tagID := range node.Tags {
|
|
|
+ for tagID := range nodeTags {
|
|
|
if _, ok := dstMap[tagID.String()]; ok {
|
|
|
if _, ok := srcMap["*"]; ok {
|
|
|
return true
|
|
|
}
|
|
|
- for tagID := range peer.Tags {
|
|
|
+ for tagID := range peerTags {
|
|
|
if _, ok := srcMap[tagID.String()]; ok {
|
|
|
return true
|
|
|
}
|
|
@@ -621,19 +624,20 @@ func IsPeerAllowed(node, peer models.Node, checkDefaultPolicy bool) bool {
|
|
|
if _, ok := dstMap["*"]; ok {
|
|
|
return true
|
|
|
}
|
|
|
- for tagID := range peer.Tags {
|
|
|
+ for tagID := range peerTags {
|
|
|
if _, ok := dstMap[tagID.String()]; ok {
|
|
|
return true
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- for tagID := range peer.Tags {
|
|
|
+
|
|
|
+ for tagID := range peerTags {
|
|
|
if _, ok := dstMap[tagID.String()]; ok {
|
|
|
if _, ok := srcMap["*"]; ok {
|
|
|
return true
|
|
|
}
|
|
|
- for tagID := range node.Tags {
|
|
|
+ for tagID := range nodeTags {
|
|
|
|
|
|
if _, ok := srcMap[tagID.String()]; ok {
|
|
|
return true
|
|
@@ -644,7 +648,7 @@ func IsPeerAllowed(node, peer models.Node, checkDefaultPolicy bool) bool {
|
|
|
if _, ok := dstMap["*"]; ok {
|
|
|
return true
|
|
|
}
|
|
|
- for tagID := range node.Tags {
|
|
|
+ for tagID := range nodeTags {
|
|
|
if _, ok := dstMap[tagID.String()]; ok {
|
|
|
return true
|
|
|
}
|