Merge pull request #381 from IdentityPython/refactor-context-query-params

Enhance Context object properties

Author: c00kiemon5ter

src/satosa/context.py

@@ -23,12 +23,18 @@ class Context(object):
     def __init__(self):
         self._path = None
         self.request = None
+        self.request_uri = None
+        self.request_method = None
+        self.qs_params = None
+        self.server = None
+        self.http_headers = None
+        self.cookie = None
+        self.request_authorization = None
         self.target_backend = None
         self.target_frontend = None
         self.target_micro_service = None
         # This dict is a data carrier between frontend and backend modules.
         self.internal_data = {}
-        self.cookie = None
         self.state = None
 
     @property

src/satosa/micro_services/idp_hinting.py

@@ -41,18 +41,18 @@ def process(self, context, data):
         :param data: the internal request
         """
         target_entity_id = context.get_decoration(context.KEY_TARGET_ENTITYID)
-        query_string = context.request
+        qs_params = context.qs_params
 
-        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:
+        issuer_is_already_selected = bool(target_entity_id)
+        query_string_is_missing = not qs_params
+        if issuer_is_already_selected or query_string_is_missing:
             return super().process(context, data)
 
         hints = (
             entity_id
-            for param in self.idp_hint_param_names
-            for entity_id in query_string.get(param, [])
-            if entity_id
+            for param_name in self.idp_hint_param_names
+            for qs_param_name, entity_id in qs_params
+            if param_name == qs_param_name
         )
         hint = next(hints, None)
 

src/satosa/proxy_server.py

@@ -1,14 +1,15 @@
-import io
 import json
 import logging
 import logging.config
 import sys
+from io import BytesIO
 from urllib.parse import parse_qsl as _parse_query_string
 
 from cookies_samesite_compat import CookiesSameSiteCompatMiddleware
 
 import satosa
 import satosa.logging_util as lu
+
 from .base import SATOSABase
 from .context import Context
 from .response import ServiceError, NotFound
@@ -68,14 +69,22 @@ def unpack_request(environ, content_length=0):
     return data
 
 
+def collect_server_headers(environ):
+    headers = {
+        header_name: header_value
+        for header_name, header_value in environ.items()
+        if header_name.startswith("SERVER_")
+    }
+    return 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
@@ -119,19 +128,21 @@ def __call__(self, environ, start_response, debug=False):
         context.path = path
 
         # copy wsgi.input stream to allow it to be re-read later by satosa plugins
-        # see: http://stackoverflow.com/
-        #      questions/1783383/how-do-i-copy-wsgi-input-if-i-want-to-process-post-data-more-than-once
+        # see: http://stackoverflow.com/questions/1783383/how-do-i-copy-wsgi-input-if-i-want-to-process-post-data-more-than-once
         content_length = int(environ.get('CONTENT_LENGTH', '0') or '0')
-        body = io.BytesIO(environ['wsgi.input'].read(content_length))
+        body = BytesIO(environ['wsgi.input'].read(content_length))
         environ['wsgi.input'] = body
+
         context.request = unpack_request(environ, content_length)
         context.request_uri = environ.get("REQUEST_URI")
         context.request_method = environ.get("REQUEST_METHOD")
+        context.qs_params = parse_query_string(environ.get("QUERY_STRING"))
+        context.server = collect_server_headers(environ)
         context.http_headers = collect_http_headers(environ)
-        environ['wsgi.input'].seek(0)
+        context.cookie = context.http_headers.get("HTTP_COOKIE", "")
+        context.request_authorization = context.http_headers.get("HTTP_AUTHORIZATION", "")
 
-        context.cookie = environ.get("HTTP_COOKIE", "")
-        context.request_authorization = environ.get("HTTP_AUTHORIZATION", "")
+        environ['wsgi.input'].seek(0)
 
         try:
             resp = self.run(context)