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