From 685ed0c22e1ef630d63cd5ca517e5c849c6b2157 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 9 Jun 2021 15:27:35 +0100
Subject: [PATCH] Tidying

---
 auth.py   | 27 +++++++++++++++++++++++++++
 daemon.py | 33 ++++++---------------------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/auth.py b/auth.py
index 5d3dbdf8e..ae5755167 100644
--- a/auth.py
+++ b/auth.py
@@ -204,3 +204,30 @@ def createPassword(length=10):
     validChars = 'abcdefghijklmnopqrstuvwxyz' + \
         'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
     return ''.join((secrets.choice(validChars) for i in range(length)))
+
+
+def recordLoginFailure(ipAddress: str, countDict: {}, failTime: int) -> None:
+    """Keeps ip addresses and the number of times login failures
+    occured for them in a dict
+    """
+    if not countDict.get(ipAddress):
+        while len(countDict.items()) > 100:
+            oldestTime = 0
+            oldestIP = None
+            for ipAddr, ipItem in countDict.items():
+                if oldestTime == 0 or ipItem['time'] < oldestTime:
+                    oldestTime = ipItem['time']
+                    oldestIP = ipAddr
+            if oldestIP:
+                del countDict[oldestIP]
+        countDict[ipAddress] = {
+            "count": 1,
+            "time": failTime
+        }
+    else:
+        countDict[ipAddress]['count'] += 1
+        failCount = countDict[ipAddress]['count']
+        if failCount > 4:
+            print('WARN: ' + str(ipAddress) + ' failed to log in ' +
+                  str(failCount) + ' times')
+        countDict[ipAddress]['time'] = failTime
diff --git a/daemon.py b/daemon.py
index e2420666c..16d68c616 100644
--- a/daemon.py
+++ b/daemon.py
@@ -101,6 +101,7 @@ from skills import noOfActorSkills
 from skills import actorHasSkill
 from skills import actorSkillValue
 from skills import setActorSkillLevel
+from auth import recordLoginFailure
 from auth import authorize
 from auth import createPassword
 from auth import createBasicAuthHeader
@@ -1442,7 +1443,8 @@ class PubServer(BaseHTTPRequestHandler):
                 ipAddress = self.headers['X-Forwarded-For']
             else:
                 ipAddress = self.client_address[0]
-            print('Login attempt from IP: ' + str(ipAddress))
+            if not isLocalNetworkAddress(ipAddress):
+                print('Login attempt from IP: ' + str(ipAddress))
             if not authorizeBasic(baseDir, '/users/' +
                                   loginNickname + '/outbox',
                                   authHeader, False):
@@ -1451,32 +1453,9 @@ class PubServer(BaseHTTPRequestHandler):
                 failTime = int(time.time())
                 self.server.lastLoginFailure = failTime
                 if not isLocalNetworkAddress(ipAddress):
-                    countDict = self.server.loginFailureCount
-                    if not countDict.get(ipAddress):
-                        while len(countDict.items()) > 100:
-                            oldestTime = 0
-                            oldestIP = None
-                            for ipAddr, ipItem in countDict.items():
-                                if oldestTime == 0 or \
-                                   ipItem['time'] < oldestTime:
-                                    oldestTime = ipItem['time']
-                                    oldestIP = ipAddr
-                            if oldestTime > 0:
-                                del countDict[oldestIP]
-                        countDict[ipAddress] = {
-                            "count": 1,
-                            "time": failTime
-                        }
-                    else:
-                        countDict[ipAddress]['count'] += 1
-                        failCount = \
-                            countDict[ipAddress]['count']
-                        if failCount > 4:
-                            print('WARN: ' + str(ipAddress) +
-                                  ' failed to log in ' +
-                                  str(failCount) + ' times')
-                        countDict[ipAddress]['time'] = \
-                            failTime
+                    recordLoginFailure(ipAddress,
+                                       self.server.loginFailureCount,
+                                       failTime)
                 self.server.POSTbusy = False
                 return
             else: