Attachment 129586 Details for Bug 99811 – manager: add HasPrints() DBus method

[patch] manager: add HasPrints() DBus method

manager-add-HasPrints-DBus-method.patch (text/plain), 6.72 KB, created by Christian Kellner on 2017-02-14 12:07:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Kellner

Created: 2017-02-14 12:07:43 UTC

Size: 6.72 KB

patch

obsolete

>From 13b45a53aa9ed4fa72ecb4932bfcbf65e92de4d8 Mon Sep 17 00:00:00 2001
>From: Christian Kellner <christian@kellner.me>
>Date: Wed, 18 Jan 2017 16:33:49 +0100
>Subject: [PATCH] manager: add HasPrints() DBus method
>
>The intended use for this method is to check if the given user has
>any fingerprints enrolled for any device at all, so we can skip
>the opening of devices in case there are no prints.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=99811
>---
> data/Makefile.am                                   |  2 +-
> ....policy.in => net.reactivated.fprint.policy.in} | 20 ++++++++
> po/POTFILES.in                                     |  2 +-
> src/manager.c                                      | 58 ++++++++++++++++++++++
> src/manager.xml                                    | 24 +++++++++
> 5 files changed, 104 insertions(+), 2 deletions(-)
> rename data/{net.reactivated.fprint.device.policy.in => net.reactivated.fprint.policy.in} (65%)
>
>diff --git a/data/Makefile.am b/data/Makefile.am
>index d71c5c5..50b86fe 100644
>--- a/data/Makefile.am
>+++ b/data/Makefile.am
>@@ -19,7 +19,7 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile
> endif
> 
> polkitdir = $(datadir)/polkit-1/actions
>-polkit_in_files = net.reactivated.fprint.device.policy.in
>+polkit_in_files = net.reactivated.fprint.policy.in
> 
> @INTLTOOL_POLICY_RULE@
> polkit_DATA = $(polkit_in_files:.policy.in=.policy)
>diff --git a/data/net.reactivated.fprint.device.policy.in b/data/net.reactivated.fprint.policy.in
>similarity index 65%
>rename from data/net.reactivated.fprint.device.policy.in
>rename to data/net.reactivated.fprint.policy.in
>index a564929..d5dd058 100644
>--- a/data/net.reactivated.fprint.device.policy.in
>+++ b/data/net.reactivated.fprint.policy.in
>@@ -9,6 +9,26 @@
>   <vendor_url>http://reactivated.net/fprint/</vendor_url>
>   <icon_name>fprint</icon_name>
> 
>+  <action id="net.reactivated.fprint.manager.hasprints">
>+    <_description>Query if a user has prints enrolled.</_description>
>+    <_message>Privileges are required to query the fingerprint system.</_message>
>+    <defaults>
>+      <allow_any>no</allow_any>
>+      <allow_inactive>no</allow_inactive>
>+      <allow_active>yes</allow_active>
>+    </defaults>
>+  </action>
>+
>+  <action id="net.reactivated.fprint.manager.setusername">
>+    <_description>Set the active fingerprint user</_description>
>+    <_message>Privileges are required to execute actions on behalf of other users.</_message>
>+    <defaults>
>+      <allow_any>no</allow_any>
>+      <allow_inactive>no</allow_inactive>
>+      <allow_active>auth_admin_keep</allow_active>
>+    </defaults>
>+  </action>
>+
>   <action id="net.reactivated.fprint.device.verify">
>     <_description>Verify a fingerprint</_description>
>     <_message>Privileges are required to verify fingerprints.</_message>
>diff --git a/po/POTFILES.in b/po/POTFILES.in
>index b4f402b..496d303 100644
>--- a/po/POTFILES.in
>+++ b/po/POTFILES.in
>@@ -1,4 +1,4 @@
>-data/net.reactivated.fprint.device.policy.in
>+data/net.reactivated.fprint.policy.in
> src/main.c
> src/manager.c
> src/device.c
>diff --git a/src/manager.c b/src/manager.c
>index 0755160..58d67a4 100644
>--- a/src/manager.c
>+++ b/src/manager.c
>@@ -20,12 +20,18 @@
> #include <unistd.h>
> #include <stdlib.h>
> #include <dbus/dbus-glib-bindings.h>
>+#include <dbus/dbus-glib-lowlevel.h>
> #include <glib.h>
> #include <glib/gi18n.h>
> #include <libfprint/fprint.h>
> #include <glib-object.h>
>+#include <polkit/polkit.h>
>+
>+#include <pwd.h>
> 
> #include "fprintd.h"
>+#include "storage.h"
>+#include "auth.h"
> 
> DBusGConnection *fprintd_dbus_conn;
> 
>@@ -33,6 +39,9 @@ static gboolean fprint_manager_get_devices(FprintManager *manager,
> 	GPtrArray **devices, GError **error);
> static gboolean fprint_manager_get_default_device(FprintManager *manager,
> 	const char **device, GError **error);
>+static void fprint_manager_has_prints(FprintManager *manager,
>+				     const char *username,
>+				     DBusGMethodInvocation *context);
> #include "manager-dbus-glue.h"
> 
> static GObjectClass *parent_class = NULL;
>@@ -195,6 +204,55 @@ static gboolean fprint_manager_get_default_device(FprintManager *manager,
> 	}
> }
> 
>+static void fprint_manager_has_prints(FprintManager *manager,
>+				      const char *username,
>+				      DBusGMethodInvocation *context)
>+{
>+	PolkitAuthority *authority;
>+	GError *error = NULL;
>+	char *user;
>+	gboolean ok;
>+	int r;
>+
>+	authority = polkit_authority_get_sync(NULL, NULL);
>+
>+	user = fprint_check_for_username(authority,
>+					 context,
>+					 username,
>+					 NULL,
>+					 &error);
>+	if (user == NULL) {
>+		dbus_g_method_return_error(context, error);
>+		g_error_free(error);
>+		g_object_unref(authority);
>+		return;
>+	}
>+
>+	ok = fprint_check_polkit_for_action(authority,
>+					    context,
>+					    "net.reactivated.fprint.manager.hasprints",
>+					    &error);
>+	g_object_unref (authority);
>+
>+	if (!ok) {
>+		g_free(user);
>+		dbus_g_method_return_error(context, error);
>+		return;
>+	}
>+
>+	r = store.has_prints(user);
>+	if (r < 0) {
>+		GError *err = NULL;
>+		g_set_error(&err, FPRINT_ERROR, FPRINT_ERROR_INTERNAL,
>+			    "Failed to get information from fingerprint store");
>+		dbus_g_method_return_error(context, err);
>+		g_error_free(err);
>+		return;
>+	}
>+
>+	dbus_g_method_return(context, r == 1);
>+}
>+
> GQuark fprint_error_quark(void)
> {
> 	static GQuark quark = 0;
>diff --git a/src/manager.xml b/src/manager.xml
>index f4a38c7..b2178f2 100644
>--- a/src/manager.xml
>+++ b/src/manager.xml
>@@ -2,6 +2,7 @@
> "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
> "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" [
> <!ENTITY ERROR_NO_SUCH_DEVICE "net.reactivated.Fprint.Error.NoSuchDevice">
>+<!ENTITY ERROR_PERMISSION_DENIED "net.reactivated.Fprint.Error.PermissionDenied">
> ]>
> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
> 	<interface name="net.reactivated.Fprint.Manager">
>@@ -45,6 +46,29 @@
> 			</doc:doc>
> 		</method>
> 
>+		
>+
>+		<method name="HasPrints">
>+		  	<arg type="s" name="username" direction="in">
>+				<doc:doc><doc:summary>The username for whom to check if the system is enabled. See <doc:ref type="description" to="usernames">Usernames</doc:ref>.</doc:summary></doc:doc>
>+			</arg>
>+			<arg type="b" name="has_prints" direction="out">
>+				<doc:doc><doc:summary>True if the given user has fingerprints enrolled.</doc:summary></doc:doc>
>+			</arg>
>+			<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
>+
>+			<doc:doc>
>+				<doc:description>
>+					<doc:para>
>+					        Check if a user has any fingerprints registered that could be used.
>+					</doc:para>
>+				</doc:description>
>+				<doc:errors>
>+					<doc:error name="&ERROR_PERMISSION_DENIED;">if the caller lacks the appropriate PolicyKit authorization</doc:error>
>+				</doc:errors>
>+			</doc:doc>
>+		</method>
>+
> 	</interface>
> </node>
> 
>-- 
>2.9.3

Actions: View | Splinter Review

Attachments on bug 99811: 129583 | 129584 | 129585 | 129586 | 129587 | 129588 | 129589 | 129590 | 129663 | 129664 | 129668 | 129670

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.