diff -up firewalld-0.3.9/src/firewall/server/firewalld.py.RHBZ#1061809 firewalld-0.3.9/src/firewall/server/firewalld.py --- firewalld-0.3.9/src/firewall/server/firewalld.py.RHBZ#1061809 2014-09-30 02:47:38.392358853 +0200 +++ firewalld-0.3.9/src/firewall/server/firewalld.py 2014-09-30 02:48:16.012487112 +0200 @@ -403,7 +403,7 @@ class FirewallD(slip.dbus.service.Object self.fw.policies.disable_lockdown() self.LockdownDisabled() - @slip.dbus.polkit.require_auth(PK_ACTION_POLICIES) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_POLICIES, in_signature='', out_signature='b') @dbus_handle_exceptions @@ -454,7 +454,7 @@ class FirewallD(slip.dbus.service.Object self.fw.policies.lockdown_whitelist.remove_command(command) self.LockdownWhitelistCommandRemoved(command) - @slip.dbus.polkit.require_auth(PK_ACTION_POLICIES) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_POLICIES, in_signature='s', out_signature='b') @dbus_handle_exceptions @@ -466,7 +466,7 @@ class FirewallD(slip.dbus.service.Object # no access check here return self.fw.policies.lockdown_whitelist.has_command(command) - @slip.dbus.polkit.require_auth(PK_ACTION_POLICIES) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_POLICIES, in_signature='', out_signature='as') @dbus_handle_exceptions @@ -515,7 +515,7 @@ class FirewallD(slip.dbus.service.Object self.fw.policies.lockdown_whitelist.remove_uid(uid) self.LockdownWhitelistUidRemoved(uid) - @slip.dbus.polkit.require_auth(PK_ACTION_POLICIES) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_POLICIES, in_signature='i', out_signature='b') @dbus_handle_exceptions @@ -527,7 +527,7 @@ class FirewallD(slip.dbus.service.Object # no access check here return self.fw.policies.lockdown_whitelist.has_uid(uid) - @slip.dbus.polkit.require_auth(PK_ACTION_POLICIES) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_POLICIES, in_signature='', out_signature='ai') @dbus_handle_exceptions @@ -576,7 +576,7 @@ class FirewallD(slip.dbus.service.Object self.fw.policies.lockdown_whitelist.remove_user(user) self.LockdownWhitelistUserRemoved(user) - @slip.dbus.polkit.require_auth(PK_ACTION_POLICIES) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_POLICIES, in_signature='s', out_signature='b') @dbus_handle_exceptions @@ -588,7 +588,7 @@ class FirewallD(slip.dbus.service.Object # no access check here return self.fw.policies.lockdown_whitelist.has_user(user) - @slip.dbus.polkit.require_auth(PK_ACTION_POLICIES) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_POLICIES, in_signature='', out_signature='as') @dbus_handle_exceptions @@ -637,7 +637,7 @@ class FirewallD(slip.dbus.service.Object self.fw.policies.lockdown_whitelist.remove_context(context) self.LockdownWhitelistContextRemoved(context) - @slip.dbus.polkit.require_auth(PK_ACTION_POLICIES) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_POLICIES, in_signature='s', out_signature='b') @dbus_handle_exceptions @@ -649,7 +649,7 @@ class FirewallD(slip.dbus.service.Object # no access check here return self.fw.policies.lockdown_whitelist.has_context(context) - @slip.dbus.polkit.require_auth(PK_ACTION_POLICIES) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_POLICIES, in_signature='', out_signature='as') @dbus_handle_exceptions @@ -869,7 +869,7 @@ class FirewallD(slip.dbus.service.Object return zone return "" - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='s', out_signature='b') @dbus_handle_exceptions @@ -946,7 +946,7 @@ class FirewallD(slip.dbus.service.Object self.InterfaceRemoved(_zone, interface) return _zone - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='ss', out_signature='b') @dbus_handle_exceptions @@ -959,7 +959,7 @@ class FirewallD(slip.dbus.service.Object log.debug1("zone.queryInterface('%s', '%s')" % (zone, interface)) return self.fw.zone.query_interface(zone, interface) - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='s', out_signature='as') @dbus_handle_exceptions @@ -1053,7 +1053,7 @@ class FirewallD(slip.dbus.service.Object self.SourceRemoved(_zone, source) return _zone - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='ss', out_signature='b') @dbus_handle_exceptions @@ -1066,7 +1066,7 @@ class FirewallD(slip.dbus.service.Object log.debug1("zone.querySource('%s', '%s')" % (zone, source)) return self.fw.zone.query_source(zone, source) - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='s', out_signature='as') @dbus_handle_exceptions @@ -1143,7 +1143,7 @@ class FirewallD(slip.dbus.service.Object self.RichRuleRemoved(_zone, rule) return _zone - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='ss', out_signature='b') @dbus_handle_exceptions @@ -1155,7 +1155,7 @@ class FirewallD(slip.dbus.service.Object obj = Rich_Rule(rule_str=rule) return self.fw.zone.query_rule(zone, obj) - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='s', out_signature='as') @dbus_handle_exceptions @@ -1227,7 +1227,7 @@ class FirewallD(slip.dbus.service.Object self.ServiceRemoved(_zone, service) return _zone - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='ss', out_signature='b') @dbus_handle_exceptions @@ -1238,7 +1238,7 @@ class FirewallD(slip.dbus.service.Object log.debug1("zone.queryService('%s', '%s')" % (zone, service)) return self.fw.zone.query_service(zone, service) - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='s', out_signature='as') @dbus_handle_exceptions @@ -1314,7 +1314,7 @@ class FirewallD(slip.dbus.service.Object self.PortRemoved(_zone, port, protocol) return _zone - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='sss', out_signature='b') @dbus_handle_exceptions @@ -1326,7 +1326,7 @@ class FirewallD(slip.dbus.service.Object log.debug1("zone.queryPort('%s', '%s', '%s')" % (zone, port, protocol)) return self.fw.zone.query_port(zone, port, protocol) - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='s', out_signature='aas') @dbus_handle_exceptions @@ -1395,7 +1395,7 @@ class FirewallD(slip.dbus.service.Object self.MasqueradeRemoved(_zone) return _zone - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='s', out_signature='b') @dbus_handle_exceptions @@ -1476,7 +1476,7 @@ class FirewallD(slip.dbus.service.Object self.ForwardPortRemoved(_zone, port, protocol, toport, toaddr) return _zone - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='sssss', out_signature='b') @dbus_handle_exceptions @@ -1493,7 +1493,7 @@ class FirewallD(slip.dbus.service.Object return self.fw.zone.query_forward_port(zone, port, protocol, toport, toaddr) - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='s', out_signature='aas') @dbus_handle_exceptions @@ -1566,7 +1566,7 @@ class FirewallD(slip.dbus.service.Object self.IcmpBlockRemoved(_zone, icmp) return _zone - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='ss', out_signature='b') @dbus_handle_exceptions @@ -1577,7 +1577,7 @@ class FirewallD(slip.dbus.service.Object log.debug1("zone.queryIcmpBlock('%s', '%s')" % (zone, icmp)) return self.fw.zone.query_icmp_block(zone, icmp) - @slip.dbus.polkit.require_auth(PK_ACTION_CONFIG) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_ZONE, in_signature='s', out_signature='as') @dbus_handle_exceptions @@ -1634,7 +1634,7 @@ class FirewallD(slip.dbus.service.Object self.fw.direct.remove_chain(ipv, table, chain) self.ChainRemoved(ipv, table, chain) - @slip.dbus.polkit.require_auth(PK_ACTION_DIRECT) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_DIRECT, in_signature='sss', out_signature='b') @dbus_handle_exceptions @@ -1646,7 +1646,7 @@ class FirewallD(slip.dbus.service.Object log.debug1("direct.queryChain('%s', '%s', '%s')" % (ipv, table, chain)) return self.fw.direct.query_chain(ipv, table, chain) - @slip.dbus.polkit.require_auth(PK_ACTION_DIRECT) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_DIRECT, in_signature='ss', out_signature='as') @dbus_handle_exceptions @@ -1657,7 +1657,7 @@ class FirewallD(slip.dbus.service.Object log.debug1("direct.getChains('%s', '%s')" % (ipv, table)) return self.fw.direct.get_chains(ipv, table) - @slip.dbus.polkit.require_auth(PK_ACTION_DIRECT) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_DIRECT, in_signature='', out_signature='a(sss)') @dbus_handle_exceptions @@ -1729,7 +1729,7 @@ class FirewallD(slip.dbus.service.Object self.fw.direct.remove_rule(ipv, table, chain, priority, args) self.RuleRemoved(ipv, table, chain, priority, args) - @slip.dbus.polkit.require_auth(PK_ACTION_DIRECT) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_DIRECT, in_signature='sssias', out_signature='b') @dbus_handle_exceptions @@ -1744,7 +1744,7 @@ class FirewallD(slip.dbus.service.Object (table, chain, priority, "','".join(args))) return self.fw.direct.query_rule(ipv, table, chain, priority, args) - @slip.dbus.polkit.require_auth(PK_ACTION_DIRECT) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_DIRECT, in_signature='sss', out_signature='a(ias)') @dbus_handle_exceptions @@ -1756,7 +1756,7 @@ class FirewallD(slip.dbus.service.Object log.debug1("direct.getRules('%s', '%s', '%s')" % (ipv, table, chain)) return self.fw.direct.get_rules(ipv, table, chain) - @slip.dbus.polkit.require_auth(PK_ACTION_DIRECT) + @slip.dbus.polkit.require_auth(PK_ACTION_INFO) @dbus_service_method(DBUS_INTERFACE_DIRECT, in_signature='', out_signature='a(sssias)') @dbus_handle_exceptions