Adjusting to changes in oidcservice. Made to work with oidcservice 0.6.0.

Author: rohe

setup.py

@@ -65,7 +65,7 @@ def run_tests(self):
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
         'cryptojwt>=0.3.1',
-        'oidcservice>=0.5.12',
+        'oidcservice>=0.6.0',
         'oidcmsg>=0.5.0'
     ],
     tests_require=[

src/oidcrp/__init__.py

@@ -14,6 +14,7 @@
 from oidcmsg.time_util import time_sans_frac
 from oidcservice import rndstr
 from oidcservice.exception import OidcServiceError
+from oidcservice.service_factory import service_factory
 from oidcservice.state_interface import InMemoryStateDataBase
 from oidcservice.state_interface import StateInterface
 
@@ -22,7 +23,7 @@
 from oidcrp import provider
 
 __author__ = 'Roland Hedberg'
-__version__ = '0.5.0'
+__version__ = '0.6.0'
 
 logger = logging.getLogger(__name__)
 
@@ -110,7 +111,7 @@ class RPHandler(object):
     def __init__(self, base_url='', hash_seed="", keyjar=None, verify_ssl=True,
                  services=None, service_factory=None, client_configs=None,
                  client_authn_factory=None, client_cls=None,
-                 state_db=None, http_lib=None, **kwargs):
+                 state_db=None, http_lib=None, module_dirs=None, **kwargs):
         self.base_url = base_url
         self.hash_seed = as_bytes(hash_seed)
         self.verify_ssl = verify_ssl
@@ -135,6 +136,7 @@ def __init__(self, base_url='', hash_seed="", keyjar=None, verify_ssl=True,
         self.service_factory = service_factory or factory
         self.client_authn_factory = client_authn_factory
         self.client_configs = client_configs
+        self.module_dirs = module_dirs or ['oidc', 'oauth2']
 
         # keep track on which RP instance that serves with OP
         self.issuer2rp = {}
@@ -207,7 +209,7 @@ def init_client(self, issuer):
                 client_authn_factory=self.client_authn_factory,
                 verify_ssl=self.verify_ssl, services=_services,
                 service_factory=self.service_factory, config=_cnf,
-                httplib=self.httplib
+                httplib=self.httplib, module_dirs=self.module_dirs
             )
         except Exception as err:
             logger.error('Failed initiating client: {}'.format(err))
@@ -872,7 +874,7 @@ def get_provider_specific_service(service_provider, service, **kwargs):
     return None
 
 
-def factory(service_name, **kwargs):
+def factory(service_name, ignore, **kwargs):
     """
     A factory the given a service name will return a
     :py:class:`oidcservice.service.Service` instance if a service matching the
@@ -887,10 +889,10 @@ def factory(service_name, **kwargs):
     if '.' in service_name:
         group, name = service_name.split('.')
         if group == 'oauth2':
-            oauth2.service.factory(service_name[1], **kwargs)
+            service_factory(service_name[1], ['oauth2'], **kwargs)
         elif group == 'oidc':
-            oidc.service.factory(service_name[1], **kwargs)
+            service_factory(service_name[1], ['oidc'], **kwargs)
         else:
             return get_provider_specific_service(group, name, **kwargs)
     else:
-        return oidc.service.factory(service_name, **kwargs)
+        return service_factory(service_name, ['oidc', 'oauth2'], **kwargs)

src/oidcrp/oauth2/__init__.py

@@ -8,7 +8,7 @@
 from oidcservice.client_auth import factory as ca_factory
 from oidcservice.exception import OidcServiceError
 from oidcservice.exception import ParseError
-from oidcservice.oauth2 import service
+from oidcservice.service_factory import service_factory as default_service_factory
 from oidcservice.service import REQUEST_INFO
 from oidcservice.service import SUCCESSFUL
 from oidcservice.service import build_services
@@ -43,7 +43,7 @@ class Client(object):
     def __init__(self, state_db, ca_certs=None, client_authn_factory=None,
                  keyjar=None, verify_ssl=True, config=None, client_cert=None,
                  httplib=None, services=None, service_factory=None,
-                 jwks_uri=''):
+                 jwks_uri='', module_dirs=None):
         """
 
         :param ca_certs: Certificates used to verify HTTPS certificates
