0.6.0

Sort the devices by ID for the GetDevices() output.

NEWS

@@ -1,6 +1,15 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.
 
+version 0.6.0:
+- Fix warning in fprintd.pod file
+- Reduce logging during normal operation
+- Fix eventfd leak in PAM module
+- List possible values for finger when enrolling
+- Fix possible crash in fprintd-verify
+- Fix listing and deleting fingerprints when there's more than
+  one reader available
+
 version 0.5.1:
 - Add max_tries and timeout arguments to PAM module
 - Add ability to require the fingerprint for enrolled users

README

@@ -4,14 +4,13 @@ fprintd
 http://www.reactivated.net/fprint/wiki/Fprintd
 
 Daemon to offer libfprint functionality over D-Bus
-Currently in early stages. Might eat your kangaroo.
+Might eat your kangaroo.
 
-Written in C. Requires bleeding edge libfprint (libusb-1.0 port).
+Written in C.
 
 Licensed under the GPL version 2 or any later version (see COPYING).
 
-An experimental PAM login module is included in the 'pam' directory.
-This will be moved to a separate package once the system has matured.
+A PAM login module is included in the 'pam' directory.
 
 API use cases
 =============

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([fprintd], [0.5.1])
+AC_INIT([fprintd], [0.6.0])
 AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip check-news])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([config.h])

data/fprintd.pod

@@ -100,3 +100,6 @@ By default, fprintd stores the fingerprints in B</var/lib/fprint/>
 =over 8
 
 =item B<dbus-daemon>, B<gnome-about-me>
+
+=back
+

pam/pam_fprintd.c

@@ -170,6 +170,17 @@ static void close_and_unref (DBusGConnection *connection)
 	dbus_g_connection_unref (connection);
 }
 
+static void unref_loop (GMainLoop *loop)
+{
+	GMainContext *ctx;
+
+	/* The main context was created separately, so
+	 * we'll need to unref it ourselves */
+	ctx = g_main_loop_get_context (loop);
+	g_main_loop_unref (loop);
+	g_main_context_unref (ctx);
+}
+
 #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)
@@ -397,13 +408,13 @@ static int do_auth(pam_handle_t *pamh, const char *username)
 	dev = open_device(pamh, connection, manager, username, &has_multiple_devices);
 	g_object_unref (manager);
 	if (!dev) {
-		g_main_loop_unref (loop);
+		unref_loop (loop);
 		close_and_unref (connection);
 		return PAM_AUTHINFO_UNAVAIL;
 	}
 	ret = do_verify(loop, pamh, dev, has_multiple_devices);
 
-	g_main_loop_unref (loop);
+	unref_loop (loop);
 	release_device(pamh, dev);
 	g_object_unref (dev);
 	close_and_unref (connection);

src/main.c

@@ -358,17 +358,17 @@ int main(int argc, char **argv)
 		goto err;
 	}
 
-	g_print("Launching FprintObject\n");
+	g_debug("Launching FprintObject");
 
 	/* create the one instance of the Manager object to be shared between
 	 * all fprintd users */
 	manager = fprint_manager_new(no_timeout);
 
-	g_message("D-Bus service launched with name: %s", FPRINT_SERVICE_NAME);
+	g_debug("D-Bus service launched with name: %s", FPRINT_SERVICE_NAME);
 
-	g_message("entering main loop");
+	g_debug("entering main loop");
 	g_main_loop_run(loop);
-	g_message("main loop completed");
+	g_debug("main loop completed");
 
 	g_object_unref (manager);
 

src/manager.c

