From 21826d41b66c175ec03657d43baa865c584e1926 Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Fri, 28 Feb 2025 21:27:18 +0400 Subject: [PATCH 01/11] add nameservers to network settings --- controllers/network.go | 1 + models/network.go | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/controllers/network.go b/controllers/network.go index c4d6c4d76..a52bde0f8 100644 --- a/controllers/network.go +++ b/controllers/network.go @@ -640,6 +640,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) { return } netNew := netOld + netNew.NameServers = payload.NameServers netNew.DefaultACL = payload.DefaultACL _, _, _, err = logic.UpdateNetwork(&netOld, &netNew) if err != nil { diff --git a/models/network.go b/models/network.go index 327079333..7ea41cce6 100644 --- a/models/network.go +++ b/models/network.go @@ -8,22 +8,23 @@ import ( // Network Struct - contains info for a given unique network // At some point, need to replace all instances of Name with something else like Identifier type Network struct { - AddressRange string `json:"addressrange" bson:"addressrange" validate:"omitempty,cidrv4"` - AddressRange6 string `json:"addressrange6" bson:"addressrange6" validate:"omitempty,cidrv6"` - NetID string `json:"netid" bson:"netid" validate:"required,min=1,max=32,netid_valid"` - NodesLastModified int64 `json:"nodeslastmodified" bson:"nodeslastmodified" swaggertype:"primitive,integer" format:"int64"` - NetworkLastModified int64 `json:"networklastmodified" bson:"networklastmodified" swaggertype:"primitive,integer" format:"int64"` - DefaultInterface string `json:"defaultinterface" bson:"defaultinterface" validate:"min=1,max=35"` - DefaultListenPort int32 `json:"defaultlistenport,omitempty" bson:"defaultlistenport,omitempty" validate:"omitempty,min=1024,max=65535"` - NodeLimit int32 `json:"nodelimit" bson:"nodelimit"` - DefaultPostDown string `json:"defaultpostdown" bson:"defaultpostdown"` - DefaultKeepalive int32 `json:"defaultkeepalive" bson:"defaultkeepalive" validate:"omitempty,max=1000"` - AllowManualSignUp string `json:"allowmanualsignup" bson:"allowmanualsignup" validate:"checkyesorno"` - IsIPv4 string `json:"isipv4" bson:"isipv4" validate:"checkyesorno"` - IsIPv6 string `json:"isipv6" bson:"isipv6" validate:"checkyesorno"` - DefaultUDPHolePunch string `json:"defaultudpholepunch" bson:"defaultudpholepunch" validate:"checkyesorno"` - DefaultMTU int32 `json:"defaultmtu" bson:"defaultmtu"` - DefaultACL string `json:"defaultacl" bson:"defaultacl" yaml:"defaultacl" validate:"checkyesorno"` + AddressRange string `json:"addressrange" bson:"addressrange" validate:"omitempty,cidrv4"` + AddressRange6 string `json:"addressrange6" bson:"addressrange6" validate:"omitempty,cidrv6"` + NetID string `json:"netid" bson:"netid" validate:"required,min=1,max=32,netid_valid"` + NodesLastModified int64 `json:"nodeslastmodified" bson:"nodeslastmodified" swaggertype:"primitive,integer" format:"int64"` + NetworkLastModified int64 `json:"networklastmodified" bson:"networklastmodified" swaggertype:"primitive,integer" format:"int64"` + DefaultInterface string `json:"defaultinterface" bson:"defaultinterface" validate:"min=1,max=35"` + DefaultListenPort int32 `json:"defaultlistenport,omitempty" bson:"defaultlistenport,omitempty" validate:"omitempty,min=1024,max=65535"` + NodeLimit int32 `json:"nodelimit" bson:"nodelimit"` + DefaultPostDown string `json:"defaultpostdown" bson:"defaultpostdown"` + DefaultKeepalive int32 `json:"defaultkeepalive" bson:"defaultkeepalive" validate:"omitempty,max=1000"` + AllowManualSignUp string `json:"allowmanualsignup" bson:"allowmanualsignup" validate:"checkyesorno"` + IsIPv4 string `json:"isipv4" bson:"isipv4" validate:"checkyesorno"` + IsIPv6 string `json:"isipv6" bson:"isipv6" validate:"checkyesorno"` + DefaultUDPHolePunch string `json:"defaultudpholepunch" bson:"defaultudpholepunch" validate:"checkyesorno"` + DefaultMTU int32 `json:"defaultmtu" bson:"defaultmtu"` + DefaultACL string `json:"defaultacl" bson:"defaultacl" yaml:"defaultacl" validate:"checkyesorno"` + NameServers []string `json:"dns_nameservers"` } // SaveData - sensitive fields of a network that should be kept the same From 33fafa83e690e5358426b64c441d6deff198b1a5 Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Fri, 28 Feb 2025 21:49:53 +0400 Subject: [PATCH 02/11] add nameservers to dns settins --- controllers/network.go | 2 +- logic/peers.go | 6 +++++- models/mqtt.go | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/controllers/network.go b/controllers/network.go index a52bde0f8..5b72bb3e1 100644 --- a/controllers/network.go +++ b/controllers/network.go @@ -648,7 +648,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) { logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest")) return } - + go mq.PublishPeerUpdate(false) slog.Info("updated network", "network", payload.NetID, "user", r.Header.Get("user")) w.WriteHeader(http.StatusOK) json.NewEncoder(w).Encode(payload) diff --git a/logic/peers.go b/logic/peers.go index 64f6acbbf..aa30f5a9d 100644 --- a/logic/peers.go +++ b/logic/peers.go @@ -270,7 +270,11 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N } } } - + networkSettings, err := GetNetwork(node.Network) + if err != nil { + continue + } + hostPeerUpdate.NameServers = append(hostPeerUpdate.NameServers, networkSettings.NameServers...) currentPeers := GetNetworkNodesMemory(allNodes, node.Network) for _, peer := range currentPeers { peer := peer diff --git a/models/mqtt.go b/models/mqtt.go index 80c3d5b09..56318aab3 100644 --- a/models/mqtt.go +++ b/models/mqtt.go @@ -27,6 +27,7 @@ type HostPeerUpdate struct { EgressRoutes []EgressNetworkRoutes `json:"egress_network_routes"` FwUpdate FwUpdate `json:"fw_update"` ReplacePeers bool `json:"replace_peers"` + NameServers []string `json:"name_servers"` ServerConfig OldPeerUpdateFields } From 76311f072dba1703b7d8f965e9051f135bf589e9 Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Sun, 2 Mar 2025 20:59:27 +0400 Subject: [PATCH 03/11] add loadbalance endpoint for extclients --- cli/cmd/ext_client/config.go | 11 +++++++++++ cli/functions/ext_client.go | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/cli/cmd/ext_client/config.go b/cli/cmd/ext_client/config.go index ef8e9ea6c..8b3def6d8 100644 --- a/cli/cmd/ext_client/config.go +++ b/cli/cmd/ext_client/config.go @@ -17,6 +17,17 @@ var extClientConfigCmd = &cobra.Command{ }, } +var extClientHAConfigCmd = &cobra.Command{ + Use: "auto_config [NETWORK NAME]", + Args: cobra.ExactArgs(1), + Short: "Get an External Client Configuration", + Long: `Get an External Client Configuration`, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println(functions.GetExtClientHAConfig(args[0])) + }, +} + func init() { rootCmd.AddCommand(extClientConfigCmd) + rootCmd.AddCommand(extClientHAConfigCmd) } diff --git a/cli/functions/ext_client.go b/cli/functions/ext_client.go index 42a3b44da..085e6a4d6 100644 --- a/cli/functions/ext_client.go +++ b/cli/functions/ext_client.go @@ -27,6 +27,11 @@ func GetExtClientConfig(networkName, clientID string) string { return get(fmt.Sprintf("/api/extclients/%s/%s/file", networkName, clientID)) } +// GetExtClientConfig - auto fetch a client config +func GetExtClientHAConfig(networkName string) string { + return get(fmt.Sprintf("/api/v1/client_conf/%s", networkName)) +} + // CreateExtClient - create an external client func CreateExtClient(networkName, nodeID string, extClient models.CustomExtClient) { request[any](http.MethodPost, fmt.Sprintf("/api/extclients/%s/%s", networkName, nodeID), extClient) From 48b805bbc2b68f9f757c3210576331ffb1ad9188 Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Sun, 2 Mar 2025 20:59:53 +0400 Subject: [PATCH 04/11] add loadbalance endpoint for extclients --- controllers/ext_client.go | 246 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) diff --git a/controllers/ext_client.go b/controllers/ext_client.go index 1c751cc47..9dd3a411e 100644 --- a/controllers/ext_client.go +++ b/controllers/ext_client.go @@ -42,6 +42,7 @@ func extClientHandlers(r *mux.Router) { Methods(http.MethodDelete) r.HandleFunc("/api/extclients/{network}/{nodeid}", logic.SecurityCheck(false, checkFreeTierLimits(limitChoiceMachines, http.HandlerFunc(createExtClient)))). Methods(http.MethodPost) + r.HandleFunc("/api/v1/client_conf/{network}", logic.SecurityCheck(false, http.HandlerFunc(getExtClientHAConf))).Methods(http.MethodGet) } func checkIngressExists(nodeID string) bool { @@ -387,6 +388,251 @@ Endpoint = %s json.NewEncoder(w).Encode(client) } +// @Summary Get an individual remote access client +// @Router /api/extclients/{network}/{clientid}/{type} [get] +// @Tags Remote Access Client +// @Security oauth2 +// @Success 200 {object} models.ExtClient +// @Failure 500 {object} models.ErrorResponse +// @Failure 403 {object} models.ErrorResponse +func getExtClientHAConf(w http.ResponseWriter, r *http.Request) { + + var params = mux.Vars(r) + networkid := params["network"] + network, err := logic.GetParentNetwork(networkid) + if err != nil { + logger.Log( + 1, + r.Header.Get("user"), + "Could not retrieve Ingress Gateway Network", + networkid, + ) + logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) + return + } + // fetch client based on availability + nodes, _ := logic.GetNetworkNodes(networkid) + defaultPolicy, _ := logic.GetDefaultPolicy(models.NetworkID(networkid), models.DevicePolicy) + var targetGwID string + var connectionCnt int = -1 + for _, nodeI := range nodes { + if nodeI.IsGw { + // check health status + logic.GetNodeStatus(&nodeI, defaultPolicy.Enabled) + if nodeI.Status != models.OnlineSt { + continue + } + // Get Total connections on the gw + clients := logic.GetGwExtclients(nodeI.ID.String(), networkid) + + if connectionCnt == -1 || len(clients) < connectionCnt { + connectionCnt = len(clients) + targetGwID = nodeI.ID.String() + } + + } + } + gwnode, err := logic.GetNodeByID(targetGwID) + if err != nil { + logger.Log( + 0, + r.Header.Get("user"), + fmt.Sprintf( + "failed to get ingress gateway node [%s] info: %v", + gwnode.ID, + err, + ), + ) + logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) + return + } + host, err := logic.GetHost(gwnode.HostID.String()) + if err != nil { + logger.Log(0, r.Header.Get("user"), + fmt.Sprintf("failed to get ingress gateway host for node [%s] info: %v", gwnode.ID, err)) + logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) + return + } + + var userName string + if r.Header.Get("ismaster") == "yes" { + userName = logic.MasterUser + } else { + caller, err := logic.GetUser(r.Header.Get("user")) + if err != nil { + logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) + return + } + userName = caller.UserName + } + // create client + var extclient models.ExtClient + extclient.OwnerID = userName + extclient.IngressGatewayID = targetGwID + extclient.Network = networkid + extclient.Tags = make(map[models.TagID]struct{}) + // extclient.Tags[models.TagID(fmt.Sprintf("%s.%s", extclient.Network, + // models.RemoteAccessTagName))] = struct{}{} + // set extclient dns to ingressdns if extclient dns is not explicitly set + if (extclient.DNS == "") && (gwnode.IngressDNS != "") { + extclient.DNS = gwnode.IngressDNS + } + + listenPort := logic.GetPeerListenPort(host) + extclient.IngressGatewayEndpoint = fmt.Sprintf("%s:%d", host.EndpointIP.String(), listenPort) + extclient.Enabled = true + + if err = logic.CreateExtClient(&extclient); err != nil { + slog.Error( + "failed to create extclient", + "user", + r.Header.Get("user"), + "network", + networkid, + "error", + err, + ) + logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) + return + } + client, err := logic.GetExtClient(extclient.ClientID, networkid) + if err != nil { + logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) + return + } + addrString := client.Address + if addrString != "" { + addrString += "/32" + } + if client.Address6 != "" { + if addrString != "" { + addrString += "," + } + addrString += client.Address6 + "/128" + } + + keepalive := "" + if network.DefaultKeepalive != 0 { + keepalive = "PersistentKeepalive = " + strconv.Itoa(int(network.DefaultKeepalive)) + } + if gwnode.IngressPersistentKeepalive != 0 { + keepalive = "PersistentKeepalive = " + strconv.Itoa(int(gwnode.IngressPersistentKeepalive)) + } + var newAllowedIPs string + if logic.IsInternetGw(gwnode) || gwnode.InternetGwID != "" { + egressrange := "0.0.0.0/0" + if gwnode.Address6.IP != nil && client.Address6 != "" { + egressrange += "," + "::/0" + } + newAllowedIPs = egressrange + } else { + newAllowedIPs = network.AddressRange + if newAllowedIPs != "" && network.AddressRange6 != "" { + newAllowedIPs += "," + } + if network.AddressRange6 != "" { + newAllowedIPs += network.AddressRange6 + } + if egressGatewayRanges, err := logic.GetEgressRangesOnNetwork(&client); err == nil { + for _, egressGatewayRange := range egressGatewayRanges { + newAllowedIPs += "," + egressGatewayRange + } + } + } + gwendpoint := "" + if host.EndpointIP.To4() == nil { + gwendpoint = fmt.Sprintf("[%s]:%d", host.EndpointIPv6.String(), host.ListenPort) + } else { + gwendpoint = fmt.Sprintf("%s:%d", host.EndpointIP.String(), host.ListenPort) + } + defaultDNS := "" + if client.DNS != "" { + defaultDNS = "DNS = " + client.DNS + } else if gwnode.IngressDNS != "" { + defaultDNS = "DNS = " + gwnode.IngressDNS + } + + defaultMTU := 1420 + if host.MTU != 0 { + defaultMTU = host.MTU + } + if gwnode.IngressMTU != 0 { + defaultMTU = int(gwnode.IngressMTU) + } + + postUp := strings.Builder{} + if client.PostUp != "" && params["type"] != "qr" { + for _, loc := range strings.Split(client.PostUp, "\n") { + postUp.WriteString(fmt.Sprintf("PostUp = %s\n", loc)) + } + } + + postDown := strings.Builder{} + if client.PostDown != "" && params["type"] != "qr" { + for _, loc := range strings.Split(client.PostDown, "\n") { + postDown.WriteString(fmt.Sprintf("PostDown = %s\n", loc)) + } + } + + config := fmt.Sprintf(`[Interface] +Address = %s +PrivateKey = %s +MTU = %d +%s +%s +%s + +[Peer] +PublicKey = %s +AllowedIPs = %s +Endpoint = %s +%s + +`, addrString, + client.PrivateKey, + defaultMTU, + defaultDNS, + postUp.String(), + postDown.String(), + host.PublicKey, + newAllowedIPs, + gwendpoint, + keepalive, + ) + + go func() { + if err := logic.SetClientDefaultACLs(&extclient); err != nil { + slog.Error( + "failed to set default acls for extclient", + "user", + r.Header.Get("user"), + "network", + networkid, + "error", + err, + ) + logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) + return + } + if err := mq.PublishPeerUpdate(false); err != nil { + logger.Log(1, "error publishing peer update ", err.Error()) + } + if servercfg.IsDNSMode() { + logic.SetDNS() + } + }() + + name := client.ClientID + ".conf" + w.Header().Set("Content-Type", "application/config") + w.Header().Set("Content-Disposition", "attachment; filename=\""+name+"\"") + w.WriteHeader(http.StatusOK) + _, err = fmt.Fprint(w, config) + if err != nil { + logger.Log(1, r.Header.Get("user"), "response writer error (file) ", err.Error()) + logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) + } +} + // @Summary Create an individual remote access client // @Router /api/extclients/{network}/{nodeid} [post] // @Tags Remote Access Client From b9343fb8452022f11a4b40fdbe33ab576bfac4ef Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Mon, 3 Mar 2025 00:15:35 +0400 Subject: [PATCH 05/11] add metric for egress routes --- models/structs.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/models/structs.go b/models/structs.go index 428e9bbf1..350f1a882 100644 --- a/models/structs.go +++ b/models/structs.go @@ -151,12 +151,18 @@ type ExtPeersResponse struct { KeepAlive int32 `json:"persistentkeepalive" bson:"persistentkeepalive"` } +type EgressRangeMetric struct { + Network net.IPNet `json:"network"` + RouteMetric net.IPNet `json:"route_metric"` +} + // EgressGatewayRequest - egress gateway request type EgressGatewayRequest struct { - NodeID string `json:"nodeid" bson:"nodeid"` - NetID string `json:"netid" bson:"netid"` - NatEnabled string `json:"natenabled" bson:"natenabled"` - Ranges []string `json:"ranges" bson:"ranges"` + NodeID string `json:"nodeid" bson:"nodeid"` + NetID string `json:"netid" bson:"netid"` + NatEnabled string `json:"natenabled" bson:"natenabled"` + Ranges []string `json:"ranges" bson:"ranges"` + RangesWithMetric []EgressRangeMetric `json:"ranges_with_metric"` } // RelayRequest - relay request struct From f5d67171863e4b79572ab8763077c0a7a089adf7 Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Mon, 3 Mar 2025 00:34:45 +0400 Subject: [PATCH 06/11] add egress routes with metric to peer update --- logic/peers.go | 11 ++++++----- models/mqtt.go | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/logic/peers.go b/logic/peers.go index aa30f5a9d..16bd82f81 100644 --- a/logic/peers.go +++ b/logic/peers.go @@ -296,11 +296,12 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N } if peer.IsEgressGateway { hostPeerUpdate.EgressRoutes = append(hostPeerUpdate.EgressRoutes, models.EgressNetworkRoutes{ - EgressGwAddr: peer.Address, - EgressGwAddr6: peer.Address6, - NodeAddr: node.Address, - NodeAddr6: node.Address6, - EgressRanges: peer.EgressGatewayRanges, + EgressGwAddr: peer.Address, + EgressGwAddr6: peer.Address6, + NodeAddr: node.Address, + NodeAddr6: node.Address6, + EgressRanges: peer.EgressGatewayRanges, + EgressRangesWithMetric: peer.EgressGatewayRequest.RangesWithMetric, }) } if peer.IsIngressGateway { diff --git a/models/mqtt.go b/models/mqtt.go index 56318aab3..2db7c51be 100644 --- a/models/mqtt.go +++ b/models/mqtt.go @@ -70,11 +70,12 @@ type EgressInfo struct { // EgressNetworkRoutes - struct for egress network routes for adding routes to peer's interface type EgressNetworkRoutes struct { - EgressGwAddr net.IPNet `json:"egress_gw_addr" yaml:"egress_gw_addr"` - EgressGwAddr6 net.IPNet `json:"egress_gw_addr6" yaml:"egress_gw_addr6"` - NodeAddr net.IPNet `json:"node_addr"` - NodeAddr6 net.IPNet `json:"node_addr6"` - EgressRanges []string `json:"egress_ranges"` + EgressGwAddr net.IPNet `json:"egress_gw_addr" yaml:"egress_gw_addr"` + EgressGwAddr6 net.IPNet `json:"egress_gw_addr6" yaml:"egress_gw_addr6"` + NodeAddr net.IPNet `json:"node_addr"` + NodeAddr6 net.IPNet `json:"node_addr6"` + EgressRanges []string `json:"egress_ranges"` + EgressRangesWithMetric []EgressRangeMetric `json:"egress_ranges_metric"` } // PeerRouteInfo - struct for peer info for an ext. client From 9652d77fd583fc79246ba3944a281a5541fab635 Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Mon, 3 Mar 2025 00:40:52 +0400 Subject: [PATCH 07/11] change struct type --- models/structs.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/structs.go b/models/structs.go index 350f1a882..7e9a5a449 100644 --- a/models/structs.go +++ b/models/structs.go @@ -152,8 +152,8 @@ type ExtPeersResponse struct { } type EgressRangeMetric struct { - Network net.IPNet `json:"network"` - RouteMetric net.IPNet `json:"route_metric"` + Network string `json:"network"` + RouteMetric uint32 `json:"route_metric"` // preffered range 1-999 } // EgressGatewayRequest - egress gateway request From d9f58efd057717903b39ea67724b0075493cb0e8 Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Mon, 3 Mar 2025 00:56:16 +0400 Subject: [PATCH 08/11] add migration func for egress --- migrate/migrate.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/migrate/migrate.go b/migrate/migrate.go index 24445f25f..0ee70a6b1 100644 --- a/migrate/migrate.go +++ b/migrate/migrate.go @@ -225,6 +225,16 @@ func updateNodes() { node.EgressGatewayRanges = egressRanges logic.UpsertNode(&node) } + if len(node.EgressGatewayRequest.Ranges) > 0 && len(node.EgressGatewayRequest.RangesWithMetric) == 0 { + for _, egressRangeI := range node.EgressGatewayRequest.Ranges { + node.EgressGatewayRequest.RangesWithMetric = append(node.EgressGatewayRequest.RangesWithMetric, models.EgressRangeMetric{ + Network: egressRangeI, + RouteMetric: 256, + }) + } + logic.UpsertNode(&node) + } + } } } From 7e0ff17420354360566c3962745032e216a6ba09 Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Mon, 3 Mar 2025 11:33:46 +0400 Subject: [PATCH 09/11] validate egress ranges with metric --- logic/gateway.go | 10 ++++++++ models/api_node.go | 60 ++++++++++++++++++++++++---------------------- 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/logic/gateway.go b/logic/gateway.go index 3b96fc398..3367fd912 100644 --- a/logic/gateway.go +++ b/logic/gateway.go @@ -104,6 +104,16 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro node.IsEgressGateway = true node.EgressGatewayRanges = gateway.Ranges node.EgressGatewayNatEnabled = models.ParseBool(gateway.NatEnabled) + rangesWithMetric := []string{} + for i, rangeI := range gateway.RangesWithMetric { + rangesWithMetric = append(rangesWithMetric, rangeI.Network) + if rangeI.RouteMetric <= 0 || rangeI.RouteMetric > 999 { + gateway.RangesWithMetric[i].RouteMetric = 256 + } + } + if !IsSlicesEqual(node.EgressGatewayRanges, rangesWithMetric) { + return models.Node{}, errors.New("invalid ranges") + } node.EgressGatewayRequest = gateway // store entire request for use when preserving the egress gateway node.SetLastModified() if err = UpsertNode(&node); err != nil { diff --git a/models/api_node.go b/models/api_node.go index 99c752e57..4cf0af3c9 100644 --- a/models/api_node.go +++ b/models/api_node.go @@ -17,35 +17,36 @@ type ApiNodeStatus struct { // ApiNode is a stripped down Node DTO that exposes only required fields to external systems type ApiNode struct { - ID string `json:"id,omitempty" validate:"required,min=5,id_unique"` - HostID string `json:"hostid,omitempty" validate:"required,min=5,id_unique"` - Address string `json:"address" validate:"omitempty,cidrv4"` - Address6 string `json:"address6" validate:"omitempty,cidrv6"` - LocalAddress string `json:"localaddress" validate:"omitempty,cidr"` - AllowedIPs []string `json:"allowedips"` - LastModified int64 `json:"lastmodified" swaggertype:"primitive,integer" format:"int64"` - ExpirationDateTime int64 `json:"expdatetime" swaggertype:"primitive,integer" format:"int64"` - LastCheckIn int64 `json:"lastcheckin" swaggertype:"primitive,integer" format:"int64"` - LastPeerUpdate int64 `json:"lastpeerupdate" swaggertype:"primitive,integer" format:"int64"` - Network string `json:"network"` - NetworkRange string `json:"networkrange"` - NetworkRange6 string `json:"networkrange6"` - IsRelayed bool `json:"isrelayed"` - IsRelay bool `json:"isrelay"` - RelayedBy string `json:"relayedby" bson:"relayedby" yaml:"relayedby"` - RelayedNodes []string `json:"relaynodes" yaml:"relayedNodes"` - IsEgressGateway bool `json:"isegressgateway"` - IsIngressGateway bool `json:"isingressgateway"` - EgressGatewayRanges []string `json:"egressgatewayranges"` - EgressGatewayNatEnabled bool `json:"egressgatewaynatenabled"` - DNSOn bool `json:"dnson"` - IngressDns string `json:"ingressdns"` - IngressPersistentKeepalive int32 `json:"ingresspersistentkeepalive"` - IngressMTU int32 `json:"ingressmtu"` - Server string `json:"server"` - Connected bool `json:"connected"` - PendingDelete bool `json:"pendingdelete"` - Metadata string `json:"metadata"` + ID string `json:"id,omitempty" validate:"required,min=5,id_unique"` + HostID string `json:"hostid,omitempty" validate:"required,min=5,id_unique"` + Address string `json:"address" validate:"omitempty,cidrv4"` + Address6 string `json:"address6" validate:"omitempty,cidrv6"` + LocalAddress string `json:"localaddress" validate:"omitempty,cidr"` + AllowedIPs []string `json:"allowedips"` + LastModified int64 `json:"lastmodified" swaggertype:"primitive,integer" format:"int64"` + ExpirationDateTime int64 `json:"expdatetime" swaggertype:"primitive,integer" format:"int64"` + LastCheckIn int64 `json:"lastcheckin" swaggertype:"primitive,integer" format:"int64"` + LastPeerUpdate int64 `json:"lastpeerupdate" swaggertype:"primitive,integer" format:"int64"` + Network string `json:"network"` + NetworkRange string `json:"networkrange"` + NetworkRange6 string `json:"networkrange6"` + IsRelayed bool `json:"isrelayed"` + IsRelay bool `json:"isrelay"` + RelayedBy string `json:"relayedby" bson:"relayedby" yaml:"relayedby"` + RelayedNodes []string `json:"relaynodes" yaml:"relayedNodes"` + IsEgressGateway bool `json:"isegressgateway"` + IsIngressGateway bool `json:"isingressgateway"` + EgressGatewayRanges []string `json:"egressgatewayranges"` + EgressGatewayNatEnabled bool `json:"egressgatewaynatenabled"` + EgressGatewayRangesWithMetric []EgressRangeMetric `json:"egressgatewayranges_with_metric"` + DNSOn bool `json:"dnson"` + IngressDns string `json:"ingressdns"` + IngressPersistentKeepalive int32 `json:"ingresspersistentkeepalive"` + IngressMTU int32 `json:"ingressmtu"` + Server string `json:"server"` + Connected bool `json:"connected"` + PendingDelete bool `json:"pendingdelete"` + Metadata string `json:"metadata"` // == PRO == DefaultACL string `json:"defaultacl,omitempty" validate:"checkyesornoorunset"` IsFailOver bool `json:"is_fail_over"` @@ -189,6 +190,7 @@ func (nm *Node) ConvertToAPINode() *ApiNode { apiNode.IsEgressGateway = nm.IsEgressGateway apiNode.IsIngressGateway = nm.IsIngressGateway apiNode.EgressGatewayRanges = nm.EgressGatewayRanges + apiNode.EgressGatewayRangesWithMetric = nm.EgressGatewayRequest.RangesWithMetric apiNode.EgressGatewayNatEnabled = nm.EgressGatewayNatEnabled apiNode.DNSOn = nm.DNSOn apiNode.IngressDns = nm.IngressDNS From d21411392b744f7509dc91d24d24349556fb2f9f Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Mon, 3 Mar 2025 12:05:23 +0400 Subject: [PATCH 10/11] fix integration tests --- controllers/node_test.go | 4 ++++ logic/gateway.go | 24 +++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/controllers/node_test.go b/controllers/node_test.go index afc9b65fa..02495fd23 100644 --- a/controllers/node_test.go +++ b/controllers/node_test.go @@ -21,6 +21,10 @@ var linuxHost models.Host func TestCreateEgressGateway(t *testing.T) { var gateway models.EgressGatewayRequest gateway.Ranges = []string{"10.100.100.0/24"} + gateway.RangesWithMetric = append(gateway.RangesWithMetric, models.EgressRangeMetric{ + Network: "10.100.100.0/24", + RouteMetric: 256, + }) gateway.NetID = "skynet" deleteAllNetworks() createNet() diff --git a/logic/gateway.go b/logic/gateway.go index 3367fd912..a72ab673c 100644 --- a/logic/gateway.go +++ b/logic/gateway.go @@ -77,6 +77,14 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro if host.FirewallInUse == models.FIREWALL_NONE { return models.Node{}, errors.New("please install iptables or nftables on the device") } + if len(gateway.RangesWithMetric) == 0 && len(gateway.Ranges) > 0 { + for _, rangeI := range gateway.Ranges { + gateway.RangesWithMetric = append(gateway.RangesWithMetric, models.EgressRangeMetric{ + Network: rangeI, + RouteMetric: 256, + }) + } + } for i := len(gateway.Ranges) - 1; i >= 0; i-- { // check if internet gateway IPv4 if gateway.Ranges[i] == "0.0.0.0/0" || gateway.Ranges[i] == "::/0" { @@ -105,9 +113,19 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro node.EgressGatewayRanges = gateway.Ranges node.EgressGatewayNatEnabled = models.ParseBool(gateway.NatEnabled) rangesWithMetric := []string{} - for i, rangeI := range gateway.RangesWithMetric { - rangesWithMetric = append(rangesWithMetric, rangeI.Network) - if rangeI.RouteMetric <= 0 || rangeI.RouteMetric > 999 { + for i := len(gateway.RangesWithMetric) - 1; i >= 0; i-- { + if gateway.RangesWithMetric[i].Network == "0.0.0.0/0" || gateway.RangesWithMetric[i].Network == "::/0" { + // remove inet range + gateway.RangesWithMetric = append(gateway.RangesWithMetric[:i], gateway.RangesWithMetric[i+1:]...) + continue + } + normalized, err := NormalizeCIDR(gateway.Ranges[i]) + if err != nil { + return models.Node{}, err + } + gateway.RangesWithMetric[i].Network = normalized + rangesWithMetric = append(rangesWithMetric, gateway.RangesWithMetric[i].Network) + if gateway.RangesWithMetric[i].RouteMetric <= 0 || gateway.RangesWithMetric[i].RouteMetric > 999 { gateway.RangesWithMetric[i].RouteMetric = 256 } } From 2cb5519978184f39b99d9cf270dd883bca4da6c1 Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Mon, 3 Mar 2025 20:24:18 +0400 Subject: [PATCH 11/11] fix egress range comparison --- logic/gateway.go | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/logic/gateway.go b/logic/gateway.go index a72ab673c..46e7b588b 100644 --- a/logic/gateway.go +++ b/logic/gateway.go @@ -3,6 +3,8 @@ package logic import ( "errors" "fmt" + "slices" + "sort" "time" "github.com/gravitl/netmaker/database" @@ -99,19 +101,6 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro gateway.Ranges[i] = normalized } - if gateway.NatEnabled == "" { - gateway.NatEnabled = "yes" - } - err = ValidateEgressGateway(gateway) - if err != nil { - return models.Node{}, err - } - if gateway.Ranges == nil { - gateway.Ranges = make([]string, 0) - } - node.IsEgressGateway = true - node.EgressGatewayRanges = gateway.Ranges - node.EgressGatewayNatEnabled = models.ParseBool(gateway.NatEnabled) rangesWithMetric := []string{} for i := len(gateway.RangesWithMetric) - 1; i >= 0; i-- { if gateway.RangesWithMetric[i].Network == "0.0.0.0/0" || gateway.RangesWithMetric[i].Network == "::/0" { @@ -119,7 +108,7 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro gateway.RangesWithMetric = append(gateway.RangesWithMetric[:i], gateway.RangesWithMetric[i+1:]...) continue } - normalized, err := NormalizeCIDR(gateway.Ranges[i]) + normalized, err := NormalizeCIDR(gateway.RangesWithMetric[i].Network) if err != nil { return models.Node{}, err } @@ -129,9 +118,25 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro gateway.RangesWithMetric[i].RouteMetric = 256 } } - if !IsSlicesEqual(node.EgressGatewayRanges, rangesWithMetric) { + sort.Strings(gateway.Ranges) + sort.Strings(rangesWithMetric) + if !slices.Equal(gateway.Ranges, rangesWithMetric) { return models.Node{}, errors.New("invalid ranges") } + if gateway.NatEnabled == "" { + gateway.NatEnabled = "yes" + } + err = ValidateEgressGateway(gateway) + if err != nil { + return models.Node{}, err + } + if gateway.Ranges == nil { + gateway.Ranges = make([]string, 0) + } + node.IsEgressGateway = true + node.EgressGatewayRanges = gateway.Ranges + node.EgressGatewayNatEnabled = models.ParseBool(gateway.NatEnabled) + node.EgressGatewayRequest = gateway // store entire request for use when preserving the egress gateway node.SetLastModified() if err = UpsertNode(&node); err != nil {