Merge pull request #403 from akatsoulas/drop-unmaintained-versions

Drop unmaintained Python and Django versions

Author: akatsoulas

.circleci/config.yml

@@ -51,119 +51,75 @@ jobs:
           root: workspace
           paths:
             - mozilla-django-oidc-dev.tar.gz
-  e2e_test_py2_rs_django111:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py2-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=1.11,<2.0.0
-    <<: *common_steps
-  e2e_test_py3_rs_django111:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=1.11,<2.0.0
-    <<: *common_steps
-  e2e_test_py3_rs_django200:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=2.0.0,<2.1
-    <<: *common_steps
-  e2e_test_py3_rs_django210:
+  e2e_test_py3_rs_django220:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=2.1.0,<2.2
-    <<: *common_steps
-  e2e_test_py2_hs_django111:
-    docker:
-      - image: mozilla/oidc-testprovider:oidc_e2e_setup_py2-latest
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=1.11,<2.0.0
+          - DJANGO_VERSION=Django>=2.2.0,<3.0
     <<: *common_steps
-  e2e_test_py3_hs_django111:
+  e2e_test_py3_hs_django220:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=1.11,<2.0.0
+          - DJANGO_VERSION=Django>=2.2.0,<3.0
     <<: *common_steps
-  e2e_test_py3_hs_django200:
+  e2e_test_py3_rs_django300:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
         name: testoidcsetup
         environment:
-          - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=2.0.0,<2.1
+          - TEST_OIDC_ALGO=rs
+          - DJANGO_VERSION=Django>=3.0.0,<3.1
     <<: *common_steps
-  e2e_test_py3_hs_django210:
+  e2e_test_py3_hs_django300:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=2.1.0,<2.2
+          - DJANGO_VERSION=Django>=3.0.0,<3.1
     <<: *common_steps
-  e2e_test_py3_hs_django220:
+  e2e_test_py3_rs_django310:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
         name: testoidcsetup
         environment:
-          - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=2.2.0,<3.0
+          - TEST_OIDC_ALGO=rs
+          - DJANGO_VERSION=Django>=3.1.0,<3.2
     <<: *common_steps
-  e2e_test_py3_hs_django300:
+  e2e_test_py3_hs_django310:
     docker:
       - image: mozilla/oidc-testprovider:oidc_e2e_setup_py3-latest
         name: testoidcsetup
         environment:
           - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=3.0.0,<3.1
+          - DJANGO_VERSION=Django>=3.1.0,<3.2
     <<: *common_steps
 
 workflows:
   version: 2
   build_and_test:
     jobs:
       - build_lib
-      - e2e_test_py2_rs_django111:
+      - e2e_test_py3_rs_django220:
           requires:
             - build_lib
-      - e2e_test_py2_hs_django111:
-          requires:
-            - build_lib
-      - e2e_test_py3_rs_django111:
-          requires:
-            - build_lib
-      - e2e_test_py3_hs_django111:
-          requires:
-            - build_lib
-      - e2e_test_py3_rs_django200:
-          requires:
-            - build_lib
-      - e2e_test_py3_hs_django200:
+      - e2e_test_py3_hs_django220:
           requires:
             - build_lib
-      - e2e_test_py3_rs_django210:
+      - e2e_test_py3_rs_django300:
           requires:
             - build_lib
-      - e2e_test_py3_hs_django210:
+      - e2e_test_py3_hs_django300:
           requires:
             - build_lib
-      - e2e_test_py3_hs_django220:
+      - e2e_test_py3_rs_django310:
           requires:
             - build_lib
-      - e2e_test_py3_hs_django300:
+      - e2e_test_py3_hs_django310:
           requires:
             - build_lib

mozilla_django_oidc/auth.py

@@ -10,7 +10,7 @@
 from django.contrib.auth.backends import ModelBackend
 from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
 from django.urls import reverse
-from django.utils.encoding import force_bytes, smart_text, smart_bytes
+from django.utils.encoding import force_bytes, smart_str, smart_bytes
 from django.utils.module_loading import import_string
 
 from josepy.b64 import b64decode
@@ -38,7 +38,7 @@ def default_username_algo(email):
         hashlib.sha1(force_bytes(email)).digest()
     ).rstrip(b'=')
 
-    return smart_text(username)
+    return smart_str(username)
 
 
 class OIDCAuthenticationBackend(ModelBackend):
