Add fingerprint functionality via fprintd DBus service

completions/bash/swaylock

@@ -14,6 +14,7 @@ _swaylock()
     -F
     -h
     -i
+    -p
     -k
     -K
     -L
@@ -41,6 +42,7 @@ _swaylock()
     --hide-keyboard-layout
     --ignore-empty-password
     --image
+    --fingerprint
     --indicator-caps-lock
     --indicator-idle-visible
     --indicator-radius

completions/fish/swaylock.fish

@@ -14,6 +14,7 @@ complete -c swaylock -l help                   -s h --description "Show help mes
 complete -c swaylock -l hide-keyboard-layout   -s K --description "Hide the current xkb layout while typing."
 complete -c swaylock -l ignore-empty-password  -s e --description "When an empty password is provided, do not validate it."
 complete -c swaylock -l image                  -s i --description "Display the given image, optionally only on the given output."
+complete -c swaylock -l fingerprint               p --description "Enable fingerprint scanning. Fprint is required."
 complete -c swaylock -l indicator-caps-lock    -s l --description "Show the current Caps Lock state also on the indicator."
 complete -c swaylock -l indicator-idle-visible      --description "Sets the indicator to show even if idle."
 complete -c swaylock -l indicator-radius            --description "Sets the indicator radius."

completions/zsh/_swaylock

@@ -18,6 +18,7 @@ _arguments -s \
 	'(--hide-keyboard-layout -K)'{--hide-keyboard-layout,-K}'[Hide the current xkb layout while typing]' \
 	'(--ignore-empty-password -e)'{--ignore-empty-password,-e}'[When an empty password is provided, do not validate it]' \
 	'(--image -i)'{--image,-i}'[Display the given image, optionally only on the given output]:filename:_files' \
+	'(--fingerprint -p)'{--fingerprint,-p}'[Enable fingerprint scanning. Fprint is required]' \
 	'(--indicator-caps-lock -l)'{--indicator-caps-lock,-l}'[Show the current Caps Lock state also on the indicator]' \
 	'(--indicator-idle-visible)'--indicator-idle-visible'[Sets the indicator to show even if idle]' \
 	'(--indicator-radius)'--indicator-radius'[Sets the indicator radius]:radius:' \

fingerprint/fingerprint.c

