|
 |
64e4ee |
From acc3cfe586947cd2d98d4b8b4303cca127ffc396 Mon Sep 17 00:00:00 2001
|
|
|
64e4ee |
From: Thomas Woerner <twoerner@redhat.com>
|
|
|
64e4ee |
Date: Mon, 22 May 2017 18:07:03 +0200
|
|
|
64e4ee |
Subject: [PATCH 6/6] firewall.server.firewalld: New property for NAT helpers
|
|
|
64e4ee |
supported by the kernel
|
|
|
64e4ee |
|
|
|
64e4ee |
The property nf_nat_helpers provides a dict with the nat helpers in a similar
|
|
|
64e4ee |
way as nf_conntrack_helpers.
|
|
|
64e4ee |
|
|
|
64e4ee |
New description for the property nf_nat_helpers in firewalld.dbus man page.
|
|
|
64e4ee |
|
|
|
64e4ee |
Related: RHBZ#1452681
|
|
|
64e4ee |
(cherry picked from commit 34558ad775afd9476c4ec5373b9bc9ee03a195af)
|
|
|
64e4ee |
---
|
|
|
64e4ee |
doc/xml/firewalld.dbus.xml | 4 ++++
|
|
|
64e4ee |
src/firewall/server/firewalld.py | 11 +++++++----
|
|
|
64e4ee |
2 files changed, 11 insertions(+), 4 deletions(-)
|
|
|
64e4ee |
|
|
|
64e4ee |
diff --git a/doc/xml/firewalld.dbus.xml b/doc/xml/firewalld.dbus.xml
|
|
|
64e4ee |
index 52b5b3b0f955..92fe5c843dfc 100644
|
|
|
64e4ee |
--- a/doc/xml/firewalld.dbus.xml
|
|
|
64e4ee |
+++ b/doc/xml/firewalld.dbus.xml
|
|
|
64e4ee |
@@ -467,6 +467,10 @@
|
|
|
64e4ee |
<term><parameter>nf_conntrack_helpers</parameter> - a{sas} - (ro)</term>
|
|
|
64e4ee |
<listitem><para>The list of conntrack helpers supported by the kernel.</para></listitem>
|
|
|
64e4ee |
</varlistentry>
|
|
|
64e4ee |
+ <varlistentry id="FirewallD1.Properties.nf_nat_helpers">
|
|
|
64e4ee |
+ <term><parameter>nf_nat_helpers</parameter> - a{sas} - (ro)</term>
|
|
|
64e4ee |
+ <listitem><para>The list of nat helpers supported by the kernel.</para></listitem>
|
|
|
64e4ee |
+ </varlistentry>
|
|
|
64e4ee |
<varlistentry id="FirewallD1.Properties.interface_version">
|
|
|
64e4ee |
<term><parameter>interface_version</parameter> - s - (ro)</term>
|
|
|
64e4ee |
<listitem><para>firewalld D-Bus interface version string.</para></listitem>
|
|
|
64e4ee |
diff --git a/src/firewall/server/firewalld.py b/src/firewall/server/firewalld.py
|
|
|
64e4ee |
index 8c4bd4f0c66a..9c5d463de793 100644
|
|
|
64e4ee |
--- a/src/firewall/server/firewalld.py
|
|
|
64e4ee |
+++ b/src/firewall/server/firewalld.py
|
|
|
64e4ee |
@@ -182,6 +182,9 @@ class FirewallD(slip.dbus.service.Object):
|
|
|
64e4ee |
elif prop == "nf_conntrack_helpers":
|
|
|
64e4ee |
return dbus.Dictionary(self.fw.nf_conntrack_helpers, "sas")
|
|
|
64e4ee |
|
|
|
64e4ee |
+ elif prop == "nf_nat_helpers":
|
|
|
64e4ee |
+ return dbus.Dictionary(self.fw.nf_nat_helpers, "sas")
|
|
|
64e4ee |
+
|
|
|
64e4ee |
else:
|
|
|
64e4ee |
raise dbus.exceptions.DBusException(
|
|
|
64e4ee |
"org.freedesktop.DBus.Error.InvalidArgs: "
|
|
|
64e4ee |
@@ -222,8 +225,8 @@ class FirewallD(slip.dbus.service.Object):
|
|
|
64e4ee |
for x in [ "version", "interface_version", "state",
|
|
|
64e4ee |
"IPv4", "IPv6", "IPv6_rpfilter", "BRIDGE",
|
|
|
64e4ee |
"IPSet", "IPSetTypes", "nf_conntrack_helper_setting",
|
|
|
64e4ee |
- "nf_conntrack_helpers", "IPv4ICMPTypes",
|
|
|
64e4ee |
- "IPv6ICMPTypes" ]:
|
|
|
64e4ee |
+ "nf_conntrack_helpers", "nf_nat_helpers",
|
|
|
64e4ee |
+ "IPv4ICMPTypes", "IPv6ICMPTypes" ]:
|
|
|
64e4ee |
ret[x] = self._get_property(x)
|
|
|
64e4ee |
elif interface_name in [ config.dbus.DBUS_INTERFACE_ZONE,
|
|
|
64e4ee |
config.dbus.DBUS_INTERFACE_DIRECT,
|
|
|
64e4ee |
@@ -253,8 +256,8 @@ class FirewallD(slip.dbus.service.Object):
|
|
|
64e4ee |
"IPv4", "IPv6", "IPv6_rpfilter", "BRIDGE",
|
|
|
64e4ee |
"IPSet", "IPSetTypes",
|
|
|
64e4ee |
"nf_conntrack_helper_setting",
|
|
|
64e4ee |
- "nf_conntrack_helpers", "IPv4ICMPTypes",
|
|
|
64e4ee |
- "IPv6ICMPTypes" ]:
|
|
|
64e4ee |
+ "nf_conntrack_helpers", "nf_nat_helpers",
|
|
|
64e4ee |
+ "IPv4ICMPTypes", "IPv6ICMPTypes" ]:
|
|
|
64e4ee |
raise dbus.exceptions.DBusException(
|
|
|
64e4ee |
"org.freedesktop.DBus.Error.PropertyReadOnly: "
|
|
|
64e4ee |
"Property '%s' is read-only" % property_name)
|
|
|
64e4ee |
--
|
|
|
64e4ee |
2.12.0
|
|
|
64e4ee |
|