adding firewall function to firegex!

backend/modules/nfregex/firegex.py

@@ -1,4 +1,3 @@
-from typing import Dict, List, Set
 from modules.nfregex.nftables import FiregexTables
 from utils import ip_parse, run_func
 from modules.nfregex.models import Service, Regex
@@ -56,8 +55,8 @@ class FiregexInterceptor:
     def __init__(self):
         self.srv:Service
         self.filter_map_lock:asyncio.Lock
-        self.filter_map: Dict[str, RegexFilter]
-        self.regex_filters: Set[RegexFilter]
+        self.filter_map: dict[str, RegexFilter]
+        self.regex_filters: set[RegexFilter]
         self.update_config_lock:asyncio.Lock
         self.process:asyncio.subprocess.Process
         self.update_task: asyncio.Task
@@ -118,7 +117,7 @@ class FiregexInterceptor:
             self.process.stdin.write((" ".join(filters_codes)+"\n").encode())
             await self.process.stdin.drain()
 
-    async def reload(self, filters:List[RegexFilter]):
+    async def reload(self, filters:list[RegexFilter]):
         async with self.filter_map_lock:
             self.filter_map = self.compile_filters(filters)
             filters_codes = self.get_filter_codes()
@@ -129,7 +128,7 @@ class FiregexInterceptor:
         filters_codes.sort(key=lambda a: self.filter_map[a].blocked, reverse=True)
         return filters_codes
 
-    def compile_filters(self, filters:List[RegexFilter]):
+    def compile_filters(self, filters:list[RegexFilter]):
         res = {}
         for filter_obj in filters:
             try:

backend/modules/nfregex/firewall.py

@@ -1,5 +1,4 @@
 import asyncio
-from typing import Dict
 from modules.nfregex.firegex import FiregexInterceptor, RegexFilter
 from modules.nfregex.nftables import FiregexTables, FiregexFilter
 from modules.nfregex.models import Regex, Service
@@ -11,49 +10,13 @@ class STATUS:
 
 nft = FiregexTables()
 
-class FirewallManager:
-    def __init__(self, db:SQLite):
-        self.db = db
-        self.service_table: Dict[str, ServiceManager] = {}
-        self.lock = asyncio.Lock()
-
-    async def close(self):
-        for key in list(self.service_table.keys()):
-            await self.remove(key)
-
-    async def remove(self,srv_id):
-        async with self.lock: 
-            if srv_id in self.service_table:
-                await self.service_table[srv_id].next(STATUS.STOP)
-                del self.service_table[srv_id]
-    
-    async def init(self):
-        nft.init()
-        await self.reload()
-
-    async def reload(self):
-        async with self.lock: 
-            for srv in self.db.query('SELECT * FROM services;'):
-                srv = Service.from_dict(srv)
-                if srv.id in self.service_table:
-                    continue
-                self.service_table[srv.id] = ServiceManager(srv, self.db)
-                await self.service_table[srv.id].next(srv.status)
-
-    def get(self,srv_id):
-        if srv_id in self.service_table:
-            return self.service_table[srv_id]
-        else:
-            raise ServiceNotFoundException()
-        
-class ServiceNotFoundException(Exception): pass
 
 class ServiceManager:
     def __init__(self, srv: Service, db):
         self.srv = srv
         self.db = db
         self.status = STATUS.STOP
-        self.filters: Dict[int, FiregexFilter] = {}
+        self.filters: dict[int, FiregexFilter] = {}
         self.lock = asyncio.Lock()
         self.interceptor = None
     
@@ -114,4 +77,41 @@ class ServiceManager:
 
     async def update_filters(self):
         async with self.lock:
-            await self._update_filters_from_db()
+            await self._update_filters_from_db()
+
+class FirewallManager:
+    def __init__(self, db:SQLite):
+        self.db = db
+        self.service_table: dict[str, ServiceManager] = {}
+        self.lock = asyncio.Lock()
+
+    async def close(self):
+        for key in list(self.service_table.keys()):
+            await self.remove(key)
+
+    async def remove(self,srv_id):
+        async with self.lock: 
+            if srv_id in self.service_table:
+                await self.service_table[srv_id].next(STATUS.STOP)
+                del self.service_table[srv_id]
+    
+    async def init(self):
+        nft.init()
+        await self.reload()
+
+    async def reload(self):
+        async with self.lock: 
+            for srv in self.db.query('SELECT * FROM services;'):
+                srv = Service.from_dict(srv)
+                if srv.id in self.service_table:
+                    continue
+                self.service_table[srv.id] = ServiceManager(srv, self.db)
+                await self.service_table[srv.id].next(srv.status)
+
+    def get(self,srv_id) -> ServiceManager:
+        if srv_id in self.service_table:
+            return self.service_table[srv_id]
+        else:
+            raise ServiceNotFoundException()
+        
+class ServiceNotFoundException(Exception): pass

backend/modules/nfregex/nftables.py

@@ -1,4 +1,3 @@
-from typing import List
 from modules.nfregex.models import Service
 from utils import ip_parse, ip_family, NFTableManager, nftables_int_to_json
 
@@ -11,9 +10,7 @@ class FiregexFilter:
         self.ip_int = str(ip_int)
 
     def __eq__(self, o: object) -> bool:
-        if isinstance(o, FiregexFilter):
-            return self.port == o.port and self.proto == o.proto and ip_parse(self.ip_int) == ip_parse(o.ip_int)
-        elif isinstance(o, Service):
+        if isinstance(o, FiregexFilter) or isinstance(o, Service):
             return self.port == o.port and self.proto == o.proto and ip_parse(self.ip_int) == ip_parse(o.ip_int)
         return False
 
@@ -80,7 +77,7 @@ class FiregexTables(NFTableManager):
         }}})
 
 
-    def get(self) -> List[FiregexFilter]:
+    def get(self) -> list[FiregexFilter]:
         res = []
         for filter in self.list_rules(tables=[self.table_name], chains=[self.input_chain,self.output_chain]):
             ip_int = None