fdo-mirrors/fprintd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/fprintd.git synced 2026-02-02 05:00:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: Use a switch to check current action so we can be more selective

Browse source 
For example we were allowing to verify stop while doing other actions
different from enrolling (such as delete or open/close).
This commit is contained in:
Marco Trevisan (Treviño) 2020-12-03 21:58:17 +01:00 • committed by Benjamin Berg
parent c5c81a2ea8
commit 2ca2d5e62c
1 changed files with 84 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
src/device.c
View file

@ -1101,16 +1101,20 @@ static gboolean fprint_device_verify_start (FprintDBusDevice *dbus_dev,
session = session_data_get (priv);
if (priv->current_action != ACTION_NONE) {
if (priv->current_action == ACTION_ENROLL) {
g_set_error(&error, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Enrollment in progress");
} else {
g_set_error(&error, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Verification already in progress");
}
g_dbus_method_invocation_return_gerror (invocation, error);
return TRUE;
switch (priv->current_action) {
case ACTION_NONE:
break;
case ACTION_VERIFY:
case ACTION_IDENTIFY:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Verification already in progress");
return TRUE;
default:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Another operation is already in progress");
return TRUE;
}
if (finger_num == -1) {
@ -1202,18 +1206,22 @@ static gboolean fprint_device_verify_stop (FprintDBusDevice *dbus_dev,
return TRUE;
}
if (priv->current_action == ACTION_NONE) {
g_dbus_method_invocation_return_error_literal (invocation,
FPRINT_ERROR,
FPRINT_ERROR_NO_ACTION_IN_PROGRESS,
"No verification in progress");
return TRUE;
} else if (priv->current_action == ACTION_ENROLL) {
g_dbus_method_invocation_return_error_literal (invocation,
FPRINT_ERROR,
FPRINT_ERROR_ALREADY_IN_USE,
"Enrollment in progress");
return TRUE;
switch (priv->current_action) {
case ACTION_VERIFY:
case ACTION_IDENTIFY:
break;
case ACTION_NONE:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR,
FPRINT_ERROR_NO_ACTION_IN_PROGRESS,
"No verification in progress");
return TRUE;
default:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR,
FPRINT_ERROR_ALREADY_IN_USE,
"Another operation is already in progress");
return TRUE;
}
if (priv->current_cancellable) {
@ -1423,16 +1431,19 @@ static gboolean fprint_device_enroll_start (FprintDBusDevice *dbus_dev,
return TRUE;
}
if (priv->current_action != ACTION_NONE) {
if (priv->current_action == ACTION_ENROLL) {
g_set_error(&error, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Enrollment already in progress");
} else {
g_set_error(&error, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Verification in progress");
}
g_dbus_method_invocation_return_gerror (invocation, error);
return TRUE;
switch (priv->current_action) {
case ACTION_NONE:
break;
case ACTION_ENROLL:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Enrollment already in progress");
return TRUE;
default:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Another operation is already in progress");
return TRUE;
}
g_debug("start enrollment device %d finger %d", priv->id, finger_num);
@ -1467,20 +1478,21 @@ static gboolean fprint_device_enroll_stop (FprintDBusDevice *dbus_dev,
return TRUE;
}
if (priv->current_action != ACTION_ENROLL) {
if (priv->current_action == ACTION_NONE) {
g_set_error (&error, FPRINT_ERROR, FPRINT_ERROR_NO_ACTION_IN_PROGRESS,
"No enrollment in progress");
} else if (priv->current_action == ACTION_VERIFY) {
g_set_error (&error, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Verification in progress");
} else if (priv->current_action == ACTION_IDENTIFY) {
g_set_error (&error, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Identification in progress");
} else
g_assert_not_reached ();
g_dbus_method_invocation_return_gerror (invocation, error);
return TRUE;
switch (priv->current_action) {
case ACTION_ENROLL:
break;
case ACTION_NONE:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR,
FPRINT_ERROR_NO_ACTION_IN_PROGRESS,
"No enrollment in progress");
return TRUE;
default:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR,
FPRINT_ERROR_ALREADY_IN_USE,
"Another operation is already in progress");
return TRUE;
}
if (priv->current_cancellable) {
@ -1632,12 +1644,19 @@ static gboolean fprint_device_delete_enrolled_fingers (FprintDBusDevice *dbus_de
log_offending_client (invocation);
#endif
if (priv->current_action != ACTION_NONE) {
g_dbus_method_invocation_return_error_literal (invocation,
FPRINT_ERROR,
FPRINT_ERROR_ALREADY_IN_USE,
"Another operation is already in progress");
return TRUE;
switch (priv->current_action) {
case ACTION_NONE:
break;
case ACTION_DELETE:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Deletion already in progress");
return TRUE;
default:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Another operation is already in progress");
return TRUE;
}
priv->current_action = ACTION_DELETE;
@ -1690,13 +1709,19 @@ static gboolean fprint_device_delete_enrolled_fingers2 (FprintDBusDevice *dbus_d
return TRUE;
}
if (priv->current_action != ACTION_NONE) {
g_dbus_method_invocation_return_error_literal (invocation,
FPRINT_ERROR,
FPRINT_ERROR_ALREADY_IN_USE,
"Another operation is already in progress");
g_dbus_method_invocation_return_gerror (invocation, error);
return TRUE;
switch (priv->current_action) {
case ACTION_NONE:
break;
case ACTION_DELETE:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Deletion already in progress");
return TRUE;
default:
g_dbus_method_invocation_return_error_literal (
invocation, FPRINT_ERROR, FPRINT_ERROR_ALREADY_IN_USE,
"Another operation is already in progress");
return TRUE;
}
priv->current_action = ACTION_DELETE;