open-formulieren · sergei-maertens · Jul 5, 2023 · Jul 4, 2023 · Jul 4, 2023 · Jul 4, 2023
diff --git a/requirements/base.in b/requirements/base.in
@@ -39,7 +39,7 @@ frozendict
 django ~= 3.2.0
 django-admin-index
 django-autoslug
-django-axes
+django-axes[ipware]
 django-better-admin-arrayfield
 django-camunda
 django-capture-tag

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -39,6 +39,7 @@ celery==5.2.7
     # via
     #   -r requirements/base.in
     #   celery-once
+    #   django-yubin
     #   flower
 celery-once==3.0.1
     # via -r requirements/base.in
@@ -136,7 +137,7 @@ django-appconf==1.0.4
     #   django-timeline-logger
 django-autoslug==1.9.9
     # via -r requirements/base.in
-django-axes==5.31.0
+django-axes[ipware]==6.0.5
     # via -r requirements/base.in
 django-better-admin-arrayfield==1.4.2
     # via
@@ -166,7 +167,7 @@ django-formtools==2.3
     # via maykin-django-two-factor-auth
 django-hijack==3.1.6
     # via -r requirements/base.in
-django-ipware==3.0.1
+django-ipware==5.0.0
     # via django-axes
 django-log-outgoing-requests==0.4.0
     # via -r requirements/base.in
@@ -210,7 +211,7 @@ django-tinymce==3.4.0
     # via -r requirements/base.in
 django-treebeard==4.5.1
     # via -r requirements/base.in
-django-yubin==1.7.1
+django-yubin==2.0.0
     # via -r requirements/base.in
 djangorestframework==3.13.1
     # via
@@ -277,8 +278,6 @@ jsonschema==4.17.3
     #   drf-spectacular
 kombu==5.2.3
     # via celery
-lockfile==0.12.2
-    # via django-yubin
 lxml==4.9.1
     # via
     #   -r requirements/base.in

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -78,6 +78,7 @@ celery==5.2.7
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   celery-once
+    #   django-yubin
     #   flower
 celery-once==3.0.1
     # via
@@ -217,7 +218,7 @@ django-autoslug==1.9.9
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-axes==5.31.0
+django-axes[ipware]==6.0.5
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -275,7 +276,7 @@ django-hijack==3.1.6
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-ipware==3.0.1
+django-ipware==5.0.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -358,7 +359,7 @@ django-treebeard==4.5.1
     #   -r requirements/base.txt
 django-webtest==1.9.7
     # via -r requirements/test-tools.in
-django-yubin==1.7.1
+django-yubin==2.0.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -506,11 +507,6 @@ kombu==5.2.3
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   celery
-lockfile==0.12.2
-    # via
-    #   -c requirements/base.txt
-    #   -r requirements/base.txt
-    #   django-yubin
 lxml==4.9.1
     # via
     #   -c requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -92,6 +92,7 @@ celery==5.2.7
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   celery-once
+    #   django-yubin
     #   flower
 celery-once==3.0.1
     # via
@@ -246,7 +247,7 @@ django-autoslug==1.9.9
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-django-axes==5.31.0
+django-axes[ipware]==6.0.5
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -308,7 +309,7 @@ django-hijack==3.1.6
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-django-ipware==3.0.1
+django-ipware==5.0.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -399,7 +400,7 @@ django-webtest==1.9.7
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-django-yubin==1.7.1
+django-yubin==2.0.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -581,11 +582,6 @@ kombu==5.2.3
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   celery
-lockfile==0.12.2
-    # via
-    #   -c requirements/ci.txt
-    #   -r requirements/ci.txt
-    #   django-yubin
 lxml==4.9.1
     # via
     #   -c requirements/ci.txt

diff --git a/requirements/extensions.txt b/requirements/extensions.txt
@@ -59,6 +59,7 @@ celery==5.2.7
     #   -c requirements/base.in
     #   -r requirements/base.txt
     #   celery-once
+    #   django-yubin
     #   flower
 celery-once==3.0.1
     # via
