gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-09 13:26:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

added server update on ACL update

Browse source
This commit is contained in:
0xdcarns 2022-03-10 14:55:25 -05:00
parent af8918e35f
commit 09551776fa
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
controllers/network.go
View file

@ -255,10 +255,13 @@ func updateNetworkACL(w http.ResponseWriter, r *http.Request) {
// send peer updates // send peer updates
if servercfg.IsMessageQueueBackend() { if servercfg.IsMessageQueueBackend() {
serverNode, err := logic.GetNetworkServerLeader(netname) serverNode, err := logic.GetNetworkServerLocal(netname)
if err != nil { if err != nil {
logger.Log(1, "failed to find server node after ACL update on", netname) logger.Log(1, "failed to find server node after ACL update on", netname)
} else { } else {
if err = logic.ServerUpdate(&serverNode, false); err != nil {
logger.Log(1, "failed to update server node after ACL update on", netname)
}
if err = mq.PublishPeerUpdate(&serverNode); err != nil { if err = mq.PublishPeerUpdate(&serverNode); err != nil {
logger.Log(0, "failed to publish peer update after ACL update on", netname) logger.Log(0, "failed to publish peer update after ACL update on", netname)
} }

2
logic/peers.go
View file

@ -86,7 +86,7 @@ func GetNodePeers(networkName, nodeid string, excludeRelayed bool, isP2S bool) (
} }
} }
} }
if !isP2S || peer.IsHub == "yes" && currentNetworkACLs.IsAllowed(acls.AclID(nodeid), acls.AclID(node.ID)) { if (!isP2S || peer.IsHub == "yes") && currentNetworkACLs.IsAllowed(acls.AclID(nodeid), acls.AclID(node.ID)) {
peers = append(peers, peer) peers = append(peers, peer)
} }
} }