Hopiu/django-defender
1
0
Fork 0
mirror of https://github.com/jazzband/django-defender.git synced 2026-03-16 22:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup the boolean logic around is_already_locked()

Browse source
This commit is contained in:
Ken Cochrane 2015-10-23 15:00:56 -04:00
parent 6e2ea2b94a
commit 6b91730722
1 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
defender/utils.py
View file

@ -280,28 +280,13 @@ def is_already_locked(request):
username = request.POST.get(config.USERNAME_FORM_FIELD, None)
user_blocked = REDIS_SERVER.get(get_username_blocked_cache_key(username))
if config.DISABLE_IP_LOCKOUT:
# if DISABLE_IP_LOCKOUT is turned on, then return user_blocked
# result, since we don't care about ip at this point.
return user_blocked
if config.LOCKOUT_BY_IP_USERNAME:
LOG.info("Block by ip & username")
if ip_blocked and user_blocked:
# if both this IP and this username are present the request is
# blocked
return True
# if both this IP and this username are present the request is
# blocked
return ip_blocked and user_blocked
else:
if ip_blocked:
# short circuit no need to check username if ip is already blocked.
return True
if user_blocked:
return True
# if the username nor ip is blocked, the request is not blocked
return False
return ip_blocked or user_blocked
def check_request(request, login_unsuccessful):