mirror of
https://github.com/gravitl/netmaker.git
synced 2025-09-09 14:46:36 +08:00
fix(go): permissions for network graph;
This commit is contained in:
parent
3a173bb4b2
commit
2ee8e18ceb
3 changed files with 32 additions and 19 deletions
|
@ -20,7 +20,6 @@ func MetricHandlers(r *mux.Router) {
|
|||
r.HandleFunc("/api/metrics/{network}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkNodesMetrics))).Methods(http.MethodGet)
|
||||
r.HandleFunc("/api/metrics", logic.SecurityCheck(true, http.HandlerFunc(getAllMetrics))).Methods(http.MethodGet)
|
||||
r.HandleFunc("/api/metrics-ext/{network}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkExtMetrics))).Methods(http.MethodGet)
|
||||
r.HandleFunc("/api/v1/graph/{network}", logic.SecurityCheck(true, http.HandlerFunc(graph))).Methods(http.MethodGet)
|
||||
}
|
||||
|
||||
// get the metrics of a given node
|
||||
|
@ -166,21 +165,3 @@ func getAllMetrics(w http.ResponseWriter, r *http.Request) {
|
|||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(networkMetrics)
|
||||
}
|
||||
|
||||
func graph(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
var params = mux.Vars(r)
|
||||
network := params["network"]
|
||||
networkNodes, err := logic.GetNetworkNodes(network)
|
||||
if err != nil {
|
||||
logger.Log(1, r.Header.Get("user"), "failed to get network nodes", err.Error())
|
||||
return
|
||||
}
|
||||
networkNodes = logic.AddStaticNodestoList(networkNodes)
|
||||
// return all the nodes in JSON/API format
|
||||
apiNodes := logic.GetAllNodesAPIWithLocation(networkNodes[:])
|
||||
logic.SortApiNodes(apiNodes[:])
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(apiNodes)
|
||||
}
|
||||
|
|
31
pro/controllers/networks.go
Normal file
31
pro/controllers/networks.go
Normal file
|
@ -0,0 +1,31 @@
|
|||
package controllers
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/gravitl/netmaker/logger"
|
||||
"github.com/gravitl/netmaker/logic"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func NetworkHandlers(r *mux.Router) {
|
||||
r.HandleFunc("/api/v1/networks/{network}/graph", logic.SecurityCheck(true, http.HandlerFunc(getNetworkGraph))).Methods(http.MethodGet)
|
||||
}
|
||||
|
||||
func getNetworkGraph(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
var params = mux.Vars(r)
|
||||
network := params["network"]
|
||||
networkNodes, err := logic.GetNetworkNodes(network)
|
||||
if err != nil {
|
||||
logger.Log(1, r.Header.Get("user"), "failed to get network nodes", err.Error())
|
||||
return
|
||||
}
|
||||
networkNodes = logic.AddStaticNodestoList(networkNodes)
|
||||
// return all the nodes in JSON/API format
|
||||
apiNodes := logic.GetAllNodesAPIWithLocation(networkNodes[:])
|
||||
logic.SortApiNodes(apiNodes[:])
|
||||
w.WriteHeader(http.StatusOK)
|
||||
json.NewEncoder(w).Encode(apiNodes)
|
||||
}
|
|
@ -35,6 +35,7 @@ func InitPro() {
|
|||
proControllers.RacHandlers,
|
||||
proControllers.EventHandlers,
|
||||
proControllers.TagHandlers,
|
||||
proControllers.NetworkHandlers,
|
||||
)
|
||||
controller.ListRoles = proControllers.ListRoles
|
||||
logic.EnterpriseCheckFuncs = append(logic.EnterpriseCheckFuncs, func() {
|
||||
|
|
Loading…
Add table
Reference in a new issue