⬆️ Upgrade several dependencies

* django-axes==6.3.0 * django-redis==5.4.0 * django-filter==23.2 * drf-spectacular==0.27.0 * elastic-apm==6.20.0 * psycopg2==2.9.9 * python-decouple==3.8 * requests==2.31.0 * sentry-sdk==1.9.0 * uwsgi==2.0.23
maykinmedia · Feb 2, 2024 · 7694bf8 · 7694bf8
1 parent 8d9fc93
commit 7694bf8
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 49 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -28,7 +28,7 @@ certifi==2020.12.5
     #   sentry-sdk
 cffi==1.16.0
     # via cryptography
-chardet==4.0.0
+charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via
@@ -90,16 +90,14 @@ django==3.2.23
     #   zgw-consumers
 django-admin-index==3.1.0
     # via -r requirements/base.in
-django-axes==5.41.1
+django-axes==6.3.0
     # via -r requirements/base.in
-django-filter==2.4.0
+django-filter==23.2
     # via
     #   -r requirements/base.in
     #   commonground-api-common
 django-formtools==2.3
     # via maykin-django-two-factor-auth
-django-ipware==3.0.2
-    # via django-axes
 django-jsonform==2.21.4
     # via mozilla-django-oidc-db
 django-markup==1.3
@@ -112,7 +110,7 @@ django-phonenumber-field==5.2.0
     # via maykin-django-two-factor-auth
 django-privates==2.0.0.post0
     # via django-simple-certmanager
-django-redis==5.2.0
+django-redis==5.4.0
     # via -r requirements/base.in
 django-relativedelta==2.0.0
     # via zgw-consumers
@@ -145,11 +143,13 @@ djangorestframework-gis==1.0
     # via -r requirements/base.in
 drf-nested-routers==0.93.3
     # via commonground-api-common
-drf-spectacular==0.16.0
+drf-spectacular==0.27.0
     # via -r requirements/base.in
 drf-yasg==1.20.0
     # via commonground-api-common
-elastic-apm==6.1.1
+ecs-logging==2.1.0
+    # via elastic-apm
+elastic-apm==6.20.0
     # via -r requirements/base.in
 face==20.1.1
     # via glom
@@ -206,7 +206,7 @@ phonenumbers==8.12.29
     # via maykin-django-two-factor-auth
 prompt-toolkit==3.0.43
     # via click-repl
-psycopg2==2.8.6
+psycopg2==2.9.9
     # via -r requirements/base.in
 pycparser==2.20
     # via cffi
@@ -225,7 +225,7 @@ python-dateutil==2.8.1
     # via
     #   django-relativedelta
     #   faker
-python-decouple==3.4
+python-decouple==3.8
     # via -r requirements/base.in
 python-dotenv==1.0.0
     # via -r requirements/base.in
@@ -243,7 +243,7 @@ qrcode==6.1
     # via maykin-django-two-factor-auth
 redis==3.5.3
     # via django-redis
-requests==2.25.1
+requests==2.31.0
     # via
     #   commonground-api-common
     #   coreapi
@@ -255,7 +255,7 @@ requests-mock==1.8.0
     # via zgw-consumers
 ruamel-yaml==0.17.4
     # via drf-yasg
-sentry-sdk==1.0.0
+sentry-sdk==1.9.0
     # via -r requirements/base.in
 six==1.15.0
     # via
@@ -281,7 +281,7 @@ urllib3==1.26.6
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.21
+uwsgi==2.0.23
     # via -r requirements/base.in
 vine==5.1.0
     # via
@@ -290,6 +290,8 @@ vine==5.1.0
     #   kombu
 wcwidth==0.2.13
     # via prompt-toolkit
+wrapt==1.14.1
+    # via elastic-apm
 zgw-consumers==0.27.0
     # via
     #   -r requirements/base.in

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -43,7 +43,7 @@ cffi==1.16.0
     # via
     #   -r requirements/base.txt
     #   cryptography
-chardet==4.0.0
+charset-normalizer==3.3.2
     # via
     #   -r requirements/base.txt
     #   requests
@@ -121,20 +121,16 @@ django==3.2.23
     #   zgw-consumers
 django-admin-index==3.1.0
     # via -r requirements/base.txt
-django-axes==5.41.1
+django-axes==6.3.0
     # via -r requirements/base.txt
-django-filter==2.4.0
+django-filter==23.2
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
 django-formtools==2.3
     # via
     #   -r requirements/base.txt
     #   maykin-django-two-factor-auth
-django-ipware==3.0.2
-    # via
-    #   -r requirements/base.txt
-    #   django-axes
 django-jsonform==2.21.4
     # via
     #   -r requirements/base.txt
@@ -157,7 +153,7 @@ django-privates==2.0.0.post0
     # via
     #   -r requirements/base.txt
     #   django-simple-certmanager
-django-redis==5.2.0
+django-redis==5.4.0
     # via -r requirements/base.txt
 django-relativedelta==2.0.0
     # via
@@ -204,13 +200,17 @@ drf-nested-routers==0.93.3
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-drf-spectacular==0.16.0
+drf-spectacular==0.27.0
     # via -r requirements/base.txt
 drf-yasg==1.20.0
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
-elastic-apm==6.1.1
+ecs-logging==2.1.0
+    # via
+    #   -r requirements/base.txt
+    #   elastic-apm
+elastic-apm==6.20.0
     # via -r requirements/base.txt
 face==20.1.1
     # via
@@ -310,7 +310,7 @@ prompt-toolkit==3.0.43
     # via
     #   -r requirements/base.txt
     #   click-repl