@@ -0,0 +1,249 @@
+/*
+ * Based on fprintd util to verify a fingerprint
+ * Copyright (C) 2008 Daniel Drake <dsd@gentoo.org>
+ * Copyright (C) 2020 Marco Trevisan <marco.trevisan@canonical.com>
+ * Copyright (C) 2023 Alexandr Lutsai <s.lyra@ya.ru>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <locale.h>
+#include <gio/gio.h>
+
+#include "fingerprint.h"
+#include "log.h"
+
+static void display_message(struct FingerprintState *state, const char *fmt, ...) {
+	va_list(args);
+	va_start(args, fmt);
+	vsnprintf(state->status, sizeof(state->status), fmt, args);
+	va_end(args);
+
+	state->sw_state->auth_state = AUTH_STATE_FINGERPRINT;
+	state->sw_state->fingerprint_msg = state->status;
+	damage_state(state->sw_state);
+	schedule_indicator_clear(state->sw_state);
+}
+
+static void create_manager(struct FingerprintState *state) {
+	g_autoptr(GError) error = NULL;
+	state->connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+	if (state->connection == NULL) {
+		swaylock_log(LOG_ERROR, "Failed to connect to session bus: %s", error->message);
+		display_message(state, "Fingerprint error");
+		return;
+	}
+
+	state->manager = fprint_dbus_manager_proxy_new_sync(
+		state->connection,
+		G_DBUS_PROXY_FLAGS_NONE,
+		"net.reactivated.Fprint",
+		"/net/reactivated/Fprint/Manager",
+		NULL, &error);
+	if (state->manager == NULL) {
+		swaylock_log(LOG_ERROR, "Failed to get Fprintd manager: %s", error->message);
+		display_message(state, "Fingerprint error");
+		return;
+	}
+
+	swaylock_log(LOG_DEBUG, "FPrint manager created");
+}
+
+static void open_device(struct FingerprintState *state) {
+	state->device = NULL;
+	g_autoptr(FprintDBusDevice) dev = NULL;
+	g_autoptr(GError) error = NULL;
+	g_autofree char *path = NULL;
+	if (!fprint_dbus_manager_call_get_default_device_sync(state->manager, &path, NULL, &error)) {
+		swaylock_log(LOG_ERROR, "Impossible to verify: %s", error->message);
+		display_message(state, "Fingerprint error");
+		return;
+	}
+
+	swaylock_log(LOG_DEBUG, "Fingerprint: using device %s", path);
+	dev = fprint_dbus_device_proxy_new_sync(
+		state->connection,
+		G_DBUS_PROXY_FLAGS_NONE,
+		"net.reactivated.Fprint",
+		path, NULL, &error);
+	if (error) {
+		swaylock_log(LOG_ERROR, "failed to connect to device: %s", error->message);
+		display_message(state, "Fingerprint error");
+		return;
+	}
+
+	if (!fprint_dbus_device_call_claim_sync(dev, "", NULL, &error)) {
+		// we need to wait while device can be claimed
+		swaylock_log(LOG_DEBUG, "failed to claim the device: %s(%d)", error->message, error->code);
+		return;
+	}
+
+	swaylock_log(LOG_DEBUG, "FPrint device opened %s", path);
+	state->device = g_steal_pointer (&dev);
+}
+
+static void verify_result(GObject *object, const char *result, gboolean done, void *user_data) {
+	struct FingerprintState *state = user_data;
+	swaylock_log(LOG_INFO, "Verify result: %s (%s)", result, done ? "done" : "not done");
+	state->match = g_str_equal(result, "verify-match");
+	if (g_str_equal(result, "verify-retry-scan")) {
+		display_message(state, "Retry");
+		return;
+	} else if (g_str_equal(result, "verify-swipe-too-short")) {
+		display_message(state, "Retry, too short");
+		return;
+	} else if (g_str_equal(result, "verify-finger-not-centered")) {
+		display_message(state, "Retry, not centered");
+		return;
+	} else if (g_str_equal(result, "verify-remove-and-retry")) {
+		display_message(state, "Remove and retry");
+		return;
+	}
+
+	if(state->match) {
+		display_message(state, "Fingerprint OK");
+	} else {
+		display_message(state, "Retry");
+	}
+
+	state->completed = TRUE;
+	g_autoptr(GError) error = NULL;
+	if (!fprint_dbus_device_call_verify_stop_sync(state->device, NULL, &error)) {
+		swaylock_log(LOG_ERROR, "VerifyStop failed: %s", error->message);
+		display_message(state, "Fingerprint error");
+		return;
+	}
+}
+
+static void verify_started_cb(GObject *obj, GAsyncResult *res, gpointer user_data) {
+	struct FingerprintState *state = user_data;
+	if (!fprint_dbus_device_call_verify_start_finish(FPRINT_DBUS_DEVICE(obj), res, &state->error)) {
+		return;
+	}
+
+	swaylock_log(LOG_DEBUG, "Verify started!");
+	state->started = TRUE;
+}
+
+static void proxy_signal_cb(GDBusProxy	*proxy,
+							const gchar *sender_name,
+							const gchar *signal_name,
+							GVariant	*parameters,
+							gpointer	 user_data)
+{
+	struct FingerprintState *state = user_data;
+	if (!state->started) {
+		return;
+	}
+
+	if (!g_str_equal(signal_name, "VerifyStatus")) {
+		return;
+	}
+
+	const gchar *result;
+	gboolean done;
+	g_variant_get(parameters, "(&sb)", &result, &done);
+	verify_result(G_OBJECT (proxy), result, done, user_data);
+}
+
+static void start_verify(struct FingerprintState *state) {
+	/* This one is funny. We connect to the signal immediately to avoid
+	 * race conditions. However, we must ignore any authentication results
+	 * that happen before our start call returns.
+	 * This is because the verify call itself may internally try to verify
+	 * against fprintd (possibly using a separate account).
+	 *
+	 * To do so, we *must* use the async version of the verify call, as the
+	 * sync version would cause the signals to be queued and only processed
+	 * after it returns.
+	 */
+	fprint_dbus_device_call_verify_start(state->device, "any", NULL,
+										 verify_started_cb,
+										 state);
+
+	/* Wait for verify start while discarding any VerifyStatus signals */
+	while (!state->started && !state->error) {
+		g_main_context_iteration(NULL, TRUE);
+	}
+
+	if (state->error) {
+		swaylock_log(LOG_ERROR, "VerifyStart failed: %s", state->error->message);
+		display_message(state, "Fingerprint error");
+		g_clear_error(&state->error);
+		return;
+	}
+}
+
+static void release_callback(GObject *source_object, GAsyncResult *res,
+							 gpointer user_data) {
+}
+
+void fingerprint_init(struct FingerprintState *fingerprint_state,
+					  struct swaylock_state *swaylock_state) {
+	memset(fingerprint_state, 0, sizeof(struct FingerprintState));
+	fingerprint_state->sw_state = swaylock_state;
+	create_manager(fingerprint_state);
+	if (fingerprint_state->manager == NULL || fingerprint_state->connection == NULL) {
+		return;
+	}
+}
+
+int fingerprint_verify(struct FingerprintState *fingerprint_state) {
+	/* VerifyStatus signals are processing, do not wait for completion. */
+	g_main_context_iteration (NULL, FALSE);
+	if (fingerprint_state->manager == NULL ||
+		fingerprint_state->connection == NULL) {
+		return false;
+	}
+
+	if (fingerprint_state->device == NULL) {
+		open_device(fingerprint_state);
+		if (fingerprint_state->device == NULL) {
+			return false;
+		}
+
+		g_signal_connect(fingerprint_state->device, "g-signal", G_CALLBACK (proxy_signal_cb),
+						 fingerprint_state);
+		start_verify(fingerprint_state);
+	}
+
+	if (!fingerprint_state->completed) {
+		return false;
+	}
+
+	if (!fingerprint_state->match) {
+		fingerprint_state->completed = 0;
+		fingerprint_state->match = 0;
+		start_verify(fingerprint_state);
+		return false;
+	}
+
+	return true;
+}
+
+void fingerprint_deinit(struct FingerprintState *fingerprint_state) {
+	if (!fingerprint_state->device) {
+		return;
+	}
+
+	g_signal_handlers_disconnect_by_func(fingerprint_state->device, proxy_signal_cb,
+										 fingerprint_state);
+	fprint_dbus_device_call_release(fingerprint_state->device, NULL, release_callback, NULL);
+	fingerprint_state->device = NULL;
+}

