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: Don't poke the hardware if user has no registered prints

Browse Source 
Before claiming the device and therefore potentially activating
the actual hardware, make a call to see if the user has any
prints registered at all.

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

39
pam/pam_fprintd.c
View File

@ -376,6 +376,26 @@ static int do_verify(GMainLoop *loop, pam_handle_t *pamh, DBusGProxy *dev, gbool
return ret; return ret;
} }
static gboolean user_has_prints(DBusGProxy *dev, const char *username)
{
char **fingers;
gboolean have_prints;
if (!dbus_g_proxy_call (dev, "ListEnrolledFingers", NULL,
G_TYPE_STRING, username, G_TYPE_INVALID,
G_TYPE_STRV, &fingers, G_TYPE_INVALID)) {
/* If ListEnrolledFingers fails then verification should
* also fail (both use the same underlying call), so we
* report FALSE here and bail out early. */
return FALSE;
}
have_prints = fingers != NULL && g_strv_length (fingers) > 0;
g_strfreev (fingers);
return have_prints;
}
static void release_device(pam_handle_t *pamh, DBusGProxy *dev) static void release_device(pam_handle_t *pamh, DBusGProxy *dev)
{ {
GError *error = NULL; GError *error = NULL;
@ -404,8 +424,9 @@ static int do_auth(pam_handle_t *pamh, const char *username)
DBusGConnection *connection; DBusGConnection *connection;
DBusGProxy *dev; DBusGProxy *dev;
GMainLoop *loop; GMainLoop *loop;
gboolean have_prints;
gboolean has_multiple_devices; gboolean has_multiple_devices;
int ret; int ret = PAM_AUTHINFO_UNAVAIL;
manager = create_manager (pamh, &connection, &loop); manager = create_manager (pamh, &connection, &loop);
if (manager == NULL) if (manager == NULL)
@ -419,17 +440,17 @@ static int do_auth(pam_handle_t *pamh, const char *username)
return PAM_AUTHINFO_UNAVAIL; return PAM_AUTHINFO_UNAVAIL;
} }
if (!claim_device(pamh, dev, username)) { have_prints = user_has_prints(dev, username);
unref_loop(loop); D(pamh, "prints registered: %s\n", have_prints ? "yes" : "no");
g_object_unref(dev);
close_and_unref(connection); if (have_prints) {
return PAM_AUTHINFO_UNAVAIL; if (claim_device (pamh, dev, username)) {
ret = do_verify (loop, pamh, dev, has_multiple_devices);
release_device (pamh, dev);
}
} }
ret = do_verify(loop, pamh, dev, has_multiple_devices);
unref_loop (loop); unref_loop (loop);
release_device(pamh, dev);
g_object_unref (dev); g_object_unref (dev);
close_and_unref (connection); close_and_unref (connection);