Browse Source

Add enroll/delete harness variants and PAM test clients

- work/artifacts/make-enroll-delete.sh patches a.exe (no WDK headers
  needed): enroll.exe trims the flow to enrollment, delete.exe redirects
  enroll() to the existing deleteRecord() (ioctl 0x442034, real
  sensor-side delete). The prebuilt a.exe ignores argv - the documented
  nop|identify|enroll dispatch is #if 0 upstream - so the hardcoded
  default flow is patched instead; signature checks fail loudly if a
  future a.exe differs
- delete.exe verified against the sensor: "Got back 0x8 bytes: 01..."
- sync-to-sandbox.sh restores enroll.exe/delete.exe too
- work/pam/pamtest2.c: PAM client with a configurable service name, used
  to exercise the real gdm-fingerprint stack as-is
- work/pam/pamtest3.c + confdir/: pam_start_confdir client for isolated
  pam_fprintd tests without touching /etc/pam.d (or hitting faillock)
Johannes Zellner 1 month ago
parent
commit
977d4ff6e2

+ 67 - 0
work/artifacts/make-enroll-delete.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+# Regenerate the flow-variant harness binaries from a.exe:
+#   enroll.exe - default flow trimmed to enroll only (identify NOPed)
+#   delete.exe - default flow with the enroll() call redirected to the
+#                existing deleteRecord() (ioctl 0x442034, identity
+#                c5698517-... / subfactor 0xF6), identify NOPed
+#
+# The prebuilt a.exe ignores argv (the nop|identify|enroll dispatch exists in
+# hello.cc but was #if 0'd upstream, see work/patches/), so the default
+# hardcoded flow (init -> setMode(2) -> enroll() -> Sleep(10s) -> identify())
+# is patched instead. No WDK headers needed - the binary is patched, not
+# rebuilt. If a future upstream a.exe differs, this script fails loudly.
+set -eu
+
+SANDBOX=${1:-/home/nebulon/projects/fingerprint/work/synaWudfBioUsb-sandbox}
+cd "$SANDBOX"
+[ -f a.exe ] || { echo "a.exe not found in $SANDBOX" >&2; exit 1; }
+
+python3 - <<'EOF'
+import sys
+
+data = bytearray(open('a.exe', 'rb').read())
+
+# PE .text: VA 0x401000, raw file offset 0x600 (see objdump -h)
+def foff(rva):
+    return 0x600 + (rva - 0x1000)
+
+def va(fo):
+    return 0x400000 + (fo - 0x600) + 0x1000
+
+SIG_A = bytes.fromhex('b902000000e81fe4ffffe802d8ffff')  # mov ecx,2; call setMode; call enroll
+SIG_B = bytes.fromhex('b910270000488b054b9c0100ffd0e816ceffff')  # mov ecx,0x2710; ...; call identify
+
+i = data.find(SIG_A)
+assert i >= 0, "signature A not found - a.exe changed upstream?"
+j = data.find(SIG_B)
+assert j >= 0, "signature B not found - a.exe changed upstream?"
+assert data[i + 10] == 0xE8, "enroll call site changed"
+assert data[j + 14] == 0xE8, "identify call site changed"
+
+enroll_call = i + 10                    # file offset of the E8 opcode
+identify_call = j + 14
+
+# deleteRecord() entry (RVA 0x2dd7), prologue-checked
+del_rva = 0x2dd7
+del_prologue = bytes.fromhex('554881ec00010000488dac2480000000')
+assert data[foff(del_rva):foff(del_rva) + 16] == del_prologue, \
+    "a.exe changed upstream: deleteRecord() prologue differs"
+
+# --- enroll.exe: trim the flow to enrollment only -------------------------
+enroll = bytearray(data)
+enroll[identify_call:identify_call + 5] = b'\x90' * 5
+enroll[j + 1:j + 3] = b'\x00\x00'                       # Sleep(10000) -> Sleep(0)
+open('enroll.exe', 'wb').write(bytes(enroll))
+
+# --- delete.exe: enroll() -> deleteRecord(), identify trimmed -------------
+delete = bytearray(enroll)
+rel = (0x400000 + del_rva) - (va(enroll_call) + 5)
+delete[enroll_call + 1:enroll_call + 5] = (rel & 0xffffffff).to_bytes(4, 'little')
+open('delete.exe', 'wb').write(bytes(delete))
+
+print(f"enroll.exe: identify NOPed, Sleep(10000)->Sleep(0)")
+print(f"delete.exe: enroll call -> deleteRecord (rel32 {rel & 0xffffffff:#x}), "
+      f"identify NOPed")
+EOF
+chmod +x enroll.exe delete.exe
+echo "enroll.exe and delete.exe ready in $SANDBOX"

