|
 |
00d018 |
From 0f94133731fa497b04744fa4a37cfa5fd5e45fab Mon Sep 17 00:00:00 2001
|
|
|
00d018 |
From: Eric Garver <eric@garver.life>
|
|
|
00d018 |
Date: Wed, 26 Aug 2020 11:38:36 -0400
|
|
|
00d018 |
Subject: [PATCH 57/62] fix(policy): cache rule_str for rich rules
|
|
|
00d018 |
|
|
|
00d018 |
There are various areas that we use list comprehensions to convert
|
|
|
00d018 |
Rich_Rule to rule_str. This isn't cheap. Let's just cache the rule_str
|
|
|
00d018 |
and avoid the cost.
|
|
|
00d018 |
|
|
|
00d018 |
Fixes: rhbz 1871298
|
|
|
00d018 |
(cherry picked from commit 5402724221a3dddc9c139663d28ababed4057cc6)
|
|
|
00d018 |
(cherry picked from commit 763b07972fd80e7b2f28b29efe812b92f6dff1d1)
|
|
|
00d018 |
---
|
|
|
00d018 |
src/firewall/core/io/zone.py | 17 ++++++++---------
|
|
|
00d018 |
1 file changed, 8 insertions(+), 9 deletions(-)
|
|
|
00d018 |
|
|
|
00d018 |
diff --git a/src/firewall/core/io/zone.py b/src/firewall/core/io/zone.py
|
|
|
00d018 |
index 529b92c25b62..ec81762be100 100644
|
|
|
00d018 |
--- a/src/firewall/core/io/zone.py
|
|
|
00d018 |
+++ b/src/firewall/core/io/zone.py
|
|
|
00d018 |
@@ -120,6 +120,7 @@ class Zone(IO_Object):
|
|
|
00d018 |
self.sources = [ ]
|
|
|
00d018 |
self.fw_config = None # to be able to check services and a icmp_blocks
|
|
|
00d018 |
self.rules = [ ]
|
|
|
00d018 |
+ self.rules_str = [ ]
|
|
|
00d018 |
self.icmp_block_inversion = False
|
|
|
00d018 |
self.combined = False
|
|
|
00d018 |
self.applied = False
|
|
|
00d018 |
@@ -141,6 +142,7 @@ class Zone(IO_Object):
|
|
|
00d018 |
del self.sources[:]
|
|
|
00d018 |
self.fw_config = None # to be able to check services and a icmp_blocks
|
|
|
00d018 |
del self.rules[:]
|
|
|
00d018 |
+ del self.rules_str[:]
|
|
|
00d018 |
self.icmp_block_inversion = False
|
|
|
00d018 |
self.combined = False
|
|
|
00d018 |
self.applied = False
|
|
|
00d018 |
@@ -163,17 +165,13 @@ class Zone(IO_Object):
|
|
|
00d018 |
self.interfaces = [u2b_if_py2(i) for i in self.interfaces]
|
|
|
00d018 |
self.sources = [u2b_if_py2(s) for s in self.sources]
|
|
|
00d018 |
self.rules = [u2b_if_py2(s) for s in self.rules]
|
|
|
00d018 |
-
|
|
|
00d018 |
- def __getattr__(self, name):
|
|
|
00d018 |
- if name == "rules_str":
|
|
|
00d018 |
- rules_str = [str(rule) for rule in self.rules]
|
|
|
00d018 |
- return rules_str
|
|
|
00d018 |
- else:
|
|
|
00d018 |
- return getattr(super(Zone, self), name)
|
|
|
00d018 |
+ self.rules_str = [u2b_if_py2(s) for s in self.rules_str]
|
|
|
00d018 |
|
|
|
00d018 |
def __setattr__(self, name, value):
|
|
|
00d018 |
if name == "rules_str":
|
|
|
00d018 |
self.rules = [rich.Rich_Rule(rule_str=s) for s in value]
|
|
|
00d018 |
+ # must convert back to string to get the canonical string.
|
|
|
00d018 |
+ super(Zone, self).__setattr__(name, [str(s) for s in self.rules])
|
|
|
00d018 |
else:
|
|
|
00d018 |
super(Zone, self).__setattr__(name, value)
|
|
|
00d018 |
|
|
|
00d018 |
@@ -307,6 +305,7 @@ class Zone(IO_Object):
|
|
|
00d018 |
self.source_ports.append(port)
|
|
|
00d018 |
for rule in zone.rules:
|
|
|
00d018 |
self.rules.append(rule)
|
|
|
00d018 |
+ self.rules_str.append(str(rule))
|
|
|
00d018 |
if zone.icmp_block_inversion:
|
|
|
00d018 |
self.icmp_block_inversion = True
|
|
|
00d018 |
|
|
|
00d018 |
@@ -687,9 +686,9 @@ class zone_ContentHandler(IO_Object_ContentHandler):
|
|
|
00d018 |
except Exception as e:
|
|
|
00d018 |
log.warning("%s: %s", e, str(self._rule))
|
|
|
00d018 |
else:
|
|
|
00d018 |
- if str(self._rule) not in \
|
|
|
00d018 |
- [ str(x) for x in self.item.rules ]:
|
|
|
00d018 |
+ if str(self._rule) not in self.item.rules_str:
|
|
|
00d018 |
self.item.rules.append(self._rule)
|
|
|
00d018 |
+ self.item.rules_str.append(str(self._rule))
|
|
|
00d018 |
else:
|
|
|
00d018 |
log.warning("Rule '%s' already set, ignoring.",
|
|
|
00d018 |
str(self._rule))
|
|
|
00d018 |
--
|
|
|
00d018 |
2.28.0
|
|
|
00d018 |
|