Repository navigation
Conversation
fprintd-list states an empty enrollment as "User kalle has no fingers
enrolled for <sensor>.", so `grep -qi finger` matches whether or not any
finger is enrolled. Both callers therefore treated an empty enrollment as
a configured one: omarchy-apply-lock wrote /etc/pam.d/omarchy-lock-fingerprint
on machines with nothing enrolled, and the lock screen then set
fingerprintConfigured and started pam_fprintd. pam_fprintd returns
PAM_AUTHINFO_UNAVAIL immediately with no enrollment, and
handleFingerprintFinished re-arms fingerprintRetryTimer on every failure,
so the lock screen forked four failing PAM sessions per second for as long
as it stayed up.
Match the per-finger listing (" - #0: right-index-finger") instead, behind
a shared omarchy-hw-fingerprint-enrolled so both callers agree.
The merge from quattro resolved omarchy-apply-lock in favour of the new omarchy-hw-fingerprint-enrolled, which drops the absolute /usr/bin/fprintd-list that 7004795 added so a root run never executes a PATH-planted fprintd-list, and leaves the root PATH reset as the only defence. apply-lock-test.sh checks each defence independently and fails without it. Keep the pinned probe and give it the enrolled-entry pattern in place of the word match; the fixtures print an enrolled entry so the trusted probe still enables fingerprint auth. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The helper ran with the host PATH behind the stub directory, so once the stub was dropped a real fprintd-list answered the "no fprintd" case and it no longer tested that path. Run the helper with only the stub directory, the repository's commands and the two tools it uses. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com>
|
| # user-planted fprintd-list. Enrolled prints list as " - #0: right-index-finger". | ||
| if [[ -x /usr/bin/fprintd-list ]] && | ||
| /usr/bin/fprintd-list "$target_user" 2>/dev/null | grep -qi finger; then | ||
| /usr/bin/fprintd-list "$target_user" 2>/dev/null | grep -qE '^[[:space:]]*-[[:space:]]*#[0-9]+:'; then |
There was a problem hiding this comment.
Enrollment checks remain duplicated
omarchy-apply-lock still has its own copy of the enrolled-entry pattern, separate from omarchy-hw-fingerprint-enrolled. If one pattern changes without the other, PAM configuration and the lock screen could disagree about whether fingerprints are enrolled. Sharing the parsing would prevent that drift while preserving the apply script’s trusted executable lookup.
| printf '%s\n' "$EUID" >"$TEST_TRUSTED_UID" | ||
| printf '%s\n' "$*" >"$TEST_TRUSTED_ARGS" | ||
| echo "Fingerprints are enrolled" | ||
| echo " - #0: right-index-finger" |
There was a problem hiding this comment.
Empty enrollment lacks apply test
This fixture always prints an enrolled finger, so the apply-lock test never checks that an empty enrollment leaves the fingerprint PAM file absent or removes an existing one. The new helper test checks only the helper; a regression in apply-lock’s separate check could therefore go unnoticed.
|
Reviewed and verified on a disposable worker built from the Omarchy ISO, at 520a9cd against The bug reproduces, and this fixes it. With Two commits pushed to your branch:
Tests on the worker: Second opinion: Codex Medium reviewed the diff over two rounds. It found the test PATH issue fixed in Related pull requests: #7158 fixes both places too, but it also adds suspend handling and a retry model. #9456, #11952, #12690 and #13918 fix only the lock screen gate, and all of them rewrite the same Nothing is left for you to do. Whether to merge it is up to the maintainer. |
Use the enrolled-entry matcher from omacom#9551 while retaining the lock's tri-state probe recovery and the privileged /usr/bin/fprintd-list call. Unknown enrollment probes must preserve existing PAM and resume recovery rather than deleting the machinery needed to recover. Preserve administrator-owned unnumbered timeout files during migration. Remove presence-driven retry overrides and their cooldown, clock, and idle-window state: resume has its own fast recovery path, while other errors can follow the bounded automatic backoff. Let the existing sleep watcher detect resume instead of also tracking the age of each retry. Setup now uses apply-lock so PAM and recovery installation have one implementation. Keep the restart, stop bound, unreachable-attempt pacing, unavailable feedback, reach watchdog, and probe rechecks because each handles a distinct failure. Co-Authored-By: Karl Ahlin <kalle.ahlin@gmail.com> Co-Authored-By: Codex Medium <noreply@openai.com>
|
Closing in favour of #7158, which incorporates your strict enrolled-entry matching in both lock configuration and lock-screen detection, with Karl Ahlin credited in f0390d1. The combined change retains three-state probe recovery so a temporary daemon failure cannot disable fingerprints for the lock session; it does not need a separate boolean helper. GPT-6 in Codex and Codex Medium checked the consolidation. Worker regression checks passed for enrolled and empty enrollment, missing fprintd-list, and temporary probe failure; mutation checks detect the old enrollment matcher. Where the second opinion agreed, independence is not guaranteed. #7158 remains open for maintainer review. |
* Restart fprintd after resume to clear a claim wedged by suspend A fingerprint verify still open when the machine suspends leaves fprintd unable to hand the reader back: the verify dies with "Cannot run while suspended" and the follow-up ReleaseDevice fails on the still-busy device. The wedged claim then rejects every lock-screen attempt after resume until fprintd exits on its own 30-second idle timer -- and the retry loop keeps it from ever reaching that timer, so the reader stays dead until the user gives up and types a password. Install a system-sleep hook that restarts fprintd on resume, dropping the claim so the reader answers on the first touch. It is installed by omarchy-setup-security-fingerprint and removed by its teardown, so it is present exactly when a fingerprint reader is configured. try-restart is a no-op when fprintd is not running, so a healthy resume pays nothing. Approach suggested in #7229 and measured by @paracycle: 45 stray PAM sessions after resume down to 2. * Pace fingerprint retries and show when the reader is unavailable The lock screen retried fingerprint auth on a flat 250ms timer with no sign to the user, so a reader it could not reach -- a claim wedged across suspend, one held by another client, or a sensor gone from the bus -- spun PAM sessions at four per second behind an icon still inviting touches that could never unlock. Pace and report on one signal: whether an attempt reached the reader at all. pam_fprintd relays a finger prompt only once the claim lands, so an attempt that ends without prompting never reached the device. Those advance a streak that backs the retry off exponentially (to a ceiling above fprintd's 30s idle exit) and, past a few in a row, crosses out the icon and shows a "Fingerprint reader unavailable" notice. An attempt that did prompt proves the reader works -- a finger that merely did not match still reaches it -- so it clears the streak and the loop stays responsive. User presence (a keypress or touch) collapses a backed-off wait to a prompt retry, rate-limited so a moving cursor cannot respin the storm. An attempt that never reaches the reader within a few seconds is aborted and settled as unreached, so a claim orphaned by the resume restart surfaces the notice and retries a fresh daemon rather than hanging silently. The pacing, streak, nudge, and reach-timeout logic live in FingerprintModel.js with Node coverage; the new Text elements declare textFormat; lock status reports fingerprintUnavailable. The attempt state machine tracks the open attempt with fingerprintAuthenticating alone; the first settle closes it, and one PAM attempt raising both onError and onCompleted still folds into the streak exactly once. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Install the fprintd resume hook root-owned and keep it with the PAM file cp -p carried the checkout's owner and mode into /usr/lib/systemd/system-sleep/, so under dev-link the root-executed hook was user-owned, and a tree whose exec bit had been stripped installed a hook that systemd-sleep silently never ran. Use install -Dm755 -o root -g root, as the migration that installs the same file already does. The hook also belongs exactly where the fingerprint PAM file does: omarchy-apply-lock creates and removes /etc/pam.d/omarchy-lock-fingerprint on its own, and any apply-lock run after enrollment left PAM without the hook while its removal branch left a hook behind without PAM. Have apply-lock install and remove the hook together with the PAM file, and teach apply-lock-test.sh to redirect the hook into its scratch tree and assert the hardened run lands it beside the PAM fixtures. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Only treat fingerprint as configured when a print is enrolled The lock screen and omarchy-apply-lock decided fingerprint was set up with fprintd-list | grep -qi finger, which also matches "has no fingers enrolled" and "ListEnrolledFingers failed". A second account on a machine where one user enrolled, or anyone who ran fprintd-delete, was therefore handed the fingerprint loop: every attempt bailed before the claim, and with the new pacing that showed up as a crossed icon and "Fingerprint reader unavailable" for a reader the account simply has no print on. Match the per-print " - #N:" lines instead. apply-lock-test.sh follows: its fprintd-list stubs answer with a real enrolled-print row and its helper patcher matches the new probe line. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Exercise the migration's default hook source in its test Every case overrode OMARCHY_FPRINTD_RESUME_SRC, so the path the migration really reads from was never checked, while its -f guard turns a missing source into a clean exit and a permanent per-user marker. Add a case that runs against the shipped hook under the repo, and adopt set -euo pipefail like the sibling tests. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Take the fprintd restart off the thaw and bound its stop timeout The resume hook ran systemctl try-restart synchronously while user sessions were still frozen, so its cost landed on the wake path: half a second when fprintd answers SIGTERM, but a wedged fprintd on a stale device handle (the reader re-enumerated across the sleep) does not, and then the desktop stayed frozen for the whole stop timeout -- precisely in the case the hook exists for. Enqueue the restart with --no-block instead, as the unmount-fuse hook already does for the same reason, and ship a drop-in capping fprintd's TimeoutStopSec at 3s so the restart lands within seconds either way. The drop-in is numbered 10-stop-timeout.conf, as the other Omarchy system drop-ins are, so an administrator's override.conf sorts after it and wins. It is installed and removed wherever the hook is (setup, teardown, apply-lock, migration), and apply-lock-test.sh redirects it into its scratch tree alongside the hook. The hook's comments now say what actually happens on a locked resume -- Omarchy locks before every suspend and the lock screen opens a verify at once, so the restart is real, not a no-op -- and name the upstream defects this works around, fprintd#173 and fprintd#216, so the hook and the drop-in can be retired when upstream fixes them. Measured by MaxMad75 on an X390 Yoga (S3): 2 of 10 fprintd stops rode out the timeout to SIGKILL; the 3s cap verified with systemctl show. Co-authored-by: Omabot <omabot@omarchy.org> Co-authored-by: MaxMad75 <44462964+MaxMad75@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: Codex XHigh <noreply@openai.com> Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Close the status-check and start-failure exits through settle Two paths left the fingerprint loop stuck or misreporting. A mid-lock status check that found fingerprint unconfigured aborted the PAM context directly; abort() delivers no signal, so fingerprintAuthenticating stayed true and every later attempt and nudge returned on it until the password unlock. And a fingerprintPam.start() that fails synchronously means the PAM file is gone -- a configuration problem, not a reader miss -- yet it fed the reader streak and reported "Fingerprint reader unavailable". Route the abort through settleFingerprintAttempt like the reach timeout does, drop the pending retry with it, and on a start failure re-check the configuration so the icon disappears instead; a pending retry owns the next attempt when a status check comes back configured. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Pace fingerprint nudges by the pending tier and the cap's idle stretch The nudge cooldown was a flat 2s, shorter than every backoff step, so a user moving the mouse at a wedged reader collapsed each wait to 2s -- thirty claims a minute against the cap's 1.5 -- and each claim re-armed fprintd's 30s idle timer, so the hook-less recovery the cap exists for never happened while anyone was present. Grow the cooldown with the pending wait, so presence collapses each backed-off wait once and repeat nudges are paced by the tier. At the cap the wait itself is the cure -- it is what lets fprintd idle out and drop a wedged claim -- so there the idle stretch is measured from the last settle, not the last nudge: a nudged attempt that hung until the reach timeout would otherwise eat most of the window, and under continuous input fprintd would never be left alone long enough to exit. Wall-clock steps are handled in both directions: a clock stepped back past the last nudge does not hold a fresh nudge back, and one stepped back past the last settle counts as no idle time at the cap rather than as enough. The retry test drives continuous input against attempts that hang to the reach bound and checks the gap fprintd is left. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Give a slow fingerprint claim time to land before aborting it The reach bound aborted any attempt that had not prompted within 5s by SIGKILLing the PAM child mid-Claim. A reader whose device open takes longer than that (out-of-tree drivers, and any reader right after the resume hook forces a re-open) could then never prompt: each kill left fprintd tearing the claim down until the open finished, the 1s retry hit "already claimed", and three misses later the reader was reported unavailable for good. Raise the bound to 20s, under GDBus's 25s Claim timeout and pam_fprintd's 30s verify timeout (whose "Verification timed out" is a non-error message that would read as reached), and name the hazard the bound actually covers: a daemon restarted under the verify fails the attempt promptly, a stuck device open does not. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Detect resume and hold the streak through the restart window Monotonic timers pause across suspend, so a backed-off wait armed before the sleep picked up mid-count afterwards: with the streak at the cap the "Fingerprint reader unavailable" notice stayed up for the remaining wait after the resume hook had already freed the reader, and misses collected around the suspend edge carried across it, so a healthy reader could cross the notice threshold in the first seconds after waking. With the restart enqueued off the thaw, the loop's first attempts after a wake can also land on the old daemon while it is being stopped -- up to ~3s when it ignores SIGTERM -- and three of those would show the notice for a reader that was merely being restarted underneath. Notice a resume from any of three signals -- a sleep watch ticking the wall clock for the whole lock, a retry that fired late, or an unreached attempt whose settle finds the watch's last tick far in the past (so a suspend shorter than the reach bound is caught before the tick itself gets a chance to) -- and open a grace window: the stale streak is dropped, a pending wait retries the fresh daemon at once, and misses inside the window hold the streak at the first tier without ever counting toward the notice. Detection is idempotent within the window, since more than one timer can notice the same resume. Pinned by MaxMad75's reading: the window is armed by the resume, not by the first miss. Verified on his X390 (S3, frozen sessions): six lid-close cycles, fingerprint-resume at +15ms, streak held, notice never fired. Co-authored-by: MaxMad75 <44462964+MaxMad75@users.noreply.github.com> Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Only let a definitive probe change whether fingerprint is configured The status probe collapsed every fprintd-list result into yes or no, so an unreachable fprintd -- restarting under the resume hook, or failing a D-Bus activation mid-resume -- read as "not configured": the icon vanished, the retry loop and the sleep watch stopped, and nothing asked again for the rest of the lock. One transient miss killed fingerprint until the next lock, with the password as the only clue. MaxMad75 hit it on hardware in run 6 of the X390 series; osborng filed the stock repro as #9453 (mask fprintd, lock, unmask -- fingerprint never returns). Classify the probe's output instead: an enrolled-print row is yes, fprintd's explicit no-prints answer (or a missing PAM file or binary) is no, and anything else is unknown -- the probe could not tell, so nothing changes and it is retried on the attempt-retry pacing. The unavailable notice, backoff, and resume detection all sit downstream of this flag; now only an answer that actually means something can clear it. Fixes #9453. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Log the fingerprint loop's misses, notice, and recovery as lock events The reach timeout, an unreached settle, the streak crossing into the notice, a resume restart, and the recovery all changed lock state without touching logEvent, so a report of "Fingerprint reader unavailable" left no omarchy lock line to line up with suspend and resume timestamps in omarchy-debug-idle output. Log those transitions; reached attempts are the steady state and stay quiet. A match that unlocks after a run of misses is the recovery too -- the unlock resets the streak without settling, so it logs fingerprint-recovered there as well. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Abort an attempt stranded in flight when a resume is detected A verify that survived into the suspend still prompted comes back to a daemon the resume hook has already replaced, and the loop's resume handling deliberately left it alone: the reach timer stopped at the prompt, so nothing bounded it but pam_fprintd's own ~25s timeout, and until that ran out the icon invited touches that could not work. Most visible where user sessions are not frozen across sleep and the lock races the hook. Abort the stranded session when the resume is detected and route it through settle: it lands inside the grace window, so the kill never counts toward the notice, and the settle arms the fast retry against the fresh daemon itself. Suggested by sliekens in review. Claude-Session: https://claude.ai/code/session_0168egYTXrVBVg16ugszGzQt * Simplify fingerprint recovery and consolidate enrollment checks Use the enrolled-entry matcher from #9551 while retaining the lock's tri-state probe recovery and the privileged /usr/bin/fprintd-list call. Unknown enrollment probes must preserve existing PAM and resume recovery rather than deleting the machinery needed to recover. Preserve administrator-owned unnumbered timeout files during migration. Remove presence-driven retry overrides and their cooldown, clock, and idle-window state: resume has its own fast recovery path, while other errors can follow the bounded automatic backoff. Let the existing sleep watcher detect resume instead of also tracking the age of each retry. Setup now uses apply-lock so PAM and recovery installation have one implementation. Keep the restart, stop bound, unreachable-attempt pacing, unavailable feedback, reach watchdog, and probe rechecks because each handles a distinct failure. Co-Authored-By: Karl Ahlin <kalle.ahlin@gmail.com> Co-Authored-By: Codex Medium <noreply@openai.com> * Preserve failed-enrollment coverage in the setup fixture The successful-enrollment fixture accepts PAM commands, so failure checks must explicitly reject those commands instead of relying on an unexpected-command error. Log both sed and tee and stub apply-lock for every case so premature authentication setup is detected without reaching live PAM files. Co-Authored-By: Codex Medium <noreply@openai.com> * Complete fingerprint recovery and setup reporting Back off immediate device errors after the verification prompt as well as failed claims, while retaining fast retries for mismatches and normal scan timeouts. Measure from the prompt so a slow claim cannot hide a fast failure. Paced user activity retries preserve the daemon idle window required to clear a wedged claim. Initial probe outages remain visible without inventing enrollment, and setup cannot claim lock-screen success when the PAM configuration was not installed. Exercise the real QML service rather than a copy of its state machine. Co-Authored-By: GPT-6 <noreply@openai.com> Co-Authored-By: Claude Opus 5.5 Medium <noreply@anthropic.com> * Avoid competing fingerprint probes and partial setup Known enrollment is recovered by the PAM retry loop, so failed status probes must not raise a false unavailable notice or interrupt its daemon idle window. Initial unknown enrollment still gets paced probes. Install recovery files before enabling fingerprint PAM so a missing source cannot leave a new partial configuration. Co-Authored-By: GPT-6 <noreply@openai.com> Co-Authored-By: Claude Opus 5.5 Medium <noreply@anthropic.com> * Keep the fingerprint error clock at the first prompt pam_fprintd also sends Verification timed out as an informational message. Updating the prompt timestamp on that message made a normal full scan window look like an immediate device error and caused unnecessary backoff. Record the first prompt of each PAM attempt so later status messages cannot move the error window. Co-Authored-By: GPT-6 <noreply@openai.com> --------- Co-authored-by: Omabot <omabot@omarchy.org> Co-authored-by: MaxMad75 <44462964+MaxMad75@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: Codex XHigh <noreply@openai.com> Co-authored-by: David Heinemeier Hansson <david@hey.com> Co-authored-by: Karl Ahlin <kalle.ahlin@gmail.com> Co-authored-by: Omarchy Bot <omarchybot@users.noreply.github.com>
|
The enrolled-entry matching credited to Karl Ahlin is now shipped in merged #7158, in both lock configuration and lock-screen detection. This competing PR remains closed. GPT-6 in Codex and Claude Opus 5.5 Medium checked the coverage against the landed source; Claude's agreement does not guarantee independence. This closure review was read-only and did not rerun runtime tests. |
…om#7158 Upstream omacom#7158 (879d658, merged 2026-10-04) is in upstream quattro 035ce29. Each rewritten reproducer exits 0 there and 1 on upstream quattro 393a43d: - KI-APPLY-LOCK-FPRINT-GATE-FAIL-OPEN: open -> fixed - KI-LOCK-FPRINT-PROBE-FAIL-OPEN: open -> fixed - KI-LOCK-FPRINT-START-FAIL-NO-RETRY: reviewed -> fixed The gate and probe KIs record the upstream report omacom#9551 (closed in favour of omacom#7158) with a fixed response and a fixed recheck. The three evidence manifests now state the red-reproducer contract; the start-fail manifest points at the new runtime reproducer.
Owner decision (2026-10-09): these known issues are already public on omacom/omarchy, so keeping them private hides nothing. - KI-APPLY-LOCK-FPRINT-GATE-FAIL-OPEN (omacom#9551) - KI-LOCK-FPRINT-PROBE-FAIL-OPEN (omacom#9551) - KI-LOCK-SPONTANEOUS-UNLOCK-FAIL-OPEN (omacom#7072, omacom#10459) - KI-MENU-JSONC-COMMA-IN-STRING (omacom#13250) proof known-issue edit --set-disclosure public --append-note, then proof evidence refresh per KI (the edit changed the record content hash). Each reproducer re-ran and matched its earlier claim: the two fingerprint KIs not reproduced (fixed by omacom#7158), spontaneous-unlock and JSONC comma still reproduced. proof known-issue check --id on the 4 KIs: clean. Engine 0.1.0-dev+g5c7b5e58084e. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
On a machine with a fingerprint reader and no fingers enrolled, the lock screen forks four failing PAM sessions per second for as long as it is up. On mine that was 26,078 journal lines in three days:
Cause
fprintd-liststates an empty enrollment in prose. Its two format strings:Both existing callers matched with
grep -qi finger, which the empty message satisfies just as well as the populated one:bin/omarchy-apply-lock:37shell/plugins/lock/Service.qml:380Run the gate verbatim on a machine with nothing enrolled and it reports enrolled:
The two failures compound.
omarchy-apply-lockwrites/etc/pam.d/omarchy-lock-fingerprinton a machine with nothing enrolled, which is the file the lock gate then tests for. The gate setsfingerprintConfigured,startFingerprint()runspam_fprintd, PAM returnsPAM_AUTHINFO_UNAVAILimmediately because nothing is enrolled, andhandleFingerprintFinishedre-armsfingerprintRetryTimer—interval: 250, no backoff, no attempt cap:Nothing breaks the loop, because the condition it retries on never changes.
Fix
Match the per-finger listing (
- #0: right-index-finger) rather than the word, behind a sharedomarchy-hw-fingerprint-enrolledso both callers agree on what "enrolled" means. Users who do have fingers enrolled see no change.Testing
New
test/shell.d/hw-fingerprint-enrolled-test.shstubsfprintd-listwith both real output shapes and covers the reader-less and fprintd-less paths. The empty-enrollment case fails against the old predicate and passes against the new one../test/allpasses apart from three pre-existing failures that need a siblingomarchy-pkgscheckout (config-test.sh,snapper-test.sh,unowned-system-paths-test.sh), which fail identically on a cleanquattrohere.Omarchy 4.0.2-1, Goodix MOC Fingerprint Sensor, fprintd 1.94.5-2.