fingerprint/fingerprint.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2023 Alexandr Lutsai <s.lyra@ya.ru>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _FINGERPRINT_H
+#define _FINGERPRINT_H
+
+#include "swaylock.h"
+#include "fingerprint/fprintd-dbus.h"
+
+struct FingerprintState {
+	GError	*error;
+	gboolean started;
+	gboolean completed;
+	gboolean match;
+
+	char status[128];
+
+	FprintDBusManager *manager;
+	GDBusConnection *connection;
+	FprintDBusDevice *device;
+	struct swaylock_state *sw_state;
+};
+
+void fingerprint_init(struct FingerprintState *fingerprint_state, struct swaylock_state *state);
+int fingerprint_verify(struct FingerprintState *fingerprint_state);
+void fingerprint_deinit(struct FingerprintState *fingerprint_state);
+
+#endif

fingerprint/meson.build

@@ -0,0 +1,33 @@
+gnome = import('gnome')
+
+dbus = dependency('dbus-1')
+glib = dependency('glib-2.0', version: '>=2.64.0')
+gio_dep = dependency('gio-2.0')
+
+fprintd_dbus_interfaces = files(
+    '/usr/share/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml',
+    '/usr/share/dbus-1/interfaces/net.reactivated.Fprint.Device.xml',
+)
+
+fprintd_dbus_sources = gnome.gdbus_codegen('fprintd-dbus',
+    sources: fprintd_dbus_interfaces,
+    autocleanup: 'all',
+    interface_prefix: 'net.reactivated.Fprint.',
+    namespace: 'FprintDBus',
+    object_manager: true,
+)
+
+fingerprint = declare_dependency(
+    include_directories: [
+        include_directories('..'),
+    ],
+    sources: [
+        fprintd_dbus_sources,
+        'fingerprint.c',
+    ],
+    dependencies: [
+        gio_dep,
+        glib,
+        dbus,
+    ],
+)

include/swaylock.h

@@ -20,6 +20,7 @@ enum auth_state {
 	AUTH_STATE_VALIDATING,
 	AUTH_STATE_INVALID,
 	AUTH_STATE_GRACE,
+	AUTH_STATE_FINGERPRINT,
 };
 
 struct swaylock_colorset {
@@ -81,6 +82,7 @@ struct swaylock_args {
 	uint32_t password_grace_period;
 	bool password_grace_no_mouse;
 	bool password_grace_no_touch;
+	bool fingerprint;
 
 	char *text_cleared;
 	char *text_caps_lock;
@@ -119,6 +121,7 @@ struct swaylock_state {
 	bool run_display;
 	struct ext_session_lock_manager_v1 *ext_session_lock_manager_v1;
 	struct ext_session_lock_v1 *ext_session_lock_v1;
+	char *fingerprint_msg;
 };
 
 struct swaylock_surface {