FIDO login middleware
This commit is contained in:
parent
9b976efa50
commit
650d6e35f0
|
@ -11,5 +11,6 @@ from .views import (
|
||||||
facebook,
|
facebook,
|
||||||
change_email,
|
change_email,
|
||||||
mfa,
|
mfa,
|
||||||
|
fido,
|
||||||
social,
|
social,
|
||||||
)
|
)
|
||||||
|
|
60
app/auth/templates/auth/fido.html
Normal file
60
app/auth/templates/auth/fido.html
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
{% extends "single.html" %}
|
||||||
|
|
||||||
|
|
||||||
|
{% block title %}
|
||||||
|
Verify Your Security Key
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block head %}
|
||||||
|
<script src="{{ url_for('static', filename='assets/js/vendors/base64.js') }}"></script>
|
||||||
|
<script src="{{ url_for('static', filename='assets/js/vendors/webauthn.js') }}"></script>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block single_content %}
|
||||||
|
<div class="bg-white p-6" style="margin: auto">
|
||||||
|
|
||||||
|
<div class="mb-2">
|
||||||
|
Your account is protected with your security key (WebAuthn). <br><br>
|
||||||
|
Follow your browser's steps to continue the sign-in process.
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form id="formRegisterKey" method="post">
|
||||||
|
{{ fido_token_form.csrf_token }}
|
||||||
|
{{ fido_token_form.sk_assertion(class="form-control", placeholder="") }}
|
||||||
|
</form>
|
||||||
|
<div class="text-center">
|
||||||
|
<button id="btnVerifyKey" class="btn btn-success mt-2">Use your security key</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
async function verifyKey () {
|
||||||
|
$("#btnVerifyKey").prop('disabled', true);
|
||||||
|
$("#btnVerifyKey").text('Waiting for Security Key...');
|
||||||
|
|
||||||
|
const credentialRequestOptions = transformCredentialRequestOptions(
|
||||||
|
JSON.parse('{{webauthn_assertion_options|tojson|safe}}')
|
||||||
|
)
|
||||||
|
|
||||||
|
let assertion;
|
||||||
|
try {
|
||||||
|
assertion = await navigator.credentials.get({
|
||||||
|
publicKey: credentialRequestOptions
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
toastr.error("An error occurred when we trying to verify your key.");
|
||||||
|
$("#btnVerifyKey").prop('disabled', false);
|
||||||
|
$("#btnVerifyKey").text('Use your security key');
|
||||||
|
return console.error("Error when trying to get credential:", err);
|
||||||
|
}
|
||||||
|
|
||||||
|
const skAssertion = transformAssertionForServer(assertion);
|
||||||
|
$('#sk_assertion').val(JSON.stringify(skAssertion));
|
||||||
|
$('#formRegisterKey').submit();
|
||||||
|
}
|
||||||
|
|
||||||
|
$("#btnVerifyKey").click(verifyKey);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% endblock %}
|
105
app/auth/views/fido.py
Normal file
105
app/auth/views/fido.py
Normal file
|
@ -0,0 +1,105 @@
|
||||||
|
import json
|
||||||
|
import secrets
|
||||||
|
import webauthn
|
||||||
|
from app.config import URL as SITE_URL
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
from flask import request, render_template, redirect, url_for, flash, session
|
||||||
|
from flask_login import login_user
|
||||||
|
from flask_wtf import FlaskForm
|
||||||
|
from wtforms import HiddenField, validators
|
||||||
|
|
||||||
|
from app.auth.base import auth_bp
|
||||||
|
from app.config import MFA_USER_ID
|
||||||
|
from app.log import LOG
|
||||||
|
from app.models import User
|
||||||
|
from app.extensions import db
|
||||||
|
|
||||||
|
|
||||||
|
class FidoTokenForm(FlaskForm):
|
||||||
|
sk_assertion = HiddenField("sk_assertion", validators=[validators.DataRequired()])
|
||||||
|
|
||||||
|
|
||||||
|
@auth_bp.route("/fido", methods=["GET", "POST"])
|
||||||
|
def fido():
|
||||||
|
# passed from login page
|
||||||
|
user_id = session.get(MFA_USER_ID)
|
||||||
|
|
||||||
|
# user access this page directly without passing by login page
|
||||||
|
if not user_id:
|
||||||
|
flash("Unknown error, redirect back to main page", "warning")
|
||||||
|
return redirect(url_for("auth.login"))
|
||||||
|
|
||||||
|
user = User.get(user_id)
|
||||||
|
|
||||||
|
if not (user and (user.fido_uuid is not None)):
|
||||||
|
flash("Only user with security key linked should go to this page", "warning")
|
||||||
|
return redirect(url_for("auth.login"))
|
||||||
|
|
||||||
|
fido_token_form = FidoTokenForm()
|
||||||
|
|
||||||
|
next_url = request.args.get("next")
|
||||||
|
|
||||||
|
rp_id = urlparse(SITE_URL).hostname
|
||||||
|
|
||||||
|
webauthn_user = webauthn.WebAuthnUser(
|
||||||
|
user.fido_uuid, user.email, user.name, False,
|
||||||
|
user.fido_credential_id, user.fido_pk, user.fido_sign_count, rp_id)
|
||||||
|
|
||||||
|
# Handling POST requests
|
||||||
|
if fido_token_form.validate_on_submit():
|
||||||
|
try:
|
||||||
|
sk_assertion = json.loads(fido_token_form.sk_assertion.data)
|
||||||
|
except Exception as e:
|
||||||
|
flash('Key registration failed. Error: Invalid Payload', "warning")
|
||||||
|
return redirect(url_for("dashboard.index"))
|
||||||
|
|
||||||
|
challenge = session['fido_challenge']
|
||||||
|
credential_id = sk_assertion['id']
|
||||||
|
|
||||||
|
webauthn_assertion_response = webauthn.WebAuthnAssertionResponse(
|
||||||
|
webauthn_user,
|
||||||
|
sk_assertion,
|
||||||
|
challenge,
|
||||||
|
SITE_URL,
|
||||||
|
uv_required=False
|
||||||
|
)
|
||||||
|
|
||||||
|
new_sign_count = False
|
||||||
|
new_sign_count = webauthn_assertion_response.verify()
|
||||||
|
try:
|
||||||
|
pass
|
||||||
|
except Exception as e:
|
||||||
|
flash('Key verification failed. Error: {}'.format(e), "warning")
|
||||||
|
|
||||||
|
if new_sign_count != False:
|
||||||
|
user.fido_sign_count = new_sign_count
|
||||||
|
db.session.commit()
|
||||||
|
del session[MFA_USER_ID]
|
||||||
|
|
||||||
|
login_user(user)
|
||||||
|
flash(f"Welcome back {user.name}!", "success")
|
||||||
|
|
||||||
|
# User comes to login page from another page
|
||||||
|
if next_url:
|
||||||
|
LOG.debug("redirect user to %s", next_url)
|
||||||
|
return redirect(next_url)
|
||||||
|
else:
|
||||||
|
LOG.debug("redirect user to dashboard")
|
||||||
|
return redirect(url_for("dashboard.index"))
|
||||||
|
else:
|
||||||
|
# Verification failed, put else here to make structure clear
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Prepare infomation for key registration process
|
||||||
|
session.pop('challenge', None)
|
||||||
|
challenge = secrets.token_urlsafe(32)
|
||||||
|
|
||||||
|
session['fido_challenge'] = challenge.rstrip('=')
|
||||||
|
|
||||||
|
webauthn_assertion_options = webauthn.WebAuthnAssertionOptions(
|
||||||
|
webauthn_user, challenge)
|
||||||
|
webauthn_assertion_options = webauthn_assertion_options.assertion_dict
|
||||||
|
|
||||||
|
return render_template("auth/fido.html", fido_token_form=fido_token_form,
|
||||||
|
webauthn_assertion_options=webauthn_assertion_options)
|
|
@ -20,7 +20,7 @@
|
||||||
{{ fido_token_form.sk_assertion(class="form-control", placeholder="") }}
|
{{ fido_token_form.sk_assertion(class="form-control", placeholder="") }}
|
||||||
</form>
|
</form>
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<button id="btnRegisterKey" onclick="registerKey($, toastr)" class="btn btn-lg btn-primary mt-2">Register Key</button>
|
<button id="btnRegisterKey" class="btn btn-lg btn-primary mt-2">Register Key</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
|
@ -55,8 +55,8 @@ def fido_setup():
|
||||||
flash('Key registration failed. Error: {}'.format(e), "warning")
|
flash('Key registration failed. Error: {}'.format(e), "warning")
|
||||||
return redirect(url_for("dashboard.index"))
|
return redirect(url_for("dashboard.index"))
|
||||||
|
|
||||||
current_user.fido_pk = fido_uuid
|
current_user.fido_pk = str(fido_credential.public_key, "utf-8")
|
||||||
current_user.fido_uuid = str(fido_credential.public_key, "utf-8")
|
current_user.fido_uuid = fido_uuid
|
||||||
current_user.fido_sign_count = fido_credential.sign_count
|
current_user.fido_sign_count = fido_credential.sign_count
|
||||||
current_user.fido_credential_id = str(fido_credential.credential_id, "utf-8")
|
current_user.fido_credential_id = str(fido_credential.credential_id, "utf-8")
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
Loading…
Reference in a new issue