Now including Timezone in with datetime

  Yup we had a Timezone issue with pendulum... so now we should properly
ban then unban at the correct 4 hour mark... and check that too every
hour.

config.py

@@ -62,7 +62,7 @@ def add_block(ip, time):
         blocks = {}
         pass
     # add ip and time
-    log.debug("Added {0} in blocks.json".format(ip))
+    #log.debug("Added {0} in blocks.json".format(ip))
     blocks[ip] = time
     # update blocks
     with open("blocks.json", "w") as f:
@@ -77,7 +77,7 @@ def rm_block(ip):
         return
     try:
         if blocks[ip]:
-            log.debug("Removed {0} in blocks.json".format(ip))
+            #log.debug("Removed {0} in blocks.json".format(ip))
             del blocks[ip]
         # update blocks
         with open("blocks.json", "w") as f:
@@ -98,8 +98,8 @@ def check_blocks():
     now = pendulum.now()
     for ip in blocks:
         dt = pendulum.parse(blocks[ip])
-        # log.debug("IP={0} TIME_LEFT={1}".format(ip, abs(now.diff(dt, False).in_hours())))
-        if abs(now.diff(dt, False).in_hours()) > conf["block_time"]:
+        #log.debug("IP={0} TIME_LEFT={1}".format(ip, abs(now.diff(dt, False).in_hours())))
+        if now.diff(dt).in_hours() > conf["block_time"]:
             # Oops, this ip needs to be unblocked
             result.append(ip)
     if result:

failUser.py

@@ -22,13 +22,13 @@ dirmask = IN_MODIFY | IN_DELETE | IN_MOVE_SELF | IN_CREATE
 
 def blocker(ip):
     # Utility function to block given ip as string
-    run(["iptables", "-I", "DOCKER-USER", "-i", "eth0", "-s", ip, "-j", "DROP"], stdout=PIPE, check=True)
-    # print("iptables -I DOCKER-USER -i eth0 -s {0} -j DROP".format(ip))
+    #run(["iptables", "-I", "DOCKER-USER", "-i", "eth0", "-s", ip, "-j", "DROP"], stdout=PIPE, check=True)
+    print("iptables -I DOCKER-USER -i eth0 -s {0} -j DROP".format(ip))
 
 def unblocker(ip):
     # Utility function to unblock given ip as string
-    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))
+    #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
@@ -63,7 +63,7 @@ class EventHandler(ProcessEvent):
             luser = is_bad(TARGET.readline().rstrip())
             if(luser):
                 blocker(luser["ip"])
-                now = pendulum.now().to_datetime_string()
+                now = pendulum.now().to_atom_string()
                 log.info("Blocked {0} at {1}".format(luser["ip"], now))
                 add_block(luser["ip"], now)
 
@@ -72,6 +72,7 @@ class EventHandler(ProcessEvent):
         log.debug("Log file moved... continuing read on stale log!")
 
     def process_IN_CREATE(self, event):
+        global TARGET
         if myfile in join(event.path, event.name):
             TARGET.close()
             TARGET = open(myfile, 'r')
@@ -80,7 +81,7 @@ class EventHandler(ProcessEvent):
                 luser = is_bad(line.rstrip())
                 if(luser):
                     blocker(luser["ip"])
-                    now = pendulum.now().to_datetime_string()
+                    now = pendulum.now().to_atom_string()
                     log.info("Blocked {0} at {1}".format(luser["ip"], now))
                     add_block(luser["ip"], now)
             TARGET.seek(0,2)
@@ -94,8 +95,8 @@ while True:
     try:
         now = pendulum.now()
         last = pendulum.parse(myConfig["last_unblock"])
-        if now.diff(last).in_hours():
-            myConfig["last_unblock"] = now.to_datetime_string()
+        if now.diff(last).in_hours() > 1:
+            myConfig["last_unblock"] = now.to_atom_string()
             save_config(myConfig)
             checkup()
         notifier.process_events()