浏览代码

fix middleware error nil check

abhishek9686 1 年之前
父节点
当前提交
31fc7efe5f
共有 2 个文件被更改,包括 3 次插入6 次删除
  1. 0 1
      controllers/node.go
  2. 3 5
      logic/security.go

+ 0 - 1
controllers/node.go

@@ -303,7 +303,6 @@ func getNetworkNodes(w http.ResponseWriter, r *http.Request) {
 // Not quite sure if this is necessary. Probably necessary based on front end but may want to review after iteration 1 if it's being used or not
 func getAllNodes(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
-	logger.Log(0, "SECURITY CHECK - 5")
 	var nodes []models.Node
 	nodes, err := logic.GetAllNodes()
 	if err != nil {

+ 3 - 5
logic/security.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/servercfg"
 )
@@ -131,13 +130,11 @@ func checkPermissionScopeWithReqMethod(scope models.RsrcPermissionScope, reqmeth
 func SecurityCheck(reqAdmin bool, next http.Handler) http.HandlerFunc {
 
 	return func(w http.ResponseWriter, r *http.Request) {
-		logger.Log(0, "SECURITY CHECK - 1")
 		r.Header.Set("ismaster", "no")
 		bearerToken := r.Header.Get("Authorization")
 		isGlobalAccesss := r.Header.Get("IS_GLOBAL_ACCESS") == "yes"
 		username, err := UserPermissions(reqAdmin, bearerToken)
 		if err != nil {
-			logger.Log(0, "SECURITY CHECK - 2", err.Error())
 			ReturnErrorResponse(w, r, FormatError(err, err.Error()))
 			return
 		}
@@ -155,9 +152,10 @@ func SecurityCheck(reqAdmin bool, next http.Handler) http.HandlerFunc {
 		w.Header().Set("TARGET_RSRC_ID", r.Header.Get("TARGET_RSRC_ID"))
 		w.Header().Set("RSRC_TYPE", r.Header.Get("RSRC_TYPE"))
 		w.Header().Set("IS_GLOBAL_ACCESS", r.Header.Get("IS_GLOBAL_ACCESS"))
-		w.Header().Set("ACCESS_PERM", err.Error())
+		if err != nil {
+			w.Header().Set("ACCESS_PERM", err.Error())
+		}
 		r.Header.Set("user", username)
-		logger.Log(0, "SECURITY CHECK - 3")
 		next.ServeHTTP(w, r)
 	}
 }