From edf1a4fb1f880d6fd8ba08e7a7e668693717cbd8 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sun, 25 Apr 2021 09:23:02 +0200
Subject: [PATCH] [Netfilter] Exit on log line error in pubsub

---
 data/Dockerfiles/netfilter/server.py | 40 +++++++++++++++-------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/data/Dockerfiles/netfilter/server.py b/data/Dockerfiles/netfilter/server.py
index 38c1ba9c..4b80851c 100644
--- a/data/Dockerfiles/netfilter/server.py
+++ b/data/Dockerfiles/netfilter/server.py
@@ -309,26 +309,30 @@ def watch():
   logInfo('Watching Redis channel F2B_CHANNEL')
   pubsub.subscribe('F2B_CHANNEL')
 
+  global quit_now
+  global exit_code
+
   while not quit_now:
+    try:
       for item in pubsub.listen():
-        try:
-          refreshF2bregex()
-          for rule_id, rule_regex in f2bregex.items():
-            if item['data'] and item['type'] == 'message':
-              try:
-                result = re.search(rule_regex, item['data'])
-              except re.error:
-                result = False
-              if result:
-                addr = result.group(1)
-                ip = ipaddress.ip_address(addr)
-                if ip.is_private or ip.is_loopback:
-                  continue
-                logWarn('%s matched rule id %s (%s)' % (addr, rule_id, item['data']))
-                ban(addr)
-        except Exception as ex:
-          logWarn('Could not read logline from pubsub, skipping...')
-          continue
+        refreshF2bregex()
+        for rule_id, rule_regex in f2bregex.items():
+          if item['data'] and item['type'] == 'message':
+            try:
+              result = re.search(rule_regex, item['data'])
+            except re.error:
+              result = False
+            if result:
+              addr = result.group(1)
+              ip = ipaddress.ip_address(addr)
+              if ip.is_private or ip.is_loopback:
+                continue
+              logWarn('%s matched rule id %s (%s)' % (addr, rule_id, item['data']))
+              ban(addr)
+    except Exception as ex:
+      logWarn('Error reading log line from pubsub')
+      quit_now = True
+      exit_code = 2
 
 def snat4(snat_target):
   global lock