|
 |
47f735 |
From 25e0354c7a582df802a54d1dd5bd22462e50f5b3 Mon Sep 17 00:00:00 2001
|
|
|
47f735 |
From: Eric Garver <eric@garver.life>
|
|
|
47f735 |
Date: Tue, 9 Feb 2021 12:19:53 -0500
|
|
|
47f735 |
Subject: [PATCH 13/22] test(dbus): policy: scope introspection checks to
|
|
|
47f735 |
interface
|
|
|
47f735 |
|
|
|
47f735 |
(cherry picked from commit 76c7ef5140de4e578e7409113c26e6c223b8ed60)
|
|
|
47f735 |
(cherry picked from commit 2236a03c212ac9abb173a5d5a5ba68a4f75e7989)
|
|
|
47f735 |
---
|
|
|
47f735 |
src/tests/dbus/policy_permanent_signatures.at | 18 +++++++++---------
|
|
|
47f735 |
src/tests/dbus/policy_runtime_signatures.at | 8 ++++----
|
|
|
47f735 |
2 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
47f735 |
|
|
|
47f735 |
diff --git a/src/tests/dbus/policy_permanent_signatures.at b/src/tests/dbus/policy_permanent_signatures.at
|
|
|
47f735 |
index d9dc38179840..7363b7715947 100644
|
|
|
47f735 |
--- a/src/tests/dbus/policy_permanent_signatures.at
|
|
|
47f735 |
+++ b/src/tests/dbus/policy_permanent_signatures.at
|
|
|
47f735 |
@@ -5,23 +5,23 @@ dnl ####################
|
|
|
47f735 |
dnl Global APIs
|
|
|
47f735 |
dnl ####################
|
|
|
47f735 |
|
|
|
47f735 |
-DBUS_INTROSPECT([config], [[//method[@name="listPolicies"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([config], [[//interface[@name="org.fedoraproject.FirewallD1.config"]//method[@name="listPolicies"]]], 0, [dnl
|
|
|
47f735 |
<method name="listPolicies">
|
|
|
47f735 |
<arg direction="out" type="ao"></arg>
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
-DBUS_INTROSPECT([config], [[//method[@name="getPolicyNames"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([config], [[//interface[@name="org.fedoraproject.FirewallD1.config"]//method[@name="getPolicyNames"]]], 0, [dnl
|
|
|
47f735 |
<method name="getPolicyNames">
|
|
|
47f735 |
<arg direction="out" type="as"></arg>
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
-DBUS_INTROSPECT([config], [[//method[@name="getPolicyByName"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([config], [[//interface[@name="org.fedoraproject.FirewallD1.config"]//method[@name="getPolicyByName"]]], 0, [dnl
|
|
|
47f735 |
<method name="getPolicyByName">
|
|
|
47f735 |
<arg direction="in" name="policy" type="s"></arg>
|
|
|
47f735 |
<arg direction="out" type="o"></arg>
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
-DBUS_INTROSPECT([config], [[//method[@name="addPolicy"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([config], [[//interface[@name="org.fedoraproject.FirewallD1.config"]//method[@name="addPolicy"]]], 0, [dnl
|
|
|
47f735 |
<method name="addPolicy">
|
|
|
47f735 |
<arg direction="in" name="policy" type="s"></arg>
|
|
|
47f735 |
<arg direction="in" name="settings" type="a{sv}"></arg>
|
|
|
47f735 |
@@ -37,30 +37,30 @@ DBUS_CHECK([config], [config.getPolicyByName], ["allow-host-ipv6"], 0, [stdout])
|
|
|
47f735 |
DBUS_POLICY_OBJ=[$(sed -e "s/.*config\/policy\/\([^']\+\)['].*/\1/" ./stdout)]
|
|
|
47f735 |
export DBUS_POLICY_OBJ
|
|
|
47f735 |
|
|
|
47f735 |
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="getSettings"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="getSettings"]]], 0, [dnl
|
|
|
47f735 |
<method name="getSettings">
|
|
|
47f735 |
<arg direction="out" type="a{sv}"></arg>
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
|
|
|
47f735 |
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="update"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="update"]]], 0, [dnl
|
|
|
47f735 |
<method name="update">
|
|
|
47f735 |
<arg direction="in" name="settings" type="a{sv}"></arg>
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
|
|
|
47f735 |
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="remove"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="remove"]]], 0, [dnl
|
|
|
47f735 |
<method name="remove">
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
|
|
|
47f735 |
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="rename"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="rename"]]], 0, [dnl
|
|
|
47f735 |
<method name="rename">
|
|
|
47f735 |
<arg direction="in" name="name" type="s"></arg>
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
|
|
|
47f735 |
-DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//method[@name="loadDefaults"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([config/policy/${DBUS_POLICY_OBJ}], [[//interface[@name="org.fedoraproject.FirewallD1.config.policy"]//method[@name="loadDefaults"]]], 0, [dnl
|
|
|
47f735 |
<method name="loadDefaults">
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
diff --git a/src/tests/dbus/policy_runtime_signatures.at b/src/tests/dbus/policy_runtime_signatures.at
|
|
|
47f735 |
index 2f0c5e75496b..c651ae981adf 100644
|
|
|
47f735 |
--- a/src/tests/dbus/policy_runtime_signatures.at
|
|
|
47f735 |
+++ b/src/tests/dbus/policy_runtime_signatures.at
|
|
|
47f735 |
@@ -3,13 +3,13 @@ AT_KEYWORDS(dbus policy)
|
|
|
47f735 |
|
|
|
47f735 |
dnl Settings
|
|
|
47f735 |
dnl
|
|
|
47f735 |
-DBUS_INTROSPECT([], [[//method[@name="getPolicySettings"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([], [[//interface[@name="org.fedoraproject.FirewallD1.policy"]//method[@name="getPolicySettings"]]], 0, [dnl
|
|
|
47f735 |
<method name="getPolicySettings">
|
|
|
47f735 |
<arg direction="in" name="policy" type="s"></arg>
|
|
|
47f735 |
<arg direction="out" type="a{sv}"></arg>
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
-DBUS_INTROSPECT([], [[//method[@name="setPolicySettings"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([], [[//interface[@name="org.fedoraproject.FirewallD1.policy"]//method[@name="setPolicySettings"]]], 0, [dnl
|
|
|
47f735 |
<method name="setPolicySettings">
|
|
|
47f735 |
<arg direction="in" name="policy" type="s"></arg>
|
|
|
47f735 |
<arg direction="in" name="settings" type="a{sv}"></arg>
|
|
|
47f735 |
@@ -17,12 +17,12 @@ DBUS_INTROSPECT([], [[//method[@name="setPolicySettings"]]], 0, [dnl
|
|
|
47f735 |
])
|
|
|
47f735 |
|
|
|
47f735 |
dnl Fetching Policies
|
|
|
47f735 |
-DBUS_INTROSPECT([], [[//method[@name="getPolicies"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([], [[//interface[@name="org.fedoraproject.FirewallD1.policy"]//method[@name="getPolicies"]]], 0, [dnl
|
|
|
47f735 |
<method name="getPolicies">
|
|
|
47f735 |
<arg direction="out" type="as"></arg>
|
|
|
47f735 |
</method>
|
|
|
47f735 |
])
|
|
|
47f735 |
-DBUS_INTROSPECT([], [[//method[@name="getActivePolicies"]]], 0, [dnl
|
|
|
47f735 |
+DBUS_INTROSPECT([], [[//interface[@name="org.fedoraproject.FirewallD1.policy"]//method[@name="getActivePolicies"]]], 0, [dnl
|
|
|
47f735 |
<method name="getActivePolicies">
|
|
|
47f735 |
<arg direction="out" type="a{sa{sas}}"></arg>
|
|
|
47f735 |
</method>
|
|
|
47f735 |
--
|
|
|
47f735 |
2.27.0
|
|
|
47f735 |
|