@@ -159,9 +159,9 @@ def retrieve_matching_jwk(self, token):
         key = None
         for jwk in jwks['keys']:
             if (import_from_settings("OIDC_VERIFY_KID", True)
-                    and jwk['kid'] != smart_text(header.kid)):
+                    and jwk['kid'] != smart_str(header.kid)):
                 continue
-            if 'alg' in jwk and jwk['alg'] != smart_text(header.alg):
+            if 'alg' in jwk and jwk['alg'] != smart_str(header.alg):
                 continue
             key = jwk
         if key is None:
@@ -172,7 +172,7 @@ def get_payload_data(self, token, key):
         """Helper method to get the payload of the JWT token."""
         if self.get_settings('OIDC_ALLOW_UNSECURED_JWT', False):
             header, payload_data, signature = token.split(b'.')
-            header = json.loads(smart_text(b64decode(header)))
+            header = json.loads(smart_str(b64decode(header)))
 
             # If config allows unsecured JWTs check the header and return the decoded payload
             if 'alg' in header and header['alg'] == 'none':

mozilla_django_oidc/middleware.py

@@ -14,11 +14,7 @@
                                        add_state_and_nonce_to_session,
                                        import_from_settings)
 
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    # Python < 3
-    from urllib import urlencode
+from urllib.parse import urlencode
 
 try:
     # Python 3.7 or later
@@ -166,7 +162,7 @@ def process_request(self, request):
 
         query = urlencode(params)
         redirect_url = '{url}?{query}'.format(url=auth_url, query=query)
-        if request.is_ajax():
+        if request.headers.get('x-requested-with') == 'XMLHttpRequest':
             # Almost all XHR request handling in client-side code struggles
             # with redirects since redirecting to a page where the user
             # is supposed to do something is extremely unlikely to work

mozilla_django_oidc/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import path
 from django.utils.module_loading import import_string
 
 from mozilla_django_oidc import views
@@ -18,9 +18,7 @@
 OIDCAuthenticateClass = import_string(AUTHENTICATE_CLASS_PATH)
 
 urlpatterns = [
-    url(r'^callback/$', OIDCCallbackClass.as_view(),
-        name='oidc_authentication_callback'),
-    url(r'^authenticate/$', OIDCAuthenticateClass.as_view(),
-        name='oidc_authentication_init'),
-    url(r'^logout/$', views.OIDCLogoutView.as_view(), name='oidc_logout'),
+    path('callback/', OIDCCallbackClass.as_view(), name='oidc_authentication_callback'),
+    path('authenticate/', OIDCAuthenticateClass.as_view(), name='oidc_authentication_init'),
+    path('logout/', views.OIDCLogoutView.as_view(), name='oidc_logout'),
 ]

mozilla_django_oidc/utils.py

@@ -5,11 +5,7 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
-try:
-    from urllib.request import parse_http_list, parse_keqv_list
-except ImportError:
-    # python < 3
-    from urllib2 import parse_http_list, parse_keqv_list
+from urllib.request import parse_http_list, parse_keqv_list
 
 
 LOGGER = logging.getLogger(__name__)

mozilla_django_oidc/views.py

@@ -5,19 +5,21 @@
 from django.http import HttpResponseRedirect
 from django.urls import reverse
 from django.utils.crypto import get_random_string
-from django.utils.http import is_safe_url
+
+try:
+    from django.utils.http import url_has_allowed_host_and_scheme
+except ImportError:
+    # Django <= 2.2
+    from django.utils.http import is_safe_url as url_has_allowed_host_and_scheme
+
 from django.utils.module_loading import import_string
 from django.views.generic import View
 
 from mozilla_django_oidc.utils import (absolutify,
                                        add_state_and_nonce_to_session,
                                        import_from_settings)
 
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    # Python < 3
-    from urllib import urlencode
+from urllib.parse import urlencode
 
 
 class OIDCAuthenticationCallbackView(View):
@@ -127,7 +129,7 @@ def get_next_url(request, redirect_field_name):
         hosts.append(request.get_host())
         kwargs['allowed_hosts'] = hosts
 
-        is_safe = is_safe_url(**kwargs)
+        is_safe = url_has_allowed_host_and_scheme(**kwargs)
         if is_safe:
             return next_url
     return None

tests/namespaced_urls.py

@@ -1,3 +1,3 @@
-from django.conf.urls import url, include
+from django.urls import path, include
 
-urlpatterns = [url(r'^namespace/', include(('mozilla_django_oidc.urls', 'namespace')))]
+urlpatterns = [path('namespace/', include(('mozilla_django_oidc.urls', 'namespace')))]