Only allow privileged apps to check authz and add ActionLookup interface

Also remove the ObtainAuthorization() call and allow apps to pass
details to CheckAuthorization.

2 files changed, 20 insertions, 27 deletions

diff --git a/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml b/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
index 2faa2cf..3b519c2 100644
--- a/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
+++ b/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
@@ -14,6 +14,18 @@
         <annotation name="org.gtk.EggDBus.DocString" value="The identifier for the action that the user is authentication for."/>
       </arg>
 
+      <arg name="message" direction="in" type="s">
+        <annotation name="org.gtk.EggDBus.DocString" value="The message to display to the user. This is translated into the locale passed when registering the authentication agent using org.freedesktop.PolicyKit1.Authority.RegisterAuthenticationAgent()."/>
+      </arg>
+
+      <arg name="icon_name" direction="in" type="s">
+        <annotation name="org.gtk.EggDBus.DocString" value="The themed icon describing the action or the empty string if no icon is set."/>
+      </arg>
+
+      <arg name="details" direction="in" type="a{ss}">
+        <annotation name="org.gtk.EggDBus.DocString" value="Details about the authentication request. This is a dictionary of key/value pairs where both key and value are strings. These strings are translated into the locale passed when registering the authentication agent using org.freedesktop.PolicyKit1.Authority.RegisterAuthenticationAgent()."/>
+      </arg>
+
       <arg name="cookie" direction="in" type="s">
         <annotation name="org.gtk.EggDBus.DocString" value="A cookie identifying the authentication request."/>
       </arg>
diff --git a/data/org.freedesktop.PolicyKit1.Authority.xml b/data/org.freedesktop.PolicyKit1.Authority.xml
index a3d5741..da2fe59 100644
--- a/data/org.freedesktop.PolicyKit1.Authority.xml
+++ b/data/org.freedesktop.PolicyKit1.Authority.xml
@@ -213,6 +213,10 @@
         <annotation name="org.gtk.EggDBus.DocString" value="Identifier for the action that @subject is attempting to do."/>
       </arg>
 
+      <arg name="details" direction="in" type="a{ss}">
+        <annotation name="org.gtk.EggDBus.DocString" value="Details describing the action."/>
+      </arg>
+
       <arg name="flags" direction="in" type="u">
         <annotation name="org.gtk.EggDBus.Type" value="CheckAuthorizationFlags"/>
         <annotation name="org.gtk.EggDBus.DocString" value="A set of #CheckAuthorizationFlags."/>
@@ -238,33 +242,6 @@
 
     <!-- ---------------------------------------------------------------------------------------------------- -->
 
-    <method name="ObtainAuthorization">
-      <annotation name="org.gtk.EggDBus.DocString" value="Obtains a temporary authorization for @subject to perform the action identified by @action_id. If @subject is already authorized, this method returns immediately without error. If the authorization could not be obtained or @action_id doesn't allow temporary authorizations, the %org.freedesktop.PolicyKit1.Error.Failed error is returned."/>
-
-      <arg name="subject" direction="in" type="(sa{sv})">
-        <annotation name="org.gtk.EggDBus.DocString" value="A #Subject struct."/>
-        <annotation name="org.gtk.EggDBus.Type" value="Subject"/>
-      </arg>
-
-      <arg name="action_id" direction="in" type="s">
-        <annotation name="org.gtk.EggDBus.DocString" value="Identifier for the action that @subject is attempting to do."/>
-      </arg>
-
-      <arg name="cancellation_id" direction="in" type="s">
-        <annotation name="org.gtk.EggDBus.DocString" value="A unique id used to cancel the the authentication check via org.freedesktop.PolicyKit1.Authority.CancelObtainAuthorization() or the empty string if cancellation is not needed."/>
-      </arg>
-    </method>
-
-    <method name="CancelObtainAuthorization">
-      <annotation name="org.gtk.EggDBus.DocString" value="Cancels an attempt to obtain an authorization."/>
-
-      <arg name="cancellation_id" direction="in" type="s">
-        <annotation name="org.gtk.EggDBus.DocString" value="The @cancellation_id passed to org.freedesktop.PolicyKit1.Authority.ObtainAuthorization()."/>
-      </arg>
-    </method>
-
-    <!-- ---------------------------------------------------------------------------------------------------- -->
-
     <method name="RegisterAuthenticationAgent">
       <annotation name="org.gtk.EggDBus.DocString" value="<para>Register an authentication agent.</para><para>Note that current versions of PolicyKit will only work if @session_id is set to the empty string. In the future it might work for non-empty strings if the caller is sufficiently privileged.</para>"/>
 
@@ -272,6 +249,10 @@
         <annotation name="org.gtk.EggDBus.DocString" value="The session to register the authentication for or blank for the session the caller of the method is in."/>
       </arg>
 
+      <arg name="locale" direction="in" type="s">
+        <annotation name="org.gtk.EggDBus.DocString" value="The locale of the authentication agent."/>
+      </arg>
+
       <arg name="object_path" direction="in" type="s">
         <annotation name="org.gtk.EggDBus.DocString" value="The object path of authentication agent object on the unique name of the caller."/>
       </arg>