commonground-api-common 2.6.5__tar.gz → 2.6.6__tar.gz

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6}/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Change history
 ==============
 
+2.6.6 (2025-06-04)
+------------------
+
+* [open-zaak/open-zaak#635] Rename JWT_LEEWAY setting to TIME_LEEWAY and add it to UntilNowValidator
+
 2.6.5 (2025-05-27)
 ------------------
 

{commonground_api_common-2.6.5/commonground_api_common.egg-info → commonground_api_common-2.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonground-api-common
-Version: 2.6.5
+Version: 2.6.6
 Summary: Commonground API tooling
 Home-page: https://github.com/maykinmedia/commonground-api-common
 Author: Maykin Media, VNG-Realisatie
@@ -45,7 +45,7 @@ Provides-Extra: drf-extra-fields
 Requires-Dist: drf-extra-fields>=3.7.0; extra == "drf-extra-fields"
 Provides-Extra: tests
 Requires-Dist: psycopg2; extra == "tests"
-Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest==8.3.5; extra == "tests"
 Requires-Dist: pytest-django; extra == "tests"
 Requires-Dist: pytest-dotenv; extra == "tests"
 Requires-Dist: pytest-factoryboy; extra == "tests"
@@ -76,7 +76,7 @@ Commonground-API-common - Tooling voor RESTful APIs
 ===================================================
 
 
-:Version: 2.6.5
+:Version: 2.6.6
 :Source: https://github.com/maykinmedia/commonground-api-common
 :PythonVersion: 3.12
 
@@ -109,7 +109,7 @@ Features
     * Niet-negatieve waarde validator
     * Alfanumerieke waarde (zonder diacritics)
     * URL-validator (test dat URL bestaat) met pluggable link-checker
-    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*.
+    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*. (Via de TIME_LEEWAY setting kan speling worden toegevoegd)
     * ``UniekeIdentificatieValidator`` (in combinatie met organisatie)
     * ``InformatieObjectUniqueValidator`` om te valideren dat M2M entries
       slechts eenmalig voorkomen

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6}/README.rst

@@ -3,7 +3,7 @@ Commonground-API-common - Tooling voor RESTful APIs
 ===================================================
 
 
-:Version: 2.6.5
+:Version: 2.6.6
 :Source: https://github.com/maykinmedia/commonground-api-common
 :PythonVersion: 3.12
 
@@ -36,7 +36,7 @@ Features
     * Niet-negatieve waarde validator
     * Alfanumerieke waarde (zonder diacritics)
     * URL-validator (test dat URL bestaat) met pluggable link-checker
-    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*.
+    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*. (Via de TIME_LEEWAY setting kan speling worden toegevoegd)
     * ``UniekeIdentificatieValidator`` (in combinatie met organisatie)
     * ``InformatieObjectUniqueValidator`` om te valideren dat M2M entries
       slechts eenmalig voorkomen

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6/commonground_api_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonground-api-common
-Version: 2.6.5
+Version: 2.6.6
 Summary: Commonground API tooling
 Home-page: https://github.com/maykinmedia/commonground-api-common
 Author: Maykin Media, VNG-Realisatie
@@ -45,7 +45,7 @@ Provides-Extra: drf-extra-fields
 Requires-Dist: drf-extra-fields>=3.7.0; extra == "drf-extra-fields"
 Provides-Extra: tests
 Requires-Dist: psycopg2; extra == "tests"
-Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest==8.3.5; extra == "tests"
 Requires-Dist: pytest-django; extra == "tests"
 Requires-Dist: pytest-dotenv; extra == "tests"
 Requires-Dist: pytest-factoryboy; extra == "tests"
@@ -76,7 +76,7 @@ Commonground-API-common - Tooling voor RESTful APIs
 ===================================================
 
 
-:Version: 2.6.5
+:Version: 2.6.6
 :Source: https://github.com/maykinmedia/commonground-api-common
 :PythonVersion: 3.12
 
@@ -109,7 +109,7 @@ Features
     * Niet-negatieve waarde validator
     * Alfanumerieke waarde (zonder diacritics)
     * URL-validator (test dat URL bestaat) met pluggable link-checker
-    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*.
+    * ``UntilNowValidator`` - valideer datetimes tot en met *nu*. (Via de TIME_LEEWAY setting kan speling worden toegevoegd)
     * ``UniekeIdentificatieValidator`` (in combinatie met organisatie)
     * ``InformatieObjectUniqueValidator`` om te valideren dat M2M entries
       slechts eenmalig voorkomen

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6}/commonground_api_common.egg-info/requires.txt

@@ -44,7 +44,7 @@ django-setup-configuration>=0.7.0
 
 [tests]
 psycopg2
-pytest
+pytest==8.3.5
 pytest-django
 pytest-dotenv
 pytest-factoryboy

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = commonground-api-common
-version = 2.6.5
+version = 2.6.6
 description = Commonground API tooling
 long_description = file: README.rst
 url = https://github.com/maykinmedia/commonground-api-common