@@ -181,7 +182,7 @@ django-autoslug==1.9.9
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-django-axes==5.31.0
+django-axes[ipware]==6.0.5
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
@@ -238,7 +239,7 @@ django-hijack==3.1.6
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-django-ipware==3.0.1
+django-ipware==5.0.0
     # via
     #   -r requirements/base.txt
     #   django-axes
@@ -310,7 +311,7 @@ django-treebeard==4.5.1
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
-django-yubin==1.7.1
+django-yubin==2.0.0
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
@@ -421,10 +422,6 @@ kombu==5.2.3
     # via
     #   -r requirements/base.txt
     #   celery
-lockfile==0.12.2
-    # via
-    #   -r requirements/base.txt
-    #   django-yubin
 lxml==4.9.1
     # via
     #   -c requirements/base.in

diff --git a/src/openforms/conf/base.py b/src/openforms/conf/base.py
@@ -349,7 +349,7 @@
 #
 # Sending EMAIL
 #
-EMAIL_BACKEND = "django_yubin.smtp_queue.EmailBackend"
+EMAIL_BACKEND = "django_yubin.backends.QueuedEmailBackend"
 EMAIL_HOST = config("EMAIL_HOST", default="localhost")
 EMAIL_PORT = config(
     "EMAIL_PORT", default=25
@@ -612,7 +612,7 @@
 )
 
 #
-# DJANGO-AXES (4.0+)
+# DJANGO-AXES (6.0+)
 #
 AXES_CACHE = "axes"  # refers to CACHES setting
 # The number of login attempts allowed before a record is created for the
@@ -623,16 +623,11 @@
 # an integer, will be interpreted as a number of hours. Default: None
 AXES_COOLOFF_TIME = 1
 # The number of reverse proxies
-AXES_PROXY_COUNT = NUM_PROXIES - 1 if NUM_PROXIES else None
-# If True only locks based on user id and never locks by IP if attempts limit
-# exceed, otherwise utilize the existing IP and user locking logic Default:
-# False
-AXES_ONLY_USER_FAILURES = True
+AXES_IPWARE_PROXY_COUNT = NUM_PROXIES - 1 if NUM_PROXIES else None
 # If set, specifies a template to render when a user is locked out. Template
 # receives cooloff_time and failure_limit as context variables. Default: None
 AXES_LOCKOUT_TEMPLATE = "account_blocked.html"
-AXES_USE_USER_AGENT = True  # Default: False
-AXES_LOCK_OUT_BY_COMBINATION_USER_AND_IP = True  # Default: False
+AXES_LOCKOUT_PARAMETERS = [["ip_address", "user_agent", "username"]]
 AXES_BEHIND_REVERSE_PROXY = IS_HTTPS
 
 # The default meta precedence order
@@ -674,10 +669,6 @@
         # https://docs.celeryproject.org/en/v4.4.7/userguide/periodic-tasks.html#crontab-schedules
         "schedule": crontab(minute=0, hour=0),
     },
-    "send-emails": {
-        "task": "openforms.utils.tasks.send_emails",
-        "schedule": config("BEAT_SEND_EMAIL_INTERVAL", default=20),  # every 20 seconds
-    },
     "retry-submissions-processing": {
         "task": "openforms.submissions.tasks.retry_processing_submissions",
         "schedule": config("RETRY_SUBMISSIONS_INTERVAL", default=60 * 5),

diff --git a/src/openforms/emails/admin.py b/src/openforms/emails/admin.py
@@ -4,15 +4,10 @@
 from django.views.generic import FormView
 
 from django_yubin.admin import (
-    Log as YubinLogAdmin,
-    Message as YubinMessageAdmin,
-    QueuedMessage as YubinQueuedMessageAdmin,
-)
-from django_yubin.models import (
-    Log as YubinLog,
-    Message as YubinMessage,
-    QueuedMessage as YubinQueuedMessage,
+    LogAdmin as YubinLogAdmin,
+    MessageAdmin as YubinMessageAdmin,
 )
+from django_yubin.models import Log as YubinLog, Message as YubinMessage
 from modeltranslation.admin import TranslationAdmin
 
 from ..utils.admin import ReadOnlyAdminMixin
@@ -51,7 +46,7 @@ def form_valid(self, form):
 class LogReadOnlyAdmin(ReadOnlyAdminMixin, YubinLogAdmin):
     readonly_fields = [
         "message",
-        "result",
+        "action",
         "date",
         "log_message",
     ]
@@ -66,25 +61,11 @@ class MessageReadOnlyAdmin(ReadOnlyAdminMixin, YubinMessageAdmin):
         "to_address",
         "from_address",
         "subject",
-        "encoded_message",
+        "message_data",
         "date_created",
         "date_sent",
     ]
 
 
 admin.site.unregister(YubinMessage)
 admin.site.register(YubinMessage, MessageReadOnlyAdmin)