BIN
work/artifacts/sandbox/delete.exe


BIN
work/artifacts/sandbox/enroll.exe


+ 3 - 3
work/artifacts/sync-to-sandbox.sh

@@ -14,10 +14,10 @@ A=$ROOT/work/artifacts/sandbox
 # vendor driver DLLs (kept in driverdlls/ in this repo)
 cp -f "$ROOT/driverdlls/synaWudfBioUsb.dll" "$SANDBOX/" || echo "WARN: driverdlls/synaWudfBioUsb.dll missing" >&2
 
-# trust/calibration state + device id + MinGW runtime DLLs + verify-only binary
+# trust/calibration state + device id + MinGW runtime DLLs + patched binaries
 cp -f "$A"/*.blob "$A"/*.uint "$A/usb.txt" "$A"/*.dll "$SANDBOX/"
-cp -f "$A/verify.exe" "$SANDBOX/"
-chmod +x "$SANDBOX/verify.exe" 2>/dev/null || true
+cp -f "$A/verify.exe" "$A/enroll.exe" "$A/delete.exe" "$SANDBOX/"
+chmod +x "$SANDBOX/verify.exe" "$SANDBOX/enroll.exe" "$SANDBOX/delete.exe" 2>/dev/null || true
 
 echo "artifacts restored to $SANDBOX"
 echo "note: a.exe / sources come from the git clone itself."

+ 8 - 2
work/pam/Makefile

@@ -1,7 +1,7 @@
 # pam_fp.so - fingerprint OR password race for PAM (sudo)
 # Usage: make            -> builds pam_fp.so + pamtest
 #        make install    -> needs root: writes the PAM config lines
-all: pam_fp.so pamtest
+all: pam_fp.so pamtest pamtest2 pamtest3
 
 pam_fp.so: pam_fp.c
 	gcc -shared -fPIC -O2 -Wall -Wextra -o $@ $< -lpam
@@ -9,6 +9,12 @@ pam_fp.so: pam_fp.c
 pamtest: pamtest.c
 	gcc -O2 -Wall -o $@ $< -lpam
 
+pamtest2: pamtest2.c
+	gcc -O2 -Wall -o $@ $< -lpam
+
+pamtest3: pamtest3.c
+	gcc -O2 -Wall -o $@ $< -lpam
+
 install: pam_fp.so
 	./install.sh
 
@@ -16,6 +22,6 @@ test: pamtest
 	./pamtest "$${USER:-nebulon}"
 
 clean:
-	rm -f pam_fp.so pamtest
+	rm -f pam_fp.so pamtest pamtest2 pamtest3
 
 .PHONY: all install test clean

+ 3 - 0
work/pam/confdir/fprintd-test

@@ -0,0 +1,3 @@
+# isolated pam_fprintd test service (used via pam_start_confdir)
+auth     required   pam_fprintd.so
+account  required   pam_permit.so

BIN
work/pam/pamtest2


+ 51 - 0
work/pam/pamtest2.c

@@ -0,0 +1,51 @@
+/*
+ * pamtest2.c - minimal PAM client with a configurable service name.
+ * Used to exercise pam_fprintd.so against the real GDM service files
+ * without touching /etc/pam.d (e.g. -s gdm-fingerprint).
+ *
+ * Build: gcc -O2 -Wall -o pamtest2 pamtest2.c -lpam
+ * Run:   ./pamtest2 -s gdm-fingerprint [username]
+ */
+#include <security/pam_appl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static int noop_conv(int n, const struct pam_message **m,
+                     struct pam_response **r, void *d)
+{
+    (void)n;
+    (void)m;
+    (void)r;
+    (void)d;
+    return PAM_CONV_ERR;
+}
+
+int main(int argc, char **argv)
+{
+    const char *service = "fptest";
+    const char *user = getenv("USER");
+    struct pam_conv conv = { noop_conv, NULL };
+    pam_handle_t *pamh = NULL;
+    int ret, i;
+
+    for (i = 1; i < argc; i++) {
+        if (strcmp(argv[i], "-s") == 0 && i + 1 < argc)
+            service = argv[++i];
+        else
+            user = argv[i];
+    }
+    if (!user)
+        user = "nobody";
+
+    ret = pam_start(service, user, &conv, &pamh);
+    if (ret != PAM_SUCCESS) {
+        printf("pam_start: %s\n", pam_strerror(pamh, ret));
+        return 2;
+    }
+    printf("service=%s user=%s\n", service, user);
+    ret = pam_authenticate(pamh, 0);
+    printf("\npam_authenticate => %d (%s)\n", ret, pam_strerror(pamh, ret));
+    pam_end(pamh, ret);
+    return ret == PAM_SUCCESS ? 0 : 1;
+}

