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

device: Add duplicate checking during enroll

Browse Source 
Always do an identify step before starting an enroll. If we find an
existing print, delete or throw an error depending on what is
appropriate.

Doing this ensures that we should not get duplicate prints system wide.
This means we will be able to identify the user that is trying to log
in. But more importantly, we need to do these checks for MoC devices,
which always run "identify" against all device stored prints rather than
the passed gallery.
This commit is contained in:
Benjamin Berg
2020-12-15 15:22:11 +01:00
committed by Marco Trevisan (Treviño)
parent b7b91e77bb
commit 5785dc65b4
2 changed files with 131 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/fprintd.py
View File

@ -882,9 +882,10 @@ class FPrintdVirtualStorageDeviceBaseTest(FPrintdVirtualDeviceBaseTest):
def _maybe_reduce_enroll_stages(self, stages=-1):
# Reduce the number of default enroll stages, we can go a bit faster
stages = stages if stages > 0 else self.enroll_stages
stages += 1 # Adding the extra stage for duplicates-check
if self.num_enroll_stages == stages:
return
self.send_command('SET_ENROLL_STAGES', stages)
self.send_command('SET_ENROLL_STAGES', stages - 1)
while self.num_enroll_stages != stages:
ctx.iteration(True)
self.assertIn({'num-enroll-stages': stages}, self._changed_properties)
@ -918,6 +919,7 @@ class FPrintdVirtualStorageDeviceTests(FPrintdVirtualStorageDeviceBaseTest):
self.assertEqual(set(prints), set(garbage_collect + list(enrolled_prints.keys())))
def trigger_garbagecollect():
self.send_image('some-other-print')
self.send_command('ERROR', int(FPrint.DeviceError.DATA_FULL))
self.device.EnrollStart('(s)', 'right-thumb')
self.device.EnrollStop()
@ -1003,6 +1005,10 @@ class FPrintdVirtualNoStorageDeviceBaseTest(FPrintdVirtualStorageDeviceBaseTest)
device_driver = 'virtual_device'
driver_name = 'Virtual device for debugging'
def enroll_image(self, img, device=None, finger='right-index-finger',
expected_result='enroll-completed', claim_user=None):
self.skipTest('Identification not supported, thus is the enrolling')
class FPrintdVirtualNoStorageDeviceTest(FPrintdVirtualNoStorageDeviceBaseTest):
def check_verify_finger_match(self, image, expect_match, finger):
@ -1107,7 +1113,7 @@ class FPrintdVirtualDeviceTest(FPrintdVirtualDeviceBaseTest):
self.driver_name)
def test_enroll_stages_property(self):
self.assertEqual(self.device.get_cached_property('num-enroll-stages').unpack(), 5)
self.assertEqual(self.device.get_cached_property('num-enroll-stages').unpack(), 6)
def test_scan_type(self):
self.assertEqual(self.device.get_cached_property('scan-type').unpack(),
@ -2206,6 +2212,8 @@ class FPrintdVirtualDeviceEnrollTests(FPrintdVirtualDeviceBaseTest):
self.assertEnrollError(FPrint.DeviceError.DATA_INVALID, 'enroll-unknown-error')
def test_enroll_error_data_not_found(self):
self.assertEnrollError(
FPrint.DeviceError.DATA_NOT_FOUND, 'enroll-stage-passed')
self.assertEnrollError(FPrint.DeviceError.DATA_NOT_FOUND, 'enroll-unknown-error')
def test_enroll_error_data_full(self):
@ -3009,6 +3017,9 @@ class FPrintdUtilsTest(FPrintdVirtualStorageDeviceBaseTest):
self.send_image('print-id')
out.check_line('Enroll result: enroll-stage-passed', get_timeout())
self.send_image('print-id')
out.check_line('Enroll result: enroll-stage-passed', get_timeout())
self.send_retry(FPrint.DeviceRetry.CENTER_FINGER)
out.check_line('Enroll result: enroll-finger-not-centered', get_timeout())