firewalld/SOURCES/0013-test-dbus-policy-scope-introspection-checks-to-inter.patch

From 25e0354c7a582df802a54d1dd5bd22462e50f5b3 Mon Sep 17 00:00:00 2001
From: Eric Garver <eric@garver.life>
Date: Tue, 9 Feb 2021 12:19:53 -0500
Subject: [PATCH 13/22] test(dbus): policy: scope introspection checks to
 interface

(cherry picked from commit 76c7ef5140de4e578e7409113c26e6c223b8ed60)
(cherry picked from commit 2236a03c212ac9abb173a5d5a5ba68a4f75e7989)
---
 src/tests/dbus/policy_permanent_signatures.at | 18 +++++++++---------
 src/tests/dbus/policy_runtime_signatures.at   |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/tests/dbus/policy_permanent_signatures.at b/src/tests/dbus/policy_permanent_signatures.at
index d9dc38179840..7363b7715947 100644
--- a/src/tests/dbus/policy_permanent_signatures.at
+++ b/src/tests/dbus/policy_permanent_signatures.at
@@ -5,23 +5,23 @@ dnl ####################
 dnl Global APIs
 dnl ####################
 
-DBUS_INTROSPECT([config], [[//method[@name="listPolicies"]]], 0, [dnl
+DBUS_INTROSPECT([config], [[//interface[@name="org.fedoraproject.FirewallD1.config"]//method[@name="listPolicies"]]], 0, [dnl
     <method name="listPolicies">
         <arg direction="out" type="ao"></arg>
     </method>
 ])
-DBUS_INTROSPECT([config], [[//method[@name="getPolicyNames"]]], 0, [dnl
+DBUS_INTROSPECT([config], [[//interface[@name="org.fedoraproject.FirewallD1.config"]//method[@name="getPolicyNames"]]], 0, [dnl
     <method name="getPolicyNames">
         <arg direction="out" type="as"></arg>
     </method>
 ])
-DBUS_INTROSPECT([config], [[//method[@name="getPolicyByName"]]], 0, [dnl
+DBUS_INTROSPECT([config], [[//interface[@name="org.fedoraproject.FirewallD1.config"]//method[@name="getPolicyByName"]]], 0, [dnl
     <method name="getPolicyByName">
         <arg direction="in" name="policy" type="s"></arg>
         <arg direction="out" type="o"></arg>
     </method>
 ])
-DBUS_INTROSPECT([config], [[//method[@name="addPolicy"]]], 0, [dnl
+DBUS_INTROSPECT([config], [[//interface[@name="org.fedoraproject.FirewallD1.config"]//method[@name="addPolicy"]]], 0, [dnl
     <method name="addPolicy">
         <arg direction="in" name="policy" type="s"></arg>
         <arg direction="in" name="settings" type="a{sv}"></arg>
@@ -37,30 +37,30 @@ DBUS_CHECK([config], [config.getPolicyByName], ["allow-host-ipv6"], 0, [stdout])
 DBUS_POLICY_OBJ=[$(sed -e "s/.*config\/policy\/\([^']\+\)['].*/\1/" ./stdout)]
 export DBUS_POLICY_OBJ
 
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="getSettings"]]], 0, [dnl
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="getSettings"]]], 0, [dnl
     <method name="getSettings">
         <arg direction="out" type="a{sv}"></arg>
     </method>
 ])
 
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="update"]]], 0, [dnl
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="update"]]], 0, [dnl
     <method name="update">
         <arg direction="in" name="settings" type="a{sv}"></arg>
     </method>
 ])
 
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="remove"]]], 0, [dnl
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="remove"]]], 0, [dnl
     <method name="remove">
     </method>
 ])
 
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="rename"]]], 0, [dnl
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="rename"]]], 0, [dnl
     <method name="rename">
         <arg direction="in" name="name" type="s"></arg>
     </method>
 ])
 
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="loadDefaults"]]], 0, [dnl
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="loadDefaults"]]], 0, [dnl
     <method name="loadDefaults">
     </method>
 ])
diff --git a/src/tests/dbus/policy_runtime_signatures.at b/src/tests/dbus/policy_runtime_signatures.at
index 2f0c5e75496b..c651ae981adf 100644
--- a/src/tests/dbus/policy_runtime_signatures.at
+++ b/src/tests/dbus/policy_runtime_signatures.at
@@ -3,13 +3,13 @@ AT_KEYWORDS(dbus policy)
 
 dnl Settings
 dnl
-DBUS_INTROSPECT([], [[//method[@name="getPolicySettings"]]], 0, [dnl
+DBUS_INTROSPECT([], [[//interface[@name="org.fedoraproject.FirewallD1.policy"]//method[@name="getPolicySettings"]]], 0, [dnl
     <method name="getPolicySettings">
         <arg direction="in" name="policy" type="s"></arg>
         <arg direction="out" type="a{sv}"></arg>
     </method>
 ])
-DBUS_INTROSPECT([], [[//method[@name="setPolicySettings"]]], 0, [dnl
+DBUS_INTROSPECT([], [[//interface[@name="org.fedoraproject.FirewallD1.policy"]//method[@name="setPolicySettings"]]], 0, [dnl
     <method name="setPolicySettings">
         <arg direction="in" name="policy" type="s"></arg>
         <arg direction="in" name="settings" type="a{sv}"></arg>
@@ -17,12 +17,12 @@ DBUS_INTROSPECT([], [[//method[@name="setPolicySettings"]]], 0, [dnl
 ])
 
 dnl Fetching Policies
-DBUS_INTROSPECT([], [[//method[@name="getPolicies"]]], 0, [dnl
+DBUS_INTROSPECT([], [[//interface[@name="org.fedoraproject.FirewallD1.policy"]//method[@name="getPolicies"]]], 0, [dnl
     <method name="getPolicies">
         <arg direction="out" type="as"></arg>
     </method>
 ])
-DBUS_INTROSPECT([], [[//method[@name="getActivePolicies"]]], 0, [dnl
+DBUS_INTROSPECT([], [[//interface[@name="org.fedoraproject.FirewallD1.policy"]//method[@name="getActivePolicies"]]], 0, [dnl
     <method name="getActivePolicies">
         <arg direction="out" type="a{sa{sas}}"></arg>
     </method>
-- 
2.27.0