Compare commits

..

31 Commits
dev ... master

Author SHA1 Message Date
fa0fd3172c Update mfa/helpers.py 2024-02-14 16:23:53 +00:00
fcfc6904b6 Update mfa/helpers.py 2024-02-14 16:16:53 +00:00
ace60d7343 Update mfa/helpers.py 2024-02-05 11:35:27 +00:00
aa76553edb Update mfa/templates/TrustedDevices/start.html 2024-02-05 10:49:54 +00:00
33938ac6e8 Update mfa/templates/MFA.html 2024-02-02 16:08:06 +00:00
5c799f15e9 Update mfa/templates/MFA.html 2024-02-02 16:01:51 +00:00
f33631ab48 Update mfa/templates/RECOVERY/recheck.html 2024-02-02 15:59:11 +00:00
11079528cb Update mfa/templates/RECOVERY/Add.html 2024-02-02 15:55:59 +00:00
b4ca28479a Update mfa/templates/TrustedDevices/start.html 2024-02-02 15:52:57 +00:00
e1d2bfa330 Update mfa/templates/TrustedDevices/start.html 2024-02-02 15:51:42 +00:00
a9ac8e7709 Update mfa/templates/TrustedDevices/Add.html 2024-02-02 15:47:47 +00:00
97ba9eeb44 Update mfa/templates/FIDO2/recheck.html 2024-02-02 15:34:22 +00:00
71a0378ef7 Update mfa/templates/FIDO2/Add.html 2024-02-02 15:31:55 +00:00
7055a7da02 Update mfa/templates/U2F/recheck.html 2024-02-02 15:30:39 +00:00
e63e315f29 Update mfa/templates/U2F/Add.html 2024-02-02 15:26:29 +00:00
b381a43927 Update mfa/templates/MFA.html 2024-02-02 15:23:42 +00:00
a31ecff6ef Update mfa/templates/TOTP/recheck.html 2024-02-02 13:57:11 +00:00
3eab9cbd46 Update mfa/templates/select_mfa_method.html 2024-02-02 12:56:43 +00:00
fc301a5a06 Update mfa/templates/TOTP/Add.html 2024-02-02 12:49:16 +00:00
c71c6d7cab Update mfa/templates/TOTP/Add.html 2024-02-02 12:40:03 +00:00
79e9e906dd Update mfa/templates/TOTP/Add.html 2024-02-02 12:20:08 +00:00
fe1e2abd6f Update mfa/templates/TOTP/Add.html 2024-02-02 12:16:44 +00:00
5db1bdca81 Update mfa/templates/TOTP/Add.html 2024-02-02 12:15:32 +00:00
1c15c74444 Update mfa/templates/TOTP/Add.html 2024-02-02 12:01:06 +00:00
bc59406713 Update mfa/templates/TOTP/recheck.html 2024-02-02 11:29:45 +00:00
3ea974f750 Update mfa/templates/TOTP/recheck.html 2024-02-02 11:26:19 +00:00
37184edfb9 Update mfa/templates/TOTP/recheck.html 2024-02-02 11:22:09 +00:00
62a240ac28 Update mfa/templates/TOTP/recheck.html 2024-02-02 11:19:53 +00:00
aa1d417c08 Update mfa/templates/TOTP/Auth.html 2024-02-02 11:11:08 +00:00
Mohamed El-Kalioby
77905b0e83 Merge pull request #81 from camposmoreira/chore/create-map-for-js
Creating .map versions for bootstrap and qrious
2024-01-06 10:44:48 +03:00
Moreira
1fe11273e3 Creating .map versions for bootstrap and qrious 2023-12-26 12:04:05 -03:00
31 changed files with 524 additions and 889 deletions

9
.gitignore vendored
View File

@@ -1,9 +1,5 @@
example/venv
# IDE
.idea .idea
.vscode example/venv
# Byte-compiled / optimized / DLL files # Byte-compiled / optimized / DLL files
__pycache__/ __pycache__/
*.py[cod] *.py[cod]
@@ -109,6 +105,3 @@ venv.bak/
# mypy # mypy
.mypy_cache/ .mypy_cache/
example/test_db example/test_db
# OS related
.DS_Store

View File

@@ -1,9 +1,4 @@
# Change Log # Change Log
## 2.9.0
* Fix a typo,
Thanks to @jkirkcaldy
## 2.8.0 ## 2.8.0
* Support For Django 4.0+ JSONField * Support For Django 4.0+ JSONField
* Removed jsonfield package from requirements * Removed jsonfield package from requirements

View File

