drop stream on udp (due to missing method to keep stream) + ack on reload config

backend/binsrc/nfqueue.cpp

@@ -33,9 +33,10 @@ void config_updater (){
 		try{
 			regex_config.reset(new RegexRules(raw_rules, regex_config->stream_mode()));
 			cerr << "[info] [updater] Config update done to ver "<< regex_config->ver() << endl;
-		}catch(...){
+			cout << "ACK OK" << endl;
+		}catch(const std::exception& e){
 			cerr << "[error] [updater] Failed to build new configuration!" << endl;
-			// TODO send a row on stdout for this error
+			cout << "ACK FAIL " << e.what() << endl;
 		}
 	}
 	
@@ -110,7 +111,9 @@ bool filter_callback(packet_info& info){
                 cerr << "[error] [filter_callback] Error opening the stream matcher (hs)" << endl;
                 throw invalid_argument("Cannot open stream match on hyperscan");
             }
+			if (info.is_tcp){
 				match_map->insert_or_assign(info.sid, stream_match);
+			}
 		}else{
 			stream_match = stream_search->second;
 		}
@@ -130,6 +133,13 @@ bool filter_callback(packet_info& info){
 			0, scratch_space, match_func, &match_res
 		);
 	}
+	if (
+		!info.is_tcp && conf->stream_mode() && 
+		hs_close_stream(stream_match, scratch_space, nullptr, nullptr) != HS_SUCCESS
+	){
+		cerr << "[error] [filter_callback] Error closing the stream matcher (hs)" << endl;
+		throw invalid_argument("Cannot close stream match on hyperscan");
+	}
 	if (err != HS_SUCCESS && err != HS_SCAN_TERMINATED) {
 		cerr << "[error] [filter_callback] Error while matching the stream (hs)" << endl;
 		throw invalid_argument("Error while matching the stream with hyperscan");

backend/modules/nfregex/firegex.py

@@ -6,6 +6,7 @@ import os
 import asyncio
 import traceback
 from utils import DEBUG
+from fastapi import HTTPException
 
 nft = FiregexTables()
 
@@ -64,6 +65,10 @@ class FiregexInterceptor:
         self.update_config_lock:asyncio.Lock
         self.process:asyncio.subprocess.Process
         self.update_task: asyncio.Task
+        self.ack_arrived = False
+        self.ack_status = None
+        self.ack_fail_what = ""
+        self.ack_lock = asyncio.Lock()
     
     @classmethod
     async def start(cls, srv: Service):
@@ -74,6 +79,8 @@ class FiregexInterceptor:
         queue_range = await self._start_binary()
         self.update_task = asyncio.create_task(self.update_blocked())
         nft.add(self.srv, queue_range)
+        if not self.ack_lock.locked():
+            await self.ack_lock.acquire()
         return self
     
     async def _start_binary(self):
@@ -103,12 +110,18 @@ class FiregexInterceptor:
                 line = (await self.process.stdout.readuntil()).decode()
                 if DEBUG:
                     print(line)
-                if line.startswith("BLOCKED"):
+                if line.startswith("BLOCKED "):
                     regex_id = line.split()[1]
                     async with self.filter_map_lock:
                         if regex_id in self.filter_map:
                             self.filter_map[regex_id].blocked+=1
                             await self.filter_map[regex_id].update()
+                if line.startswith("ACK "):
+                    self.ack_arrived = True
+                    self.ack_status = line.split()[1].upper() == "OK"
+                    if not self.ack_status:
+                        self.ack_fail_what = " ".join(line.split()[2:])
+                    self.ack_lock.release()
         except asyncio.CancelledError:
             pass
         except asyncio.IncompleteReadError:
@@ -125,6 +138,14 @@ class FiregexInterceptor:
         async with self.update_config_lock:
             self.process.stdin.write((" ".join(filters_codes)+"\n").encode())
             await self.process.stdin.drain()
+            try:
+                async with asyncio.timeout(3):
+                    await self.ack_lock.acquire()
+            except TimeoutError:
+                pass
+            if not self.ack_arrived or not self.ack_status:
+                raise HTTPException(status_code=500, detail=f"NFQ error: {self.ack_fail_what}")
+            
 
     async def reload(self, filters:list[RegexFilter]):
         async with self.filter_map_lock:

backend/routers/nfregex.py

@@ -89,12 +89,18 @@ async def reset(params: ResetRequest):
         db.init()
     else:
         db.restore()
+    try:
         await firewall.init()
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
     
 
 async def startup():
     db.init()
+    try:
         await firewall.init()
+    except Exception as e:
+        print("WARNING cannot start firewall:", e)
 
 async def shutdown():
     db.backup()