dj-jwt-auth 1.6.0__tar.gz → 1.7.1__tar.gz

{dj-jwt-auth-1.6.0 → dj_jwt_auth-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.6.0
+Version: 1.7.1
 Summary: A Django package for JSON Web Token validation and verification. Using PyJWT.
 Home-page: https://www.example.com/
 Author: Konstantin Seleznev
@@ -17,10 +17,15 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: Django>=3.0
+Requires-Dist: pyjwt>=2.5.0
+Requires-Dist: requests>=2.28.1
+Requires-Dist: cryptography>=36.0.2
 
 # Django-JWT
 

{dj-jwt-auth-1.6.0 → dj_jwt_auth-1.7.1}/dj_jwt_auth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dj-jwt-auth
-Version: 1.6.0
+Version: 1.7.1
 Summary: A Django package for JSON Web Token validation and verification. Using PyJWT.
 Home-page: https://www.example.com/
 Author: Konstantin Seleznev
@@ -17,10 +17,15 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: Django>=3.0
+Requires-Dist: pyjwt>=2.5.0
+Requires-Dist: requests>=2.28.1
+Requires-Dist: cryptography>=36.0.2
 
 # Django-JWT
 

{dj-jwt-auth-1.6.0 → dj_jwt_auth-1.7.1}/django_jwt/config.py

@@ -6,7 +6,7 @@ import requests
 from jwt.algorithms import ECAlgorithm, RSAAlgorithm
 
 from django_jwt import settings
-from django_jwt.exceptions import ConfigException
+from django_jwt.exceptions import AlgorithmNotSupportedException, ConfigException
 
 
 def ensure_well_known(url: str) -> str:
@@ -24,6 +24,9 @@ class Config:
         if not self.route:
             raise ConfigException("OIDC_CONFIG_ROUTES is not set")
 
+        if alg not in self.route:
+            raise AlgorithmNotSupportedException(f"Algorithm {alg} is not supported")
+
         response = requests.get(ensure_well_known(self.route[alg]))
         response.raise_for_status()
         return response.json()

{dj-jwt-auth-1.6.0 → dj_jwt_auth-1.7.1}/django_jwt/exceptions.py

@@ -8,3 +8,9 @@ class BadRequestException(Exception):
     """Base class for exceptions in this module."""
 
     pass
+
+
+class AlgorithmNotSupportedException(Exception):
+    """Base class for exceptions in this module."""
+
+    pass

{dj-jwt-auth-1.6.0 → dj_jwt_auth-1.7.1}/django_jwt/middleware.py

@@ -5,6 +5,7 @@ from django.http import JsonResponse
 from django.utils.deprecation import MiddlewareMixin
 from jwt import ExpiredSignatureError
 
+from django_jwt.exceptions import AlgorithmNotSupportedException
 from django_jwt.user import UserHandler
 from django_jwt.utils import oidc_handler
 
@@ -27,6 +28,8 @@ class JWTAuthMiddleware(MiddlewareMixin):
         try:
             info = oidc_handler.decode_token(raw_token)
             request.user = request._cached_user = UserHandler(info, request, raw_token).get_user()
+        except AlgorithmNotSupportedException as exc:
+            return JsonResponse(status=HTTPStatus.UNAUTHORIZED.value, data={"detail": str(exc)})
         except ExpiredSignatureError:
             return JsonResponse(status=HTTPStatus.UNAUTHORIZED.value, data={"detail": "expired token"})
         except UnicodeDecodeError as exc:

{dj-jwt-auth-1.6.0 → dj_jwt_auth-1.7.1}/django_jwt/user.py

@@ -1,8 +1,7 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from functools import cache
 from logging import getLogger
 
-import pytz
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.http.request import HttpRequest
@@ -10,7 +9,7 @@ from django.http.request import HttpRequest
 from django_jwt import settings
 from django_jwt.utils import oidc_handler
 
-utc = pytz.UTC
+utc = timezone.utc
 log = getLogger(__name__)
 
 model = get_user_model()
@@ -32,7 +31,7 @@ class UserHandler:
 
         modified_at = payload.get(settings.OIDC_TOKEN_MODIFIED_FIELD, None)
         if modified_at and isinstance(modified_at, int):
-            self.modified_at = utc.localize(datetime.fromtimestamp(modified_at))
+            self.modified_at = datetime.fromtimestamp(modified_at, utc)
 
         self.on_create = settings.OIDC_USER_ON_CREATE
         self.on_update = settings.OIDC_USER_ON_UPDATE
@@ -61,8 +60,9 @@ class UserHandler:
     def _create_new_user(self) -> model:
         """Create new user if user is not found in database even by email."""
 
-        user = model.objects.create(**self.kwargs)
-        if self.on_create:
+        email = self.kwargs.pop("email")
+        user, created = model.objects.get_or_create(email=email, defaults=self.kwargs)
+        if created and self.on_create:
             self.on_create(user, self.request, self.payload)
         return user
 
@@ -81,7 +81,7 @@ class UserHandler:
         user_modified_at = getattr(user, settings.OIDC_USER_MODIFIED_FIELD, None)
         if user_modified_at:
             if not user_modified_at.tzinfo:
-                user_modified_at = utc.localize(user_modified_at)
+                user_modified_at = user_modified_at.replace(tzinfo=utc)
             is_modified = user_modified_at < self.modified_at
 
             log.info(

{dj-jwt-auth-1.6.0 → dj_jwt_auth-1.7.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dj-jwt-auth
-version = 1.6.0
+version = 1.7.1
 description = A Django package for JSON Web Token validation and verification. Using PyJWT.
 long_description = file: README.md
 url = https://www.example.com/
@@ -19,6 +19,7 @@ classifiers =
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 	Topic :: Internet :: WWW/HTTP
 	Topic :: Internet :: WWW/HTTP :: Dynamic Content
 

{dj-jwt-auth-1.6.0 → dj_jwt_auth-1.7.1}/tests/test.py

@@ -1,8 +1,7 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from http import HTTPStatus
 from unittest.mock import Mock, patch
 
-import pytz
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.test import TestCase
@@ -10,11 +9,13 @@ from django.urls import reverse
 from jwt.api_jwt import ExpiredSignatureError
 
 from django_jwt import settings
+from django_jwt.config import config
+from django_jwt.exceptions import ConfigException
 from django_jwt.middleware import JWTAuthMiddleware
 from django_jwt.roles import ROLE
 from django_jwt.user import role_handler
 
-utc = pytz.UTC
+utc = timezone.utc
 access_token_payload = {
     "sub": "1234",
     "updated_at": 2687276498,
@@ -185,7 +186,7 @@ class OIDCHandlerTest(TestCase):
         - don't call userdata if updated_at is not changed
         """
 
-        updated_at = utc.localize(datetime.fromtimestamp(access_token_payload["updated_at"]))
+        updated_at = datetime.fromtimestamp(access_token_payload["updated_at"], utc)
         user = User.objects.create(kc_id="1234", first_name="", last_name="", username="")
 
         self.middleware.process_request(self.request)
@@ -201,6 +202,25 @@ class OIDCHandlerTest(TestCase):
         # self.assertEqual(user_info.call_count, 1)
 
 
+@patch("django_jwt.utils.get_alg", return_value="HS256")
+class ConfigTest(TestCase):
+    def setUp(self):
+        self.middleware = JWTAuthMiddleware(get_response=lambda x: x)
+        self.request = Mock()
+        self.request.META = {"HTTP_AUTHORIZATION": "Bearer Token"}
+
+    @patch.object(config, "route", {})
+    def test_empty_routes(self, *_):
+        with self.assertRaises(ConfigException):
+            self.middleware.process_request(self.request)
+
+    @patch.object(config, "route", {"ES256": "http://localhost:8080"})
+    def test_not_supported_alg(self, *_):
+        response = self.middleware.process_request(self.request)
+        self.assertEqual(HTTPStatus.UNAUTHORIZED.value, response.status_code)
+        self.assertEqual(b'{"detail": "Algorithm HS256 is not supported"}', response.content)
+
+
 class RolesTest(TestCase):
     def setUp(self) -> None:
         self.user = User.objects.create(username="user")