Attach request_uri, request_method and http_headers on the context

- _http_headers is replaced by http_headers
- _http_headers used to hold more than headers; this is now fixed
- http_headers hold all headers that start with HTTP_ or REMOTE_ or
  SERVER_
- the query-string of a GET request is already available as
  context.request
- IdpHinting micro-service is now using the new properties

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

src/satosa/micro_services/idp_hinting.py

@@ -1,5 +1,4 @@
 import logging
-from urllib.parse import parse_qs
 
 from .base import RequestMicroService
 from ..exception import SATOSAConfigurationError
@@ -42,15 +41,17 @@ def process(self, context, data):
         :param data: the internal request
         """
         target_entity_id = context.get_decoration(context.KEY_TARGET_ENTITYID)
-        qs_raw = context._http_headers['QUERY_STRING']
-        if target_entity_id or not qs_raw:
+        query_string = context.request
+
+        an_issuer_is_already_selected = bool(target_entity_id)
+        query_string_is_missing = not query_string
+        if an_issuer_is_already_selected or query_string_is_missing:
             return super().process(context, data)
 
-        qs = parse_qs(qs_raw)
         hints = (
             entity_id
             for param in self.idp_hint_param_names
-            for entity_id in qs.get(param, [None])
+            for entity_id in query_string.get(param, [])
             if entity_id
         )
         hint = next(hints, None)

src/satosa/proxy_server.py

@@ -65,11 +65,17 @@ def unpack_request(environ, content_length=0):
     return data
 
 
-def unpack_http_headers(environ):
-    headers = ('REQUEST_METHOD', 'PATH_INFO', 'REQUEST_URI',
-               'QUERY_STRING', 'SERVER_NAME', 'REMOTE_ADDR',
-               'HTTP_HOST', 'HTTP_USER_AGENT', 'HTTP_ACCEPT_LANGUAGE')
-    return {k:v for k,v in environ.items() if k in headers}
+def collect_http_headers(environ):
+    headers = {
+        header_name: header_value
+        for header_name, header_value in environ.items()
+        if (
+            header_name.startswith("HTTP_")
+            or header_name.startswith("REMOTE_")
+            or header_name.startswith("SERVER_")
+        )
+    }
+    return headers
 
 
 class ToBytesMiddleware(object):
@@ -116,7 +122,9 @@ def __call__(self, environ, start_response, debug=False):
         body = io.BytesIO(environ['wsgi.input'].read(content_length))
         environ['wsgi.input'] = body
         context.request = unpack_request(environ, content_length)
-        context._http_headers = unpack_http_headers(environ)
+        context.request_uri = environ.get("REQUEST_URI")
+        context.request_method = environ.get("REQUEST_METHOD")
+        context.http_headers = collect_http_headers(environ)
         environ['wsgi.input'].seek(0)
 
         context.cookie = environ.get("HTTP_COOKIE", "")