-psycopg2==2.8.6
+psycopg2==2.9.9
     # via -r requirements/base.txt
 pycparser==2.20
     # via
@@ -339,7 +339,7 @@ python-dateutil==2.8.1
     #   django-relativedelta
     #   faker
     #   freezegun
-python-decouple==3.4
+python-decouple==3.8
     # via -r requirements/base.txt
 python-dotenv==1.0.0
     # via -r requirements/base.txt
@@ -363,7 +363,7 @@ redis==3.5.3
     # via
     #   -r requirements/base.txt
     #   django-redis
-requests==2.25.1
+requests==2.31.0
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
@@ -381,7 +381,7 @@ ruamel-yaml==0.17.4
     # via
     #   -r requirements/base.txt
     #   drf-yasg
-sentry-sdk==1.0.0
+sentry-sdk==1.9.0
     # via -r requirements/base.txt
 six==1.15.0
     # via
@@ -421,7 +421,7 @@ urllib3==1.26.6
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.21
+uwsgi==2.0.23
     # via -r requirements/base.txt
 vine==5.1.0
     # via
@@ -439,6 +439,10 @@ webob==1.8.7
     # via webtest
 webtest==2.0.35
     # via django-webtest
+wrapt==1.14.1
+    # via
+    #   -r requirements/base.txt
+    #   elastic-apm
 zgw-consumers==0.27.0
     # via
     #   -r requirements/base.txt

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -57,7 +57,7 @@ cffi==1.16.0
     # via
     #   -r requirements/ci.txt
     #   cryptography
-chardet==4.0.0
+charset-normalizer==3.3.2
     # via
     #   -r requirements/ci.txt
     #   requests
@@ -143,24 +143,20 @@ django==3.2.23
     #   zgw-consumers
 django-admin-index==3.1.0
     # via -r requirements/ci.txt
-django-axes==5.41.1
+django-axes==6.3.0
     # via -r requirements/ci.txt
 django-debug-toolbar==4.2.0
     # via -r requirements/dev.in
 django-extensions==3.2.3
     # via -r requirements/dev.in
-django-filter==2.4.0
+django-filter==23.2
     # via
     #   -r requirements/ci.txt
     #   commonground-api-common
 django-formtools==2.3
     # via
     #   -r requirements/ci.txt
     #   maykin-django-two-factor-auth
-django-ipware==3.0.2
-    # via
-    #   -r requirements/ci.txt
-    #   django-axes
 django-jsonform==2.21.4
     # via
     #   -r requirements/ci.txt
@@ -183,7 +179,7 @@ django-privates==2.0.0.post0
     # via
     #   -r requirements/ci.txt
     #   django-simple-certmanager
-django-redis==5.2.0
+django-redis==5.4.0
     # via -r requirements/ci.txt
 django-relativedelta==2.0.0
     # via
@@ -236,13 +232,17 @@ drf-nested-routers==0.93.3
     # via
     #   -r requirements/ci.txt
     #   commonground-api-common
-drf-spectacular==0.16.0
+drf-spectacular==0.27.0
     # via -r requirements/ci.txt
 drf-yasg==1.20.0
     # via
     #   -r requirements/ci.txt
     #   commonground-api-common
-elastic-apm==6.1.1
+ecs-logging==2.1.0
+    # via
+    #   -r requirements/ci.txt
+    #   elastic-apm
+elastic-apm==6.20.0
     # via -r requirements/ci.txt
 face==20.1.1
     # via
@@ -364,7 +364,7 @@ prompt-toolkit==3.0.43
     # via
     #   -r requirements/ci.txt
     #   click-repl
-psycopg2==2.8.6
+psycopg2==2.9.9
     # via -r requirements/ci.txt
 pycodestyle==2.11.1
     # via flake8
@@ -403,7 +403,7 @@ python-dateutil==2.8.1
     #   django-relativedelta
     #   faker
     #   freezegun
-python-decouple==3.4
+python-decouple==3.8
     # via -r requirements/ci.txt
 python-dotenv==1.0.0
     # via -r requirements/ci.txt
@@ -430,7 +430,7 @@ redis==3.5.3
     # via
     #   -r requirements/ci.txt
     #   django-redis
-requests==2.25.1
+requests==2.31.0
     # via
     #   -r requirements/ci.txt
     #   commonground-api-common
@@ -448,7 +448,7 @@ ruamel-yaml==0.17.4
     # via
     #   -r requirements/ci.txt
     #   drf-yasg
-sentry-sdk==1.0.0
+sentry-sdk==1.9.0
     # via -r requirements/ci.txt
 six==1.15.0
     # via
@@ -525,7 +525,7 @@ urllib3==1.26.6
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.21
+uwsgi==2.0.23
     # via -r requirements/ci.txt
 vine==5.1.0
     # via
@@ -551,6 +551,10 @@ webtest==2.0.35
     #   django-webtest
 wheel==0.42.0
     # via pip-tools
+wrapt==1.14.1
+    # via
+    #   -r requirements/ci.txt
+    #   elastic-apm
 zgw-consumers==0.27.0
     # via
     #   -r requirements/ci.txt

diff --git a/src/objects/conf/base.py b/src/objects/conf/base.py
@@ -347,15 +347,10 @@
 # will be forgotten. Can be set to a python timedelta object or an integer. If
 # an integer, will be interpreted as a number of hours. Default: None
 AXES_COOLOFF_TIME = 1
-# 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
 # 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"]]
 
 # The default meta precedence order
 IPWARE_META_PRECEDENCE_ORDER = (