Merge branch 'issuer_metadata' of https://github.com/IdentityPython/idpy-oidc into issuer_metadata

Author: rohe

src/idpyoidc/client/oauth2/add_on/par.py

@@ -1,8 +1,10 @@
 import logging
 
+from cryptojwt import JWT
 from cryptojwt.utils import importer
 
 from idpyoidc.client.client_auth import CLIENT_AUTHN_METHOD
+from idpyoidc.client.service import Service
 from idpyoidc.message import Message
 from idpyoidc.message.oauth2 import JWTSecuredAuthorizationRequest
 from idpyoidc.server.util import execute
@@ -13,7 +15,7 @@
 HTTP_METHOD = "POST"
 
 
-def push_authorization(request_args, service, **kwargs):
+def push_authorization(request_args: Message, service: Service, **kwargs):
     """
     :param request_args: All the request arguments as a AuthorizationRequest instance
     :param service: The service to which this post construct method is applied.
@@ -48,8 +50,15 @@ def push_authorization(request_args, service, **kwargs):
         )
         _headers["Content-Type"] = "application/x-www-form-urlencoded"
 
+    # construct a signed request object
+    _jwt = JWT(key_jar=_context.keyjar)
+    _request_object = _jwt.pack(request_args)
+
     # construct the message body
-    _body = request_args.to_urlencoded()
+    _required_params = {k: v for k, v in request_args.items() if k in request_args.required_parameters()}
+    _required_params["request"] = _request_object
+    _req = service.msg_type(**_required_params)
+    _body = _req.to_urlencoded()
 
     _http_client = method_args.get("http_client", None)
     if not _http_client:

src/idpyoidc/client/util.py

@@ -271,6 +271,11 @@ def get_deserialization_method(reqresp):
                 return "jwt"
             except Exception:
                 return "urlencoded"  # reasonable default ??
+    elif ';' in _ctype:
+        for _typ in _ctype.split(";"):
+            if _typ.startswith("application") or _typ.startswith("text"):
+                _ctype = _typ
+                break
 
     if match_to_("application/json", _ctype) or match_to_("application/jrd+json", _ctype):
         deser_method = "json"

src/idpyoidc/storage/abfile.py

@@ -239,6 +239,14 @@ def synch(self):
                 else:
                     self.fmtime[f] = mtime
 
+        _keys = self.storage.keys()
+        for f in _keys:
+            fname = os.path.join(self.fdir, f)
+            if os.path.isfile(fname):
+                pass
+            else:
+                del self.storage[f]
+
     def items(self):
         """
         Implements the dict.items() method

src/idpyoidc/storage/listfile.py

@@ -137,3 +137,43 @@ def _read_info(self, fname):
 
     def __call__(self):
         return self._read_info(self.file_name)
+
+class ReadWriteListFile(object):
+
+    def __init__(self, file_name):
+        self.file_name = file_name
+
+        if not os.path.exists(file_name):
+            fp = open(file_name, "x")
+            fp.close()
+
+    def __contains__(self, item):
+        _lst = self._read_info(self.file_name)
+        return item in _lst
+
+    def __len__(self):
+        _lst = self._read_info(self.file_name)
+        if _lst is None or _lst == []:
+            return 0
+
+        return len(_lst)
+
+    def _read_info(self, fname):
+        if os.path.isfile(fname):
+            try:
+                lock = FileLock(f"{fname}.lock")
+                with lock:
+                    fp = open(fname, "r")
+                    info = [x.strip() for x in fp.readlines()]
+                lock.release()
+                return info or None
+            except Exception as err:
+                logger.error(err)
+                raise
+        else:
+            _msg = f"No such file: '{fname}'"
+            logger.error(_msg)
+        return None
+
+    def __call__(self):
+        return self._read_info(self.file_name)