add a fix so that we don't block an empty IP or username

jazzband · Feb 1, 2015 · 88c388e · 88c388e
1 parent 8ee8f3c
commit 88c388e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/defender/tests.py b/defender/tests.py
@@ -21,7 +21,8 @@
 
 # Django >= 1.7 compatibility
 try:
-    LOGIN_FORM_KEY = '<form action="/admin/login/" method="post" id="login-form">'
+    LOGIN_FORM_KEY = '<form action="/admin/login/" method="post"'
+    ' id="login-form">'
     ADMIN_LOGIN_URL = reverse('admin:login')
 except NoReverseMatch:
     ADMIN_LOGIN_URL = reverse('admin:index')

diff --git a/defender/utils.py b/defender/utils.py
@@ -162,6 +162,9 @@ def get_user_attempts(request):
 
 def block_ip(ip):
     """ given the ip, block it """
+    if not ip:
+        # no reason to continue when there is no ip
+        return
     key = get_ip_blocked_cache_key(ip)
     if config.COOLOFF_TIME:
         redis_server.set(key, 'blocked', config.COOLOFF_TIME)
@@ -171,6 +174,9 @@ def block_ip(ip):
 
 def block_username(username):
     """ given the username block it. """
+    if not username:
+        # no reason to continue when there is no username
+        return
     key = get_username_blocked_cache_key(username)
     if config.COOLOFF_TIME:
         redis_server.set(key, 'blocked', config.COOLOFF_TIME)