ASGI use new headers helper class

Author: bitterpanda63

aikido_zen/context/asgi/__init__.py

@@ -3,7 +3,7 @@
 from urllib.parse import parse_qs
 from aikido_zen.helpers.get_ip_from_request import get_ip_from_request
 from ..parse_cookies import parse_cookies
-from .normalize_asgi_headers import normalize_asgi_headers
+from .extract_asgi_headers import extract_asgi_headers
 from .build_url_from_asgi import build_url_from_asgi
 
 
@@ -22,7 +22,7 @@ def parse_asgi_scope(scope) -> ASGIContext:
     This extracts ASGI Scope attributes, described in :
     https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope
     """
-    headers = normalize_asgi_headers(scope["headers"])
+    headers = extract_asgi_headers(scope["headers"])
 
     cookies = {}
     if "COOKIE" in headers and headers["COOKIE"]:

aikido_zen/context/asgi/extract_asgi_headers.py

@@ -0,0 +1,10 @@
+"""Mainly exports extract_asgi_headers"""
+
+from aikido_zen.helpers.headers import Headers
+
+
+def extract_asgi_headers(headers) -> Headers:
+    result = Headers()
+    for k, v in headers:
+        result.store_header(k.decode("utf-8"), v.decode("utf-8"))
+    return result

…text/asgi/normalize_asgi_headers_test.py …ontext/asgi/extract_asgi_headers_test.pyaikido_zen/context/asgi/normalize_asgi_headers_test.py renamed to aikido_zen/context/asgi/extract_asgi_headers_test.py aikido_zen/context/asgi/normalize_asgi_headers_test.py renamed to aikido_zen/context/asgi/extract_asgi_headers_test.py

@@ -1,23 +1,23 @@
 import pytest
-from .normalize_asgi_headers import normalize_asgi_headers
+from .extract_asgi_headers import extract_asgi_headers
 
 
-def test_normalize_asgi_headers_basic():
+def test_extract_asgi_headers_basic():
     headers = [
         (b"content-type", b"text/html"),
         (b"accept-encoding", b"gzip, deflate"),
     ]
     expected = {"CONTENT_TYPE": ["text/html"], "ACCEPT_ENCODING": ["gzip, deflate"]}
-    assert normalize_asgi_headers(headers) == expected
+    assert extract_asgi_headers(headers) == expected
 
 
-def test_normalize_asgi_headers_empty():
+def test_extract_asgi_headers_empty():
     headers = []
     expected = {}
-    assert normalize_asgi_headers(headers) == expected
+    assert extract_asgi_headers(headers) == expected
 
 
-def test_normalize_asgi_headers_with_special_characters():
+def test_extract_asgi_headers_with_special_characters():
     headers = [
         (b"content-type", b"text/html"),
         (b"x-custom-header", b"some_value"),
@@ -28,19 +28,19 @@ def test_normalize_asgi_headers_with_special_characters():
         "X_CUSTOM_HEADER": ["some_value"],
         "ACCEPT_ENCODING": ["gzip, deflate"],
     }
-    assert normalize_asgi_headers(headers) == expected
+    assert extract_asgi_headers(headers) == expected
 
 
-def test_normalize_asgi_headers_with_dashes():
+def test_extract_asgi_headers_with_dashes():
     headers = [
         (b"X-Forwarded-For", b"192.168.1.1"),
         (b"X-Request-ID", b"abc123"),
     ]
     expected = {"X_FORWARDED_FOR": ["192.168.1.1"], "X_REQUEST_ID": ["abc123"]}
-    assert normalize_asgi_headers(headers) == expected
+    assert extract_asgi_headers(headers) == expected
 
 
-def test_normalize_asgi_headers_case_insensitivity():
+def test_extract_asgi_headers_case_insensitivity():
     headers = [
         (b"Content-Type", b"text/html"),
         (b"ACCEPT-ENCODING", b"gzip, deflate"),
@@ -50,19 +50,19 @@ def test_normalize_asgi_headers_case_insensitivity():
         "CONTENT_TYPE": ["text/html"],
         "ACCEPT_ENCODING": ["gzip, deflate", "json"],
     }
-    assert normalize_asgi_headers(headers) == expected
+    assert extract_asgi_headers(headers) == expected
 
 
-def test_normalize_asgi_headers_unicode():
+def test_extract_asgi_headers_unicode():
     headers = [
         (b"content-type", b"text/html"),
         (b"custom-header", b"value"),
     ]
     expected = {"CONTENT_TYPE": ["text/html"], "CUSTOM_HEADER": ["value"]}
-    assert normalize_asgi_headers(headers) == expected
+    assert extract_asgi_headers(headers) == expected
 
 
-def test_normalize_asgi_headers_mixed_case_and_dashes():
+def test_extract_asgi_headers_mixed_case_and_dashes():
     headers = [
         (b"Content-Type", b"text/html"),
         (b"X-Custom-Header", b"some_value"),
@@ -73,10 +73,10 @@ def test_normalize_asgi_headers_mixed_case_and_dashes():
         "X_CUSTOM_HEADER": ["some_value"],
         "ACCEPT_ENCODING": ["gzip, deflate"],
     }
-    assert normalize_asgi_headers(headers) == expected
+    assert extract_asgi_headers(headers) == expected
 
 
-def test_normalize_asgi_headers_non_ascii():
+def test_extract_asgi_headers_non_ascii():
     headers = [
         (b"content-type", b"text/html"),
         (b"custom-header", b"value"),
@@ -87,13 +87,13 @@ def test_normalize_asgi_headers_non_ascii():
         "CUSTOM_HEADER": ["value"],
         "X_HEADER_WITH_EMOJI": ["test"],
     }
-    assert normalize_asgi_headers(headers) == expected
+    assert extract_asgi_headers(headers) == expected
 
 
-def test_normalize_asgi_headers_large_input():
+def test_extract_asgi_headers_large_input():
     headers = [
         (f"header-{i}".encode("utf-8"), f"value-{i}".encode("utf-8"))
         for i in range(1000)
     ]
     expected = {f"HEADER_{i}": [f"value-{i}"] for i in range(1000)}
-    assert normalize_asgi_headers(headers) == expected
+    assert extract_asgi_headers(headers) == expected