improvement(config): drop redundant _get_dbus_property() function

This serves no purpose. Already _get_property() is about D-Bus properties, as it returns D-Bus types.
Fisiu · Jan 26, 2024 · 3e832ce · 3e832ce
1 parent 7233f2b
commit 3e832ce
Showing 1 changed file with 1 addition and 56 deletions.
diff --git a/src/firewall/server/config.py b/src/firewall/server/config.py
@@ -616,28 +616,6 @@ def accessCheck(self, sender):
 
     @dbus_handle_exceptions
     def _get_property(self, prop):
-        if prop not in [
-            "DefaultZone",
-            "MinimalMark",
-            "CleanupOnExit",
-            "CleanupModulesOnExit",
-            "Lockdown",
-            "IPv6_rpfilter",
-            "IndividualCalls",
-            "LogDenied",
-            "AutomaticHelpers",
-            "FirewallBackend",
-            "FlushAllOnReload",
-            "RFC3964_IPv4",
-            "AllowZoneDrifting",
-            "NftablesFlowtable",
-            "NftablesCounters",
-        ]:
-            raise dbus.exceptions.DBusException(
-                "org.freedesktop.DBus.Error.InvalidArgs: "
-                "Property '%s' does not exist" % prop
-            )
-
         value = self.config.get_firewalld_conf().get(prop)
 
         if prop == "DefaultZone":
@@ -702,39 +680,6 @@ def _get_property(self, prop):
             if value is None:
                 value = "yes" if config.FALLBACK_NFTABLES_COUNTERS else "no"
             return dbus.String(value)
-
-    @dbus_handle_exceptions
-    def _get_dbus_property(self, prop):
-        if prop == "DefaultZone":
-            return dbus.String(self._get_property(prop))
-        elif prop == "MinimalMark":
-            return dbus.Int32(self._get_property(prop))
-        elif prop == "CleanupOnExit":
-            return dbus.String(self._get_property(prop))
-        elif prop == "CleanupModulesOnExit":
-            return dbus.String(self._get_property(prop))
-        elif prop == "Lockdown":
-            return dbus.String(self._get_property(prop))
-        elif prop == "IPv6_rpfilter":
-            return dbus.String(self._get_property(prop))
-        elif prop == "IndividualCalls":
-            return dbus.String(self._get_property(prop))
-        elif prop == "LogDenied":
-            return dbus.String(self._get_property(prop))
-        elif prop == "AutomaticHelpers":
-            return dbus.String(self._get_property(prop))
-        elif prop == "FirewallBackend":
-            return dbus.String(self._get_property(prop))
-        elif prop == "FlushAllOnReload":
-            return dbus.String(self._get_property(prop))
-        elif prop == "RFC3964_IPv4":
-            return dbus.String(self._get_property(prop))
-        elif prop == "AllowZoneDrifting":
-            return dbus.String(self._get_property(prop))
-        elif prop == "NftablesFlowtable":
-            return dbus.String(self._get_property(prop))
-        elif prop == "NftablesCounters":
-            return dbus.String(self._get_property(prop))
         else:
             raise dbus.exceptions.DBusException(
                 "org.freedesktop.DBus.Error.InvalidArgs: "
@@ -750,7 +695,7 @@ def Get(self, interface_name, property_name, sender=None):  # pylint: disable=W0
         log.debug1("config.Get('%s', '%s')", interface_name, property_name)
 
         if interface_name == config.dbus.DBUS_INTERFACE_CONFIG:
-            return self._get_dbus_property(property_name)
+            return self._get_property(property_name)
         elif interface_name in [
             config.dbus.DBUS_INTERFACE_CONFIG_DIRECT,
             config.dbus.DBUS_INTERFACE_CONFIG_POLICIES,