@@ -71,7 +71,7 @@ drf_extra_fields =
 	drf-extra-fields>=3.7.0
 tests = 
 	psycopg2
-	pytest
+	pytest==8.3.5 # can be unpinned when pytest-factoryboy is updated
 	pytest-django
 	pytest-dotenv
 	pytest-factoryboy

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6}/tests/test_jwt_decoding.py

@@ -42,7 +42,7 @@ def test_nbf_validated():
 @pytest.mark.django_db
 @freeze_time("2021-08-23T14:20:00")
 def test_nbf_validated_with_leeway(settings):
-    settings.JWT_LEEWAY = 3
+    settings.TIME_LEEWAY = 3
     JWTSecret.objects.create(identifier="client", secret="secret")
     payload = {
         "client_id": "client",

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6}/tests/test_validators.py

@@ -1,10 +1,14 @@
+from datetime import datetime, timezone
+
 from django.core.exceptions import ValidationError
 
 import pytest
+from freezegun import freeze_time
 
 from vng_api_common.validators import (
     AlphanumericExcludingDiacritic,
     BaseIdentifierValidator,
+    UntilNowValidator,
     validate_bsn,
     validate_rsin,
 )
@@ -104,3 +108,18 @@ def test_invalid_rsin():
     with pytest.raises(ValidationError) as error:
         validate_rsin("12345678")  # validate_length
     assert "Waarde moet 9 tekens lang zijn" in str(error.value)
+
+
+@freeze_time("2021-08-23T14:20:00")
+def test_invalid_date():
+    validator = UntilNowValidator()
+    with pytest.raises(ValidationError) as error:
+        validator(datetime(2021, 8, 23, 14, 20, 4, tzinfo=timezone.utc))
+    assert "Ensure this value is not in the future." in str(error.value)
+
+
+@freeze_time("2021-08-23T14:20:00")
+def test_invalid_date_with_leeway(settings):
+    settings.TIME_LEEWAY = 5
+    validator = UntilNowValidator()
+    validator(datetime(2021, 8, 23, 14, 20, 4, tzinfo=timezone.utc))

commonground_api_common-2.6.6/vng_api_common/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.6.6"

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6}/vng_api_common/authorizations/middleware.py

@@ -108,7 +108,7 @@ class JWTAuth:
                     self.encoded,
                     algorithms=["HS256"],
                     options={"verify_signature": False},
-                    leeway=settings.JWT_LEEWAY,
+                    leeway=settings.TIME_LEEWAY,
                 )
             except jwt.DecodeError:
                 logger.info("Invalid JWT encountered")
@@ -146,7 +146,7 @@ class JWTAuth:
                     self.encoded,
                     key,
                     algorithms=["HS256"],
-                    leeway=settings.JWT_LEEWAY,
+                    leeway=settings.TIME_LEEWAY,
                 )
             except jwt.InvalidSignatureError:
                 logger.exception("Invalid signature - possible payload tampering?")

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6}/vng_api_common/conf/api.py

@@ -8,7 +8,7 @@ __all__ = [
     "GEMMA_URL_INFORMATIEMODEL_VERSIE",
     "GEMMA_URL_INFORMATIEMODEL",
     "GEMMA_URL_TEMPLATE",
-    "JWT_LEEWAY",
+    "TIME_LEEWAY",
     "JWT_SPECTACULAR_SETTINGS",
     "LINK_FETCHER",
     "NOTIFICATIONS_DISABLED",
@@ -95,6 +95,6 @@ vng_repo = "VNG-Realisatie/vng-api-common"
 vng_branch = "ref-responses"
 COMMON_SPEC = f"https://raw.githubusercontent.com/{vng_repo}/feature/{vng_branch}/vng_api_common/schemas/common.yaml"
 
-JWT_LEEWAY = 0  # default in PyJWT
+TIME_LEEWAY = 0  # default in PyJWT
 
 COMMONGROUND_API_COMMON_GET_DOMAIN = "vng_api_common.utils.get_site_domain"

{commonground_api_common-2.6.5 → commonground_api_common-2.6.6}/vng_api_common/validators.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import re
+from datetime import timedelta
 from typing import Callable
 
 from django.conf import settings
@@ -277,6 +278,8 @@ class UntilNowValidator:
     Validate a datetime to not be in the future.
 
     This means that `now` is included.
+
+    Some leeway can be added with the TIME_LEEWAY setting.
     """
 
     message = _("Ensure this value is not in the future.")
@@ -284,7 +287,7 @@ class UntilNowValidator:
 
     @property
     def limit_value(self):
-        return timezone.now()
+        return timezone.now() + timedelta(seconds=settings.TIME_LEEWAY)
 
     def __call__(self, value):
         if value > self.limit_value:

commonground_api_common-2.6.5/vng_api_common/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.6.5"