From c495decbb2065c0961d92c6c45fbae8392bef2c3 Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Tue, 23 Nov 2021 09:30:11 -0500 Subject: [PATCH 1/3] added remove private key when server node gets deleted --- logic/wireguard.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/logic/wireguard.go b/logic/wireguard.go index 8507724b..67bcfb38 100644 --- a/logic/wireguard.go +++ b/logic/wireguard.go @@ -325,6 +325,9 @@ func setWGKeyConfig(node models.Node) error { func removeLocalServer(node *models.Node) error { var ifacename = node.Interface var err error + if err = RemovePrivKey(node.ID); err != nil { + Log("failed to remove server conf from db "+node.ID, 1) + } if ifacename != "" { if !ncutils.IsKernel() { if err = RemoveConf(ifacename, true); err == nil { From b5bcf53a3e00334992197b1be8fde7f59921415a Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Tue, 23 Nov 2021 09:34:20 -0500 Subject: [PATCH 2/3] updated ui tags --- compose/docker-compose.caddy.yml | 2 +- compose/docker-compose.contained.yml | 2 +- compose/docker-compose.nodns.yml | 2 +- compose/docker-compose.reference.yml | 2 +- compose/docker-compose.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose/docker-compose.caddy.yml b/compose/docker-compose.caddy.yml index 52249660..2e4646d6 100644 --- a/compose/docker-compose.caddy.yml +++ b/compose/docker-compose.caddy.yml @@ -40,7 +40,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.9.0 + image: gravitl/netmaker-ui:v0.9.1 links: - "netmaker:api" ports: diff --git a/compose/docker-compose.contained.yml b/compose/docker-compose.contained.yml index ba225a2b..f81fad2b 100644 --- a/compose/docker-compose.contained.yml +++ b/compose/docker-compose.contained.yml @@ -38,7 +38,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.9.0 + image: gravitl/netmaker-ui:v0.9.1 links: - "netmaker:api" ports: diff --git a/compose/docker-compose.nodns.yml b/compose/docker-compose.nodns.yml index 867915ad..a73d9f2c 100644 --- a/compose/docker-compose.nodns.yml +++ b/compose/docker-compose.nodns.yml @@ -36,7 +36,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.9.0 + image: gravitl/netmaker-ui:v0.9.1 links: - "netmaker:api" ports: diff --git a/compose/docker-compose.reference.yml b/compose/docker-compose.reference.yml index f90ae1de..e7f7b36c 100644 --- a/compose/docker-compose.reference.yml +++ b/compose/docker-compose.reference.yml @@ -41,7 +41,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.9.0 + image: gravitl/netmaker-ui:v0.9.1 links: - "netmaker:api" ports: diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index e07c520a..d48448e8 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -40,7 +40,7 @@ services: container_name: netmaker-ui depends_on: - netmaker - image: gravitl/netmaker-ui:v0.9.0 + image: gravitl/netmaker-ui:v0.9.1 links: - "netmaker:api" ports: From e521c5936a464322579477b1da36e8fcf322a678 Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Tue, 23 Nov 2021 09:47:49 -0500 Subject: [PATCH 3/3] added logic for future use --- controllers/networkHttpController.go | 6 ++++++ logic/networks.go | 32 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/controllers/networkHttpController.go b/controllers/networkHttpController.go index 580fef40..8508b550 100644 --- a/controllers/networkHttpController.go +++ b/controllers/networkHttpController.go @@ -275,12 +275,18 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) { returnErrorResponse(w, r, formatError(err, "badrequest")) return } + rangeupdate, localrangeupdate, err := logic.UpdateNetwork(&network, &newNetwork) if err != nil { returnErrorResponse(w, r, formatError(err, "badrequest")) return } + // if newNetwork.IsDualStack != currentNetwork.IsDualStack && newNetwork.IsDualStack == "no" { + // // Remove IPv6 address from network nodes + // RemoveNetworkNodeIPv6Addresses(currentNetwork.NetID) + // } + if rangeupdate { err = logic.UpdateNetworkNodeAddresses(network.NetID) if err != nil { diff --git a/logic/networks.go b/logic/networks.go index 8fae80ef..298efe44 100644 --- a/logic/networks.go +++ b/logic/networks.go @@ -260,6 +260,38 @@ func UpdateNetworkLocalAddresses(networkName string) error { return nil } +// RemoveNetworkNodeIPv6Addresses - removes network node IPv6 addresses +func RemoveNetworkNodeIPv6Addresses(networkName string) error { + + collections, err := database.FetchRecords(database.NODES_TABLE_NAME) + if err != nil { + return err + } + + for _, value := range collections { + + var node models.Node + err := json.Unmarshal([]byte(value), &node) + if err != nil { + fmt.Println("error in node address assignment!") + return err + } + if node.Network == networkName { + node.IsDualStack = "no" + node.Address6 = "" + node.PullChanges = "yes" + data, err := json.Marshal(&node) + if err != nil { + return err + } + node.SetID() + database.Insert(node.ID, string(data), database.NODES_TABLE_NAME) + } + } + + return nil +} + // UpdateNetworkNodeAddresses - updates network node addresses func UpdateNetworkNodeAddresses(networkName string) error {