Check if host is denied before verifying password

2016-05-04 19:02:53 +01:00
parent 33c1144e2e
commit 944d8bd8f3
2 changed files with 9 additions and 2 deletions
@@ -104,13 +104,12 @@ def write_hosts_deny(denied_hosts):
    portalocker.unlock(f)
    f.close()

-
 def login_record(success=True):
    denied_hosts = read_hosts_deny()
    val = (0, 0)
    if success and request.client in denied_hosts:
        del denied_hosts[request.client]
-    elif not success and not request.is_local:
+    elif not success:
        val = denied_hosts.get(request.client, (0, 0))
        if time.time() - val[1] < expiration_failed_logins \
            and val[0] >= allowed_number_of_attempts:
@@ -121,6 +120,11 @@ def login_record(success=True):
    write_hosts_deny(denied_hosts)
    return val[0]

+def failed_login_count():
+    denied_hosts = read_hosts_deny()
+    val = denied_hosts.get(request.client, (0, 0))
+    return val[0]
+

 # ###########################################################
 # ## session expiration