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

adapted node routes further to new id

Browse Source
This commit is contained in:
0xdcarns
2022-01-11 13:05:22 -05:00
parent 96aec541e3
commit 0502ff131c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/node.go
View File

@@ -29,7 +29,7 @@ func nodeHandlers(r *mux.Router) {
r.HandleFunc("/api/nodes/{network}/{nodeid}/createingress", securityCheck(false, http.HandlerFunc(createIngressGateway))).Methods("POST") r.HandleFunc("/api/nodes/{network}/{nodeid}/createingress", securityCheck(false, http.HandlerFunc(createIngressGateway))).Methods("POST")
r.HandleFunc("/api/nodes/{network}/{nodeid}/deleteingress", securityCheck(false, http.HandlerFunc(deleteIngressGateway))).Methods("DELETE") r.HandleFunc("/api/nodes/{network}/{nodeid}/deleteingress", securityCheck(false, http.HandlerFunc(deleteIngressGateway))).Methods("DELETE")
r.HandleFunc("/api/nodes/{network}/{nodeid}/approve", authorize(true, "user", http.HandlerFunc(uncordonNode))).Methods("POST") r.HandleFunc("/api/nodes/{network}/{nodeid}/approve", authorize(true, "user", http.HandlerFunc(uncordonNode))).Methods("POST")
// r.HandleFunc("/api/nodes/{network}", createNode).Methods("POST") r.HandleFunc("/api/nodes/{network}", createNode).Methods("POST")
r.HandleFunc("/api/nodes/adm/{network}/lastmodified", authorize(true, "network", http.HandlerFunc(getLastModified))).Methods("GET") r.HandleFunc("/api/nodes/adm/{network}/lastmodified", authorize(true, "network", http.HandlerFunc(getLastModified))).Methods("GET")
r.HandleFunc("/api/nodes/adm/{network}/authenticate", authenticate).Methods("POST") r.HandleFunc("/api/nodes/adm/{network}/authenticate", authenticate).Methods("POST")

6
logic/gateway.go
View File

@@ -158,9 +158,9 @@ func CreateIngressGateway(netid string, nodeid string) (models.Node, error) {
} }
// DeleteIngressGateway - deletes an ingress gateway // DeleteIngressGateway - deletes an ingress gateway
func DeleteIngressGateway(networkName string, macaddress string) (models.Node, error) { func DeleteIngressGateway(networkName string, nodeid string) (models.Node, error) {
node, err := GetNodeByMacAddress(networkName, macaddress) node, err := GetNodeByID(nodeid)
if err != nil { if err != nil {
return models.Node{}, err return models.Node{}, err
} }
@@ -169,7 +169,7 @@ func DeleteIngressGateway(networkName string, macaddress string) (models.Node, e
return models.Node{}, err return models.Node{}, err
} }
// delete ext clients belonging to ingress gateway // delete ext clients belonging to ingress gateway
if err = DeleteGatewayExtClients(macaddress, networkName); err != nil { if err = DeleteGatewayExtClients(node.ID, networkName); err != nil {
return models.Node{}, err return models.Node{}, err
} }

2
logic/util.go
View File

@@ -105,10 +105,10 @@ func CreateNode(node *models.Node) error {
return err return err
} }
// TODO: This covers legacy nodes, eventually want to remove legacy check
if (node.IsServer != "yes" && (node.ID == "" || strings.Contains(node.ID, "###"))) || (node.IsServer == "yes" && servercfg.GetNodeID() == "") { if (node.IsServer != "yes" && (node.ID == "" || strings.Contains(node.ID, "###"))) || (node.IsServer == "yes" && servercfg.GetNodeID() == "") {
node.ID = uuid.NewString() node.ID = uuid.NewString()
} }
logger.Log(0, "server ID: ", node.ID)
//Create a JWT for the node //Create a JWT for the node
tokenString, _ := CreateJWT(node.ID, node.MacAddress, node.Network) tokenString, _ := CreateJWT(node.ID, node.MacAddress, node.Network)