port back mime_type helper changes

bentsku · bentsku · commit 294e3748f849 · 2025-02-03T10:31:39.000+01:00
diff --git a/localstack-core/localstack/services/apigateway/next_gen/execute_api/helpers.py b/localstack-core/localstack/services/apigateway/next_gen/execute_api/helpers.py
@@ -150,11 +150,14 @@ def parse_trace_id(trace_id: str) -> dict[str, str]:
     return trace_values
 
 
-def accept_header_matches_binary_media_types(accept: str | None, binary_media_types: list[str]):
-    accept_type_and_subtype = accept.split(",")[0].split(";")[0].split("/")
-    if len(accept_type_and_subtype) != 2:
+def mime_type_matches_binary_media_types(mime_type: str | None, binary_media_types: list[str]):
+    if not mime_type or not binary_media_types:
         return False
-    accept_type, accept_subtype = accept_type_and_subtype
+
+    mime_type_and_subtype = mime_type.split(",")[0].split(";")[0].split("/")
+    if len(mime_type_and_subtype) != 2:
+        return False
+    mime_type, mime_subtype = mime_type_and_subtype
 
     for bmt in binary_media_types:
         type_and_subtype = bmt.split(";")[0].split("/")
@@ -164,10 +167,10 @@ def accept_header_matches_binary_media_types(accept: str | None, binary_media_ty
         if _type == "*":
             continue
 
-        if subtype == "*" and accept_type == _type:
+        if subtype == "*" and mime_type == _type:
             return True
 
-        if accept_type == _type and accept_subtype == subtype:
+        if mime_type == _type and mime_subtype == subtype:
             return True
 
     return False
diff --git a/localstack-core/localstack/services/apigateway/next_gen/execute_api/integrations/aws.py b/localstack-core/localstack/services/apigateway/next_gen/execute_api/integrations/aws.py
@@ -32,9 +32,9 @@
 from ..gateway_response import IntegrationFailureError, InternalServerError
 from ..header_utils import build_multi_value_headers
 from ..helpers import (
-    accept_header_matches_binary_media_types,
     get_lambda_function_arn_from_invocation_uri,
     get_source_arn,
+    mime_type_matches_binary_media_types,
     render_uri_with_stage_variables,
     validate_sub_dict_of_typed_dict,
 )
@@ -395,7 +395,7 @@ def invoke(self, context: RestApiInvocationContext) -> EndpointResponse:
 
         # TODO: maybe centralize this flag inside the context, when we are also using it for other integration types
         #  AWS_PROXY behaves a bit differently, but this could checked only once earlier
-        binary_response_accepted = accept_header_matches_binary_media_types(
+        binary_response_accepted = mime_type_matches_binary_media_types(
             context.invocation_request["headers"].get("Accept"),
             context.deployment.rest_api.rest_api.get("binaryMediaTypes", []),
         )
