Compare commits

..

5 Commits

Author SHA1 Message Date
Mohamed ElKalioby
5fbb505e98 Fixing CVE-2022-42731 2022-10-10 17:07:01 +03:00
Mohamed El-Kalioby
0936ea2533 Update CHANGELOG.md 2022-06-22 16:11:17 +03:00
Mohamed El-Kalioby
383a3e8da6 Update CHANGELOG.md 2022-06-22 16:11:04 +03:00
Mohamed ElKalioby
843a4e676c Merged v2.5 2022-06-22 08:57:28 +03:00
Mohamed El-Kalioby
7cf2df0a1e Added krypt.co 2021-10-30 16:31:59 +03:00
21 changed files with 123 additions and 94 deletions

View File

@@ -1,4 +1,15 @@
# Change Log # Change Log
## 2.5.1
* Fix: CVE-2022-42731: related to possibility of registration replay attack thanks to 'SSE (Secure Systems Engineering)'
## 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
* Upgraded to fido2==1.0.0
## 2.4.0 ## 2.4.0
* Fixed: issue in the 'Authorize' button don't show on Safari Mobile. * Fixed: issue in the 'Authorize' button don't show on Safari Mobile.

View File

@@ -20,6 +20,8 @@ For FIDO2, the following are supported
* **Apple's Touch ID/Face ID** (Chrome 70+ on Mac OS X, Safari on macOS Big Sur, Safari on iOS 14.0+ ), * **Apple's Touch ID/Face ID** (Chrome 70+ on Mac OS X, Safari on macOS Big Sur, Safari on iOS 14.0+ ),
* **android-safetynet** (Chrome 70+, Firefox 68+) * **android-safetynet** (Chrome 70+, Firefox 68+)
* **NFC devices using PCSC** (Not Tested, but as supported in fido2) * **NFC devices using PCSC** (Not Tested, but as supported in fido2)
* **Soft Tokens**
* [krypt.co](https://krypt.co/): Login by a notification on your phone.
In English :), It allows you to verify the user by security keys on PC, Laptops or Mobiles, Windows Hello (Fingerprint, PIN) on Windows 10 Build 1903+ (May 2019 Update) Touch/Face ID on Macbooks (Chrome, Safari), Touch/Face ID on iPhone and iPad and Fingerprint/Face/Iris/PIN on Android Phones. In English :), It allows you to verify the user by security keys on PC, Laptops or Mobiles, Windows Hello (Fingerprint, PIN) on Windows 10 Build 1903+ (May 2019 Update) Touch/Face ID on Macbooks (Chrome, Safari), Touch/Face ID on iPhone and iPad and Fingerprint/Face/Iris/PIN on Android Phones.
@@ -36,7 +38,7 @@ Depends on
* ua-parser * ua-parser
* user-agents * user-agents
* python-jose * python-jose
* fido2==0.9.0 * fido2==1.0.0
# Installation # Installation
1. using pip 1. using pip
@@ -185,6 +187,7 @@ function some_func() {
* [willingham](https://github.com/willingham) * [willingham](https://github.com/willingham)
* [AndreasDickow](https://github.com/AndreasDickow) * [AndreasDickow](https://github.com/AndreasDickow)
* [mnelson4](https://github.com/mnelson4) * [mnelson4](https://github.com/mnelson4)
* [ezrajrice](https://github.com/ezrajrice)
# Security contact information # Security contact information

View File

@@ -146,5 +146,5 @@ MFA_SUCCESS_REGISTRATION_MSG="Go to Home"
TOKEN_ISSUER_NAME="PROJECT_NAME" #TOTP Issuer name TOKEN_ISSUER_NAME="PROJECT_NAME" #TOTP Issuer name
U2F_APPID="https://localhost" #URL For U2F 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_ID="localhost" # Server rp id for FIDO2, it the full domain of your project
FIDO_SERVER_NAME=u"TestApp" FIDO_SERVER_NAME="TestApp"

View File

@@ -36,7 +36,7 @@
<!-- Navbar Search --> <!-- Navbar Search -->
<form class="d-none d-md-inline-block form-inline ml-auto mr-0 mr-md-3 my-2 my-md-0"> <form class="d-none d-md-inline-block form-inline ml-auto mr-0 mr-md-3 my-2 my-md-0">
<div class="input-group"> <div class="input-group mb-3">
<input type="text" class="form-control" placeholder="Search for..." aria-label="Search" aria-describedby="basic-addon2"> <input type="text" class="form-control" placeholder="Search for..." aria-label="Search" aria-describedby="basic-addon2">
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-primary" type="button"> <button class="btn btn-primary" type="button">

View File

@@ -34,7 +34,7 @@
<!-- Navbar Search --> <!-- Navbar Search -->
<form class="d-none d-md-inline-block form-inline ml-auto mr-0 mr-md-3 my-2 my-md-0"> <form class="d-none d-md-inline-block form-inline ml-auto mr-0 mr-md-3 my-2 my-md-0">
<div class="input-group"> <div class="input-group mb-3">
<input type="text" class="form-control" placeholder="Search for..." aria-label="Search" aria-describedby="basic-addon2"> <input type="text" class="form-control" placeholder="Search for..." aria-label="Search" aria-describedby="basic-addon2">
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-primary" type="button"> <button class="btn btn-primary" type="button">

View File

@@ -1,6 +1,6 @@
from fido2.client import ClientData from fido2.client import Fido2Client
from fido2.server import Fido2Server, PublicKeyCredentialRpEntity from fido2.server import Fido2Server, PublicKeyCredentialRpEntity
from fido2.ctap2 import AttestationObject, AuthenticatorData from fido2.webauthn import AttestationObject, AuthenticatorData, CollectedClientData
from django.template.context_processors import csrf from django.template.context_processors import csrf
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from django.shortcuts import render from django.shortcuts import render
@@ -11,12 +11,12 @@ from django.http import HttpResponse
from django.conf import settings from django.conf import settings
from .models import * from .models import *
from fido2.utils import websafe_decode, websafe_encode from fido2.utils import websafe_decode, websafe_encode
from fido2.ctap2 import AttestedCredentialData from fido2.webauthn import AttestedCredentialData
from .views import login, reset_cookie from .views import login, reset_cookie
import datetime import datetime
from .Common import get_redirect_url from .Common import get_redirect_url
from django.utils import timezone from django.utils import timezone
from django.http import JsonResponse
def recheck(request): def recheck(request):
"""Starts FIDO2 recheck""" """Starts FIDO2 recheck"""
@@ -28,7 +28,7 @@ def recheck(request):
def getServer(): def getServer():
"""Get Server Info from settings and returns a Fido2Server""" """Get Server Info from settings and returns a Fido2Server"""
rp = PublicKeyCredentialRpEntity(settings.FIDO_SERVER_ID, settings.FIDO_SERVER_NAME) rp = PublicKeyCredentialRpEntity(id=settings.FIDO_SERVER_ID, name=settings.FIDO_SERVER_NAME)
return Fido2Server(rp) return Fido2Server(rp)
@@ -49,13 +49,15 @@ def begin_registeration(request):
def complete_reg(request): def complete_reg(request):
"""Completes the registeration, called by API""" """Completes the registeration, called by API"""
try: try:
if not "fido_state" in request.session:
return JsonResponse({'status': 'ERR', "message": "FIDO Status can't be found, please try again"})
data = cbor.decode(request.body) data = cbor.decode(request.body)
client_data = ClientData(data['clientDataJSON']) client_data = CollectedClientData(data['clientDataJSON'])
att_obj = AttestationObject((data['attestationObject'])) att_obj = AttestationObject((data['attestationObject']))
server = getServer() server = getServer()
auth_data = server.register_complete( auth_data = server.register_complete(
request.session['fido_state'], request.session.pop['fido_state'],
client_data, client_data,
att_obj att_obj
) )
@@ -68,12 +70,14 @@ def complete_reg(request):
uk.save() uk.save()
return HttpResponse(simplejson.dumps({'status': 'OK'})) return HttpResponse(simplejson.dumps({'status': 'OK'}))
except Exception as exp: except Exception as exp:
import traceback
print(traceback.format_exc())
try: try:
from raven.contrib.django.raven_compat.models import client from raven.contrib.django.raven_compat.models import client
client.captureException() client.captureException()
except: except:
pass pass
return HttpResponse(simplejson.dumps({'status': 'ERR', "message": "Error on server, please try again later"})) return JsonResponse({'status': 'ERR', "message": "Error on server, please try again later"})
def start(request): def start(request):
@@ -112,7 +116,7 @@ def authenticate_complete(request):
credentials = getUserCredentials(username) credentials = getUserCredentials(username)
data = cbor.decode(request.body) data = cbor.decode(request.body)
credential_id = data['credentialId'] credential_id = data['credentialId']
client_data = ClientData(data['clientDataJSON']) client_data = CollectedClientData(data['clientDataJSON'])
auth_data = AuthenticatorData(data['authenticatorData']) auth_data = AuthenticatorData(data['authenticatorData'])
signature = data['signature'] signature = data['signature']
try: try:

View File

@@ -4,12 +4,12 @@
{% block content %} {% block content %}
<br/> <br/>
<br/> <br/>
<div class="container"> <div class="container d-flex justify-content-center">
<div class="panel panel-default"> <div class="panel panel-default card">
<div class="panel-heading"> <div class="panel-heading card-header">
<strong> Activate Token by email</strong> <strong> Activate Token by email</strong>
</div> </div>
<div class="panel-body"> <div class="panel-body card-body">
<FORM METHOD="POST" ACTION="{% url 'start_email' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1"> <FORM METHOD="POST" ACTION="{% url 'start_email' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">
{% csrf_token %} {% csrf_token %}
{% if invalid %} {% if invalid %}
@@ -31,14 +31,14 @@
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group mb-3">
<span class="input-group-addon"> <span class="input-group-addon input-group-text">
<i class="glyphicon glyphicon-lock"></i> <i class="glyphicon glyphicon-lock bi bi-lock"></i>
</span> </span>
<input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus> <input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group d-grid gap-2">
<input type="submit" class="btn btn-lg btn-success btn-block" value="Verify"> <input type="submit" class="btn btn-lg btn-success btn-block" value="Verify">
</div> </div>
</div> </div>

View File

@@ -13,14 +13,15 @@
} }
</script> </script>
<div class='container'>
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div class="panel panel-default"> <div class="panel panel-default card">
<div class="panel-heading"> <div class="panel-heading card-header">
<strong> Email One Time Password </strong> <strong> Email One Time Password </strong>
</div> </div>
<div class="panel-body"> <div class="panel-body card-body">
<FORM METHOD="POST" ACTION="{% url 'email_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1"> <FORM METHOD="POST" ACTION="{% url 'email_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">
@@ -46,16 +47,16 @@
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group mb-3">
<span class="input-group-addon"> <span class="input-group-addon input-group-text">
<i class="glyphicon glyphicon-lock"></i> <i class="glyphicon glyphicon-lock bi bi-lock"></i>
</span> </span>
<input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus> <input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group d-grid gap-2">
<input type="{% if mode == "auth" %}submit{% elif mode == 'recheck' %}button{% endif %}" {% if mode == "recheck" %}onclick="send_totp()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in"> <input type="{% if mode == "auth" %}submit{% elif mode == 'recheck' %}button{% endif %}" {% if mode == "recheck" %}onclick="send_totp()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in">
</div> </div>
@@ -64,7 +65,7 @@
</FORM> </FORM>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6" style="padding-left: 25px"> <div class="col-md-12 mb-3" style="padding-left: 25px">
{% if request.session.mfa_methods|length > 1 %} {% if request.session.mfa_methods|length > 1 %}
<a href="{% url 'mfa_methods_list' %}">Select Another Method</a> <a href="{% url 'mfa_methods_list' %}">Select Another Method</a>
{% endif %} {% endif %}
@@ -74,3 +75,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>

View File

@@ -59,11 +59,11 @@
<br/> <br/>
<br/> <br/>
<div class="container"> <div class="container">
<div class="panel panel-default"> <div class="panel panel-default card">
<div class="panel-heading"> <div class="panel-heading card-header">
<strong> FIDO2 Security Key</strong> <strong> FIDO2 Security Key</strong>
</div> </div>
<div class="panel-body"> <div class="panel-body card-body">
<div class="row alert alert-pr" id="res" align="center"> <div class="row alert alert-pr" id="res" align="center">

View File

@@ -4,11 +4,11 @@
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div class="panel panel-default"> <div class="panel panel-default card">
<div class="panel-heading"> <div class="panel-heading card-header">
<strong> Security Key</strong> <strong> Security Key</strong>
</div> </div>
<div class="panel-body"> <div class="panel-body card-body">
<div class="row"> <div class="row">
<div style="padding-left: 15px" class="col-md-10 col-md-offset-1" id="main_paragraph" align="center"> <div style="padding-left: 15px" class="col-md-10 col-md-offset-1" id="main_paragraph" align="center">
@@ -35,7 +35,7 @@
</div> </div>
<div class="row"> <div class="row">
<div style="padding-left: 15px"> <div class="col-md-12 mb-3" style="padding-left: 15px">
{% if request.session.mfa_methods|length > 1 %} {% if request.session.mfa_methods|length > 1 %}
<a href="{% url 'mfa_methods_list' %}">Select Another Method</a> <a href="{% url 'mfa_methods_list' %}">Select Another Method</a>
@@ -105,7 +105,7 @@
$("#main_paragraph").html("FIDO2 must work under secure context") $("#main_paragraph").html("FIDO2 must work under secure context")
} else { } else {
ua=new UAParser().getResult() ua=new UAParser().getResult()
if (ua.browser.name == "Safari" || ua.browser.name == "Mobile Safari" ) if (ua.browser.name == "Safari" || ua.browser.name == "Mobile Safari" || ua.os.name == "iOS" || ua.os.name == "iPadOS")
$("#res").html("<button class='btn btn-success' onclick='authen()'>Authenticate...</button>") $("#res").html("<button class='btn btn-success' onclick='authen()'>Authenticate...</button>")
else else
authen() authen()

View File

@@ -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."); $("#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() $("#actionBtn").remove()
$("#modal-footer").prepend("<button id='actionBtn' class='btn btn-danger' onclick='confirmDel("+id+")'>Confirm Deletion</button>") $("#modal-footer").prepend("<button id='actionBtn' class='btn btn-danger' onclick='confirmDel("+id+")'>Confirm Deletion</button>")
$("#popUpModal").modal() $("#popUpModal").modal('show')
} }
function toggleKey(id) { function toggleKey(id) {
@@ -47,24 +47,24 @@
<div class="row"> <div class="row">
<div align="center"> <div align="center">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-success dropdown-toggle" data-toggle="dropdown"> <button class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
Add Method&nbsp;<span class="caret"></span> Add Method&nbsp;<span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{% if not 'TOTP' in UNALLOWED_AUTHEN_METHODS %} {% if not 'TOTP' in UNALLOWED_AUTHEN_METHODS %}
<li><a href="{% url 'start_new_otop' %}">Authenticator app</a></li> <li><a class="dropdown-item" href="{% url 'start_new_otop' %}">Authenticator app</a></li>
{% endif %} {% endif %}
{% if not 'Email' in UNALLOWED_AUTHEN_METHODS %} {% if not 'Email' in UNALLOWED_AUTHEN_METHODS %}
<li><a href="{% url 'start_email' %}">Email Token</a></li> <li><a class="dropdown-item" href="{% url 'start_email' %}">Email Token</a></li>
{% endif %} {% endif %}
{% if not 'U2F' in UNALLOWED_AUTHEN_METHODS %} {% if not 'U2F' in UNALLOWED_AUTHEN_METHODS %}
<li><a href="{% url 'start_u2f' %}">Security Key</a></li> <li><a class="dropdown-item" href="{% url 'start_u2f' %}">Security Key</a></li>
{% endif %} {% endif %}
{% if not 'FIDO2' in UNALLOWED_AUTHEN_METHODS %} {% if not 'FIDO2' in UNALLOWED_AUTHEN_METHODS %}
<li><a href="{% url 'start_fido2' %}">FIDO2 Security Key</a></li> <li><a class="dropdown-item" href="{% url 'start_fido2' %}">FIDO2 Security Key</a></li>
{% endif %} {% endif %}
{% if not 'Trusted_Devices' in UNALLOWED_AUTHEN_METHODS %} {% if not 'Trusted_Devices' in UNALLOWED_AUTHEN_METHODS %}
<li><a href="{% url 'start_td' %}">Trusted Device</a></li> <li><a class="dropdown-item" href="{% url 'start_td' %}">Trusted Device</a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
@@ -98,7 +98,7 @@
<td>{% if key.key_type in HIDE_DISABLE %} <td>{% if key.key_type in HIDE_DISABLE %}
---- ----
{% else %} {% else %}
<a href="javascript:void(0)" onclick="deleteKey({{ key.id }},'{{ key.key_type }}')"> <span class="fa fa-trash"></span></a></td> <a href="javascript:void(0)" onclick="deleteKey({{ key.id }},'{{ key.key_type }}')"> <span class="fa fa-trash fa-solid fa-trash-can bi bi-trash-fill"></span></a></td>
{% endif %} {% endif %}
</tr> </tr>
{% empty %} {% empty %}

View File

@@ -63,7 +63,7 @@
{% block content %} {% block content %}
<br/> <br/>
<br/> <br/>
<div class="container"> <div class="container d-flex justify-content-center">
<div class="col-md-6 col-md-offset-3" id="two-factor-steps"> <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
<div class="row" align="center"> <div class="row" align="center">
<h4>Adding Authenticator</h4> <h4>Adding Authenticator</h4>
@@ -98,7 +98,7 @@
<button class="btn btn-success" onclick="verify()">Enable</button> <button class="btn btn-success" onclick="verify()">Enable</button>
</div> </div>
<div class="col-md-6" align="right" style="padding-right: 30px"> <div class="col-md-6" align="right" style="padding-right: 30px">
<a href="{% url 'mfa_home' %}"><button class="btn btn-default">Cancel</button></a> <a href="{% url 'mfa_home' %}" class="btn btn-default btn-secondary" role="button">Cancel</a>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -13,14 +13,15 @@
} }
</script> </script>
<div class='container'>
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div class="panel panel-default"> <div class="panel panel-default card">
<div class="panel-heading"> <div class="panel-heading card-header">
<strong> One Time Password</strong> <strong> One Time Password</strong>
</div> </div>
<div class="panel-body"> <div class="panel-body card-body">
<FORM METHOD="POST" ACTION="{% url 'totp_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1"> <FORM METHOD="POST" ACTION="{% url 'totp_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">
@@ -46,16 +47,16 @@
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group mb-3">
<span class="input-group-addon"> <span class="input-group-addon input-group-text">
<i class="glyphicon glyphicon-lock"></i> <i class="glyphicon glyphicon-lock bi bi-lock"></i>
</span> </span>
<input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus> <input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group d-grid gap-2">
<input type="{% if mode == "auth" %}submit{% elif mode == 'recheck' %}button{% endif %}" {% if mode == "recheck" %}onclick="send_totp()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in"> <input type="{% if mode == "auth" %}submit{% elif mode == 'recheck' %}button{% endif %}" {% if mode == "recheck" %}onclick="send_totp()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in">
</div> </div>
@@ -64,7 +65,7 @@
</FORM> </FORM>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6" style="padding-left: 25px"> <div class="col-md-12 mb-3" style="padding-left: 25px">
{% if request.session.mfa_methods|length > 1 %} {% if request.session.mfa_methods|length > 1 %}
<a href="{% url 'mfa_methods_list' %}">Select Another Method</a> <a href="{% url 'mfa_methods_list' %}">Select Another Method</a>
{% endif %} {% endif %}
@@ -74,3 +75,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>

View File

@@ -31,11 +31,11 @@
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div class="panel panel-default"> <div class="panel panel-default card">
<div class="panel-heading"> <div class="panel-heading card-header">
<strong> Add Trusted Device</strong> <strong> Add Trusted Device</strong>
</div> </div>
<div class="panel-body"> <div class="panel-body card-body">
{% if success %} {% if success %}
<div class="alert alert-warning"> <div class="alert alert-warning">
Please check your PC window, to continue the process. Please check your PC window, to continue the process.
@@ -67,31 +67,31 @@
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div class="col-sm-12 col-md-12">
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group mb-3">
<span class="input-group-addon"> <span class="input-group-addon input-group-text">
<i class="glyphicon glyphicon-user"></i> <i class="glyphicon glyphicon-user bi bi-person"></i>
</span> </span>
<input class="form-control" id="username" size="30" MaxLength="30" placeholder="Username" name="username" value="{{ username }}" type="text" autofocus autocomplete="on"> <input class="form-control" id="username" size="30" MaxLength="30" placeholder="Username" name="username" value="{{ username }}" type="text" autofocus autocomplete="on">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group mb-3">
<span class="input-group-addon"> <span class="input-group-addon input-group-text">
<i class="fa fa-key"></i> <i class="fa fa-key"></i>
</span> </span>
<input class="form-control" placeholder="e.g GAK-Y2M" id='key' style="text-transform: uppercase" name="key" type="text" size="9" MaxLength="9" value="{{ key }}"> <input class="form-control" placeholder="e.g GAK-Y2M" id='key' style="text-transform: uppercase" name="key" type="text" size="9" MaxLength="9" value="{{ key }}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<span class="input-group"> <span class="input-group mb-3">
<input id='agree' name="agree" type="checkbox"><span style="color: red"> I confirm that this device is mine and it is only used by me.</span> <input id='agree' name="agree" type="checkbox"><span style="color: red"> I confirm that this device is mine and it is only used by me.</span>
</div> </div>
{% comment %} {% comment %}
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group mb-3">
<span class="input-group-addon"> <span class="input-group-addon input-group-text">
<select size="1" name="Institution_Code" style="font-size: 10pt; font-family: Calibri; height: 34px;width: 230px"> <select size="1" name="Institution_Code" style="font-size: 10pt; font-family: Calibri; height: 34px;width: 230px">
@@ -104,7 +104,7 @@
</div> </div>
</div> </div>
{% endcomment %} {% endcomment %}
<div class="form-group"> <div class="form-group d-grid gap-2">
<input type="submit" class="btn btn-lg btn-success btn-block" value="Trust Device"> <input type="submit" class="btn btn-lg btn-success btn-block" value="Trust Device">
</div> </div>
</div> </div>
@@ -113,7 +113,7 @@
</form> </form>
{% endif %} {% endif %}
</div> </div>
<div class="panel-footer "> <div class="panel-footer card-footer">
</div> </div>

View File

@@ -7,17 +7,17 @@
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div class="panel panel-default"> <div class="panel panel-default card">
<div class="panel-heading"> <div class="panel-heading card-header">
<strong> Add Trusted Device</strong> <strong> Add Trusted Device</strong>
</div> </div>
<div class="panel-body"> <div class="panel-body card-body">
<div class="alert alert-success"> <div class="alert alert-success">
Your device is now trusted, please try to <a href="{{ HOST }}{{ BASE_URL }}accounts/login/"> login</a> Your device is now trusted, please try to <a href="{{ HOST }}{{ BASE_URL }}accounts/login/"> login</a>
</div> </div>
</div> </div>
<div class="panel-footer "> <div class="panel-footer card-footer">
</div> </div>

View File

@@ -15,7 +15,7 @@
function sendEmail() { function sendEmail() {
$("#modal-title").html("Send Link") $("#modal-title").html("Send Link")
$("#modal-body").html("Sending Email, Please wait...."); $("#modal-body").html("Sending Email, Please wait....");
$("#popUpModal").modal(); $("#popUpModal").modal('show');
$.ajax({ $.ajax({
"url":"{% url 'td_sendemail' %}", "url":"{% url 'td_sendemail' %}",
success:function (data) { success:function (data) {
@@ -60,7 +60,7 @@
$("#actionBtn").remove(); $("#actionBtn").remove();
$("#modal-footer").prepend("<button id='actionBtn' class='btn btn-success' onclick='checkMFA()'>Trust Device</button>") $("#modal-footer").prepend("<button id='actionBtn' class='btn btn-success' onclick='checkMFA()'>Trust Device</button>")
$("#modal-body").html(data) $("#modal-body").html(data)
$("#popUpModal").modal() $("#popUpModal").modal('show');
} }
} }
}) })

View File

@@ -2,11 +2,11 @@
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div class="panel panel-default"> <div class="panel panel-default card">
<div class="panel-heading"> <div class="panel-heading card-header">
<strong> Security Key</strong> <strong> Security Key</strong>
</div> </div>
<div class="panel-body"> <div class="panel-body card-body">
<div class="row"> <div class="row">
<div style="padding-left: 15px" class="col-md-10 col-md-offset-1" id="main_paragraph" align="center"> <div style="padding-left: 15px" class="col-md-10 col-md-offset-1" id="main_paragraph" align="center">
@@ -24,7 +24,7 @@
</div> </div>
<div class="row"> <div class="row">
<div style="padding-left: 15px"> <div class="col-md-12 mb-3" style="padding-left: 15px">
{% if request.session.mfa_methods|length > 1 %} {% if request.session.mfa_methods|length > 1 %}
<a href="{% url 'mfa_methods_list' %}">Select Another Method</a> <a href="{% url 'mfa_methods_list' %}">Select Another Method</a>

View File

@@ -24,7 +24,7 @@
{ {
$("#modal-title").html("Recheck Indentity") $("#modal-title").html("Recheck Indentity")
$("#modal-body").html(data["html"]) $("#modal-body").html(data["html"])
$("#popUpModal").modal() $("#popUpModal").modal('show')
} }

View File

@@ -2,15 +2,15 @@
<div class="modal-dialog" style="height: 80%;width: 80%;"> <div class="modal-dialog" style="height: 80%;width: 80%;">
<div class="modal-content" > <div class="modal-content" >
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="modal-title"></h4> <h4 class="modal-title" id="modal-title"></h4>
<button type="button" class="close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div> </div>
<div class="modal-body" id="modal-body" > <div class="modal-body" id="modal-body" >
</div> </div>
<div class="modal-footer" id="modal-footer"> <div class="modal-footer" id="modal-footer">
<button type="button" class="btn btn-default" id='btnModalClose' data-dismiss="modal">Close</button> <button type="button" class="btn btn-default btn-secondary" id='btnModalClose' data-dismiss="modal" data-bs-dismiss="modal">Close</button>
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->

View File

@@ -2,14 +2,15 @@
{% block content %} {% block content %}
<br/> <br/>
<br/> <br/>
<div class='container'>
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
<div class="panel panel-default"> <div class="panel panel-default card">
<div class="panel-heading"> <div class="panel-heading card-header">
<strong> Select Second Verification Method</strong> <strong> Select Second Verification Method</strong>
</div> </div>
<div class="panel-body"> <div class="panel-body card-body">
<ul> <ul>
{% for method in request.session.mfa_methods %} {% for method in request.session.mfa_methods %}
@@ -24,6 +25,8 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

View File

@@ -4,7 +4,7 @@ from setuptools import find_packages, setup
setup( setup(
name='django-mfa2', name='django-mfa2',
version='2.4.0', version='2.5.1',
description='Allows user to add 2FA to their accounts', description='Allows user to add 2FA to their accounts',
long_description=open("README.md").read(), long_description=open("README.md").read(),
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
@@ -24,7 +24,7 @@ setup(
'ua-parser', 'ua-parser',
'user-agents', 'user-agents',
'python-jose', 'python-jose',
'fido2 == 0.9.2', 'fido2 == 1.0.0',
'jsonLookup' 'jsonLookup'
], ],
python_requires=">=3.5", python_requires=">=3.5",
@@ -39,6 +39,8 @@ setup(
"Framework :: Django :: 2.2", "Framework :: Django :: 2.2",
"Framework :: Django :: 3.0", "Framework :: Django :: 3.0",
"Framework :: Django :: 3.1", "Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Intended Audience :: Developers", "Intended Audience :: Developers",
"Operating System :: OS Independent", "Operating System :: OS Independent",
"Programming Language :: Python", "Programming Language :: Python",
@@ -47,6 +49,8 @@ setup(
"Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Software Development :: Libraries :: Python Modules",
] ]
) )