BIN
work/pam/pamtest3


+ 58 - 0
work/pam/pamtest3.c

@@ -0,0 +1,58 @@
+/*
+ * pamtest3.c - PAM client with a custom config directory (pam_start_confdir),
+ * for testing pam_fprintd without touching /etc/pam.d or hitting faillock.
+ *
+ * Build: gcc -O2 -Wall -o pamtest3 pamtest3.c -lpam
+ * Run:   ./pamtest3 -d confdir -s fprintd-test [username]
+ */
+#include <security/pam_appl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static int silent_conv(int n, const struct pam_message **m,
+                       struct pam_response **r, void *d)
+{
+    (void)n;
+    (void)m;
+    (void)r;
+    (void)d;
+    return PAM_CONV_ERR;
+}
+
+int main(int argc, char **argv)
+{
+    const char *service = "fptest";
+    const char *user = getenv("USER");
+    const char *confdir = NULL;
+    struct pam_conv conv = { silent_conv, NULL };
+    pam_handle_t *pamh = NULL;
+    int ret, i;
+
+    for (i = 1; i < argc; i++) {
+        if (strcmp(argv[i], "-s") == 0 && i + 1 < argc)
+            service = argv[++i];
+        else if (strcmp(argv[i], "-d") == 0 && i + 1 < argc)
+            confdir = argv[++i];
+        else
+            user = argv[i];
+    }
+    if (!user)
+        user = "nobody";
+
+    if (confdir)
+        ret = pam_start_confdir(service, user, &conv, confdir, &pamh);
+    else
+        ret = pam_start(service, user, &conv, &pamh);
+    if (ret != PAM_SUCCESS) {
+        printf("pam_start%s: %s\n", confdir ? "_confdir" : "",
+               pam_strerror(pamh, ret));
+        return 2;
+    }
+    printf("service=%s user=%s confdir=%s\n", service, user,
+           confdir ? confdir : "(default)");
+    ret = pam_authenticate(pamh, 0);
+    printf("\npam_authenticate => %d (%s)\n", ret, pam_strerror(pamh, ret));
+    pam_end(pamh, ret);
+    return ret == PAM_SUCCESS ? 0 : 1;
+}