infrastructure/blender-id
0
4
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity

Initial mfa support (for internal users) #93591

Merged
Oleg-Komarov merged 46 commits from mfa into main 2024-08-29 11:44:06 +02:00
Conversation 0 Commits 46 Files Changed 45 +18 -12
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 94df1fcd80 - Show all commits

6
bid_main/templates/bid_main/mfa/disable.html
View File

@ -17,7 +17,9 @@ Disable Multi-factor Authentication
{% include "components/forms/field.html" %} {% include "components/forms/field.html" %}
{% endwith %} {% endwith %}
{% endwith %} {% endwith %}
<button type="submit" class="btn-danger">Disable</button> <div class="d-inline-flex mt-3">
<a class="btn" href="{% url 'bid_main:mfa' %}">Cancel</a> <button type="submit" class="btn btn-danger">Disable</button>
<a class="btn btn-secondary ml-3" href="{% url 'bid_main:mfa' %}">Cancel</a>
</div>
</form> </form>
{% endblock %} {% endblock %}

12
bid_main/templates/bid_main/mfa/setup.html
View File

@ -25,7 +25,7 @@ Multi-factor Authentication Setup
Verification also expires after {{ agent_inactivity_days }} days of inactivity. Verification also expires after {{ agent_inactivity_days }} days of inactivity.
</p> </p>
<div> <div>
<a class="btn btn-danger" href="{% url 'bid_main:mfa_disable' %}">Disable</a> <a class="btn btn-danger" href="{% url 'bid_main:mfa_disable' %}">Disable MFA</a>
</div> </div>
{% else %} {% else %}
<p> <p>
@ -60,7 +60,7 @@ Multi-factor Authentication Setup
<div class="bid box mt-3"> <div class="bid box mt-3">
<h3>Security keys (U2F, WebAuthn, FIDO2)</h3> <h3>Security keys (U2F, WebAuthn, FIDO2)</h3>
<p> <p>
E.g. yubikey. E.g. a yubikey.
</p> </p>
<ul> <ul>
{% for d in devices_per_type.u2f %} {% for d in devices_per_type.u2f %}
@ -87,12 +87,12 @@ Multi-factor Authentication Setup
{% with code_count=recovery_codes|length %} {% with code_count=recovery_codes|length %}
{{ code_count }} recovery code{{ code_count|pluralize }} remaining {{ code_count }} recovery code{{ code_count|pluralize }} remaining
{% if display_recovery_codes %} {% if display_recovery_codes %}
<a href="?display_recovery_codes=" class="btn">Hide</a> <a href="?display_recovery_codes=" class="btn btn-secondary">Hide</a>
{% else %} {% else %}
<a href="?display_recovery_codes=1#recovery-codes" class="btn">Display</a> <a href="?display_recovery_codes=1#recovery-codes" class="btn btn-secondary">Display</a>
{% endif %} {% endif %}
<form action="{% url 'bid_main:mfa_invalidate_recovery' %}" method="post" class="d-inline-flex">{% csrf_token %} <form action="{% url 'bid_main:mfa_invalidate_recovery' %}" method="post" class="d-inline-flex">{% csrf_token %}
<button class="btn-danger" type="submit">Invalidate</button> <button class="btn btn-danger" type="submit">Invalidate</button>
</form> </form>
{% if display_recovery_codes %} {% if display_recovery_codes %}
<ul> <ul>
@ -105,7 +105,7 @@ Multi-factor Authentication Setup
</div> </div>
{% endif %} {% endif %}
<form action="{% url 'bid_main:mfa_generate_recovery' %}" method="post">{% csrf_token %} <form action="{% url 'bid_main:mfa_generate_recovery' %}" method="post">{% csrf_token %}
<button type="submit">{% if recovery %}Regenerate{% else %}Generate{% endif %} recovery codes</button> <button type="submit" class="btn">{% if recovery %}Regenerate{% else %}Generate{% endif %} recovery codes</button>
</form> </form>
{% endwith %} {% endwith %}
</div> </div>

6
bid_main/templates/bid_main/mfa/totp_register.html
View File

@ -45,8 +45,10 @@ Multi-factor Authentication Setup
{% with field=form.signature %} {% with field=form.signature %}
{% include "components/forms/field.html" %} {% include "components/forms/field.html" %}
{% endwith %} {% endwith %}
<button type="submit" class="btn btn-primary">Validate</button> <div class="d-inline-flex">
<a class="btn btn-secondary" href="{% url 'bid_main:mfa' %}">Cancel</a> <button type="submit" class="btn btn-primary">Validate</button>
<a class="btn btn-secondary ml-3" href="{% url 'bid_main:mfa' %}">Cancel</a>
</div>
{% if form.non_field_errors %} {% if form.non_field_errors %}
<div class="text-danger mt-3"> <div class="text-danger mt-3">
something went wrong something went wrong

6
bid_main/templates/bid_main/mfa/u2f_register.html
View File

@ -24,8 +24,10 @@ Multi-factor Authentication Setup
{% with field=form.state %} {% with field=form.state %}
{% include "components/forms/field.html" %} {% include "components/forms/field.html" %}
{% endwith %} {% endwith %}
<button type="submit" class="btn btn-primary">Add security key</button> <div class="d-inline-flex">
<a class="btn btn-secondary" href="{% url 'bid_main:mfa' %}">Cancel</a> <button type="submit" class="btn btn-primary">Add security key</button>
<a class="btn btn-secondary ml-3" href="{% url 'bid_main:mfa' %}">Cancel</a>
</div>
{% if form.non_field_errors %} {% if form.non_field_errors %}
<div class="text-danger mt-3"> <div class="text-danger mt-3">
something went wrong something went wrong