fetch route temaplate

controllers/middleware.go

@@ -14,43 +14,48 @@ import (
 func userMiddleWare(handler http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var params = mux.Vars(r)
+		route, err := mux.CurrentRoute(r).GetPathTemplate()
+		if err != nil {
+			logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+			return
+		}
 		r.Header.Set("IS_GLOBAL_ACCESS", "no")
 		r.Header.Set("TARGET_RSRC", "")
 		r.Header.Set("RSRC_TYPE", "")
 		r.Header.Set("TARGET_RSRC_ID", "")
 		r.Header.Set("NET_ID", params["network"])
-		if strings.Contains(r.URL.Path, "hosts") || strings.Contains(r.URL.Path, "nodes") {
+		if strings.Contains(route, "hosts") || strings.Contains(route, "nodes") {
 			r.Header.Set("TARGET_RSRC", models.HostRsrc.String())
 		}
-		if strings.Contains(r.URL.Path, "dns") {
+		if strings.Contains(route, "dns") {
 			r.Header.Set("TARGET_RSRC", models.DnsRsrc.String())
 		}
-		if strings.Contains(r.URL.Path, "users") {
+		if strings.Contains(route, "users") {
 			r.Header.Set("TARGET_RSRC", models.UserRsrc.String())
 		}
-		if strings.Contains(r.URL.Path, "ingress") {
+		if strings.Contains(route, "ingress") {
 			r.Header.Set("TARGET_RSRC", models.RemoteAccessGwRsrc.String())
 		}
-		if strings.Contains(r.URL.Path, "createrelay") || strings.Contains(r.URL.Path, "deleterelay") {
+		if strings.Contains(route, "createrelay") || strings.Contains(route, "deleterelay") {
 			r.Header.Set("TARGET_RSRC", models.RelayRsrc.String())
 		}
 
-		if strings.Contains(r.URL.Path, "gateway") {
+		if strings.Contains(route, "gateway") {
 			r.Header.Set("TARGET_RSRC", models.EgressGwRsrc.String())
 		}
-		if strings.Contains(r.URL.Path, "networks") {
+		if strings.Contains(route, "networks") {
 			r.Header.Set("TARGET_RSRC", models.NetworkRsrc.String())
 		}
-		if strings.Contains(r.URL.Path, "acls") {
+		if strings.Contains(route, "acls") {
 			r.Header.Set("TARGET_RSRC", models.AclRsrc.String())
 		}
-		if strings.Contains(r.URL.Path, "extclients") {
+		if strings.Contains(route, "extclients") {
 			r.Header.Set("TARGET_RSRC", models.ExtClientsRsrc.String())
 		}
-		if strings.Contains(r.URL.Path, "enrollment-keys") {
+		if strings.Contains(route, "enrollment-keys") {
 			r.Header.Set("TARGET_RSRC", models.EnrollmentKeysRsrc.String())
 		}
-		if strings.Contains(r.URL.Path, "metrics") {
+		if strings.Contains(route, "metrics") {
 			r.Header.Set("TARGET_RSRC", models.MetricRsrc.String())
 		}
 		if keyID, ok := params["keyID"]; ok {
@@ -59,7 +64,7 @@ func userMiddleWare(handler http.Handler) http.Handler {
 		if nodeID, ok := params["nodeid"]; ok && r.Header.Get("TARGET_RSRC") != models.ExtClientsRsrc.String() {
 			r.Header.Set("TARGET_RSRC_ID", nodeID)
 		}
-		if strings.Contains(r.URL.Path, "failover") {
+		if strings.Contains(route, "failover") {
 			r.Header.Set("TARGET_RSRC", models.FailOverRsrc.String())
 			nodeID := r.Header.Get("TARGET_RSRC_ID")
 			node, _ := logic.GetNodeByID(nodeID)
@@ -73,7 +78,7 @@ func userMiddleWare(handler http.Handler) http.Handler {
 			r.Header.Set("TARGET_RSRC_ID", clientID)
 		}
 		if netID, ok := params["networkname"]; ok {
-			if !strings.Contains(r.URL.Path, "acls") {
+			if !strings.Contains(route, "acls") {
 				r.Header.Set("TARGET_RSRC_ID", netID)
 			}
 			r.Header.Set("NET_ID", params["networkname"])
@@ -94,7 +99,7 @@ func userMiddleWare(handler http.Handler) http.Handler {
 		}
 
 		r.Header.Set("RSRC_TYPE", r.Header.Get("TARGET_RSRC"))
-		logger.Log(0, "URL ------> ", r.URL.String())
+		logger.Log(0, "URL ------> ", route)
 		handler.ServeHTTP(w, r)
 	})
 }

logic/security.go

@@ -33,7 +33,7 @@ func SecurityCheck(reqAdmin bool, next http.Handler) http.HandlerFunc {
 		username, err := GetUserNameFromToken(bearerToken)
 		if err != nil {
 			logger.Log(0, "next 1", r.URL.String(), err.Error())
-			ReturnErrorResponse(w, r, FormatError(err, err.Error()))
+			ReturnErrorResponse(w, r, FormatError(err, "unauthorized"))
 			return
 		}
 		// detect masteradmin