django-pfx 1.4.dev40__tar.gz → 1.4.dev42__tar.gz

{django_pfx-1.4.dev40 → django_pfx-1.4.dev42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.4.dev40
+Version: 1.4.dev42
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev40 → django_pfx-1.4.dev42}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.4.dev40
+Version: 1.4.dev42
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev40 → django_pfx-1.4.dev42}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-18 14:37+0200\n"
+"POT-Creation-Date: 2024-04-22 11:49+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -59,23 +59,23 @@ msgstr ""
 "Format non valide, il peut s’agir d’un nombre en heures, « 1:05 », « :05 », "
 "« 1h 5m », « 1.5h » ou « 30m »."
 
-#: models/login_ban.py:43
+#: models/login_ban.py:45
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: models/login_ban.py:44
+#: models/login_ban.py:46
 msgid "Failed counter"
 msgstr "Compteur d’échec"
 
-#: models/login_ban.py:45
+#: models/login_ban.py:47
 msgid "Last failed"
 msgstr "Dernier échec"
 
-#: models/login_ban.py:50
+#: models/login_ban.py:52
 msgid "Login ban"
 msgstr "Login banni"
 
-#: models/login_ban.py:51
+#: models/login_ban.py:53
 msgid "Login bans"
 msgstr "Login bannis"
 

{django_pfx-1.4.dev40 → django_pfx-1.4.dev42}/pfx/pfxcore/models/login_ban.py

@@ -17,7 +17,9 @@ class LoginBanQuerySet(models.QuerySet):
             return False
         if ban.failed_counter % settings.PFX_LOGIN_BAN_FAILED_NUMBER == 0:
             seconds = settings.PFX_LOGIN_BAN_SECONDS_START + (
-                settings.PFX_LOGIN_BAN_SECONDS_STEP * (ban.failed_counter - 1))
+                settings.PFX_LOGIN_BAN_SECONDS_STEP * (
+                    ban.failed_counter //
+                    settings.PFX_LOGIN_BAN_FAILED_NUMBER - 1))
             ban_time = ban.last_failed + timedelta(seconds=seconds)
             now = timezone.now()
             if now < ban_time:

{django_pfx-1.4.dev40 → django_pfx-1.4.dev42}/tests/tests/test_auth_api.py

@@ -88,7 +88,7 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
 
     @override_settings(
         PFX_TOKEN_SHORT_VALIDITY={'minutes': 30},
-        PFX_LOGIN_BAN_FAILED_NUMBER=1,
+        PFX_LOGIN_BAN_FAILED_NUMBER=2,
         PFX_LOGIN_BAN_SECONDS_START=30,
         PFX_LOGIN_BAN_SECONDS_STEP=60)
     def test_login_ban(self):
@@ -98,6 +98,11 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
                     'username': 'jrr.tolkien',
                     'password': 'BAD PASSWORD'})
             self.assertRC(response, 422)
+            response = self.client.post(
+                '/api/auth/login', {
+                    'username': 'jrr.tolkien',
+                    'password': 'BAD PASSWORD'})
+            self.assertRC(response, 422)
 
             response = self.client.post(
                 '/api/auth/login', {
@@ -128,6 +133,11 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
                     'username': 'jrr.tolkien',
                     'password': 'BAD PASSWORD'})
             self.assertRC(response, 422)
+            response = self.client.post(
+                '/api/auth/login', {
+                    'username': 'jrr.tolkien',
+                    'password': 'BAD PASSWORD'})
+            self.assertRC(response, 422)
 
             response = self.client.post(
                 '/api/auth/login', {
@@ -1072,7 +1082,7 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
 
     @override_settings(
         PFX_TOKEN_SHORT_VALIDITY={'minutes': 30},
-        PFX_LOGIN_BAN_FAILED_NUMBER=1,
+        PFX_LOGIN_BAN_FAILED_NUMBER=2,
         PFX_LOGIN_BAN_SECONDS_START=30,
         PFX_LOGIN_BAN_SECONDS_STEP=60)
     def test_otp_login_ban(self):
@@ -1085,6 +1095,9 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
             self.assertRC(response, 200)
             token = self.get_val(response, 'token')
 
+            response = self.client.post('/api/auth/otp/login', dict(
+                token=token, otp_code='-'))
+            self.assertRC(response, 422)
             response = self.client.post('/api/auth/otp/login', dict(
                 token=token, otp_code='-'))
             self.assertRC(response, 422)
@@ -1112,6 +1125,9 @@ class AuthAPITest(TestAssertMixin, TransactionTestCase):
             response = self.client.post('/api/auth/otp/login', dict(
                 token=token, otp_code='-'))
             self.assertRC(response, 422)
+            response = self.client.post('/api/auth/otp/login', dict(
+                token=token, otp_code='-'))
+            self.assertRC(response, 422)
 
             response = self.client.post('/api/auth/otp/login', dict(
                 token=token, otp_code='-'))