|
 |
00d018 |
From dbce20e28a898c394274109904d471d84cfa7fea Mon Sep 17 00:00:00 2001
|
|
|
00d018 |
From: Vrinda Punj <vpunj@redhat.com>
|
|
|
00d018 |
Date: Fri, 13 Nov 2020 10:40:51 -0500
|
|
|
00d018 |
Subject: [PATCH 65/66] fix(rich): non-printable characters removed from rich
|
|
|
00d018 |
rules
|
|
|
00d018 |
|
|
|
00d018 |
Fixes: rhbz 1596304
|
|
|
00d018 |
Fixes: #480
|
|
|
00d018 |
|
|
|
00d018 |
(cherry picked from commit ac5960856991a00ddf7a558e31fd3248c8279a1f)
|
|
|
00d018 |
(cherry picked from commit a55416ea5f79f1a7cb1a97b6ee39524a542a8663)
|
|
|
00d018 |
---
|
|
|
00d018 |
src/firewall/core/rich.py | 2 ++
|
|
|
00d018 |
src/firewall/functions.py | 9 ++++++++-
|
|
|
00d018 |
src/tests/regression/regression.at | 1 +
|
|
|
00d018 |
src/tests/regression/rhbz1596304.at | 23 +++++++++++++++++++++++
|
|
|
00d018 |
4 files changed, 34 insertions(+), 1 deletion(-)
|
|
|
00d018 |
create mode 100644 src/tests/regression/rhbz1596304.at
|
|
|
00d018 |
|
|
|
00d018 |
diff --git a/src/firewall/core/rich.py b/src/firewall/core/rich.py
|
|
|
00d018 |
index 86c0c998a478..03bc194c2b28 100644
|
|
|
00d018 |
--- a/src/firewall/core/rich.py
|
|
|
00d018 |
+++ b/src/firewall/core/rich.py
|
|
|
00d018 |
@@ -307,6 +307,8 @@ class Rich_Rule(object):
|
|
|
00d018 |
if not rule_str:
|
|
|
00d018 |
raise FirewallError(errors.INVALID_RULE, 'empty rule')
|
|
|
00d018 |
|
|
|
00d018 |
+ rule_str = functions.stripNonPrintableCharacters(rule_str)
|
|
|
00d018 |
+
|
|
|
00d018 |
self.priority = 0
|
|
|
00d018 |
self.family = None
|
|
|
00d018 |
self.source = None
|
|
|
00d018 |
diff --git a/src/firewall/functions.py b/src/firewall/functions.py
|
|
|
00d018 |
index 6af220619f17..d20b702e047e 100644
|
|
|
00d018 |
--- a/src/firewall/functions.py
|
|
|
00d018 |
+++ b/src/firewall/functions.py
|
|
|
00d018 |
@@ -27,7 +27,7 @@ __all__ = [ "PY2", "getPortID", "getPortRange", "portStr", "getServiceName",
|
|
|
00d018 |
"check_single_address", "check_mac", "uniqify", "ppid_of_pid",
|
|
|
00d018 |
"max_zone_name_len", "checkUser", "checkUid", "checkCommand",
|
|
|
00d018 |
"checkContext", "joinArgs", "splitArgs",
|
|
|
00d018 |
- "b2u", "u2b", "u2b_if_py2" ]
|
|
|
00d018 |
+ "b2u", "u2b", "u2b_if_py2", "stripNonPrintableCharacters"]
|
|
|
00d018 |
|
|
|
00d018 |
import socket
|
|
|
00d018 |
import os
|
|
|
00d018 |
@@ -42,6 +42,10 @@ from firewall.config import FIREWALLD_TEMPDIR, FIREWALLD_PIDFILE
|
|
|
00d018 |
|
|
|
00d018 |
PY2 = sys.version < '3'
|
|
|
00d018 |
|
|
|
00d018 |
+NOPRINT_TRANS_TABLE = {
|
|
|
00d018 |
+ i: None for i in range(0, sys.maxunicode + 1) if not chr(i).isprintable()
|
|
|
00d018 |
+}
|
|
|
00d018 |
+
|
|
|
00d018 |
def getPortID(port):
|
|
|
00d018 |
""" Check and Get port id from port string or port id using socket.getservbyname
|
|
|
00d018 |
|
|
|
00d018 |
@@ -226,6 +230,9 @@ def checkIPnMask(ip):
|
|
|
00d018 |
return False
|
|
|
00d018 |
return True
|
|
|
00d018 |
|
|
|
00d018 |
+def stripNonPrintableCharacters(rule_str):
|
|
|
00d018 |
+ return rule_str.translate(NOPRINT_TRANS_TABLE)
|
|
|
00d018 |
+
|
|
|
00d018 |
def checkIP6nMask(ip):
|
|
|
00d018 |
if "/" in ip:
|
|
|
00d018 |
addr = ip[:ip.index("/")]
|
|
|
00d018 |
diff --git a/src/tests/regression/regression.at b/src/tests/regression/regression.at
|
|
|
00d018 |
index 65540840f50e..c1e8620ee700 100644
|
|
|
00d018 |
--- a/src/tests/regression/regression.at
|
|
|
00d018 |
+++ b/src/tests/regression/regression.at
|
|
|
00d018 |
@@ -35,3 +35,4 @@ m4_include([regression/rhbz1483921.at])
|
|
|
00d018 |
m4_include([regression/rhbz1541077.at])
|
|
|
00d018 |
m4_include([regression/rhbz1855140.at])
|
|
|
00d018 |
m4_include([regression/rhbz1871298.at])
|
|
|
00d018 |
+m4_include([regression/rhbz1596304.at])
|
|
|
00d018 |
diff --git a/src/tests/regression/rhbz1596304.at b/src/tests/regression/rhbz1596304.at
|
|
|
00d018 |
new file mode 100644
|
|
|
00d018 |
index 000000000000..98a33934e271
|
|
|
00d018 |
--- /dev/null
|
|
|
00d018 |
+++ b/src/tests/regression/rhbz1596304.at
|
|
|
00d018 |
@@ -0,0 +1,23 @@
|
|
|
00d018 |
+FWD_START_TEST([rich rules strip non-printable characters])
|
|
|
00d018 |
+AT_KEYWORDS(rich rhbz1596304)
|
|
|
00d018 |
+
|
|
|
00d018 |
+dnl source address contains a tab character
|
|
|
00d018 |
+FWD_CHECK([--permanent --zone=public --add-rich-rule 'rule family="ipv4" source address="104.243.250.0/22 " port port=80 protocol=tcp accept'],0,ignore)
|
|
|
00d018 |
+FWD_RELOAD
|
|
|
00d018 |
+FWD_CHECK([--list-all | TRIM_WHITESPACE], 0, [m4_strip([dnl
|
|
|
00d018 |
+ public
|
|
|
00d018 |
+ target: default
|
|
|
00d018 |
+ icmp-block-inversion: no
|
|
|
00d018 |
+ interfaces:
|
|
|
00d018 |
+ sources:
|
|
|
00d018 |
+ services: cockpit dhcpv6-client ssh
|
|
|
00d018 |
+ ports:
|
|
|
00d018 |
+ protocols:
|
|
|
00d018 |
+ masquerade: no
|
|
|
00d018 |
+ forward-ports:
|
|
|
00d018 |
+ source-ports:
|
|
|
00d018 |
+ icmp-blocks:
|
|
|
00d018 |
+ rich rules:
|
|
|
00d018 |
+ rule family="ipv4" source address="104.243.250.0/22" port port="80" protocol="tcp" accept
|
|
|
00d018 |
+ ])])
|
|
|
00d018 |
+FWD_END_TEST
|
|
|
00d018 |
--
|
|
|
00d018 |
2.28.0
|
|
|
00d018 |
|