0xb00b5/firegex-traffic-viewer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using also bridge table on network hooking

Browse Source
This commit is contained in:
Domingo Dirutigliano
2025-04-12 16:51:42 +02:00
parent c22892b97f
commit 33b22a174c
7 changed files with 71 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
backend/modules/nfproxy/nftables.py
View File

@@ -10,7 +10,8 @@ def convert_protocol_to_l4(proto:str):
raise Exception("Invalid protocol")
class FiregexFilter:
def __init__(self, proto:str, port:int, ip_int:str, target:str, id:int):
def __init__(self, proto:str, port:int, ip_int:str, target:str, id:int, family:str):
self.family = family
self.id = id
self.target = target
self.proto = proto
@@ -28,29 +29,30 @@ class FiregexTables(NFTableManager):
def __init__(self):
super().__init__([
{"add":{"chain":{ #Input chain attached before conntrack see it
"family":"inet",
*[{"add":{"chain":{ #Input chain attached before conntrack see it
"family":fam,
"table":self.table_name,
"name":self.input_chain,
"type":"filter",
"hook":"prerouting",
"prio":-310,
"policy":"accept"
}}},
{"add":{"chain":{ #Output chain attached after conntrack saw it
"family":"inet",
}}} for fam in ("inet", "bridge")],
*[{"add":{"chain":{ #Output chain attached after conntrack saw it
"family":fam,
"table":self.table_name,
"name":self.output_chain,
"type":"filter",
"hook":"postrouting",
"prio":-310,
"policy":"accept"
}}}
}}} for fam in ("inet", "bridge")],
],[
{"flush":{"chain":{"table":self.table_name,"family":"inet", "name":self.input_chain}}},
{"delete":{"chain":{"table":self.table_name,"family":"inet", "name":self.input_chain}}},
{"flush":{"chain":{"table":self.table_name,"family":"inet", "name":self.output_chain}}},
{"delete":{"chain":{"table":self.table_name,"family":"inet", "name":self.output_chain}}},
*[{"flush":{"chain":{"table":self.table_name,"family":fam, "name":self.input_chain}}} for fam in ("inet", "bridge")],
*[{"delete":{"chain":{"table":self.table_name,"family":fam, "name":self.input_chain}}} for fam in ("inet", "bridge")],
*[{"flush":{"chain":{"table":self.table_name,"family":fam, "name":self.output_chain}}} for fam in ("inet", "bridge")],
*[{"delete":{"chain":{"table":self.table_name,"family":fam, "name":self.output_chain}}} for fam in ("inet", "bridge")],
])
def add(self, srv:Service, queue_range):
@@ -63,8 +65,8 @@ class FiregexTables(NFTableManager):
if init > end:
init, end = end, init
self.cmd(
{ "insert":{ "rule": {
"family": "inet",
*[{ "insert":{ "rule": {
"family": fam,
"table": self.table_name,
"chain": self.output_chain,
"expr": [
@@ -73,9 +75,9 @@ class FiregexTables(NFTableManager):
{"mangle": {"key": {"meta": {"key": "mark"}},"value": 0x1338}},
{"queue": {"num": str(init) if init == end else {"range":[init, end] }, "flags": ["bypass"]}}
]
}}},
{"insert":{"rule":{
"family": "inet",
}}} for fam in ("inet", "bridge")],
*[{"insert":{"rule":{
"family": fam,
"table": self.table_name,
"chain": self.input_chain,
"expr": [
@@ -84,7 +86,7 @@ class FiregexTables(NFTableManager):
{"mangle": {"key": {"meta": {"key": "mark"}},"value": 0x1337}},
{"queue": {"num": str(init) if init == end else {"range":[init, end] }, "flags": ["bypass"]}}
]
}}}
}}} for fam in ("inet", "bridge")]
)
@@ -99,6 +101,7 @@ class FiregexTables(NFTableManager):
res.append(FiregexFilter(
target=filter["chain"],
id=int(filter["handle"]),
family=filter["family"],
proto=filter["expr"][1]["match"]["left"]["payload"]["protocol"],
port=filter["expr"][1]["match"]["right"],
ip_int=ip_int
@@ -109,9 +112,10 @@ class FiregexTables(NFTableManager):
for filter in self.get():
if filter.__eq__(srv):
self.cmd({ "delete":{ "rule": {
"family": "inet",
"table": self.table_name,
"chain": filter.target,
"handle": filter.id
}}})
"family": filter.family,
"table": self.table_name,
"chain": filter.target,
"handle": filter.id
}}}
)