Browse Source

added server update on ACL update

0xdcarns 3 years ago
parent
commit
09551776fa
2 changed files with 5 additions and 2 deletions
  1. 4 1
      controllers/network.go
  2. 1 1
      logic/peers.go

+ 4 - 1
controllers/network.go

@@ -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)
 			}
 			}

+ 1 - 1
logic/peers.go

@@ -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)
 			}
 			}
 		}
 		}