-
-
-class QueuedMessageReadOnlyAdmin(ReadOnlyAdminMixin, YubinQueuedMessageAdmin):
-    readonly_fields = [
-        "message",
-        "priority",
-        "deferred",
-        "retries",
-        "date_queued",
-    ]
-
-
-admin.site.unregister(YubinQueuedMessage)
-admin.site.register(YubinQueuedMessage, QueuedMessageReadOnlyAdmin)
diff --git a/src/openforms/emails/tests/test_check_email.py b/src/openforms/emails/tests/test_check_email.py
@@ -69,7 +69,7 @@ def test_ok(self):
     @override_settings(
         **replace(
             smtp_settings,
-            EMAIL_BACKEND="django_yubin.smtp_queue.EmailBackend",
+            EMAIL_BACKEND="django_yubin.backends.QueuedEmailBackend",
         )
     )
     def test_init_yubin(self):

diff --git a/src/openforms/fixtures/default_admin_index.json b/src/openforms/fixtures/default_admin_index.json
@@ -244,6 +244,10 @@
                 "axes",
                 "accesslog"
             ],
+            [
+                "axes",
+                "accessfailurelog"
+            ],
             [
                 "cookie_consent",
                 "logitem"
@@ -260,10 +264,6 @@
                 "django_yubin",
                 "message"
             ],
-            [
-                "django_yubin",
-                "queuedmessage"
-            ],
             [
                 "logging",
                 "avgtimelinelogproxy"

diff --git a/src/openforms/fixtures/default_groups.json b/src/openforms/fixtures/default_groups.json
@@ -708,6 +708,26 @@
                 "axes",
                 "accessattempt"
             ],
+            [
+                "add_accessfailurelog",
+                "axes",
+                "accessfailurelog"
+            ],
+            [
+                "change_accessfailurelog",
+                "axes",
+                "accessfailurelog"
+            ],
+            [
+                "delete_accessfailurelog",
+                "axes",
+                "accessfailurelog"
+            ],
+            [
+                "view_accessfailurelog",
+                "axes",
+                "accessfailurelog"
+            ],
             [
                 "add_accesslog",
                 "axes",
@@ -928,26 +948,6 @@
                 "django_yubin",
                 "message"
             ],
-            [
-                "add_queuedmessage",
-                "django_yubin",
-                "queuedmessage"
-            ],
-            [
-                "change_queuedmessage",
-                "django_yubin",
-                "queuedmessage"
-            ],
-            [
-                "delete_queuedmessage",
-                "django_yubin",
-                "queuedmessage"
-            ],
-            [
-                "view_queuedmessage",
-                "django_yubin",
-                "queuedmessage"
-            ],
             [
                 "add_confirmationemailtemplate",
                 "emails",

diff --git a/src/openforms/registrations/contrib/email/checks.py b/src/openforms/registrations/contrib/email/checks.py
@@ -8,7 +8,7 @@
 
 
 def check_config():
-    if settings.EMAIL_BACKEND == "django_yubin.smtp_queue.EmailBackend":
+    if settings.EMAIL_BACKEND == "django_yubin.backends.QueuedEmailBackend":
         backend = yubin_settings.USE_BACKEND
     else:
         backend = settings.EMAIL_BACKEND