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

Revert "using also bridge table on network hooking"

Browse Source 
This reverts commit 33b22a174c.
This commit is contained in:
Domingo Dirutigliano
2025-04-12 20:32:52 +02:00
parent 33b22a174c
commit d0b2c67554
7 changed files with 63 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
backend/modules/porthijack/nftables.py
View File

@@ -2,9 +2,8 @@ from modules.porthijack.models import Service
from utils import addr_parse, ip_parse, ip_family, NFTableManager, nftables_json_to_int
class FiregexHijackRule():
def __init__(self, proto:str, public_port:int,proxy_port:int, ip_src:str, ip_dst:str, target:str, id:int, family:str):
def __init__(self, proto:str, public_port:int,proxy_port:int, ip_src:str, ip_dst:str, target:str, id:int):
self.id = id
self.family = family
self.target = target
self.proto = proto
self.public_port = public_port
@@ -23,29 +22,29 @@ class FiregexTables(NFTableManager):
def __init__(self):
super().__init__([
*[{"add":{"chain":{
"family":fam,
{"add":{"chain":{
"family":"inet",
"table":self.table_name,
"name":self.prerouting_porthijack,
"type":"filter",
"hook":"prerouting",
"prio":-310,
"policy":"accept"
}}} for fam in ("inet", "bridge")],
*[{"add":{"chain":{
"family":fam,
}}},
{"add":{"chain":{
"family":"inet",
"table":self.table_name,
"name":self.postrouting_porthijack,
"type":"filter",
"hook":"postrouting",
"prio":-310,
"policy":"accept"
}}} for fam in ("inet", "bridge")]
}}}
],[
*[{"flush":{"chain":{"table":self.table_name,"family":fam, "name":self.prerouting_porthijack}}} for fam in ("inet", "bridge")],
*[{"delete":{"chain":{"table":self.table_name,"family":fam, "name":self.prerouting_porthijack}}} for fam in ("inet", "bridge")],
*[{"flush":{"chain":{"table":self.table_name,"family":fam, "name":self.postrouting_porthijack}}} for fam in ("inet", "bridge")],
*[{"delete":{"chain":{"table":self.table_name,"family":fam, "name":self.postrouting_porthijack}}} for fam in ("inet", "bridge")]
{"flush":{"chain":{"table":self.table_name,"family":"inet", "name":self.prerouting_porthijack}}},
{"delete":{"chain":{"table":self.table_name,"family":"inet", "name":self.prerouting_porthijack}}},
{"flush":{"chain":{"table":self.table_name,"family":"inet", "name":self.postrouting_porthijack}}},
{"delete":{"chain":{"table":self.table_name,"family":"inet", "name":self.postrouting_porthijack}}}
])
def add(self, srv:Service):
@@ -54,8 +53,8 @@ class FiregexTables(NFTableManager):
if ele.__eq__(srv):
return
self.cmd(*[{ "insert":{ "rule": {
"family": fam,
self.cmd({ "insert":{ "rule": {
"family": "inet",
"table": self.table_name,
"chain": self.prerouting_porthijack,
"expr": [
@@ -64,9 +63,9 @@ class FiregexTables(NFTableManager):
{'mangle': {'key': {'payload': {'protocol': str(srv.proto), 'field': 'dport'}}, 'value': int(srv.proxy_port)}},
{'mangle': {'key': {'payload': {'protocol': ip_family(srv.ip_src), 'field': 'daddr'}}, 'value': addr_parse(srv.ip_dst)}}
]
}}} for fam in ("inet", "bridge")])
self.cmd(*[{ "insert":{ "rule": {
"family": fam,
}}})
self.cmd({ "insert":{ "rule": {
"family": "inet",
"table": self.table_name,
"chain": self.postrouting_porthijack,
"expr": [
@@ -75,7 +74,7 @@ class FiregexTables(NFTableManager):
{'mangle': {'key': {'payload': {'protocol': str(srv.proto), 'field': 'sport'}}, 'value': int(srv.public_port)}},
{'mangle': {'key': {'payload': {'protocol': ip_family(srv.ip_dst), 'field': 'saddr'}}, 'value': addr_parse(srv.ip_src)}}
]
}}} for fam in ("inet", "bridge")])
}}})
def get(self) -> list[FiregexHijackRule]:
@@ -84,7 +83,6 @@ class FiregexTables(NFTableManager):
res.append(FiregexHijackRule(
target=filter["chain"],
id=int(filter["handle"]),
family=filter["family"],
proto=filter["expr"][1]["match"]["left"]["payload"]["protocol"],
public_port=filter["expr"][1]["match"]["right"] if filter["chain"] == self.prerouting_porthijack else filter["expr"][2]["mangle"]["value"],
proxy_port=filter["expr"][1]["match"]["right"] if filter["chain"] == self.postrouting_porthijack else filter["expr"][2]["mangle"]["value"],
@@ -97,7 +95,7 @@ class FiregexTables(NFTableManager):
for filter in self.get():
if filter.__eq__(srv):
self.cmd({ "delete":{ "rule": {
"family": filter.family,
"family": "inet",
"table": self.table_name,
"chain": filter.target,
"handle": filter.id