|
 |
1ae9b3 |
From 32de2767e869970877c19c8919e37de375351bc1 Mon Sep 17 00:00:00 2001
|
|
|
1ae9b3 |
From: Eric Garver <eric@garver.life>
|
|
|
1ae9b3 |
Date: Thu, 6 Aug 2020 08:24:02 -0400
|
|
|
1ae9b3 |
Subject: [PATCH] fix(rich): use correct error code for invalid priority
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
Fixes: 3a0e79b1cfe4 ("fix: core: rich: Catch ValueError on non-numeric priority values")
|
|
|
1ae9b3 |
(cherry picked from commit e1562ba92caec988c7cf397b2fa77b8d41592c7e)
|
|
|
1ae9b3 |
(cherry picked from commit 5a4e35317a32422dec4acffc845a6651f65680da)
|
|
|
1ae9b3 |
---
|
|
|
1ae9b3 |
src/firewall/core/rich.py | 2 +-
|
|
|
1ae9b3 |
src/tests/regression/rhbz1689429.at | 8 ++++----
|
|
|
1ae9b3 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
diff --git a/src/firewall/core/rich.py b/src/firewall/core/rich.py
|
|
|
1ae9b3 |
index eb4a2d2d9669..86c0c998a478 100644
|
|
|
1ae9b3 |
--- a/src/firewall/core/rich.py
|
|
|
1ae9b3 |
+++ b/src/firewall/core/rich.py
|
|
|
1ae9b3 |
@@ -382,7 +382,7 @@ class Rich_Rule(object):
|
|
|
1ae9b3 |
try:
|
|
|
1ae9b3 |
self.priority = int(attr_value)
|
|
|
1ae9b3 |
except ValueError:
|
|
|
1ae9b3 |
- raise FirewallError(errors.INVALID_RULE, "invalid 'priority' attribute value '%s'." % attr_value)
|
|
|
1ae9b3 |
+ raise FirewallError(errors.INVALID_PRIORITY, "invalid 'priority' attribute value '%s'." % attr_value)
|
|
|
1ae9b3 |
elif attr_name:
|
|
|
1ae9b3 |
if attr_name == 'protocol':
|
|
|
1ae9b3 |
err_msg = "wrong 'protocol' usage. Use either 'rule protocol value=...' or 'rule [forward-]port protocol=...'."
|
|
|
1ae9b3 |
diff --git a/src/tests/regression/rhbz1689429.at b/src/tests/regression/rhbz1689429.at
|
|
|
1ae9b3 |
index 5701607d660f..9157c9544ffc 100644
|
|
|
1ae9b3 |
--- a/src/tests/regression/rhbz1689429.at
|
|
|
1ae9b3 |
+++ b/src/tests/regression/rhbz1689429.at
|
|
|
1ae9b3 |
@@ -1,11 +1,11 @@
|
|
|
1ae9b3 |
FWD_START_TEST([rich rule invalid priority])
|
|
|
1ae9b3 |
AT_KEYWORDS(rich rhbz1689429)
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
-FWD_CHECK([--add-rich-rule='rule priority=foo accept'], 122, [],
|
|
|
1ae9b3 |
- [Error: INVALID_RULE: invalid 'priority' attribute value 'foo'.
|
|
|
1ae9b3 |
+FWD_CHECK([--add-rich-rule='rule priority=foo accept'], 139, [],
|
|
|
1ae9b3 |
+ [Error: INVALID_PRIORITY: invalid 'priority' attribute value 'foo'.
|
|
|
1ae9b3 |
])
|
|
|
1ae9b3 |
-FWD_CHECK([--permanent --add-rich-rule='rule priority=foo accept'], 122, [],
|
|
|
1ae9b3 |
- [Error: INVALID_RULE: invalid 'priority' attribute value 'foo'.
|
|
|
1ae9b3 |
+FWD_CHECK([--permanent --add-rich-rule='rule priority=foo accept'], 139, [],
|
|
|
1ae9b3 |
+ [Error: INVALID_PRIORITY: invalid 'priority' attribute value 'foo'.
|
|
|
1ae9b3 |
])
|
|
|
1ae9b3 |
FWD_RELOAD
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
--
|
|
|
1ae9b3 |
2.27.0
|
|
|
1ae9b3 |
|