github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 修改登录验证

pull/3428/head
ibuler 2019-11-11 10:58:11 +08:00
parent 9e4874834f
commit 74f22274b4
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/authentication/templates/authentication/login_wait_confirm.html
View File

@ -81,7 +81,9 @@ function doRequestAuth() {
url: url, url: url,
method: "GET", method: "GET",
success: function (data) { success: function (data) {
if (data.error !== "login_confirm_wait") { if (!data.error && data.msg === 'ok') {
window.location = "{% url 'authentication:login-guard' %}"
} else if (data.error !== "login_confirm_wait") {
if (!errorMsgShow) { if (!errorMsgShow) {
infoMsgRef.hide(); infoMsgRef.hide();
errorMsgRef.show(); errorMsgRef.show();
@ -90,11 +92,7 @@ function doRequestAuth() {
} }
clearInterval(interval); clearInterval(interval);
clearInterval(checkInterval); clearInterval(checkInterval);
$(".copy-btn").attr('disabled', 'disabled') $(".copy-btn").attr('disabled', 'disabled');
}
if (data.msg === 'ok' && !data.error) {
window.location = "{% url 'authentication:login-guard' %}"
} else {
errorMsgRef.html(data.msg) errorMsgRef.html(data.msg)
} }
}, },

2
apps/authentication/templates/authentication/xpack_login.html
View File

@ -85,6 +85,8 @@
</div> </div>
{% elif form.errors.captcha %} {% elif form.errors.captcha %}
<p class="red-fonts">{% trans 'Captcha invalid' %}</p> <p class="red-fonts">{% trans 'Captcha invalid' %}</p>
{% else %}
<div style="height: 50px"></div>
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">

5
apps/authentication/views/login.py
View File

@ -22,7 +22,6 @@ from common.utils import get_request_ip, get_object_or_none
from users.utils import ( from users.utils import (
redirect_user_first_login_or_index redirect_user_first_login_or_index
) )
from ..signals import post_auth_success, post_auth_failed
from .. import forms, mixins, errors from .. import forms, mixins, errors
@ -75,7 +74,9 @@ class UserLoginView(mixins.AuthMixin, FormView):
form.add_error(None, e.msg) form.add_error(None, e.msg)
ip = self.get_request_ip() ip = self.get_request_ip()
cache.set(self.key_prefix_captcha.format(ip), 1, 3600) cache.set(self.key_prefix_captcha.format(ip), 1, 3600)
context = self.get_context_data(form=form) new_form = self.form_class_captcha(data=form.data)
new_form._errors = form.errors
context = self.get_context_data(form=new_form)
return self.render_to_response(context) return self.render_to_response(context)
return self.redirect_to_guard_view() return self.redirect_to_guard_view()