allow http.Request object to retain dashes and key casing (#5969)

thrau · web-flow · commit 64a4012eae11 · 2022-05-01T20:36:40.000+02:00
diff --git a/localstack/http/request.py b/localstack/http/request.py
@@ -147,9 +147,16 @@ def __init__(
 
         super(Request, self).__init__(environ)
 
+        # restore originally passed headers:
         # werkzeug normally provides read-only access to headers set in the WSGIEnvironment through the EnvironHeaders
-        # class, this makes them mutable.
-        self.headers = Headers(self.headers)
+        # class, here we make them mutable again. moreover, WSGI header encoding conflicts with RFC2616. see this github
+        # issue for a discussion: https://github.com/pallets/werkzeug/issues/940
+        headers = Headers(headers)
+        # these two headers are treated separately in the WSGI environment, so we extract them if necessary
+        for h in ["content-length", "content-type"]:
+            if h not in headers and h in self.headers:
+                headers[h] = self.headers[h]
+        self.headers = headers
 
 
 def get_raw_path(request) -> str:
diff --git a/tests/unit/http/test_request.py b/tests/unit/http/test_request.py
@@ -104,12 +104,16 @@ def validate(*args, **kwargs):
     validate(headers={"Content-Type": "text/xml", "x-amz-target": "foobar"}, body=b"")
 
 
-def test_get_content_length():
-    request = Request("GET", "/", body="foobar", headers={"Content-Length": "7"})
-    assert request.content_length == 7  # checking that the value from headers take precedence
-
+def test_content_length_is_set_automatically():
+    # checking that the value is calculated automatically
     request = Request("GET", "/", body="foobar")
-    assert request.content_length == 6  # checking that the value is calculated
+    assert request.content_length == 6
+
+
+def test_content_length_is_overwritten():
+    # checking that the value passed from headers take precedence
+    request = Request("GET", "/", body="foobar", headers={"Content-Length": "7"})
+    assert request.content_length == 7
 
 
 def test_get_custom_headers():
@@ -131,3 +135,19 @@ def test_get_raw_path_with_query():
     assert request.path == "/foo/bar/ed"
     assert request.environ["RAW_URI"] == "/foo%2Fbar/ed?fizz=buzz"
     assert get_raw_path(request) == "/foo%2Fbar/ed"
+
+
+def test_headers_retain_dashes():
+    request = Request("GET", "/foo/bar/ed", {"X-Amz-Meta--foo_bar-ed": "foobar"})
+    assert "x-amz-meta--foo_bar-ed" in request.headers
+    assert request.headers["x-amz-meta--foo_bar-ed"] == "foobar"
+
+
+def test_headers_retain_case():
+    request = Request("GET", "/foo/bar/ed", {"X-Amz-Meta--FOO_BaR-ed": "foobar"})
+    keys = list(request.headers.keys())
+    for k in keys:
+        if k.lower().startswith("x-amz-meta"):
+            assert k == "X-Amz-Meta--FOO_BaR-ed"
+            return
+    pytest.fail(f"key not in header keys {keys}")
