mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-20 10:58:33 +00:00
Fix tests
This commit is contained in:
@@ -47,7 +47,7 @@ def log_user_in(request, user, redirect_to):
|
|||||||
if request.session.test_cookie_worked():
|
if request.session.test_cookie_worked():
|
||||||
request.session.delete_test_cookie()
|
request.session.delete_test_cookie()
|
||||||
|
|
||||||
_clear_login_failed_attempts(request)
|
_clear_login_failed_attempts(request, user)
|
||||||
|
|
||||||
if two_factor_auth_enabled(user):
|
if two_factor_auth_enabled(user):
|
||||||
return handle_two_factor_auth(request, user, redirect_to)
|
return handle_two_factor_auth(request, user, redirect_to)
|
||||||
@@ -105,14 +105,15 @@ def _incr_login_failed_attempts(username=None, ip=None):
|
|||||||
|
|
||||||
return max(username_attempts, ip_attempts)
|
return max(username_attempts, ip_attempts)
|
||||||
|
|
||||||
def _clear_login_failed_attempts(request):
|
def _clear_login_failed_attempts(request, user):
|
||||||
"""Clear login failed attempts records.
|
"""Clear login failed attempts records.
|
||||||
|
|
||||||
Arguments:
|
Arguments:
|
||||||
- `request`:
|
- `request`:
|
||||||
"""
|
"""
|
||||||
username = request.user.username
|
username = user.username
|
||||||
ip = get_remote_ip(request)
|
ip = get_remote_ip(request)
|
||||||
|
|
||||||
cache.delete(LOGIN_ATTEMPT_PREFIX + urlquote(username))
|
cache.delete(LOGIN_ATTEMPT_PREFIX + urlquote(username))
|
||||||
cache.delete(LOGIN_ATTEMPT_PREFIX + ip)
|
cache.delete(LOGIN_ATTEMPT_PREFIX + ip)
|
||||||
p = Profile.objects.get_profile_by_user(username)
|
p = Profile.objects.get_profile_by_user(username)
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
{% extends "admin_base.html" %}
|
{% extends "sysadmin/base.html" %}
|
||||||
{% load i18n seahub_tags %}
|
{% load i18n seahub_tags %}
|
||||||
|
|
||||||
{% block nav_orgadmin_class %}class="cur"{% endblock %}
|
{% block nav_orgadmin_class %}class="cur"{% endblock %}
|
||||||
|
Reference in New Issue
Block a user