host based updates

controllers/node.go

@@ -435,7 +435,7 @@ func getNode(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 	}
-	peerUpdate, err := logic.GetPeerUpdate(&node, host)
+	peerUpdate, err := logic.GetPeerUpdateForHost(host)
 	if err != nil && !database.IsEmptyRecord(err) {
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("error fetching wg peers config for node [ %s ]: %v", nodeid, err))

logic/hosts.go

@@ -63,6 +63,26 @@ func GetHostsMap() (map[string]*models.Host, error) {
 	return currHostMap, nil
 }
 
+func GetNetworkHosts(network string) ([]models.Host, error) {
+	networkHosts := []models.Host{}
+	hosts, err := GetAllHosts()
+	if err != nil {
+		return networkHosts, err
+	}
+	for _, host := range hosts {
+		for _, nodeID := range host.Nodes {
+			node, err := GetNodeByID(nodeID)
+			if err == nil {
+				if node.Network == network {
+					networkHosts = append(networkHosts, host)
+					break
+				}
+			}
+		}
+	}
+	return networkHosts, nil
+}
+
 // GetHost - gets a host from db given id
 func GetHost(hostid string) (*models.Host, error) {
 	record, err := database.FetchRecord(database.HOSTS_TABLE_NAME, hostid)

logic/peers.go

@@ -199,13 +199,13 @@ func GetPeerUpdateForHost(host *models.Host) (models.HostPeerUpdate, error) {
 		ServerVersion: servercfg.GetVersion(),
 		ServerAddrs:   []models.ServerAddr{},
 	}
+	log.Println("peer update for host ", host.ID.String())
 	peerIndexMap := make(map[string]int)
 	for _, nodeID := range host.Nodes {
 		node, err := GetNodeByID(nodeID)
 		if err != nil {
 			continue
 		}
-		log.Println("peer update for node ", node.ID)
 		hostPeerUpdate.Network[node.Network] = models.NetworkInfo{
 			DNS: getPeerDNS(node.Network),
 		}
@@ -279,10 +279,9 @@ func GetPeerUpdateForHost(host *models.Host) (models.HostPeerUpdate, error) {
 				allowedips = append(allowedips, getEgressIPs(&node, &peer)...)
 			}
 			peerConfig.AllowedIPs = allowedips
+
 			if _, ok := hostPeerUpdate.PeerIDs[peerHost.PublicKey.String()]; !ok {
 				hostPeerUpdate.PeerIDs[peerHost.PublicKey.String()] = make(map[string]models.IDandAddr)
-			}
-			if _, ok := hostPeerUpdate.PeerIDs[peerHost.PublicKey.String()]; !ok {
 				hostPeerUpdate.Peers = append(hostPeerUpdate.Peers, peerConfig)
 				peerIndexMap[peerHost.PublicKey.String()] = len(hostPeerUpdate.Peers) - 1
 				hostPeerUpdate.PeerIDs[peerHost.PublicKey.String()][peer.ID.String()] = models.IDandAddr{

mq/dynsec_helper.go

@@ -271,7 +271,7 @@ func createHostRole(hostID string) error {
 			{
 				Command:  CreateRoleCmd,
 				RoleName: getHostRoleName(hostID),
-				Textname: "host  role with Acls for hosts",
+				Textname: "host role with Acls for hosts",
 				Acls:     fetchHostAcls(hostID),
 			},
 		},

mq/publishers.go

@@ -20,7 +20,7 @@ func PublishPeerUpdate(network string, publishToSelf bool) error {
 		return nil
 	}
 
-	hosts, err := logic.GetAllHosts()
+	hosts, err := logic.GetNetworkHosts(network)
 	if err != nil {
 		logger.Log(1, "err getting all hosts", err.Error())
 		return err