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

2
backend/binsrc/classes/nfqueue.cpp
View File

@@ -295,7 +295,7 @@ class PktRequest {
if (tcp){ if (tcp){
//If the packet has data, we have to remove it //If the packet has data, we have to remove it
set_data(nullptr, 0); set_data(nullptr, 0);
//For the first matched data or only for data packets, we set RST bit //For the first matched data or only for data packets, we set FIN bit
//This only for client packets, because this will trigger server to close the connection //This only for client packets, because this will trigger server to close the connection
//Packets will be filtered anyway also if client don't send packets //Packets will be filtered anyway also if client don't send packets
if (_data_original_size != 0){ if (_data_original_size != 0){

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

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

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

@@ -2,8 +2,7 @@ from modules.nfregex.models import Service
from utils import ip_parse, ip_family, NFTableManager, nftables_int_to_json from utils import ip_parse, ip_family, NFTableManager, nftables_int_to_json
class FiregexFilter: class FiregexFilter:
def __init__(self, proto:str, port:int, ip_int:str, target:str, id:int, family:str): def __init__(self, proto:str, port:int, ip_int:str, target:str, id:int):
self.family = family
self.id = id self.id = id
self.target = target self.target = target
self.proto = proto self.proto = proto
@@ -21,29 +20,29 @@ class FiregexTables(NFTableManager):
def __init__(self): def __init__(self):
super().__init__([ super().__init__([
*[{"add":{"chain":{ {"add":{"chain":{
"family":fam, "family":"inet",
"table":self.table_name, "table":self.table_name,
"name":self.input_chain, "name":self.input_chain,
"type":"filter", "type":"filter",
"hook":"prerouting", "hook":"prerouting",
"prio":-301, "prio":-301,
"policy":"accept" "policy":"accept"
}}} for fam in ("inet", "bridge")], }}},
*[{"add":{"chain":{ {"add":{"chain":{
"family":fam, "family":"inet",
"table":self.table_name, "table":self.table_name,
"name":self.output_chain, "name":self.output_chain,
"type":"filter", "type":"filter",
"hook":"postrouting", "hook":"postrouting",
"prio":-301, "prio":-301,
"policy":"accept" "policy":"accept"
}}} for fam in ("inet", "bridge")] }}}
],[ ],[
*[{"flush":{"chain":{"table":self.table_name,"family":fam, "name":self.input_chain}}} for fam in ("inet", "bridge")], {"flush":{"chain":{"table":self.table_name,"family":"inet", "name":self.input_chain}}},
*[{"delete":{"chain":{"table":self.table_name,"family":fam, "name":self.input_chain}}} for fam in ("inet", "bridge")], {"delete":{"chain":{"table":self.table_name,"family":"inet", "name":self.input_chain}}},
*[{"flush":{"chain":{"table":self.table_name,"family":fam, "name":self.output_chain}}} for fam in ("inet", "bridge")], {"flush":{"chain":{"table":self.table_name,"family":"inet", "name":self.output_chain}}},
*[{"delete":{"chain":{"table":self.table_name,"family":fam, "name":self.output_chain}}} for fam in ("inet", "bridge")], {"delete":{"chain":{"table":self.table_name,"family":"inet", "name":self.output_chain}}},
]) ])
def add(self, srv:Service, queue_range): def add(self, srv:Service, queue_range):
@@ -56,8 +55,8 @@ class FiregexTables(NFTableManager):
if init > end: if init > end:
init, end = end, init init, end = end, init
self.cmd( self.cmd(
*[{ "insert":{ "rule": { { "insert":{ "rule": {
"family": fam, "family": "inet",
"table": self.table_name, "table": self.table_name,
"chain": self.output_chain, "chain": self.output_chain,
"expr": [ "expr": [
@@ -66,9 +65,9 @@ class FiregexTables(NFTableManager):
{"mangle": {"key": {"meta": {"key": "mark"}},"value": 0x1338}}, {"mangle": {"key": {"meta": {"key": "mark"}},"value": 0x1338}},
{"queue": {"num": str(init) if init == end else {"range":[init, end] }, "flags": ["bypass"]}} {"queue": {"num": str(init) if init == end else {"range":[init, end] }, "flags": ["bypass"]}}
] ]
}}} for fam in ("inet", "bridge")], }}},
*[{"insert":{"rule":{ {"insert":{"rule":{
"family": fam, "family": "inet",
"table": self.table_name, "table": self.table_name,
"chain": self.input_chain, "chain": self.input_chain,
"expr": [ "expr": [
@@ -77,7 +76,7 @@ class FiregexTables(NFTableManager):
{"mangle": {"key": {"meta": {"key": "mark"}},"value": 0x1337}}, {"mangle": {"key": {"meta": {"key": "mark"}},"value": 0x1337}},
{"queue": {"num": str(init) if init == end else {"range":[init, end] }, "flags": ["bypass"]}} {"queue": {"num": str(init) if init == end else {"range":[init, end] }, "flags": ["bypass"]}}
] ]
}}} for fam in ("inet", "bridge")] }}}
) )
@@ -92,7 +91,6 @@ class FiregexTables(NFTableManager):
res.append(FiregexFilter( res.append(FiregexFilter(
target=filter["chain"], target=filter["chain"],
id=int(filter["handle"]), id=int(filter["handle"]),
family=filter["family"],
proto=filter["expr"][1]["match"]["left"]["payload"]["protocol"], proto=filter["expr"][1]["match"]["left"]["payload"]["protocol"],
port=filter["expr"][1]["match"]["right"], port=filter["expr"][1]["match"]["right"],
ip_int=ip_int ip_int=ip_int
@@ -103,7 +101,7 @@ class FiregexTables(NFTableManager):
for filter in self.get(): for filter in self.get():
if filter.__eq__(srv): if filter.__eq__(srv):
self.cmd({ "delete":{ "rule": { self.cmd({ "delete":{ "rule": {
"family": filter.family, "family": "inet",
"table": self.table_name, "table": self.table_name,
"chain": filter.target, "chain": filter.target,
"handle": filter.id "handle": filter.id

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 from utils import addr_parse, ip_parse, ip_family, NFTableManager, nftables_json_to_int
class FiregexHijackRule(): 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.id = id
self.family = family
self.target = target self.target = target
self.proto = proto self.proto = proto
self.public_port = public_port self.public_port = public_port
@@ -23,29 +22,29 @@ class FiregexTables(NFTableManager):
def __init__(self): def __init__(self):
super().__init__([ super().__init__([
*[{"add":{"chain":{ {"add":{"chain":{
"family":fam, "family":"inet",
"table":self.table_name, "table":self.table_name,
"name":self.prerouting_porthijack, "name":self.prerouting_porthijack,
"type":"filter", "type":"filter",
"hook":"prerouting", "hook":"prerouting",
"prio":-310, "prio":-310,
"policy":"accept" "policy":"accept"
}}} for fam in ("inet", "bridge")], }}},
*[{"add":{"chain":{ {"add":{"chain":{
"family":fam, "family":"inet",
"table":self.table_name, "table":self.table_name,
"name":self.postrouting_porthijack, "name":self.postrouting_porthijack,
"type":"filter", "type":"filter",
"hook":"postrouting", "hook":"postrouting",
"prio":-310, "prio":-310,
"policy":"accept" "policy":"accept"
}}} for fam in ("inet", "bridge")] }}}
],[ ],[
*[{"flush":{"chain":{"table":self.table_name,"family":fam, "name":self.prerouting_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":fam, "name":self.prerouting_porthijack}}} for fam in ("inet", "bridge")], {"delete":{"chain":{"table":self.table_name,"family":"inet", "name":self.prerouting_porthijack}}},
*[{"flush":{"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.postrouting_porthijack}}},
*[{"delete":{"chain":{"table":self.table_name,"family":fam, "name":self.postrouting_porthijack}}} for fam in ("inet", "bridge")] {"delete":{"chain":{"table":self.table_name,"family":"inet", "name":self.postrouting_porthijack}}}
]) ])
def add(self, srv:Service): def add(self, srv:Service):
@@ -54,8 +53,8 @@ class FiregexTables(NFTableManager):
if ele.__eq__(srv): if ele.__eq__(srv):
return return
self.cmd(*[{ "insert":{ "rule": { self.cmd({ "insert":{ "rule": {
"family": fam, "family": "inet",
"table": self.table_name, "table": self.table_name,
"chain": self.prerouting_porthijack, "chain": self.prerouting_porthijack,
"expr": [ "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': 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)}} {'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": { self.cmd({ "insert":{ "rule": {
"family": fam, "family": "inet",
"table": self.table_name, "table": self.table_name,
"chain": self.postrouting_porthijack, "chain": self.postrouting_porthijack,
"expr": [ "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': 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)}} {'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]: def get(self) -> list[FiregexHijackRule]:
@@ -84,7 +83,6 @@ class FiregexTables(NFTableManager):
res.append(FiregexHijackRule( res.append(FiregexHijackRule(
target=filter["chain"], target=filter["chain"],
id=int(filter["handle"]), id=int(filter["handle"]),
family=filter["family"],
proto=filter["expr"][1]["match"]["left"]["payload"]["protocol"], 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"], 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"], 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(): for filter in self.get():
if filter.__eq__(srv): if filter.__eq__(srv):
self.cmd({ "delete":{ "rule": { self.cmd({ "delete":{ "rule": {
"family": filter.family, "family": "inet",
"table": self.table_name, "table": self.table_name,
"chain": filter.target, "chain": filter.target,
"handle": filter.id "handle": filter.id

2
backend/utils/__init__.py
View File

@@ -143,7 +143,7 @@ class NFTableManager(Singleton):
def init(self): def init(self):
self.reset() self.reset()
self.raw_cmd(*[{"add":{"table":{"name":self.table_name,"family":fam}}} for fam in ("inet", "bridge")]) self.raw_cmd({"add":{"table":{"name":self.table_name,"family":"inet"}}})
self.cmd(*self.__init_cmds) self.cmd(*self.__init_cmds)
def reset(self): def reset(self):

2
frontend/src/components/NFProxy/utils.ts
View File

@@ -117,7 +117,7 @@ from firegex.nfproxy import pyfilter
from firegex.nfproxy import REJECT, ACCEPT, UNSTABLE_MANGLE, DROP from firegex.nfproxy import REJECT, ACCEPT, UNSTABLE_MANGLE, DROP
# - The filter must return one of the following values: # - The filter must return one of the following values:
# - ACCEPT: The packet will be accepted # - ACCEPT: The packet will be accepted
# - REJECT: The packet will be rejected (will be activated a mechanism to send a RST packet and drop all data in the stream) # - REJECT: The packet will be rejected (will be activated a mechanism to send a FIN packet and drop all data in the stream)
# - UNSTABLE_MANGLE: The packet will be mangled and accepted # - UNSTABLE_MANGLE: The packet will be mangled and accepted
# - DROP: All the packets in this stream will be easly dropped # - DROP: All the packets in this stream will be easly dropped

2
tests/utils/tcpserver.py
View File

@@ -64,7 +64,7 @@ class TcpServer:
def recv_packet(self): def recv_packet(self):
try: try:
return self.client_sock.recv(4096) return self.client_sock.recv(4096)
except (TimeoutError, ConnectionResetError): except TimeoutError:
if self.verbose: if self.verbose:
traceback.print_exc() traceback.print_exc()
return False return False