Use new 2FA solution

maykinmedia · Feb 14, 2024 · d1ed51a · d1ed51a
1 parent cb2b4a1
commit d1ed51a
Show file tree

Hide file tree

Showing 15 changed files with 142 additions and 62 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -13,8 +13,7 @@ django-axes
 django-jsonsuit
 django-redis
 django-rosetta
-maykin-django-two-factor-auth
-maykin-django-two-factor-auth[phonenumbers]
+maykin-2fa
 mozilla-django-oidc-db
 sharing-configs
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -8,6 +8,8 @@ amqp==5.1.1
     # via kombu
 asgiref==3.6.0
     # via django
+asn1crypto==1.5.1
+    # via webauthn
 async-timeout==4.0.2
     # via redis
 attrs==23.1.0
@@ -20,6 +22,8 @@ boltons==23.0.0
     # via
     #   face
     #   glom
+cbor2==5.6.1
+    # via webauthn
 celery==5.2.7
     # via notifications-api-common
 certifi==2023.5.7
@@ -50,12 +54,13 @@ coreapi==2.3.3
     # via commonground-api-common
 coreschema==0.0.4
     # via coreapi
-cryptography==40.0.2
+cryptography==42.0.2
     # via
     #   django-simple-certmanager
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
+    #   webauthn
 django==3.2.20
     # via
     #   -r requirements/base.in
@@ -75,11 +80,12 @@ django==3.2.20
     #   django-rosetta
     #   django-simple-certmanager
     #   django-solo
+    #   django-two-factor-auth
     #   djangorestframework
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-yasg
-    #   maykin-django-two-factor-auth
+    #   maykin-2fa
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -94,7 +100,7 @@ django-filter==23.2
     #   -r requirements/base.in
     #   commonground-api-common
 django-formtools==2.4.1
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
 django-ipware==6.0.3
     # via django-axes
 django-jsonform==2.21.5
@@ -104,9 +110,9 @@ django-jsonsuit==0.5.0
 django-ordered-model==3.7.4
     # via django-admin-index
 django-otp==1.2.0
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
 django-phonenumber-field==5.2.0
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
 django-privates==2.0.0.post0
     # via django-simple-certmanager
 django-redis==5.2.0
@@ -128,6 +134,8 @@ django-solo==2.0.0
     #   notifications-api-common
     #   sharing-configs
     #   zgw-consumers
+django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
+    # via maykin-2fa
 djangorestframework==3.12.4
     # via
     #   -r requirements/base.in
@@ -185,7 +193,7 @@ kombu==5.2.4
     # via celery
 markupsafe==2.1.2
     # via jinja2
-maykin-django-two-factor-auth[phonenumbers]==2.0.4
+maykin-2fa==1.0.0
     # via -r requirements/base.in
 mozilla-django-oidc==4.0.0
     # via mozilla-django-oidc-db
@@ -197,8 +205,8 @@ oyaml==1.0
     # via commonground-api-common
 packaging==23.1
     # via drf-yasg
-phonenumbers==8.13.11
-    # via maykin-django-two-factor-auth
+phonenumberslite==8.13.30
+    # via django-two-factor-auth
 pillow==9.5.0
     # via -r requirements/base.in
 polib==1.2.0
@@ -213,10 +221,11 @@ pyjwt==2.7.0
     # via
     #   commonground-api-common
     #   gemma-zds-client
-pyopenssl==23.1.1
+pyopenssl==24.0.0
     # via
     #   django-simple-certmanager
     #   josepy
+    #   webauthn
     #   zgw-consumers
 pyrsistent==0.19.3
     # via jsonschema
@@ -244,7 +253,7 @@ pyyaml==6.0
     #   gemma-zds-client
     #   oyaml
 qrcode==6.1
-    # via maykin-django-two-factor-auth
+    # via django-two-factor-auth
 redis==4.5.5
     # via django-redis
 requests==2.31.0
@@ -291,6 +300,8 @@ vine==5.0.0
     #   kombu
 wcwidth==0.2.6
     # via prompt-toolkit
