Merge pull request #1 from IdentityPython/master

merge

Author: peppelinux

setup.py

@@ -56,10 +56,14 @@ def run_tests(self):
     classifiers=[
         "Development Status :: 4 - Beta",
         "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: Software Development :: Libraries :: Python Modules"],
+    extras_require={
+        'docs': ['Sphinx', 'sphinx-autobuild', 'alabaster'],
+        'quality': ['pylama', 'isort', 'eradicate', 'mypy', 'black', 'bandit'],
+    },
     install_requires=[
         "oidcmsg>=0.6.3",
         "oidcservice>=0.6.3",

src/oidcendpoint/__init__.py

@@ -1,24 +1,27 @@
 import string
+
 # Since SystemRandom is not available on all systems
 try:
     import random.SystemRandom as rnd
 except ImportError:
     import random as rnd
 
-__version__ = '0.8.5'
+__version__ = "0.9.0"
 
 
-DEF_SIGN_ALG = {"id_token": "RS256",
-                "userinfo": "RS256",
-                "request_object": "RS256",
-                "client_secret_jwt": "HS256",
-                "private_key_jwt": "RS256"}
+DEF_SIGN_ALG = {
+    "id_token": "RS256",
+    "userinfo": "RS256",
+    "request_object": "RS256",
+    "client_secret_jwt": "HS256",
+    "private_key_jwt": "RS256",
+}
 
 HTTP_ARGS = ["headers", "redirections", "connection_type"]
 
 JWT_BEARER = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"
 
-URL_ENCODED = 'application/x-www-form-urlencoded'
+URL_ENCODED = "application/x-www-form-urlencoded"
 JSON_ENCODED = "application/json"
 JOSE_ENCODED = "application/jose"
 

src/oidcendpoint/authn_event.py

@@ -6,21 +6,21 @@
 
 class AuthnEvent(Message):
     c_param = {
-        'uid': SINGLE_REQUIRED_STRING,
-        'salt': SINGLE_REQUIRED_STRING,
-        'authn_info': SINGLE_REQUIRED_STRING,
-        'authn_time': SINGLE_OPTIONAL_INT,
-        'valid_until': SINGLE_OPTIONAL_INT
+        "uid": SINGLE_REQUIRED_STRING,
+        "salt": SINGLE_REQUIRED_STRING,
+        "authn_info": SINGLE_REQUIRED_STRING,
+        "authn_time": SINGLE_OPTIONAL_INT,
+        "valid_until": SINGLE_OPTIONAL_INT,
     }
 
     def valid(self, now=0):
         if now:
-            return self['valid_until'] > now
+            return self["valid_until"] > now
         else:
-            return self['valid_until'] > time_sans_frac()
+            return self["valid_until"] > time_sans_frac()
 
     def expires_in(self):
-        return self['valid_until'] - time_sans_frac()
+        return self["valid_until"] - time_sans_frac()
 
 
 def create_authn_event(uid, salt, authn_info=None, **kwargs):
@@ -33,22 +33,22 @@ def create_authn_event(uid, salt, authn_info=None, **kwargs):
     :return:
     """
 
-    args = {'uid': uid, 'salt': salt, 'authn_info': authn_info}
+    args = {"uid": uid, "salt": salt, "authn_info": authn_info}
 
     try:
-        args['authn_time'] = int(kwargs['authn_time'])
+        args["authn_time"] = int(kwargs["authn_time"])
     except KeyError:
         try:
-            args['authn_time'] = int(kwargs['timestamp'])
+            args["authn_time"] = int(kwargs["timestamp"])
         except KeyError:
-            args['authn_time'] = time_sans_frac()
+            args["authn_time"] = time_sans_frac()
 
     try:
-        args['valid_until'] = kwargs['valid_until']
+        args["valid_until"] = kwargs["valid_until"]
     except KeyError:
         try:
-            args['valid_until'] = args['authn_time'] + kwargs['expires_in']
+            args["valid_until"] = args["authn_time"] + kwargs["expires_in"]
         except KeyError:
-            args['valid_until'] = args['authn_time'] + 3600
+            args["valid_until"] = args["authn_time"] + 3600
 
     return AuthnEvent(**args)

src/oidcendpoint/authz/__init__.py

@@ -24,7 +24,7 @@ def set(self, uid, client_id, permission):
         try:
             self.permdb[uid][client_id] = permission
         except KeyError:
-            self.permdb[uid] = {client_id:permission}
+            self.permdb[uid] = {client_id: permission}
 
     def permissions(self, cookie=None, **kwargs):
         if cookie is None:
@@ -39,7 +39,7 @@ def permissions(self, cookie=None, **kwargs):
                 b64, _ts, typ = val
 
             info = cookie_value(b64)
-            return self.get(info['sub'], info['client_id'])
+            return self.get(info["sub"], info["client_id"])
 
     def get(self, uid, client_id):
         try: