firewalld.py (firewalld-0.7.2) | : | firewalld.py (firewalld-0.8.0) | ||
---|---|---|---|---|
skipping to change at line 186 | skipping to change at line 186 | |||
elif prop == "BRIDGE": | elif prop == "BRIDGE": | |||
return dbus.Boolean(self.fw.ebtables_enabled) | return dbus.Boolean(self.fw.ebtables_enabled) | |||
elif prop == "IPSet": | elif prop == "IPSet": | |||
return dbus.Boolean(self.fw.ipset_enabled) | return dbus.Boolean(self.fw.ipset_enabled) | |||
elif prop == "IPSetTypes": | elif prop == "IPSetTypes": | |||
return dbus.Array(self.fw.ipset_supported_types, "s") | return dbus.Array(self.fw.ipset_supported_types, "s") | |||
elif prop == "nf_conntrack_helper_setting": | elif prop == "nf_conntrack_helper_setting": | |||
return dbus.Boolean(self.fw.nf_conntrack_helper_setting == 1) | return dbus.Boolean(False) | |||
elif prop == "nf_conntrack_helpers": | elif prop == "nf_conntrack_helpers": | |||
return dbus.Dictionary(self.fw.nf_conntrack_helpers, "sas") | return dbus.Dictionary({}, "sas") | |||
elif prop == "nf_nat_helpers": | elif prop == "nf_nat_helpers": | |||
return dbus.Dictionary(self.fw.nf_nat_helpers, "sas") | return dbus.Dictionary({}, "sas") | |||
else: | else: | |||
raise dbus.exceptions.DBusException( | raise dbus.exceptions.DBusException( | |||
"org.freedesktop.DBus.Error.InvalidArgs: " | "org.freedesktop.DBus.Error.InvalidArgs: " | |||
"Property '%s' does not exist" % prop) | "Property '%s' does not exist" % prop) | |||
@dbus_service_method(dbus.PROPERTIES_IFACE, in_signature='ss', | @dbus_service_method(dbus.PROPERTIES_IFACE, in_signature='ss', | |||
out_signature='v') | out_signature='v') | |||
@dbus_handle_exceptions | @dbus_handle_exceptions | |||
def Get(self, interface_name, property_name, sender=None): # pylint: disable =W0613 | def Get(self, interface_name, property_name, sender=None): # pylint: disable =W0613 | |||
skipping to change at line 1012 | skipping to change at line 1012 | |||
# AUTOMATIC HELPER ASSIGNMENT | # AUTOMATIC HELPER ASSIGNMENT | |||
@slip.dbus.polkit.require_auth(config.dbus.PK_ACTION_CONFIG_INFO) | @slip.dbus.polkit.require_auth(config.dbus.PK_ACTION_CONFIG_INFO) | |||
@dbus_service_method(config.dbus.DBUS_INTERFACE, in_signature='', | @dbus_service_method(config.dbus.DBUS_INTERFACE, in_signature='', | |||
out_signature='s') | out_signature='s') | |||
@dbus_handle_exceptions | @dbus_handle_exceptions | |||
def getAutomaticHelpers(self, sender=None): # pylint: disable=W0613 | def getAutomaticHelpers(self, sender=None): # pylint: disable=W0613 | |||
# returns the automatic helpers value | # returns the automatic helpers value | |||
log.debug1("getAutomaticHelpers()") | log.debug1("getAutomaticHelpers()") | |||
return self.fw.get_automatic_helpers() | # NOTE: This feature was removed and is now a noop. We retain the dbus | |||
# call to keep API. | ||||
return "no" | ||||
@slip.dbus.polkit.require_auth(config.dbus.PK_ACTION_CONFIG) | @slip.dbus.polkit.require_auth(config.dbus.PK_ACTION_CONFIG) | |||
@dbus_service_method(config.dbus.DBUS_INTERFACE, in_signature='s', | @dbus_service_method(config.dbus.DBUS_INTERFACE, in_signature='s', | |||
out_signature='') | out_signature='') | |||
@dbus_handle_exceptions | @dbus_handle_exceptions | |||
def setAutomaticHelpers(self, value, sender=None): | def setAutomaticHelpers(self, value, sender=None): | |||
# set the automatic helpers value | # set the automatic helpers value | |||
value = dbus_to_python(value, str) | value = dbus_to_python(value, str) | |||
log.debug1("setAutomaticHelpers('%s')" % value) | log.debug1("setAutomaticHelpers('%s')" % value) | |||
self.accessCheck(sender) | self.accessCheck(sender) | |||
self.fw.set_automatic_helpers(value) | # NOTE: This feature was removed and is now a noop. We retain the dbus | |||
self.AutomaticHelpersChanged(value) | # call to keep API. | |||
# must reload the firewall as well | ||||
self.fw.reload() | ||||
self.config.reload() | ||||
self.Reloaded() | ||||
@dbus.service.signal(config.dbus.DBUS_INTERFACE, signature='s') | @dbus.service.signal(config.dbus.DBUS_INTERFACE, signature='s') | |||
@dbus_handle_exceptions | @dbus_handle_exceptions | |||
def AutomaticHelpersChanged(self, value): | def AutomaticHelpersChanged(self, value): | |||
log.debug1("AutomaticHelpersChanged('%s')" % (value)) | log.debug1("AutomaticHelpersChanged('%s')" % (value)) | |||
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # | # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # | |||
# DEFAULT ZONE | # DEFAULT ZONE | |||
End of changes. 5 change blocks. | ||||
10 lines changed or deleted | 8 lines changed or added |