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

fixing get config

Browse Source
This commit is contained in:
afeiszli
2021-08-19 19:00:23 -04:00
parent cd37d7701b
commit 72e7f6bfde
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
controllers/serverHttpController.go
View File

@@ -48,9 +48,11 @@ func securityCheckServer(adminonly bool, next http.Handler) http.HandlerFunc {
} }
if !adminonly && (err != nil || user == "") { if !adminonly && (err != nil || user == "") {
returnErrorResponse(w, r, errorResponse) returnErrorResponse(w, r, errorResponse)
return
} }
if !isadmin && !authenticateMasterServer(authToken) { if adminonly && !isadmin && !authenticateMasterServer(authToken) {
returnErrorResponse(w, r, errorResponse) returnErrorResponse(w, r, errorResponse)W
return
} }
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
} }
@@ -88,23 +90,10 @@ func getConfig(w http.ResponseWriter, r *http.Request) {
// get params // get params
scfg := servercfg.GetServerConfig() scfg := servercfg.GetServerConfig()
w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(scfg) json.NewEncoder(w).Encode(scfg)
//w.WriteHeader(http.StatusOK)
} }
/*
func getMongoConfig(w http.ResponseWriter, r *http.Request) {
// Set header
w.Header().Set("Content-Type", "application/json")
// get params
mcfg := servercfg.GetMongoConfig()
w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(mcfg)
}
*/
func addNetwork(w http.ResponseWriter, r *http.Request) { func addNetwork(w http.ResponseWriter, r *http.Request) {
// Set header // Set header
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")