@@ -79,7 +79,6 @@ static gchar *get_device_path(FprintDevice *rdev)
 static gboolean
 fprint_manager_timeout_cb (FprintManager *manager)
 {
-	g_message ("No devices in use, exit");
 	//FIXME kill all the devices
 	exit(0);
 	return FALSE;
@@ -160,15 +159,19 @@ static gboolean fprint_manager_get_devices(FprintManager *manager,
 	GPtrArray **devices, GError **error)
 {
 	FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (manager);
-	GSList *elem = priv->dev_registry;
+	GSList *elem = g_slist_reverse(g_slist_copy(priv->dev_registry));
+	GSList *l;
 	int num_open = g_slist_length(elem);
 	GPtrArray *devs = g_ptr_array_sized_new(num_open);
 
-	if (num_open > 0)
-		do {
-			FprintDevice *rdev = elem->data;
+	if (num_open > 0) {
+		for (l = elem; l != NULL; l = l->next) {
+			FprintDevice *rdev = l->data;
 			g_ptr_array_add(devs, get_device_path(rdev));
-		} while ((elem = g_slist_next(elem)) != NULL);
+		}
+	}
+
+	g_slist_free(elem);
 
 	*devices = devs;
 	return TRUE;
@@ -182,7 +185,7 @@ static gboolean fprint_manager_get_default_device(FprintManager *manager,
 	int num_open = g_slist_length(elem);
 
 	if (num_open > 0) {
-		*device = get_device_path (elem->data);
+		*device = get_device_path (g_slist_last (elem)->data);
 		return TRUE;
 	} else {
 		g_set_error (error, FPRINT_ERROR, FPRINT_ERROR_NO_SUCH_DEVICE,

tests/Makefile.am

@@ -9,7 +9,7 @@ fprintd_verify_CFLAGS = $(WARN_CFLAGS) $(GLIB_CFLAGS)
 fprintd_verify_LDADD = $(GLIB_LIBS)
 
 fprintd_enroll_SOURCES = enroll.c $(MARSHALFILES)
-fprintd_enroll_CFLAGS = $(WARN_CFLAGS) $(GLIB_CFLAGS)
+fprintd_enroll_CFLAGS = $(WARN_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/pam
 fprintd_enroll_LDADD = $(GLIB_LIBS)
 
 fprintd_list_SOURCES = list.c

tests/delete.c

@@ -95,7 +95,7 @@ static void process_devices(char **argv)
 		guint j;
 		DBusGProxy *dev;
 
-		path = g_ptr_array_index(devices, 0);
+		path = g_ptr_array_index(devices, i);
 		g_print("Using device %s\n", path);
 
 		/* FIXME use for_name_owner?? */

tests/enroll.c

@@ -24,6 +24,10 @@
 #include "device-dbus-glue.h"
 #include "marshal.h"
 
+#define N_(x) x
+#define TR(x) x
+#include "fingerprint-strings.h"
+
 static DBusGProxy *manager = NULL;
 static DBusGConnection *connection = NULL;
 static char *finger_name = "right-index-finger";
@@ -87,11 +91,35 @@ static void do_enroll(DBusGProxy *dev)
 {
 	GError *error = NULL;
 	gboolean enroll_completed = FALSE;
+	gboolean found;
+	guint i;
 
 	dbus_g_proxy_add_signal(dev, "EnrollStatus", G_TYPE_STRING, G_TYPE_BOOLEAN, NULL);
 	dbus_g_proxy_connect_signal(dev, "EnrollStatus", G_CALLBACK(enroll_result),
 				    &enroll_completed, NULL);
 
+	found = FALSE;
+	for (i = 0; fingers[i].dbus_name != NULL; i++) {
+		if (g_strcmp0 (fingers[i].dbus_name, finger_name) == 0) {
+			found = TRUE;
+			break;
+		}
+	}
+	if (!found) {
+		GString *s;
+
+		s = g_string_new (NULL);
+		g_string_append_printf (s, "Invalid finger name '%s'. Name must be one of ", finger_name);
+		for (i = 0; fingers[i].dbus_name != NULL; i++) {
+			g_string_append_printf (s, "%s", fingers[i].dbus_name);
+			if (fingers[i + 1].dbus_name != NULL)
+				g_string_append (s, ", ");
+		}
+		g_warning ("%s", s->str);
+		g_string_free (s, TRUE);
+		exit (1);
+	}
+
 	g_print("Enrolling %s finger.\n", finger_name);
 	if (!net_reactivated_Fprint_Device_enroll_start(dev, finger_name, &error)) {
 		g_print("EnrollStart failed: %s\n", error->message);

tests/list.c

@@ -111,7 +111,7 @@ static void process_devices(char **argv)
 		guint j;
 		DBusGProxy *dev;
 
-		path = g_ptr_array_index(devices, 0);
+		path = g_ptr_array_index(devices, i);
 		g_print("Using device %s\n", path);
 
 		/* FIXME use for_name_owner?? */

tests/verify.c

@@ -27,7 +27,7 @@
 
 static DBusGProxy *manager = NULL;
 static DBusGConnection *connection = NULL;
-static char *finger_name = "any";
+static char *finger_name = NULL;
 static gboolean g_fatal_warnings = FALSE;
 static char **usernames = NULL;
 
@@ -99,8 +99,10 @@ static void find_finger(DBusGProxy *dev, const char *username)
 		g_print(" - #%d: %s\n", i, fingers[i]);
 	}
 
-	if (strcmp (finger_name, "any") == 0)
-		finger_name = fingers[0];
+	if (finger_name == NULL || strcmp (finger_name, "any") == 0) {
+		g_free (finger_name);
+		finger_name = g_strdup (fingers[0]);
+	}
 
 	g_strfreev (fingers);
 }