fix SQS json requests sent to query route (localstack#9634)

bentsku · web-flow · commit 805920f8e1d9 · 2023-11-14T22:56:08.000+01:00
diff --git a/localstack/services/sqs/query_api.py b/localstack/services/sqs/query_api.py
@@ -9,6 +9,7 @@
 from botocore.exceptions import ClientError
 from botocore.model import OperationModel
 from werkzeug.datastructures import Headers
+from werkzeug.exceptions import NotFound
 
 from localstack.aws.api import CommonServiceException
 from localstack.aws.connect import connect_to
@@ -134,6 +135,12 @@ def __init__(self, boto_response):
 
 
 def handle_request(request: Request, region: str) -> Response:
+    # some SDK (PHP) still send requests to the Queue URL even though the JSON spec does not allow it in the
+    # documentation. If the request is `json`, raise `NotFound` so that we continue the handler chain and the provider
+    # can handle the request
+    if request.headers.get("Content-Type", "").lower() == "application/x-amz-json-1.0":
+        raise NotFound
+
     request_id = long_uid()
 
     try:
diff --git a/tests/aws/services/sqs/test_sqs.py b/tests/aws/services/sqs/test_sqs.py
@@ -4173,6 +4173,27 @@ def test_get_without_query_json_format_returns_returns_xml(
     # TODO: write tests for making POST requests (not clear how signing would work without custom code)
     #  https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-making-api-requests.html#structure-post-request
 
+    @markers.aws.validated
+    def test_send_message_via_queue_url_with_json_protocol(
+        self,
+        sqs_create_queue,
+        aws_client_factory,
+        snapshot,
+    ):
+        queue_url = sqs_create_queue()
+        # that is what the PHP SDK is doing in a way, sending the request against the queue URL directly when `json`
+        # protocol should target the root path
+        sqs_client = aws_client_factory(
+            endpoint_url=queue_url,
+        ).sqs
+
+        response = sqs_client.receive_message(QueueUrl=queue_url, WaitTimeSeconds=1)
+        assert (
+            response["ResponseMetadata"]["HTTPHeaders"]["content-type"]
+            == "application/x-amz-json-1.0"
+        )
+        snapshot.match("receive-json-on-queue-url", response)
+
 
 class TestSQSMultiAccounts:
     @pytest.mark.parametrize("strategy", ["standard", "domain", "path"])
diff --git a/tests/aws/services/sqs/test_sqs.snapshot.json b/tests/aws/services/sqs/test_sqs.snapshot.json
@@ -1323,5 +1323,17 @@
         }
       }
     }
+  },
+  "tests/aws/services/sqs/test_sqs.py::TestSqsQueryApi::test_send_message_via_queue_url_with_json_protocol": {
+    "recorded-date": "14-11-2023, 21:27:28",
+    "recorded-content": {
+      "receive-json-on-queue-url": {
+        "Messages": [],
+        "ResponseMetadata": {
+          "HTTPHeaders": {},
+          "HTTPStatusCode": 200
+        }
+      }
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1323,5 +1323,17 @@`
`1323`	`1323`	`}`
`1324`	`1324`	`}`
`1325`	`1325`	`}`
	`1326`	`+ },`
	`1327`	`+ "tests/aws/services/sqs/test_sqs.py::TestSqsQueryApi::test_send_message_via_queue_url_with_json_protocol": {`
	`1328`	`+ "recorded-date": "14-11-2023, 21:27:28",`
	`1329`	`+ "recorded-content": {`
	`1330`	`+ "receive-json-on-queue-url": {`
	`1331`	`+ "Messages": [],`
	`1332`	`+ "ResponseMetadata": {`
	`1333`	`+ "HTTPHeaders": {},`
	`1334`	`+ "HTTPStatusCode": 200`
	`1335`	`+ }`
	`1336`	`+ }`
	`1337`	`+ }`
`1326`	`1338`	`}`
`1327`	`1339`	`}`