From 843a4e676cb1d3c6fb3eced54a1eb99d42f42ecf Mon Sep 17 00:00:00 2001 From: Mohamed ElKalioby Date: Wed, 22 Jun 2022 08:57:28 +0300 Subject: [PATCH] Merged v2.5 --- CHANGELOG.md | 7 +++++++ README.md | 3 ++- example/example/settings.py | 4 ++-- example/example/templates/base.html | 2 +- example/example/templates/blank.html | 2 +- mfa/FIDO2.py | 14 +++++++------ mfa/templates/Email/Add.html | 18 ++++++++--------- mfa/templates/Email/recheck.html | 18 +++++++++-------- mfa/templates/FIDO2/Add.html | 8 ++++---- mfa/templates/FIDO2/recheck.html | 12 ++++++------ mfa/templates/MFA.html | 18 ++++++++--------- mfa/templates/TOTP/Add.html | 6 +++--- mfa/templates/TOTP/recheck.html | 18 +++++++++-------- mfa/templates/TrustedDevices/Add.html | 26 ++++++++++++------------- mfa/templates/TrustedDevices/Done.html | 8 ++++---- mfa/templates/TrustedDevices/start.html | 4 ++-- mfa/templates/U2F/recheck.html | 10 +++++----- mfa/templates/mfa_check.html | 2 +- mfa/templates/modal.html | 4 ++-- mfa/templates/select_mfa_method.html | 11 +++++++---- setup.py | 8 ++++++-- 21 files changed, 112 insertions(+), 91 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 730f324..8e456fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ # Change Log +## 2.5.0 + + * Fixed: issue in the 'Authorize' button don't show on Firefox and Chrome on iOS. + Note: It seems Firefox doesn't support WebAuthn on iOS + * Fixed: Support for bootstrap5 +Thanks to @ezrajrice + ## 2.4.0 * Fixed: issue in the 'Authorize' button don't show on Safari Mobile. diff --git a/README.md b/README.md index 32c18a2..2953966 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Depends on * ua-parser * user-agents * python-jose -* fido2==0.9.0 +* fido2==1.0.0 # Installation 1. using pip @@ -187,6 +187,7 @@ function some_func() { * [willingham](https://github.com/willingham) * [AndreasDickow](https://github.com/AndreasDickow) * [mnelson4](https://github.com/mnelson4) +* [ezrajrice](https://github.com/ezrajrice) # Security contact information diff --git a/example/example/settings.py b/example/example/settings.py index cc9633c..6c1b772 100644 --- a/example/example/settings.py +++ b/example/example/settings.py @@ -146,5 +146,5 @@ MFA_SUCCESS_REGISTRATION_MSG="Go to Home" TOKEN_ISSUER_NAME="PROJECT_NAME" #TOTP Issuer name U2F_APPID="https://localhost" #URL For U2F -FIDO_SERVER_ID=u"local.mkalioby.com" # Server rp id for FIDO2, it the full domain of your project -FIDO_SERVER_NAME=u"TestApp" +FIDO_SERVER_ID="localhost" # Server rp id for FIDO2, it the full domain of your project +FIDO_SERVER_NAME="TestApp" diff --git a/example/example/templates/base.html b/example/example/templates/base.html index 786d08b..e5b1a6e 100644 --- a/example/example/templates/base.html +++ b/example/example/templates/base.html @@ -36,7 +36,7 @@
-
+
") else authen() @@ -114,4 +114,4 @@ - \ No newline at end of file + diff --git a/mfa/templates/MFA.html b/mfa/templates/MFA.html index ce435d8..4940ad8 100644 --- a/mfa/templates/MFA.html +++ b/mfa/templates/MFA.html @@ -19,7 +19,7 @@ $("#modal-body").html("Are you sure you want to delete '"+name+"'? you may lose access to your system if this your only 2FA."); $("#actionBtn").remove() $("#modal-footer").prepend("") - $("#popUpModal").modal() + $("#popUpModal").modal('show') } function toggleKey(id) { @@ -47,24 +47,24 @@
-
@@ -98,7 +98,7 @@ {% if key.key_type in HIDE_DISABLE %} ---- {% else %} - + {% endif %} {% empty %} @@ -108,4 +108,4 @@
{% include "modal.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/mfa/templates/TOTP/Add.html b/mfa/templates/TOTP/Add.html index d303f96..7bd2ce6 100644 --- a/mfa/templates/TOTP/Add.html +++ b/mfa/templates/TOTP/Add.html @@ -63,7 +63,7 @@ {% block content %}

-
+

Adding Authenticator

@@ -98,7 +98,7 @@
- + Cancel
@@ -106,4 +106,4 @@
{% include "modal.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/mfa/templates/TOTP/recheck.html b/mfa/templates/TOTP/recheck.html index 87c5a7c..e172b0e 100644 --- a/mfa/templates/TOTP/recheck.html +++ b/mfa/templates/TOTP/recheck.html @@ -13,14 +13,15 @@ } +
-
-
+
+
One Time Password
-
+
@@ -46,16 +47,16 @@
-
- - +
+ +
-
+
@@ -64,7 +65,7 @@
-
+
{% if request.session.mfa_methods|length > 1 %} Select Another Method {% endif %} @@ -74,3 +75,4 @@
+
diff --git a/mfa/templates/TrustedDevices/Add.html b/mfa/templates/TrustedDevices/Add.html index dbb1961..ec74e16 100644 --- a/mfa/templates/TrustedDevices/Add.html +++ b/mfa/templates/TrustedDevices/Add.html @@ -31,11 +31,11 @@
-
-
+
+
Add Trusted Device
-
+
{% if success %}
Please check your PC window, to continue the process. @@ -67,31 +67,31 @@
-
- - +
+ +
-
- +
+
- + I confirm that this device is mine and it is only used by me.
{% comment %}
-
- +
+
@@ -113,7 +113,7 @@ {% endif %}
-
+
diff --git a/mfa/templates/TrustedDevices/Done.html b/mfa/templates/TrustedDevices/Done.html index f0fecc1..2c21c01 100644 --- a/mfa/templates/TrustedDevices/Done.html +++ b/mfa/templates/TrustedDevices/Done.html @@ -7,17 +7,17 @@
-
-
+
+
Add Trusted Device
-
+
Your device is now trusted, please try to login
-
+
diff --git a/mfa/templates/TrustedDevices/start.html b/mfa/templates/TrustedDevices/start.html index a95bca4..dd208b3 100644 --- a/mfa/templates/TrustedDevices/start.html +++ b/mfa/templates/TrustedDevices/start.html @@ -15,7 +15,7 @@ function sendEmail() { $("#modal-title").html("Send Link") $("#modal-body").html("Sending Email, Please wait...."); - $("#popUpModal").modal(); + $("#popUpModal").modal('show'); $.ajax({ "url":"{% url 'td_sendemail' %}", success:function (data) { @@ -60,7 +60,7 @@ $("#actionBtn").remove(); $("#modal-footer").prepend("") $("#modal-body").html(data) - $("#popUpModal").modal() + $("#popUpModal").modal('show'); } } }) diff --git a/mfa/templates/U2F/recheck.html b/mfa/templates/U2F/recheck.html index 9d9bfa6..5f47b44 100644 --- a/mfa/templates/U2F/recheck.html +++ b/mfa/templates/U2F/recheck.html @@ -2,11 +2,11 @@
-
-
+
+
Security Key
-
+
@@ -24,7 +24,7 @@
-
+
{% if request.session.mfa_methods|length > 1 %} Select Another Method @@ -95,4 +95,4 @@ }) - \ No newline at end of file + diff --git a/mfa/templates/mfa_check.html b/mfa/templates/mfa_check.html index a7077b7..47f550b 100644 --- a/mfa/templates/mfa_check.html +++ b/mfa/templates/mfa_check.html @@ -24,7 +24,7 @@ { $("#modal-title").html("Recheck Indentity") $("#modal-body").html(data["html"]) - $("#popUpModal").modal() + $("#popUpModal").modal('show') } diff --git a/mfa/templates/modal.html b/mfa/templates/modal.html index 59a3cee..2e43f02 100644 --- a/mfa/templates/modal.html +++ b/mfa/templates/modal.html @@ -2,15 +2,15 @@
- +
diff --git a/mfa/templates/select_mfa_method.html b/mfa/templates/select_mfa_method.html index d4bea9c..0ee10f6 100644 --- a/mfa/templates/select_mfa_method.html +++ b/mfa/templates/select_mfa_method.html @@ -2,14 +2,15 @@ {% block content %}

+
-
-
+
+
Select Second Verification Method
-
+
    {% for method in request.session.mfa_methods %} @@ -25,5 +26,7 @@
+
-{% endblock %} \ No newline at end of file +
+{% endblock %} diff --git a/setup.py b/setup.py index ac13127..273081d 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import find_packages, setup setup( name='django-mfa2', - version='2.4.0', + version='2.5.0', description='Allows user to add 2FA to their accounts', long_description=open("README.md").read(), long_description_content_type="text/markdown", @@ -24,7 +24,7 @@ setup( 'ua-parser', 'user-agents', 'python-jose', - 'fido2 == 0.9.2', + 'fido2 == 1.0.0', 'jsonLookup' ], python_requires=">=3.5", @@ -39,6 +39,8 @@ setup( "Framework :: Django :: 2.2", "Framework :: Django :: 3.0", "Framework :: Django :: 3.1", + "Framework :: Django :: 3.2", + "Framework :: Django :: 4.0", "Intended Audience :: Developers", "Operating System :: OS Independent", "Programming Language :: Python", @@ -47,6 +49,8 @@ setup( "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Topic :: Software Development :: Libraries :: Python Modules", ] )