Merge branch 'master' of github.com:IdentityPython/oidcmsg

Author: rohe

.travis.yml

@@ -0,0 +1,10 @@
+language: python
+python:
+  - "3.5"
+  - "3.6"
+# command to install dependencies
+install:
+  - pip install -r requirements.txt
+# command to run tests
+script:
+  - pytest # or py.test for Python versions 3.5 and below

README.md

@@ -1,2 +1,20 @@
 # oidcmsg
-Implementation of OIDC protocol messages
+Implementation of OIDC protocol messages.
+
+oidcmsg is the 2nd layer in the
+JwtConnect stack (cryptojwt, oidcmsg, oidcservice, oidcrp)
+
+Handles serialising into a couple of formats (jwt, json, urlencoded and dict) and deserialising from said formats.
+
+It also does verification of messages , that is :
+
++ does all the required parameters have a value
++ are the parameter values of the right type
++ if there is a list of permitted values is a parameter value in that list.
+
+Also implements a **KeyJar** which keeps keys belonging to 
+different owners. One owner may have many keys.
+If some of these keys have a common origin, like described in a JWKS.
+Such a set will be kept in a **keyBundle**.
+Also implemented in this package. 
+   

requirements.txt

@@ -0,0 +1,6 @@
+pytest==3.2.5
+setuptools==39.0.1
+cryptography==2.1.3
+cryptojwt==0.3.2
+future==0.16.0
+Requests==2.18.4

src/oidcmsg/key_bundle.py

@@ -5,7 +5,6 @@
 import time
 
 import requests
-import six
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import serialization
@@ -49,7 +48,7 @@ def harmonize_usage(use):
     :param use:
     :return: list of usage
     """
-    if type(use) in six.string_types:
+    if isinstance(use, str):
         return [MAP[use]]
     elif isinstance(use, list):
         ul = list(MAP.keys())

src/oidcmsg/oidc/__init__.py

@@ -7,7 +7,6 @@
 import inspect
 import json
 import logging
-import six
 import sys
 import time
 
@@ -85,7 +84,7 @@ def idtoken_deser(val, sformat="urlencoded"):
 
 def address_deser(val, sformat="urlencoded"):
     if sformat in ["dict", "json"]:
-        if not isinstance(val, six.string_types):
+        if not isinstance(val, str):
             val = json.dumps(val)
             sformat = "json"
         elif sformat == "dict":
@@ -95,7 +94,7 @@ def address_deser(val, sformat="urlencoded"):
 
 def claims_deser(val, sformat="urlencoded"):
     if sformat in ["dict", "json"]:
-        if not isinstance(val, six.string_types):
+        if not isinstance(val, str):
             val = json.dumps(val)
             sformat = "json"
     return Claims().deserialize(val, sformat)
@@ -131,7 +130,7 @@ def msg_list_ser(insts, sformat, lev=0):
 
 def claims_ser(val, sformat="urlencoded", lev=0):
     # everything in c_extension
-    if isinstance(val, six.string_types):
+    if isinstance(val, str):
         item = val
     elif isinstance(val, list):
         item = val[0]
@@ -161,7 +160,7 @@ def claims_ser(val, sformat="urlencoded", lev=0):
 
 def registration_request_deser(val, sformat="urlencoded"):
     if sformat in ["dict", "json"]:
-        if not isinstance(val, six.string_types):
+        if not isinstance(val, str):
             val = json.dumps(val)
             sformat = "json"
     return RegistrationRequest().deserialize(val, sformat)
@@ -172,7 +171,7 @@ def claims_request_deser(val, sformat="json"):
     if sformat == "urlencoded":
         sformat = "json"
     if sformat in ["dict", "json"]:
-        if not isinstance(val, six.string_types):
+        if not isinstance(val, str):
             val = json.dumps(val)
             sformat = "json"
     return ClaimsRequest().deserialize(val, sformat)
@@ -183,7 +182,7 @@ def dict_deser(val, sformat="json"):
     if sformat == "urlencoded":
         sformat = "json"
     if sformat in ["dict", "json"]:
-        if not isinstance(val, six.string_types):
+        if not isinstance(val, str):
             val = json.dumps(val)
         elif isinstance(val, dict):
             return val
@@ -394,7 +393,7 @@ def verify(self, **kwargs):
             args["opponent_id"] = self["client_id"]
 
         if "request" in self:
-            if isinstance(self["request"], six.string_types):
+            if isinstance(self["request"], str):
                 # Try to decode the JWT, checks the signature
                 oidr = OpenIDRequest().from_jwt(str(self["request"]), **args)
 
@@ -408,7 +407,7 @@ def verify(self, **kwargs):
                 self["request"] = oidr
 
         if "id_token_hint" in self:
-            if isinstance(self["id_token_hint"], six.string_types):
+            if isinstance(self["id_token_hint"], str):
                 idt = IdToken().from_jwt(str(self["id_token_hint"]), **args)
                 self["verified_id_token_hint"] = idt
 
@@ -986,7 +985,7 @@ def jwt_deser(val, sformat="json"):
     if sformat == "urlencoded":
         sformat = "json"
     if sformat in ["dict", "json"]:
-        if not isinstance(val, six.string_types):
+        if not isinstance(val, str):
             val = json.dumps(val)
             sformat = "json"
     return JsonWebToken().deserialize(val, sformat)