do not audit if length of commands is 0 (#2063)

erda-project · Sep 23, 2021 · fe4f001 · fe4f001
1 parent f184f42
commit fe4f001
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/modules/cmp/steve/middleware/audit.go b/modules/cmp/steve/middleware/audit.go
@@ -127,7 +127,10 @@ func (a *Auditor) AuditMiddleWare(next http.Handler) http.Handler {
 				cmd := fmt.Sprintf("%s: %s", cwt.start.Format(time.RFC3339), cwt.cmd)
 				cmds = append(cmds, cmd)
 			}
-			res := strings.Join(cmds, "\n")
+			if len(cmds) == 0 {
+				return
+			}
+			res := fmt.Sprintf("\n%s", strings.Join(cmds, "\n"))
 			if len(res) > maxAuditLength {
 				res = res[:maxAuditLength] + "..."
 			}

diff --git a/modules/cmp/steve/middleware/auth.go b/modules/cmp/steve/middleware/auth.go
@@ -45,11 +45,11 @@ func NewAuthenticator(bdl *bundle.Bundle) *Authenticator {
 // AuthMiddleware authenticate for steve server by bundle.
 func (a *Authenticator) AuthMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
-		vars := parseVars(req)
-		ctx := context.WithValue(req.Context(), varsKey, vars)
+		muxVars := parseVars(req)
+		ctx := context.WithValue(req.Context(), varsKey, muxVars)
 		req = req.WithContext(ctx)
-		clusterName := vars["clusterName"]
-		typ := vars["type"]
+		clusterName := muxVars["clusterName"]
+		typ := muxVars["type"]
 
 		userID := req.Header.Get("User-ID")
 		orgID := req.Header.Get("Org-ID")