@@ -11,7 +11,6 @@ A Django app that handles MFA, it supports TOTP, U2F, FIDO2 U2F (Web Authn), Ema
[![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/django-mfa2.svg)](https://anaconda.org/conda-forge/django-mfa2) [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/django-mfa2.svg)](https://anaconda.org/conda-forge/django-mfa2)
[![Conda Version](https://img.shields.io/conda/vn/conda-forge/django-mfa2.svg)](https://anaconda.org/conda-forge/django-mfa2) [![Conda Version](https://img.shields.io/conda/vn/conda-forge/django-mfa2.svg)](https://anaconda.org/conda-forge/django-mfa2)
Web Authencation API (WebAuthn) is state-of-the art techology that is expected to replace passwords. Web Authencation API (WebAuthn) is state-of-the art techology that is expected to replace passwords.
![Andriod Fingerprint](https://cdn-images-1.medium.com/max/800/1*1FWkRE8D7NTA2Kn1DrPjPA.png) ![Andriod Fingerprint](https://cdn-images-1.medium.com/max/800/1*1FWkRE8D7NTA2Kn1DrPjPA.png)
@@ -197,43 +196,6 @@ function some_func() {
```` ````
# Testing
We use `pytest` and several pytest plugins, especially the `pytest-django` and `pytest-cov` plugins that provide Django fixtures, and test coverage analysis.
In the root folder, `pytest.ini` contains configurations for running the tests, `requirements_testing.txt` contains the python packages required for running tests, and the folder `tests` contains the actual test files.
To run the tests, install the packages in requirements and requirements_testing.txt:
```bash
pip install -r requirements.txt -r requirements_testing.txt
```
then simply run pytest
```
pytest
```
to generate the coverage html pages:
```
pytest --cov=. --cov-report html -v
```
the coverage html files will be generated in the `htmlcov` folder
We use `tox` to test the package against different isolated environments. `tox.ini` contains the configurations for tox. To run the tests in the environments defined in the `tox.ini` file, make sure the python package tox is installed:
```
pip install tox
```
then run tox in the project root:
```
tox
```
# Contributors # Contributors
* [mahmoodnasr](https://github.com/mahmoodnasr) * [mahmoodnasr](https://github.com/mahmoodnasr)
* [d3cline](https://github.com/d3cline) * [d3cline](https://github.com/d3cline)
@@ -245,8 +207,6 @@ tox
* [ezrajrice](https://github.com/ezrajrice) * [ezrajrice](https://github.com/ezrajrice)
* [Spitfireap](https://github.com/Spitfireap) * [Spitfireap](https://github.com/Spitfireap)
* [peterthomassen](https://github.com/peterthomassen) * [peterthomassen](https://github.com/peterthomassen)
* [oussjarrousse](https://github.com/oussjarrousse)
* [jkirkcaldy](https://github.com/jkirkcaldy)
# Security contact information # Security contact information

View File

@@ -1,4 +1,4 @@
from django.apps import AppConfig from django.apps import AppConfig
class myAppNameConfig(AppConfig): class myAppNameConfig(AppConfig):
name = 'mfa' name = 'mfa'
verbose_name = 'Django MFA2' verbose_name = 'A Much Better Name'

View File

@@ -4,8 +4,14 @@ from . import TrustedDevice, U2F, FIDO2, totp
import simplejson import simplejson
from django.shortcuts import HttpResponse from django.shortcuts import HttpResponse
from mfa.views import verify,goto from mfa.views import verify,goto
from mfa.recovery import delTokens
def has_mfa(request,username): def has_mfa(request,username):
if User_Keys.objects.filter(username=username,enabled=1).count()>0: uk = User_Keys.objects.filter(username=username,enabled=1)
if uk.count()==1:
for u in uk:
if u.key_type == "RECOVERY":
delTokens(request)
elif uk.count()>0:
return verify(request, username) return verify(request, username)
return False return False

View File

@@ -0,0 +1 @@
{"version":3,"file":"bootstrap-toggle.min.js","sources":["bootstrap-toggle.js"],"names":["$","Plugin","option","this","each","$this","data","options","Toggle","element","$element","extend","defaults","render","VERSION","DEFAULTS","on","off","onstyle","offstyle","size","style","width","height","prototype","attr","_onstyle","_offstyle","$toggleOn","html","addClass","$toggleOff","$toggleHandle","$toggleGroup","append","$toggle","prop","wrap","parent","Math","max","outerWidth","outerHeight","css","update","trigger","toggle","silent","removeClass","enable","removeAttr","disable","change","proxy","destroy","remove","removeData","unwrap","old","fn","bootstrapToggle","Constructor","noConflict","document","e","$checkbox","find","preventDefault","jQuery"],"mappings":"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"}

File diff suppressed because one or more lines are too long

View File

@@ -61,20 +61,23 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<br/> <div class="col-lg-8 col-md-8 col-12 mx-auto">
<br/> <div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<div class="container"> <span class="mask bg-gradient-primary opacity-6"></span>
<div class="panel panel-default card">
<div class="panel-heading card-header">
<strong> Adding a New {{ method.name }}</strong>
</div> </div>
<div class="panel-body card-body"> <div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="card-header pb-0 p-3">
<h6 class="mb-0"><strong> Adding a New {{ method.name }}</strong></h6>
</div>
<div class="card-body">
<div class="row alert alert-pr" id="res" align="center"> <div class="row alert alert-pr" id="res" align="center">
<p style="color: green">Your browser should ask you to confirm you identity.</p> <p style="color: green">Your browser should ask you to confirm you identity.</p>
</div> </div>
</div> </div>
</div> </div>
{% include "modal.html" %} {% include "modal.html" %}

View File

@@ -1,14 +1,15 @@
{% load static %} {% load static %}
<script type="application/javascript" src="{% static 'mfa/js/cbor.js' %}"></script> <script type="application/javascript" src="{% static 'mfa/js/cbor.js' %}"></script>
<script type="application/javascript" src="{% static 'mfa/js/ua-parser.min.js' %}"></script> <script type="application/javascript" src="{% static 'mfa/js/ua-parser.min.js' %}"></script>
<div class="row"> <div class="col-lg-8 col-md-8 col-12 mx-auto">
<div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<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 offset-2 col-8"> <span class="mask bg-gradient-primary opacity-6"></span>
<div class="panel panel-default card">
<div class="panel-heading card-header">
<strong> Security Key</strong>
</div> </div>
<div class="panel-body card-body"> <div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="card-header pb-0 p-3">
<h6 class="mb-0"><strong> Security Key</strong></h6>
</div>
<div class="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">
@@ -16,7 +17,6 @@
Welcome back {% comment %}<img src="{% url 'getUserImage' request.session.base_username %}" title="{{ request.session.base_username }}" style="padding: 3px;height: 50px" class="img-circle"/>{% endcomment %} {{ request.session.base_username }}<br/> Welcome back {% comment %}<img src="{% url 'getUserImage' request.session.base_username %}" title="{{ request.session.base_username }}" style="padding: 3px;height: 50px" class="img-circle"/>{% endcomment %} {{ request.session.base_username }}<br/>
<a href="{% url 'mfa_reset_cookie' %}">Not me</a> <a href="{% url 'mfa_reset_cookie' %}">Not me</a>
<br/> <br/>
{% endif %} {% endif %}
<div id="res"> <div id="res">
<p style="color: green">please press the button on your security key to prove it is you.</p> <p style="color: green">please press the button on your security key to prove it is you.</p>
@@ -32,19 +32,13 @@
</form> </form>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
<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 %}
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">

View File

@@ -40,12 +40,15 @@
<script src="{% static 'mfa/js/bootstrap-toggle.min.js'%}"></script> <script src="{% static 'mfa/js/bootstrap-toggle.min.js'%}"></script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{{block.super}}
<br/>
<br/> <div class="col-lg-10 col-md-10 col-12 mx-auto">
<div class="container"> <div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<div class="row"> <span class="mask bg-gradient-primary opacity-6"></span>
<div class="offset-5 col-2" style="text-align: center"> </div>
<div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="card-body">
<div class="" style="text-align: center">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-bs-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>
@@ -70,10 +73,9 @@
</div> </div>
</div> </div>
</div> </div>
<br/> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-responsive table-striped">
<tr> <tr>
<th>Type</th> <th>Type</th>
<th>Date Added</th> <th>Date Added</th>
<th>Expires On</th> <th>Expires On</th>
@@ -85,7 +87,6 @@
{% if keys %} {% if keys %}
{% for key in keys %} {% for key in keys %}
<tr> <tr>
<td>{{ key.name }}</td> <td>{{ key.name }}</td>
<td>{{ key.added_on }}</td> <td>{{ key.added_on }}</td>
<td>{% if key.expires %}{{ key.expires }}{% else %}N/A{% endif %}</td> <td>{% if key.expires %}{{ key.expires }}{% else %}N/A{% endif %}</td>
@@ -116,10 +117,15 @@
</tr> </tr>
{% endif %} {% endif %}
{% else %} {% else %}
<tr><td colspan="7" align="center">You don't have any keys yet.</td> </tr> <tr><td colspan="7" align="center">You didn't have any keys yet.</td> </tr>
{% endif %} {% endif %}
</table> </table>
</div> </div>
</div> </div>
</div>
</div>
{% include "modal.html" %} {% include "modal.html" %}
{% endblock %} {% endblock %}

View File

@@ -1,4 +1,3 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load static %} {% load static %}
{% block head %} {% block head %}
@@ -98,35 +97,25 @@
</script> </script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<br/> <div class="col-lg-8 col-md-8 col-12 mx-auto">
<br/> <div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<div class="container d-flex justify-content-center"> <span class="mask bg-gradient-primary opacity-6"></span>
<div class="col-md-6 col-md-offset-3" id="two-factor-steps">
<div class="row">
<h4>Recovery Codes List</h4>
</div> </div>
<div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="tokenrow" id="tokens"> <div class="card-header pb-0 p-3">
<h6 class="mb-0">
Recovery Codes List
</h6>
</div>
<div class="card-body">
<div class="tokenrow mb-4" id="tokens">
</div> </div>
<br/>
<br/>
<div class="row"> <div class="row">
<div class="col-md-4 col-md-offset-4" style="padding-left: 0px" align="center"> <div class="col-md-4 col-md-offset-4" style="padding-left: 0px" align="center">
<button onclick="confirmRegenerateTokens()" class="btn btn-success">Regenerate</button> <button onclick="confirmRegenerateTokens()" class="btn btn-success">Regenerate</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="{{redirect_html}}" class="btn btn-default btn-secondary" role="button"> {{reg_success_msg}}</a> <a href="{{redirect_html}}" class="btn btn-default btn-secondary" role="button"> {{reg_success_msg}}</a>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -22,17 +22,18 @@
}) })
} }
</script> </script>
<div class="row"> <div class="col-lg-8 col-md-8 col-12 mx-auto">
<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-10 col-lg-offset-1"> <div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<div class="panel panel-default card"> <span class="mask bg-gradient-primary opacity-6"></span>
<div class="panel-heading card-header">
<strong> Recovery code</strong>
</div> </div>
<div class="panel-body card-body"> <div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="card-header pb-0 p-3">
<FORM METHOD="POST" ACTION="{% url 'recovery_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1"> <h6 class="mb-0">
Recovery code
</h6>
</div>
<div class="card-body">
<form METHOD="POST" ACTION="{% url 'recovery_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">
{% csrf_token %} {% csrf_token %}
{% if invalid %} {% if invalid %}
<div class="alert alert-danger"> <div class="alert alert-danger">
@@ -46,40 +47,30 @@
{% endif %} {% endif %}
<fieldset> <fieldset>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12">
<p>Enter the 11-digits on your authenticator. Or input a recovery code</p> <p>Enter the 11-digits on your authenticator. Or input a recovery code</p>
</div> </div>
</div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12">
<div class="form-group"> <div class="form-group">
<div class="input-group mb-3"> <div class="input-group input-group-static mb-3">
<span class="input-group-addon input-group-text"> <span class="input-group-addon input-group-text">
<i class="glyphicon glyphicon-lock bi bi-lock"></i> <i class="glyphicon glyphicon-lock bi bi-lock"></i>
</span> </span>
<input class="form-control" size="11" MaxLength="11" value="" placeholder="e.g abcde-fghij" name="recovery" type="text" id="recovery" autofocus> <input class="form-control" size="11" MaxLength="11" value="" placeholder="e.g abcde-fghij" name="recovery" type="text" id="recovery" autofocus>
</div>
</div> </div>
<div class="form-group d-grid gap-2"> <div class="form-group d-grid gap-2">
<input type="{% if mode == "auth" %}submit{% elif mode == 'recheck' %}button{% endif %}" {% if mode == "recheck" %}onclick="send_recovery()" {% 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_recovery()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in">
</div> </div>
</div> </div>
</fieldset>
</FORM>
</div> </div>
</fieldset>
</form>
<div class="row"> <div class="row">
<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 %}
</div> </div>
</div>
</div>
</div>
</div> </div>
</div> </div>
{% include "modal.html" %} {% include "modal.html" %}

View File

@@ -1,13 +1,8 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load static %} {% load static %}
{% block head %} {% block head %}
<style> <style>
#two-factor-steps {
border: 1px solid #ccc;
border-radius: 3px;
padding: 15px;
}
.row{ .row{
margin: 0px; margin: 0px;
} }
@@ -87,11 +82,19 @@
{% block content %} {% block content %}
<br/> <br/>
<br/> <br/>
<div class="container d-flex justify-content-center"> <div class="container-fluid px-2 px-md-4">
<div class="col-md-6 col-md-offset-3" id="two-factor-steps"> <div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<div class="row" align="center"> <span class="mask bg-gradient-primary opacity-6"></span>
<h4>Adding a new {{ method.name }}</h4>
</div> </div>
<div class="card mx-3 mx-md-4 mt-n6 h-100" id="two-factor-steps" >
<div class="card-header pb-0 p-3">
<h6 class="mb-0">Adding a new {{ method.name }}</h6>
</div>
<div class="card-body p-3">
<div class="row"> <div class="row">
<p>Scan the image below with the two-factor authentication app on your <a href="javascript:void(0)" onclick="showTOTP()">phone/PC</a>. If you cant use a barcode, <p>Scan the image below with the two-factor authentication app on your <a href="javascript:void(0)" onclick="showTOTP()">phone/PC</a>. If you cant use a barcode,
@@ -111,23 +114,27 @@
<div class="row"> <div class="row">
<p><b>Enter the six-digit code from the application</b></p> <p><b>Enter the six-digit code from the application</b></p>
<p style="color: #333333;font-size: 10px">After scanning the barcode image, the app will display a six-digit code that you can enter below. </p> <p >After scanning the barcode image, the app will display a six-digit code that you can enter below. </p>
</div> </div>
<div class="row"> <div class="row">
<div class="offset-md-4 col-md-4"> <div class="offset-md-4 col-md-4">
<div class="input-group input-group-static">
<input style="display: inline;width: 95%" maxlength="6" size="6" class="form-control" id="answer" placeholder="e.g 785481"/> <input style="display: inline;width: 95%" maxlength="6" size="6" class="form-control" id="answer" placeholder="e.g 785481"/>
</div> </div>
</div> </div>
</div>
<div class="row" style="padding-top: 10px;"> <div class="row" style="padding-top: 10px;">
<div class="col-md-4 offset-md-4" style="padding-left: 0px"> <div class="offset-md-4 col-md-4">
<button class="btn btn-success" onclick="verify()">Enable</button> <button class="btn btn-success" onclick="verify()">Enable</button>
<a href="{% url 'mfa_home' %}" class="btn btn-default btn-secondary" role="button">Cancel</a> <a href="{% url 'mfa_home' %}" class="btn btn-default btn-secondary" role="button">Cancel</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
{% include "modal.html" %} {% include "modal.html" %}
{% endblock %} {% endblock %}

View File

@@ -1,10 +1,10 @@
{% extends "mfa_auth_base.html" %} {% extends "mfa_auth_base.html" %}
{% block head %} {% block head %}
<style> <!--<style>
.row{ .row{
margin-left: 15px; margin-left: 15px;
} }
</style> </style>-->
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<br/> <br/>

View File

@@ -1,30 +1,19 @@
<script type="application/javascript"> {% extends "mfa_auth_base.html" %}
function send_totp() { {% load static %}
$.ajax({"url":"{% url 'totp_recheck' %}", method:"POST",dataType:"JSON",
data:{"csrfmiddlewaretoken":"{{ csrf_token }}","otp":$("#otp").val()},
success:function (data) {
if (data["recheck"])
mfa_success_function();
else {
mfa_failed_function();
}
}
})
}
</script>
<div class='container'>
<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"> {% block content %}
<div class="panel panel-default card">
<div class="panel-heading card-header">
<strong> One Time Password</strong> <div class="col-lg-8 col-md-8 col-12 mx-auto">
<div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<span class="mask bg-gradient-primary opacity-6"></span>
</div> </div>
<div class="panel-body card-body"> <div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="card-header pb-0 p-3 ">
<FORM METHOD="POST" ACTION="{% url 'totp_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1"> <h6 class="mb-0">One Time Password</h6>
</div>
<div class="card-body">
<form METHOD="POST" ACTION="{% url 'totp_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">
{% csrf_token %} {% csrf_token %}
{% if invalid %} {% if invalid %}
<div class="alert alert-danger"> <div class="alert alert-danger">
@@ -37,41 +26,39 @@
</div> </div>
{% endif %} {% endif %}
<fieldset> <fieldset>
<div class="row">
<div class="col-sm-12 col-md-12"> <div class=" text-left">
<p>Enter the 6-digits on your authenticator</p> <p>Enter the 6-digits on your authenticator</p>
</div> </div>
</div>
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="form-group"> <div class="form-group">
<div class="input-group mb-3"> <div class="input-group input-group-dynamic mb-3">
<span class="input-group-addon input-group-text"> <span class="input-group-addon input-group-text">
<i class="glyphicon glyphicon-lock bi bi-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 d-grid gap-2"> <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">
</div>
<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>
</fieldset> </fieldset>
</FORM> </form>
</div>
<div class="row">
<div class="col-md-12 mb-3" style="padding-left: 25px"> <div class="">
{% 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 %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div>
{% include "modal.html" %} {% include "modal.html" %}
{% endblock %}

View File

@@ -25,17 +25,17 @@
</script> </script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<br/> <div class="col-lg-8 col-md-8 col-12 mx-auto">
<br/> <div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<span class="mask bg-gradient-primary opacity-6"></span>
<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="panel panel-default card">
<div class="panel-heading card-header">
<strong> Add Trusted Device</strong>
</div> </div>
<div class="panel-body card-body"> <div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="card-header pb-0 p-3">
<h6 class="mb-0">
<strong> Add Trusted Device</strong>
</h6>
</div>
<div class="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.
@@ -46,8 +46,8 @@
</div> </div>
{% else %} {% else %}
<div class="alert alert-warning">Please make sure you are not in private (incognito) mode <i class="fal fa-user-secret"></i></div> <div class="alert alert-warning text-white">Please make sure you are not in private (incognito) mode <i class="fa fa-user-secret"></i></div>
<FORM METHOD="POST" ACTION="{% url 'add_td' %}" Id="formLogin" onSubmit="return checkFlag()" name="FrontPage_Form1"> <form METHOD="POST" ACTION="{% url 'add_td' %}" Id="formLogin" onSubmit="return checkFlag()" name="FrontPage_Form1">
{% csrf_token %} {% csrf_token %}
{% if invalid %} {% if invalid %}
<div class="alert alert-danger"> <div class="alert alert-danger">
@@ -60,23 +60,19 @@
</div> </div>
{% endif %} {% endif %}
<fieldset> <fieldset>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12"> <div>
</div>
</div>
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="form-group"> <div class="form-group">
<div class="input-group mb-3"> <div class="input-group input-group-static mb-3">
<span class="input-group-addon input-group-text"> <span class="input-group-addon input-group-text">
<i class="glyphicon glyphicon-user bi bi-person"></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 mb-3"> <div class="input-group input-group-static mb-3">
<span class="input-group-addon input-group-text"> <span class="input-group-addon input-group-text">
<i class="fa fa-key"></i> <i class="fa fa-key"></i>
</span> </span>
@@ -84,27 +80,25 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<span class="input-group mb-3"> <span class=" form-check ">
<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 class="form-check-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 mb-3"> <div class="input-group mb-3">
<span class="input-group-addon input-group-text"> <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">
{% for ins in institutes %} {% for ins in institutes %}
<option value="{{ ins.institution_code }}">{{ ins.alias }}</option> <option value="{{ ins.institution_code }}">{{ ins.alias }}</option>
{% endfor %} {% endfor %}
</select> </select>
</span> </span>
</div> </div>
</div> </div>
{% endcomment %} {% endcomment %}
<div class="form-group d-grid gap-2"> <div class="form-group d-grid gap-2 mt-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,13 +107,6 @@
</form> </form>
{% endif %} {% endif %}
</div> </div>
<div class="panel-footer card-footer">
</div> </div>
</div> {% include "modal.html" %}
</div>
</div>
{% endblock %} {% endblock %}

View File

@@ -78,21 +78,22 @@
</script> </script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<br/> <div class="col-lg-8 col-md-8 col-12 mx-auto">
<br/> <div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<div class="container"> <span class="mask bg-gradient-primary opacity-6"></span>
<div class="col-md-6 col-md-offset-3" id="two-factor-steps">
<div class="row" align="center">
<h4>Add Trusted Device</h4>
</div> </div>
<div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="row" > <div class="card-header pb-0 p-3">
<h6 class="mb-0">
Add Trusted Device
</h6>
</div>
<div class="card-body">
{% if not_allowed %} {% if not_allowed %}
<div class="alert alert-danger">You can't add any more devices, you need to remove previously trusted devices first.</div> <div class="alert alert-danger">You can't add any more devices, you need to remove previously trusted devices first.</div>
{% else %} {% else %}
<p style="color: green">Allow access from mobile phone and tables.</p><br/> <p style="color: green">Allow access from mobile phone and tables.</p><br/>
<br/> <br/>
</div>
<div class="row"> <div class="row">
<h5>Steps:</h5> <h5>Steps:</h5>
</div> </div>
@@ -108,8 +109,6 @@
<li>Confirm the consent and submit form.</li> <li>Confirm the consent and submit form.</li>
</ol> </ol>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<h5>Manual</h5> <h5>Manual</h5>
<ol> <ol>
@@ -122,20 +121,15 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-8 offset-2">
This window will ask to confirm the device. This window will ask to confirm the device.
</div> </div>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div>
<br/> </div>
<br/>
<br/>
<br/>
{% include "modal.html" %} {% include "modal.html" %}
{% include 'mfa_check.html' %} {% include 'mfa_check.html' %}
{% endblock %} {% endblock %}

View File

@@ -1,16 +1,7 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load static %} {% load static %}
{% block head %} {% block head %}
<style>
#two-factor-steps {
border: 1px solid #ccc;
border-radius: 3px;
padding: 15px;
}
.row{
margin: 0px;
}
</style>
<script src="{% static 'mfa/js/u2f-api.js' %}" type="text/javascript"></script> <script src="{% static 'mfa/js/u2f-api.js' %}" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
function addToken() { function addToken() {
@@ -43,20 +34,29 @@
</script> </script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="col-lg-8 col-md-8 col-12 mx-auto">
<div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<span class="mask bg-gradient-primary opacity-6"></span>
</div>
<div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="card-body">
<br/> <br/>
<br/> <br/>
<div class="container"> <div class="container">
<div class="col-md-6 col-md-offset-3" id="two-factor-steps"> <div id="two-factor-steps">
<div id="res"></div> <div id="res"></div>
<div class="row" align="center"> <div class="row" align="center">
<h4>Adding {{ method.name}}</h4> <h4>Adding {{ method.name}}</h4>
</div> </div>
<div class="row"> <div class="row" align="center">
<p style="color: green">Your secure Key should be flashing now, please press on button.</p> <p style="color: green">Your secure Key should be flashing now, please press on button.</p>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
{% include "modal.html" %} {% include "modal.html" %}
{% endblock %} {% endblock %}

View File

@@ -1,15 +1,16 @@
{% load static %} {% load static %}
<div class="row"> < <div class="col-lg-8 col-md-8 col-12 mx-auto">
<div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<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"> <span class="mask bg-gradient-primary opacity-6"></span>
<div class="panel panel-default card">
<div class="panel-heading card-header">
<strong> Verify your identity using {{ method.name }}</strong>
</div> </div>
<div class="panel-body card-body"> <div class="card mx-3 mx-md-4 mt-n6 h-100 z-index-0 fadeIn3 fadeInBottom " >
<div class="card-header pb-0 p-3">
<h6 class="mb-0">Verify your identity using {{ method.name }}</h6>
</div>
<div class="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 id="main_paragraph" align="center">
<p style="color: green">Your key should be flashing now, please press the button.</p> <p style="color: green">Your key should be flashing now, please press the button.</p>
{% if mode == "auth" %} {% if mode == "auth" %}
<form id="u2f_login" action="{% url 'u2f_verify' %}" method="post"> <form id="u2f_login" action="{% url 'u2f_verify' %}" method="post">
@@ -21,18 +22,17 @@
</form> </form>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
<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>
{% endif %} {% endif %}
</div> </div>
</div>
</div>
</div>
</div> </div>
</div> </div>
<script src="{% static 'mfa/js/u2f-api.js' %}" type="text/javascript"></script> <script src="{% static 'mfa/js/u2f-api.js' %}" type="text/javascript"></script>

View File

@@ -1,19 +1,20 @@
{% extends "mfa_auth_base.html" %} {% extends "mfa_auth_base.html" %}
{% block content %} {% block content %}
<br/>
<div class='container'>
<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 offset-2 col-8"> <div class="container-fluid px-2 px-md-4 mt-6">
<div class="panel panel-default card"> <div class="page-header min-height-300 border-radius-xl mt-4" style="background-repeat: no-repeat; background-position: cover; background-size:contain; background-image: url('{% static 'img/keys.jpg'%}');">
<div class="panel-heading card-header"> <span class="mask bg-gradient-primary opacity-6"></span>
<strong> Select Second Verification Method</strong>
</div> </div>
<div class="card mx-3 mx-md-4 mt-n6 h-100" >
<div class="card-header pb-0 p-3">
<h6 class="mb-0">Select Second Verification Method</h6>
</div>
<div class="card-body p-3">
<div class="panel-body card-body"> <div class="panel-body card-body">
<ul> <ul>
{% for method in request.session.mfa_methods %} {% for method in request.session.mfa_methods %}
<li><a href="{% url "mfa_goto" method %}"> <li style="list-style-type: none;"><a class="btn btn-sm btn-outline-primary" href="{% url 'mfa_goto' method %}" >
{% if method == "TOTP" %}{% if 'TOTP' in RENAME_METHODS %}{{ RENAME_METHODS.TOTP }}{% else %}Authenticator App{% endif %} {% if method == "TOTP" %}{% if 'TOTP' in RENAME_METHODS %}{{ RENAME_METHODS.TOTP }}{% else %}Authenticator App{% endif %}
{% elif method == "Email" %}{% if 'Email' in RENAME_METHODS %}{{ RENAME_METHODS.Email }}{% else %}Send OTP by Email{% endif %} {% elif method == "Email" %}{% if 'Email' in RENAME_METHODS %}{{ RENAME_METHODS.Email }}{% else %}Send OTP by Email{% endif %}
{% elif method == "U2F" %}{% if 'U2F' in RENAME_METHODS %}{{ RENAME_METHODS.U2F }}{% else %}Secure Key{% endif %} {% elif method == "U2F" %}{% if 'U2F' in RENAME_METHODS %}{{ RENAME_METHODS.U2F }}{% else %}Secure Key{% endif %}
@@ -25,8 +26,6 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

3
mfa/tests.py Normal file
View File

@@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.

View File

@@ -1,109 +0,0 @@
[pytest]
# Searching
python_files = test_*
python_classes = Tests*
python_functions = test_*
env_files =
.env
# do not search for tests in these folders
norecursedirs = .vscode .tox docs example img mfa venv .coverage django_mfa2.egg-info
# Add folder to PYTHONPATH
# requires pytest >= 7.0.0
pythonpath = .
# https://pytest-django.readthedocs.io/en/latest/usage.html
DJANGO_SETTINGS_MODULE = tests.settings
# do not override the debug mode (True/False) set in the django settings module
# https://pytest-django.readthedocs.io/en/latest/usage.html#additional-pytest-ini-settings
django_debug_mode = keep
#
# set env variables
# https://tech.serhatteker.com/post/2020-02/test-env-vars-in-python/
# https://github.com/pytest-dev/pytest-env
; env =
; KEY=value
addopts =
# verbose
-v
# more verbosity
# -vv
# Don't show warnings
# -p no:warnings
# generates coverage report
# note that enabling pytest coverage will cause debugging pytest to fail on pycharm
# add the --no-cov to the pytest configuration on pycharm to allow for debugging pytest
--cov=./mfa
# surpress generating converage if one or more tests failed
; --no-cov-on-fail
# do not run migrations => faster test initialization
# --nomigrations
# Show hypthesis statistics whereever hypothesis was used
# ignore these tests/files when looking for tests
#--ignore=
# black
# --black
--hypothesis-show-statistics
# Add --reuse-db if you want to speed up tests by reusing the database between test runs.
#--reuse-db
# Define additional pytest markers so that using them in test will not trigger warnings
# To show the help line use: % pytest --marker
# To run pytest on a specifc marker use: pytest -m mark
# to run pytestt on several markers use quotation and logic operators as in:
# pytest -m "mark1 and mark2"
# pytest -m "mark1 or mark2"
# pytest -m "mark1 and not mark2"
markers =
API: tests of server api functions whether it is exposed as REST API or otherwise
BLACK_BOX: Black Box tests
WHITE_BOX: White Box tests
ENVIRONMENT: tests for the environment
CONFIGURATION: tests related configurations
LOGGING: tests related to logging
UNIT: Unit tests
INTEGRATION: Integration testing
UTILS: tests for utilities
FOCUS: tests under the microscope... under the spotlight... in focus
FUNC: functional teesting
REGRESSION: tests for fixed bugs
DJANGO: tests related to DJANGO
HTTP_REQUEST: tests of functions that handles HTTP REQUESTS
HTTP_GET: tests of functions that handles HTTP_GET_REQUESTS
HTTP_POST: tests of functions that handles HTTP_POST_REQUESTS
AUTH: tests related to user authentication
SQL_DB: tests related to the sql database
CLI: tests related to flask-cli
SERVER: tests for the server
API_V1: API related tests
PRIVILEGED_USER: tests for privileged users
NON_PRIVILEGED_USER: tests for non-privileged users
PERMISSIONS: tests related to permissions
ANNONYMOUS_USER: tests for non-authenticated users
AUTHENTICATED_USER: tests for authenticated users
ENDPOINTS: tests for endpoints (API nodes)
SERIALIZERS: tests for serializers
VIEWS: tests for DRF viewsets
FILTERS: tests for DRF filters
MODELS: tests for models
VALIDATORS: tests for validators
ERROR_HANDLING: tests for error handling
SECURITY: tests for security

View File

@@ -6,5 +6,5 @@ python-u2flib-server
ua-parser ua-parser
user-agents user-agents
python-jose python-jose
fido2==1.1.2 fido2 == 1.0.0
jsonLookup jsonLookup

View File

@@ -1,10 +0,0 @@
tox
pytest>=7.0.0
pytest-xdist
pytest-cov # Test coverage
pytest-dotenv # plugin to load environment from .env file
pytest-env # plugin to allow passing environment variable to pytest environmentt
pytest-mock # plugin that provides a mocker fixture which is a thin-wrapper around the patching API provided by the mock package
hypothesis # plugin that helps in automatize generating random values instead of static values in pyttests
pytest-django # pytest support for Django
validators # a package containing several validator functions

View File

@@ -14,7 +14,7 @@ setup(
url = 'https://github.com/mkalioby/django-mfa2/', url = 'https://github.com/mkalioby/django-mfa2/',
download_url='https://github.com/mkalioby/django-mfa2/', download_url='https://github.com/mkalioby/django-mfa2/',
license='MIT', license='MIT',
packages=find_packages(exclude=("tests",)), packages=find_packages(),
install_requires=[ install_requires=[
'django >= 2.0', 'django >= 2.0',
'simplejson', 'simplejson',
@@ -23,7 +23,7 @@ setup(
'ua-parser', 'ua-parser',
'user-agents', 'user-agents',
'python-jose', 'python-jose',
'fido2 == 1.1.2', 'fido2 == 1.0.0',
], ],
python_requires=">=3.5", python_requires=">=3.5",
include_package_data=True, include_package_data=True,

View File

View File

@@ -1,19 +0,0 @@
import pytest
# @pytest.fixture
# def api_request(rf):
# request = rf.get('/url')
# # Modify the request object as needed (e.g., set user, add data)
# return request
# @pytest.fixture
# def create_test_model(db):
# def make_model(**kwargs):
# return MyModel.objects.create(**kwargs)
# return make_model
@pytest.fixture
def authenticated_user(client, django_user_model):
user = django_user_model.objects.create_user(username='test', password='123')
client.login(username='test', password='123')
return user

View File

@@ -1,51 +0,0 @@
import os
SECRET_KEY = 'fake-key-for-testing'
INSTALLED_APPS = [
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'mfa'
]
ROOT_URLCONF="mfa.urls"
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': ':memory:',
}
}
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [
os.path.join(BASE_DIR ,'mfa','templates' ),
os.path.join(BASE_DIR ,'tests','templates' )
],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
},
]
MFA_UNALLOWED_METHODS = []

View File

@@ -1,11 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
{% block head %}
{% endblock %}
</head>
<body>
{% block content %}
{% endblock %}
</body>
</html>

View File

@@ -1,29 +0,0 @@
import pytest
from django.urls import reverse
@pytest.mark.VIEWS
@pytest.mark.DJANGO
@pytest.mark.ANNONYMOUS_USER
@pytest.mark.django_db
def test_index_unauthenticated(client):
url = reverse("mfa_home")
response = client.get(url)
assert response is not None
assert response.status_code == 302
assert response.url=="/accounts/login/?next=/"
@pytest.mark.VIEWS
@pytest.mark.AUTHENTICATED_USER
@pytest.mark.django_db
def test_index_authenticated(client, authenticated_user):
url = reverse("mfa_home")
response = client.get(url)
assert response is not None
assert response.status_code == 200
assert isinstance(response.templates, list)
assert len(response.templates) == 4
for template in response.templates:
assert template.name in ["modal.html", "base.html", "mfa_base.html", "MFA.html"]

52
tox.ini
View File

@@ -1,52 +0,0 @@
# Tox (https://tox.readthedocs.io/) is a tool for running tests
# in multiple virtualenvs. This configuration file will run the
# test suite on all supported python versions. To use it, "pip install tox"
# and then run "tox" from this directory.
#
# See also https://tox.readthedocs.io/en/latest/config.html for more
# configuration options.
[tox]
# Choose your Python versions. They have to be available
# on the system the tests are run on.
# comma separated
envlist =
python{3.6,3.7,3.8,3.9}-django2.2
python{3.6,3.7,3.8,3.9}-django3
python{3.8,3.9,3.10,3.11}-django4
python{3.8,3.9,3.10,3.11}-django5
# Tell tox to not require a setup.py file
;skipsdist = True
isolated_build = True
[testenv]
# https://tox.wiki/en/latest/example/basic.html#using-a-different-default-pypi-url
;setenv =
; PIP_INDEX_URL = https://pypi.my-alternative-index.org
# https://tech.serhatteker.com/post/2020-02/test-env-vars-in-python/
;setenv =
; NAME=value
# https://tox.wiki/en/latest/example/basic.html#passing-down-environment-variables
# passenv = ENV_VAR_NAME
# https://tox.wiki/en/latest/example/pytest.html#extended-example-change-dir-before-test-and-use-per-virtualenv-tempdir
;changedir = tests
deps =
django22: django>=2.2,<2.3
django32: django>=3.2,<3.3
django40: django>=4.0,<4.1
django41: django>=4.1,<4.2
django42: django>=4.2,<4.3
django50: django==5.0
-rrequirements.txt
-rrequirements_testing.txt
# https://tox.wiki/en/latest/example/basic.html#ignoring-a-command-exit-code
commands =
; pytest --junitxml=report.xml
pytest {posargs}