cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-08 20:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

pam: separate device opening and claiming

Browse Source 
For some operations, i.e. listing the enrolled prints, the device
does not need to be claimed. Therefore the claiming can be delayed
until we actually start the verification process, allowing us to
query the fingerprint system if the user has any prints enrolled.

https://bugs.freedesktop.org/show_bug.cgi?id=99811
This commit is contained in:
Christian Kellner
2017-02-16 11:05:10 +01:00
committed by Bastien Nocera
parent da87d1d7ee
commit f54a90ea80
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pam/pam_fprintd.c
View File

@ -183,7 +183,7 @@ static void unref_loop (GMainLoop *loop)
#define DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH)) #define DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
static DBusGProxy *open_device(pam_handle_t *pamh, DBusGConnection *connection, DBusGProxy *manager, const char *username, gboolean *has_multiple_devices) static DBusGProxy *open_device(pam_handle_t *pamh, DBusGConnection *connection, DBusGProxy *manager, gboolean *has_multiple_devices)
{ {
GError *error = NULL; GError *error = NULL;
const char *path; const char *path;
@ -217,13 +217,6 @@ static DBusGProxy *open_device(pam_handle_t *pamh, DBusGConnection *connection,
path, path,
"net.reactivated.Fprint.Device"); "net.reactivated.Fprint.Device");
if (!dbus_g_proxy_call (dev, "Claim", &error, G_TYPE_STRING, username, G_TYPE_INVALID, G_TYPE_INVALID)) {
D(pamh, "failed to claim device '%s': %s\n", path, error->message);
g_error_free (error);
g_object_unref (dev);
dev = NULL;
}
g_ptr_array_free (paths_array, TRUE); g_ptr_array_free (paths_array, TRUE);
return dev; return dev;
@ -392,6 +385,19 @@ static void release_device(pam_handle_t *pamh, DBusGProxy *dev)
} }
} }
static gboolean claim_device(pam_handle_t *pamh, DBusGProxy *dev, const char *username)
{
GError *error = NULL;
if (!dbus_g_proxy_call (dev, "Claim", &error, G_TYPE_STRING, username, G_TYPE_INVALID, G_TYPE_INVALID)) {
D(pamh, "failed to claim device %s\n", error->message);
g_error_free (error);
return FALSE;
}
return TRUE;
}
static int do_auth(pam_handle_t *pamh, const char *username) static int do_auth(pam_handle_t *pamh, const char *username)
{ {
DBusGProxy *manager; DBusGProxy *manager;
@ -405,13 +411,21 @@ static int do_auth(pam_handle_t *pamh, const char *username)
if (manager == NULL) if (manager == NULL)
return PAM_AUTHINFO_UNAVAIL; return PAM_AUTHINFO_UNAVAIL;
dev = open_device(pamh, connection, manager, username, &has_multiple_devices); dev = open_device(pamh, connection, manager, &has_multiple_devices);
g_object_unref (manager); g_object_unref (manager);
if (!dev) { if (!dev) {
unref_loop (loop); unref_loop (loop);
close_and_unref (connection); close_and_unref (connection);
return PAM_AUTHINFO_UNAVAIL; return PAM_AUTHINFO_UNAVAIL;
} }
if (!claim_device(pamh, dev, username)) {
unref_loop(loop);
g_object_unref(dev);
close_and_unref(connection);
return PAM_AUTHINFO_UNAVAIL;
}
ret = do_verify(loop, pamh, dev, has_multiple_devices); ret = do_verify(loop, pamh, dev, has_multiple_devices);
unref_loop (loop); unref_loop (loop);