fix ut check

Signed-off-by: wang yan <[email protected]>

src/server/middleware/csrf/csrf.go

@@ -72,8 +72,8 @@ func Middleware() func(handler http.Handler) http.Handler {
 		} else if len(key) != 32 {
 			log.Errorf("Invalid CSRF key length from the environment: %s. Please ensure the key length is 32 characters.", key)
 			protect = func(_ http.Handler) http.Handler {
-				return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-					lib_http.SendError(w, errors.New("Invalid CSRF key length from the environment. Please ensure the key length is 32 characters."))
+				return http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+					lib_http.SendError(w, errors.New("invalid CSRF key length from the environment. Please ensure the key length is 32 characters"))
 				})
 			}
 			return

src/server/middleware/csrf/csrf_test.go

@@ -37,45 +37,29 @@ func TestMiddleware(t *testing.T) {
 		req         *http.Request
 		statusCode  int
 		returnToken bool
-		validKey    bool
 	}{
 		{
 			req:         httptest.NewRequest(http.MethodGet, "/", nil),
 			statusCode:  http.StatusOK,
 			returnToken: true,
-			validKey:    true,
 		},
 		{
 			req:         httptest.NewRequest(http.MethodDelete, "/", nil),
 			statusCode:  http.StatusForbidden,
 			returnToken: true,
-			validKey:    true,
 		},
 		{
 			req:         httptest.NewRequest(http.MethodGet, "/api/2.0/projects", nil), // should be skipped
 			statusCode:  http.StatusOK,
 			returnToken: false,
-			validKey:    true,
 		},
 		{
 			req:         httptest.NewRequest(http.MethodDelete, "/v2/library/hello-world/manifests/latest", nil), // should be skipped
 			statusCode:  http.StatusOK,
 			returnToken: false,
-			validKey:    true,
-		},
-		{
-			req:         httptest.NewRequest(http.MethodGet, "/", nil),
-			statusCode:  http.StatusInternalServerError,
-			returnToken: false,
-			validKey:    false,
 		},
 	}
 	for _, c := range cases {
-		if c.validKey {
-			os.Setenv(csrfKeyEnv, utils.GenerateRandomStringWithLen(32))
-		} else {
-			os.Setenv(csrfKeyEnv, utils.GenerateRandomStringWithLen(10))
-		}
 		srv := Middleware()(&handler{})
 		rec := httptest.NewRecorder()
 		srv.ServeHTTP(rec, c.req)
@@ -84,6 +68,18 @@ func TestMiddleware(t *testing.T) {
 	}
 }
 
+func TestMiddlewareInvalidKey(t *testing.T) {
+	os.Setenv(csrfKeyEnv, utils.GenerateRandomStringWithLen(10))
+	srv := Middleware()(&handler{})
+	rec := httptest.NewRecorder()
+	req := httptest.NewRequest(http.MethodDelete, "/", nil)
+	statusCode := http.StatusInternalServerError
+	returnToken := false
+	srv.ServeHTTP(rec, req)
+	assert.Equal(t, statusCode, rec.Result().StatusCode)
+	assert.Equal(t, returnToken, rec.Result().Header.Get(tokenHeader) != "")
+}
+
 func TestSecureCookie(t *testing.T) {
 	assert.True(t, secureCookie())
 	conf := map[string]interface{}{