+webauthn==2.0.0
+    # via django-two-factor-auth
 wrapt==1.15.0
     # via elastic-apm
 zgw-consumers==0.26.1

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -12,6 +12,10 @@ asgiref==3.6.0
     # via
     #   -r requirements/base.txt
     #   django
+asn1crypto==1.5.1
+    # via
+    #   -r requirements/base.txt
+    #   webauthn
 async-timeout==4.0.2
     # via
     #   -r requirements/base.txt
@@ -32,6 +36,10 @@ boltons==23.0.0
     #   -r requirements/base.txt
     #   face
     #   glom
+cbor2==5.6.1
+    # via
+    #   -r requirements/base.txt
+    #   webauthn
 celery==5.2.7
     # via
     #   -r requirements/base.txt
@@ -82,13 +90,14 @@ coreschema==0.0.4
     #   coreapi
 coverage==4.5.4
     # via -r requirements/test-tools.in
-cryptography==40.0.2
+cryptography==42.0.2
     # via
     #   -r requirements/base.txt
     #   django-simple-certmanager
     #   josepy
     #   mozilla-django-oidc
     #   pyopenssl
+    #   webauthn
 cssselect==1.2.0
     # via pyquery
 django==3.2.20
@@ -112,11 +121,12 @@ django==3.2.20
     #   django-sendfile2
     #   django-simple-certmanager
     #   django-solo
+    #   django-two-factor-auth
     #   djangorestframework
     #   drf-nested-routers
     #   drf-spectacular
     #   drf-yasg
-    #   maykin-django-two-factor-auth
+    #   maykin-2fa
     #   mozilla-django-oidc
     #   mozilla-django-oidc-db
     #   notifications-api-common
@@ -133,7 +143,7 @@ django-filter==23.2
 django-formtools==2.4.1
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-ipware==6.0.3
     # via
     #   -r requirements/base.txt
@@ -153,11 +163,11 @@ django-ordered-model==3.7.4
 django-otp==1.2.0
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-phonenumber-field==5.2.0
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 django-privates==2.0.0.post0
     # via
     #   -r requirements/base.txt
@@ -190,6 +200,10 @@ django-solo==2.0.0
     #   notifications-api-common
     #   sharing-configs
     #   zgw-consumers
+django-two-factor-auth[phonenumberslite,webauthn]==1.16.0
+    # via
+    #   -r requirements/base.txt
+    #   maykin-2fa
 django-webtest==1.9.10
     # via -r requirements/test-tools.in
 djangorestframework==3.12.4
@@ -283,7 +297,7 @@ markupsafe==2.1.2
     # via
     #   -r requirements/base.txt
     #   jinja2
-maykin-django-two-factor-auth[phonenumbers]==2.0.4
+maykin-2fa==1.0.0
     # via -r requirements/base.txt
 mozilla-django-oidc==4.0.0
     # via
@@ -303,10 +317,10 @@ packaging==23.1
     # via
     #   -r requirements/base.txt
     #   drf-yasg
-phonenumbers==8.13.11
+phonenumberslite==8.13.30
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 pillow==9.5.0
     # via -r requirements/base.txt
 polib==1.2.0
@@ -328,11 +342,12 @@ pyjwt==2.7.0
     #   -r requirements/base.txt
     #   commonground-api-common
     #   gemma-zds-client
-pyopenssl==23.1.1
+pyopenssl==24.0.0
     # via
     #   -r requirements/base.txt
     #   django-simple-certmanager
     #   josepy
+    #   webauthn
     #   zgw-consumers
 pyquery==2.0.0
     # via -r requirements/test-tools.in
@@ -371,7 +386,7 @@ pyyaml==6.0
 qrcode==6.1
     # via
     #   -r requirements/base.txt
-    #   maykin-django-two-factor-auth
+    #   django-two-factor-auth
 redis==4.5.5
     # via
     #   -r requirements/base.txt
@@ -438,6 +453,10 @@ wcwidth==0.2.6
     # via
     #   -r requirements/base.txt
     #   prompt-toolkit
+webauthn==2.0.0
+    # via
+    #   -r requirements/base.txt
+    #   django-two-factor-auth
 webob==1.8.7
     # via webtest
 webtest==3.0.0