@@ -80,10 +80,14 @@ def __init__(self, state_db, ca_certs=None, client_authn_factory=None,
             self.client_id = self.service_context.client_id
 
         _cam = client_authn_factory or ca_factory
-        self.service_factory = service_factory or service.factory
+        self.service_factory = service_factory or default_service_factory
         _srvs = services or DEFAULT_SERVICES
 
+        if not module_dirs:
+            module_dirs = ['oauth2']
+
         self.service = build_services(_srvs, self.service_factory,
+                                      module_dirs,
                                       self.service_context, state_db, _cam)
 
         self.service_context.service = self.service

src/oidcrp/oidc/__init__.py

@@ -2,6 +2,7 @@
 import logging
 
 from oidcservice.client_auth import BearerHeader
+from oidcservice.service_factory import service_factory as default_service_factory
 
 try:
     from json import JSONDecodeError
@@ -10,7 +11,6 @@
 else:
     _decode_err = JSONDecodeError
 
-from oidcservice.oidc import service
 from oidcrp import oauth2
 
 __author__ = 'Roland Hedberg'
@@ -72,16 +72,20 @@ class FetchException(Exception):
 class RP(oauth2.Client):
     def __init__(self, state_db, ca_certs=None, client_authn_factory=None,
                  keyjar=None, verify_ssl=True, config=None, client_cert=None,
-                 httplib=None, services=None, service_factory=None):
+                 httplib=None, services=None, service_factory=None,
+                 module_dirs=None):
 
         _srvs = services or DEFAULT_SERVICES
-        service_factory = service_factory or service.factory
+        service_factory = service_factory or default_service_factory
+        module_dirs = module_dirs or ['oidc']
+
         oauth2.Client.__init__(self, state_db, ca_certs,
                                client_authn_factory=client_authn_factory,
                                keyjar=keyjar, verify_ssl=verify_ssl,
                                config=config, client_cert=client_cert,
                                httplib=httplib, services=_srvs,
-                               service_factory=service_factory)
+                               service_factory=service_factory,
+                               module_dirs=module_dirs)
 
     def fetch_distributed_claims(self, userinfo, callback=None):
         """

src/oidcrp/provider/github.py

@@ -3,9 +3,8 @@
 from oidcmsg.message import SINGLE_OPTIONAL_STRING
 from oidcmsg.message import SINGLE_REQUIRED_STRING
 from oidcmsg.oauth2 import ResponseMessage
-
-from oidcservice.oidc import service as oidc_service
-from oidcservice.oauth2 import service
+from oidcservice.oauth2 import access_token
+from oidcservice.oidc import userinfo
 
 
 class AccessTokenResponse(Message):
@@ -19,14 +18,14 @@ class AccessTokenResponse(Message):
     }
 
 
-class AccessToken(service.AccessToken):
+class AccessToken(access_token.AccessToken):
     msg_type = oauth2.AccessTokenRequest
     response_cls = AccessTokenResponse
     error_msg = oauth2.TokenErrorResponse
     response_body_type = 'urlencoded'
 
 
-class UserInfo(oidc_service.UserInfo):
+class UserInfo(userinfo.UserInfo):
     response_cls = Message
     error_msg = ResponseMessage
     default_authn_method = ''

src/oidcrp/provider/linkedin.py

@@ -1,13 +1,13 @@
-from oidcservice.oidc import service as oidc_service
-from oidcservice.oauth2 import service
-
 from oidcmsg import oauth2
 from oidcmsg.message import Message
 from oidcmsg.message import SINGLE_OPTIONAL_JSON
 from oidcmsg.message import SINGLE_OPTIONAL_STRING
 from oidcmsg.message import SINGLE_REQUIRED_INT
 from oidcmsg.message import SINGLE_REQUIRED_STRING
 
+from oidcservice.oauth2 import access_token
+from oidcservice.oidc import userinfo
+
 
 class AccessTokenResponse(Message):
     """
@@ -29,11 +29,11 @@ class UserSchema(Message):
     }
 
 
-class AccessToken(service.AccessToken):
+class AccessToken(access_token.AccessToken):
     msg_type = oauth2.AccessTokenRequest
     response_cls = AccessTokenResponse
     error_msg = oauth2.TokenErrorResponse
 
 
-class UserInfo(oidc_service.UserInfo):
+class UserInfo(userinfo.UserInfo):
     response_cls = UserSchema

tests/test_11_oauth2.py

@@ -85,7 +85,7 @@ def test_construct_accesstoken_request(self):
 
         auth_request = AuthorizationRequest(
             redirect_uri='https://example.com/cli/authz_cb',
-            state='state'
+            state='ABCDE'
         )
 
         self.client.session_interface.store_item(auth_request, 'auth_request',

tests/test_14_oidc.py

@@ -80,7 +80,7 @@ def test_construct_authorization_request(self):
     def test_construct_accesstoken_request(self):
         auth_request = AuthorizationRequest(
             redirect_uri='https://example.com/cli/authz_cb',
-            state='state'
+            state='ABCDE'
         )
 
         self.client.session_interface.store_item(auth_request,

tests/test_20_rp_handler.py

@@ -160,7 +160,7 @@ class TestRPHandler(object):
     @pytest.fixture(autouse=True)
     def rphandler_setup(self):
         self.rph = RPHandler(base_url=BASE_URL, client_configs=CLIENT_CONFIG,
-                             keyjar=CLI_KEY)
+                             keyjar=CLI_KEY, module_dirs=['oidc'])
 
     def test_support_webfinger(self):
         assert self.rph.supports_webfinger()