adding in softer check for content type (#14097)

prysmaticlabs · Jun 10, 2024 · dfe31c9 · dfe31c9
1 parent b7866be
commit dfe31c9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/api/server/middleware/middleware.go b/api/server/middleware/middleware.go
@@ -50,7 +50,7 @@ func ContentTypeHandler(acceptedMediaTypes []string) mux.MiddlewareFunc {
 
 			accepted := false
 			for _, acceptedType := range acceptedMediaTypes {
-				if strings.TrimSpace(contentType) == strings.TrimSpace(acceptedType) {
+				if strings.Contains(strings.TrimSpace(contentType), strings.TrimSpace(acceptedType)) {
 					accepted = true
 					break
 				}

diff --git a/api/server/middleware/middleware_test.go b/api/server/middleware/middleware_test.go
@@ -96,6 +96,11 @@ func TestContentTypeHandler(t *testing.T) {
 			expectedStatusCode: http.StatusOK,
 			isGet:              true,
 		},
+		{
+			name:               "Content type contains charset is ok",
+			contentType:        "application/json; charset=utf-8",
+			expectedStatusCode: http.StatusOK,
+		},
 	}
 
 	for _, tt := range tests {

diff --git a/validator/client/beacon-api/json_rest_handler.go b/validator/client/beacon-api/json_rest_handler.go
@@ -109,7 +109,7 @@ func decodeResp(httpResp *http.Response, resp interface{}) error {
 		return errors.Wrapf(err, "failed to read response body for %s", httpResp.Request.URL)
 	}
 
-	if httpResp.Header.Get("Content-Type") != api.JsonMediaType {
+	if !strings.Contains(httpResp.Header.Get("Content-Type"), api.JsonMediaType) {
 		// 2XX codes are a success
 		if strings.HasPrefix(httpResp.Status, "2") {
 			return nil

diff --git a/validator/client/beacon-api/json_rest_handler_test.go b/validator/client/beacon-api/json_rest_handler_test.go
@@ -99,7 +99,16 @@ func Test_decodeResp(t *testing.T) {
 	type j struct {
 		Foo string `json:"foo"`
 	}
-
+	t.Run("200 JSON with charset", func(t *testing.T) {
+		body := bytes.Buffer{}
+		r := &http.Response{
+			Status:     "200",
+			StatusCode: http.StatusOK,
+			Body:       io.NopCloser(&body),
+			Header:     map[string][]string{"Content-Type": {"application/json; charset=utf-8"}},
+		}
+		require.NoError(t, decodeResp(r, nil))
+	})
 	t.Run("200 non-JSON", func(t *testing.T) {
 		body := bytes.Buffer{}
 		r := &http.Response{