|
 |
00cd46 |
From 08cb6f0c7abca95fa898020bb9f3ba3f4bfbf148 Mon Sep 17 00:00:00 2001
|
|
|
00cd46 |
From: Eric Garver <eric@garver.life>
|
|
|
00cd46 |
Date: Fri, 28 Aug 2020 13:15:34 -0400
|
|
|
00cd46 |
Subject: [PATCH 53/62] fix(nftables): packet marks with masks
|
|
|
00cd46 |
|
|
|
00cd46 |
(cherry picked from commit e296b926ae5dc4cbc277b6dd755d045e73ed4411)
|
|
|
00cd46 |
(cherry picked from commit 371efe757f2bde20b4301a78ed3c48ec1d31bf5e)
|
|
|
00cd46 |
---
|
|
|
00cd46 |
src/firewall/core/fw_zone.py | 2 ++
|
|
|
00cd46 |
src/firewall/core/nftables.py | 9 +++++++--
|
|
|
00cd46 |
2 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
00cd46 |
|
|
|
00cd46 |
diff --git a/src/firewall/core/fw_zone.py b/src/firewall/core/fw_zone.py
|
|
|
00cd46 |
index 129306b6f969..6eaed4232405 100644
|
|
|
00cd46 |
--- a/src/firewall/core/fw_zone.py
|
|
|
00cd46 |
+++ b/src/firewall/core/fw_zone.py
|
|
|
00cd46 |
@@ -1719,6 +1719,8 @@ class FirewallZone(object):
|
|
|
00cd46 |
if enable:
|
|
|
00cd46 |
transaction.add_chain(zone, table, "INPUT")
|
|
|
00cd46 |
transaction.add_chain(zone, table, "FORWARD_IN")
|
|
|
00cd46 |
+ if enable and type(rule.action) == Rich_Mark:
|
|
|
00cd46 |
+ transaction.add_chain(zone, "mangle", "PREROUTING")
|
|
|
00cd46 |
|
|
|
00cd46 |
rules = backend.build_zone_icmp_block_rules(enable, zone, ict, rule)
|
|
|
00cd46 |
transaction.add_rules(backend, rules)
|
|
|
00cd46 |
diff --git a/src/firewall/core/nftables.py b/src/firewall/core/nftables.py
|
|
|
00cd46 |
index 0198200b2372..76668a60468f 100644
|
|
|
00cd46 |
--- a/src/firewall/core/nftables.py
|
|
|
00cd46 |
+++ b/src/firewall/core/nftables.py
|
|
|
00cd46 |
@@ -1043,8 +1043,13 @@ class nftables(object):
|
|
|
00cd46 |
zone=zone)
|
|
|
00cd46 |
table = "mangle"
|
|
|
00cd46 |
chain = "%s_%s_%s" % (table, target, chain_suffix)
|
|
|
00cd46 |
- rule_action = {"mangle": {"key": {"meta": {"key": "mark"}},
|
|
|
00cd46 |
- "value": rich_rule.action.set}}
|
|
|
00cd46 |
+ value = rich_rule.action.set.split("/")
|
|
|
00cd46 |
+ if len(value) > 1:
|
|
|
00cd46 |
+ rule_action = {"mangle": {"key": {"meta": {"key": "mark"}},
|
|
|
00cd46 |
+ "value": {"^": [{"&": [{"meta": {"key": "mark"}}, value[1]]}, value[0]]}}}
|
|
|
00cd46 |
+ else:
|
|
|
00cd46 |
+ rule_action = {"mangle": {"key": {"meta": {"key": "mark"}},
|
|
|
00cd46 |
+ "value": value[0]}}
|
|
|
00cd46 |
else:
|
|
|
00cd46 |
raise FirewallError(INVALID_RULE,
|
|
|
00cd46 |
"Unknown action %s" % type(rich_rule.action))
|
|
|
00cd46 |
--
|
|
|
00cd46 |
2.28.0
|
|
|
00cd46 |
|