gateway: fix IPv6 unban and report delivery failure

gateway/usr/share/eterban/eterban_switcher.py

@@ -380,13 +380,16 @@ def process_message(message):
     elif message is not None and message['type'] =='message' and message['channel'] == b'unban' :
         print (message)
         ip = message['data'].decode('utf-8')
-        ipo = ipaddress.ip_network(ip, strict=False)
-        if isinstance(ipo, ipaddress.IPv6Address):
+        try:
+            ipo = ipaddress.ip_network(ip, strict=False)
+        except ValueError:
+            log.write("Not parsed as IP, skipped " + str(ip) + '\n')
+            log.flush()
+            return
+        if isinstance(ipo, ipaddress.IPv6Network):
             unban = 'ipset -D ' + ipset_eterban_1_ipv6 + ' ' + ip
         elif isinstance(ipo, ipaddress.IPv4Network):
             unban = 'ipset -D ' + ipset_eterban_1 + ' ' + ip
-        else:
-            log.write("Not parsed as IP, skipped " + str(ip) + '\n')
         #add   = 'ipset -A ' + ipset_eterban_white + ' ' + ip
         subprocess.call (unban, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell = True)
         #subprocess.call (add, shell = True)

gateway/usr/share/eterban/unban.py

@@ -34,8 +34,12 @@ if not ip:
 
 try:
     r = redis.Redis (host=redis_server)
-    r.publish ('unban', ip)
+    subscribers = r.publish ('unban', ip)
+    if subscribers == 0:
+        print("No eterban Redis subscribers; IP was not unblocked")
+        sys.exit(1)
     message = ip + " was unblocked by admin on " + hostname
     r.publish ('by', message)
-except:
-    print("Error with connect to redis " + redis_server)
+except Exception as error:
+    print("Error with connect to redis " + redis_server + ": " + str(error))
+    sys.exit(1)