Converted from Enigma 1/2 to Synchronet

  This will now monitor the hack.log file for your bbs.

config.py

@@ -10,7 +10,7 @@ import pendulum
 currentdir = dirname(abspath(__file__))
 
 # Target log file
-TARGET = join("bbs", join("logs", "enigma-bbs.log"))
+TARGET = join("data", join("data", "hack.log"))
 
 # Setup logging
 # DEBUG, INFO, WARN, ERROR, CRITICAL
@@ -38,8 +38,8 @@ def load_config():
     if not exists("failUser.cfg"):
         now = pendulum.now().to_datetime_string()
         defaults = {
-            # Target enigma logs
-            "target": "bbs/logs/enigma-bbs.log",
+            # Target hack logs
+            "target": "data/data/hack.log",
             # block_time in hours
             "block_time": 4,
             # Last unblock
@@ -51,6 +51,7 @@ def load_config():
                 "mysql",
                 "apache",
                 "nginx",
+                "admin"
             ],
         }
         save_config(defaults)
@@ -69,6 +70,9 @@ def add_block(ip, time):
     except FileNotFoundError:
         blocks = {}
         pass
+    except JSONDecodeError:
+        blocks = {}
+        pass
     # add ip and time
     #log.debug("Added {0} in blocks.json".format(ip))
     blocks[ip] = time
@@ -83,6 +87,8 @@ def rm_block(ip):
             blocks = loads(f.read())
     except FileNotFoundError:
         return
+    except JSONDecodeError:
+        return
     try:
         if blocks[ip]:
             #log.debug("Removed {0} in blocks.json".format(ip))
@@ -91,7 +97,7 @@ def rm_block(ip):
         with open("blocks.json", "w") as f:
             f.write(dumps(blocks))
     except KeyError:
-        log.debug("Unable to unblock '{0}'".format(ip))
+        log.error("Unable to unblock '{0}'".format(ip))
 
 def check_blocks():
     # return a list of ips exceeding block_time in config

failUser.py

@@ -35,20 +35,38 @@ def unblocker(ip):
     #run(["iptables", "-D", "DOCKER-USER", "-i", "eth0", "-s", ip, "-j", "DROP"], stdout=PIPE, check=True)
     print("iptables -D DOCKER-USER -i eth0 -s {0} -j DROP".format(ip))
 
+# def is_bad(line):
+#     # Given line, attempt to parse... then is there a issue with it
+#     # Returns a python dict with ip and time in log
+#     if line: # Do we actually have something?
+#         try:
+#             j = loads(line)
+#             #if j["msg"] == "Attempt to login with banned username":
+#             if j["username"] in bad_users:
+#                 r = {}
+#                 r["ip"] = "{0}".format(j["ip"][7:])
+#                 r["time"] = j["time"]
+#                 return r
+#         except JSONDecodeError:
+#             log.error("Failed to decode line, '{0}'".format(line))
+
+struct = {}
+state = 0
 def is_bad(line):
-    # Given line, attempt to parse... then is there a issue with it
-    # Returns a python dict with ip and time in log
-    if line: # Do we actually have something?
-        try:
-            j = loads(line)
-            #if j["msg"] == "Attempt to login with banned username":
-            if j["username"] in bad_users:
-                r = {}
-                r["ip"] = "{0}".format(j["ip"][7:])
-                r["time"] = j["time"]
-                return r
-        except JSONDecodeError:
-            log.error("Failed to decode line, '{0}'".format(line))
+    global state, struct
+    if state == 0 and line.startswith("SUSPECTED"):
+        _, user, at = line.split("'")
+        at = at.replace(" on ", "")
+        struct = {"user": user.lower(), "time": at}
+        state = 1
+        print(struct)
+    elif state == 1 and line.startswith("Using port"):
+        _, ip = line.split("[")
+        ip = ip.replace("]", "")
+        struct["ip"] = ip
+        state = 0
+        print(struct)
+        return struct
 
 def checkup():
     # Check all our blocks