kiichan/django-sqrl-2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Misc updates

Browse source
This commit is contained in:
= 2019-09-04 21:08:57 -05:00
parent 25ef7b5675
commit f000e564f9
Signed by: kiichan
GPG key ID: 619DFD67F0976616
10 changed files with 183 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sqrl/static/sqrl/sqrl.js
View file

@ -1,5 +1,16 @@
(function() {
var get_next_url = function() {
// A Next defined in the URL has priority
var urlparam = document.URL.match(/next=([^&#]+)/)
if (urlparam.length == 2) {
return urlparam[1]
}
// Next highest priority is a defined SQRL_NEXT
if (typeof SQRL_NEXT !== "undefined") {
return SQRL_NEXT
}
// Lowest priority is the first input element
// named "next", otherwise return null
var input = document.querySelectorAll('input[name="next"]');
return input.length > 0 ? input[0].value : null;
},

10
sqrl/templates/admin/auth/user/sqrl_manage.html
View file

@ -60,13 +60,13 @@
</p>
{% endif %}
{% sqrl as session_sqrl %}
{% sqrl as sqrl_session %}
<fieldset class="module aligned">
<div class="sqrl-wrap">
SQRL Login
<a href="{{ session_sqrl.sqrl_url }}">
<div id="sqrl-qr" data-sqrl="{{ session_sqrl.sqrl_url }}"></div>
<a href="{{ sqrl_session.sqrl_url }}">
<div id="sqrl-qr" data-sqrl="{{ sqrl_session.sqrl_url }}"></div>
</a>
<a href="https://www.grc.com/sqrl/sqrl.htm">What is SQRL?</a>
{# redirect to manage page after successful SQRL transaction #}
@ -74,9 +74,9 @@
</div>
</fieldset>
<form method="get" action="{{ session_sqrl.sqrl_url }}" class="sqrl">
<form method="get" action="{{ sqrl_session.sqrl_url }}" class="sqrl">
<div class="submit-row">
<input type="hidden" name="nut" value="{{ session_sqrl.nut.nonce }}">
<input type="hidden" name="nut" value="{{ sqrl_session.nut.nonce }}">
<input type="submit" value="Manage SQRL" class="default" style="float: left;">
</div>
</form>

12
sqrl/templates/admin/login.html
View file

@ -57,9 +57,9 @@
</div>
</form>
{% sqrl as session_sqrl %}
{% sqrl as sqrl_session %}
<form method="get" action="{{ session_sqrl.sqrl_url }}" class="sqrl">
<form method="get" action="{{ sqrl_session.sqrl_url }}" class="sqrl">
<p class="align-center or">
<span class="line-center">or</span>
</p>
@ -69,21 +69,21 @@
<div class="sqrl-wrap">
SQRL Login
<a href="{{ session_sqrl.sqrl_url }}">
<div id="sqrl-qr" data-sqrl="{{ session_sqrl.sqrl_url }}"></div>
<a href="{{ sqrl_session.sqrl_url }}">
<div id="sqrl-qr" data-sqrl="{{ sqrl_session.sqrl_url }}"></div>
</a>
<a href="https://www.grc.com/sqrl/sqrl.htm">What is SQRL?</a>
</div>
<div class="submit-row">
<input type="hidden" name="nut" value="{{ session_sqrl.nut.nonce }}">
<input type="hidden" name="nut" value="{{ sqrl_session.nut.nonce }}">
<input type="submit" value="{% trans 'Log in using SQRL' %}"/>
</div>
</div>
</form>
<script type="text/javascript">
SQRL_CHECK_URL="{% sqrl_status_url_script_tag session_sqrl %}"
SQRL_CHECK_URL="{% sqrl_status_url_script_tag sqrl_session %}"
document.getElementById('id_username').focus()
</script>
<script type="application/javascript" src="{% static 'sqrl/sqrl.js' %}"></script>

4
sqrl/templates/sqrl/login.html
View file

@ -11,8 +11,8 @@
Please use via SQRL using the information below.
</p>
{% sqrl as session_sqrl %}
{% sqrl_login_dropin session_sqrl login %}
{% sqrl as sqrl_session %}
{% sqrl_login_dropin sqrl_session login %}
{% endblock %}
{% comment %}

4
sqrl/templates/sqrl/manage.html
View file

@ -32,8 +32,8 @@
</p>
{% endif %}
{% sqrl as session_sqrl %}
{% sqrl_login_dropin session_sqrl method="manage" %}
{% sqrl as sqrl_session %}
{% sqrl_login_dropin sqrl_session method="manage" %}
{% endblock %}
{% block scripts %}

10
sqrl/templates/sqrl/sqrl-dropin.html
View file

@ -18,19 +18,19 @@
}
</style>
<div>
<form method="get" action="{{ session_sqrl.sqrl_url }}">
<form method="get" action="{{ sqrl_session.sqrl_url }}">
<div class="sqrl-wrap">
SQRL Login
<a href="{{ session_sqrl.sqrl_url }}">
<div id="sqrl-qr" data-sqrl="{{ session_sqrl.sqrl_url }}"></div>
<a href="{{ sqrl_session.sqrl_url }}">
<div id="sqrl-qr" data-sqrl="{{ sqrl_session.sqrl_url }}"></div>
</a>
<a href="https://www.grc.com/sqrl/sqrl.htm">What is SQRL?</a>
</div>
<input type="hidden" name="nut" value="{{ session_sqrl.nut.nonce }}">
<input type="hidden" name="nut" value="{{ sqrl_session.nut.nonce }}">
<input type="hidden" name="next" value="{{ redir }}">
<input type="submit" value="Authenticate using SQRL">
</form>
</div>
<script>SQRL_CHECK_URL="{% sqrl_status_url_script_tag session_sqrl %}"</script>
<script>SQRL_NEXT="{{ redir }}"; SQRL_CHECK_URL="{% sqrl_status_url_script_tag sqrl_session %}"</script>
<script type="application/javascript" src="{% static 'sqrl/sqrl.js' %}"></script>

10
sqrl/templatetags/sqrl.py
View file

@ -15,25 +15,25 @@ def sqrl(context):
@register.inclusion_tag('sqrl/sqrl-dropin.html')
def sqrl_login_dropin(session_sqrl, redir):
def sqrl_login_dropin(sqrl_session, redir=""):
"""
Creates a drop-in SQRL element in your template pages.
Add it to your login template to make it SQRL-aware.
Usage:
{% load sqrl %}
{% sqrl as session_sqrl %}
{% sqrl_login_dropin session_sqrl REDIR %}
{% sqrl as sqrl_session %}
{% sqrl_login_dropin sqrl_session REDIR %}
REDIR is the registered name of the page to move to once the login
is completed.
is completed. It can be blank to not define a redirection.
Notes:
The drop-in is defaulted to a max-width of 300px. Set the width
property of the parent if you want or need it smaller. You will
likely want to change the font-size as well in this case.
"""
return {'session_sqrl':session_sqrl, 'redir': reverse(redir)}
return {'sqrl_session':sqrl_session, 'redir': reverse(redir)}
@register.simple_tag