fix: harden app lock system unlock flow

This commit is contained in:
Zheng Liu committed 2026-06-24 14:42:49 +08:00
1 parent f6a49dbf0a
commit 0ea707f70f
14 files changed
+114 -26

No files matched your search

+11
View File
@@ -206,6 +206,16 @@ test("startup-locked gate reveals children after hidden app lock reset", async (
assert.equal(dom.document.getElementById("reset-unlocked-content"), null);
const input = dom.document.getElementById("app-lock-password") as HTMLInputElement | null;
assert.ok(input);
const setInputValue = Object.getOwnPropertyDescriptor(
dom.window.HTMLInputElement.prototype,
"value",
)?.set;
assert.ok(setInputValue);
setInputValue.call(input, "secret");
await dispatchDomEvent(input, new dom.window.Event("input", { bubbles: true }));
const logoButton = dom.document.querySelector("[data-testid='app-lock-logo-easter-egg']");
assert.ok(logoButton);
for (let index = 0; index < 5; index += 1) {
@@ -221,6 +231,7 @@ test("startup-locked gate reveals children after hidden app lock reset", async (
await flushEffects();
assert.equal(bridgeHarness.getResetCount(), 1);
assert.deepEqual(bridgeHarness.getResetAttempts(), ["secret"]);
assert.equal(bridgeHarness.getRuntimeState().locked, false);
assert.equal(dom.document.getElementById("reset-unlocked-content")?.textContent, "Unlocked");
} finally {
+29 -9
View File
@@ -67,7 +67,7 @@ test("AppLockOverlay shows incorrect-password error and clears it after editing"
test("AppLockOverlay reveals reset action after clicking Netcatty logo five times", async () => {
const dom = installDomEnvironment();
const renderer = await createDomRenderer(dom.document);
let resetCount = 0;
const resetAttempts: string[] = [];
try {
await renderer.render(
@@ -78,14 +78,24 @@ test("AppLockOverlay reveals reset action after clicking Netcatty logo five time
locked: true,
reason: "manual",
onUnlock: async () => ({ ok: false, error: "incorrect" as const }),
onResetAppLock: async () => {
resetCount += 1;
onResetAppLock: async (currentPassword) => {
resetAttempts.push(currentPassword);
},
}),
),
);
await flushEffects();
const input = dom.document.getElementById("app-lock-password") as HTMLInputElement | null;
assert.ok(input);
const setInputValue = Object.getOwnPropertyDescriptor(
dom.window.HTMLInputElement.prototype,
"value",
)?.set;
assert.ok(setInputValue);
setInputValue.call(input, "secret");
await dispatchDomEvent(input, new dom.window.Event("input", { bubbles: true }));
assert.doesNotMatch(dom.document.body.textContent ?? "", /Reset App Lock/i);
const logoButton = dom.document.querySelector("[data-testid='app-lock-logo-easter-egg']");
assert.ok(logoButton);
@@ -104,7 +114,7 @@ test("AppLockOverlay reveals reset action after clicking Netcatty logo five time
await flushEffects();
await flushEffects();
assert.equal(resetCount, 1);
assert.deepEqual(resetAttempts, ["secret"]);
} finally {
await renderer.unmount();
dom.cleanup();
@@ -152,7 +162,7 @@ test("AppLockOverlay reset controls do not submit the unlock form", async () =>
const dom = installDomEnvironment();
const renderer = await createDomRenderer(dom.document);
let unlockCount = 0;
let resetCount = 0;
const resetAttempts: string[] = [];
try {
await renderer.render(
@@ -166,14 +176,24 @@ test("AppLockOverlay reset controls do not submit the unlock form", async () =>
unlockCount += 1;
return { ok: false, error: "incorrect" as const };
},
onResetAppLock: async () => {
resetCount += 1;
onResetAppLock: async (currentPassword) => {
resetAttempts.push(currentPassword);
},
}),
),
);
await flushEffects();
const input = dom.document.getElementById("app-lock-password") as HTMLInputElement | null;
assert.ok(input);
const setInputValue = Object.getOwnPropertyDescriptor(
dom.window.HTMLInputElement.prototype,
"value",
)?.set;
assert.ok(setInputValue);
setInputValue.call(input, "secret");
await dispatchDomEvent(input, new dom.window.Event("input", { bubbles: true }));
assert.doesNotMatch(dom.document.body.textContent ?? "", /forgot password/i);
const logoButton = dom.document.querySelector("[data-testid='app-lock-logo-easter-egg']");
assert.ok(logoButton);
@@ -188,7 +208,7 @@ test("AppLockOverlay reset controls do not submit the unlock form", async () =>
await dispatchDomEvent(cancelButton, new dom.window.MouseEvent("click", { bubbles: true }));
await flushEffects();
assert.equal(unlockCount, 0);
assert.equal(resetCount, 0);
assert.deepEqual(resetAttempts, []);
for (let index = 0; index < 5; index += 1) {
await dispatchDomEvent(logoButton, new dom.window.MouseEvent("click", { bubbles: true }));
@@ -202,7 +222,7 @@ test("AppLockOverlay reset controls do not submit the unlock form", async () =>
await flushEffects();
assert.equal(unlockCount, 0);
assert.equal(resetCount, 1);
assert.deepEqual(resetAttempts, ["secret"]);
} finally {
await renderer.unmount();
dom.cleanup();
+2 -2
View File
@@ -21,7 +21,7 @@ interface AppLockOverlayProps {
onUnlock: (password: string) => Promise<AppLockUnlockResult>;
systemUnlockStatus?: AppLockSystemUnlockStatus;
onSystemUnlock?: () => Promise<AppLockSystemUnlockResult>;
onResetAppLock: () => Promise<void>;
onResetAppLock: (currentPassword: string) => Promise<void>;
}
export function getAppLockReasonMessageKey(reason: AppLockReason | null): string {
@@ -135,7 +135,7 @@ export const AppLockOverlay: React.FC<AppLockOverlayProps> = ({
setIsResetting(true);
setResetError(false);
try {
await onResetAppLock();
await onResetAppLock(password);
} catch {
setResetError(true);
setIsResetting(false);
@@ -71,6 +71,15 @@ test("app lock system unlock enablement requires current password", () => {
assert.match(handlerSource, /currentPassword: enabled \? appLockSystemUnlockPassword : undefined/);
});
test("app lock system unlock toggle still allows disabling when system auth is unavailable", () => {
const source = readFileSync(new URL("./SettingsSystemTab.tsx", import.meta.url), "utf8");
const appLockSectionStart = source.indexOf('<SectionHeader title={t("settings.appLock.title")} />');
const nextSectionStart = source.indexOf("<SectionHeader", appLockSectionStart + 1);
const appLockSection = source.slice(appLockSectionStart, nextSectionStart);
assert.match(appLockSection, /disabled=\{isSavingAppLockSystemUnlock \|\| \(!appLockSettings\.systemUnlockEnabled && !appLockSystemUnlockStatus\.available\)\}/);
});
test("app lock disable explains that turning it off removes the saved password", () => {
const englishLocale = readFileSync(new URL("../../../application/i18n/locales/en/core.ts", import.meta.url), "utf8");
@@ -761,7 +761,7 @@ const SettingsSystemTab: React.FC<SettingsSystemTabProps> = ({
)}
<Toggle
checked={appLockSettings.systemUnlockEnabled}
disabled={!appLockSystemUnlockStatus.available || isSavingAppLockSystemUnlock}
disabled={isSavingAppLockSystemUnlock || (!appLockSettings.systemUnlockEnabled && !appLockSystemUnlockStatus.available)}
ariaLabel={t("settings.appLock.systemUnlock.label").replace("{label}", appLockSystemUnlockStatus.label)}
onChange={(enabled) => void handleAppLockSystemUnlockChange(enabled)}
/>
@@ -44,6 +44,7 @@ export function createAppLockBridgeHarness(options: HarnessOptions) {
let systemUnlockResult = options.systemUnlockResult ?? { ok: true as const };
let systemUnlockCount = 0;
let resetCount = 0;
const resetAttempts: string[] = [];
let runtimeFetchCount = 0;
const emitRuntimeState = () => {
@@ -84,8 +85,11 @@ export function createAppLockBridgeHarness(options: HarnessOptions) {
});
return { ok: true } satisfies UnlockResult;
},
requestAppLockReset: async () => {
requestAppLockReset: async (currentPassword) => {
resetCount += 1;
resetAttempts.push(currentPassword);
if (!currentPassword) return { ok: false, error: "empty-current" };
if (currentPassword !== unlockPassword) return { ok: false, error: "incorrect" };
setRuntimeState({
initialized: true,
locked: false,
@@ -96,6 +100,7 @@ export function createAppLockBridgeHarness(options: HarnessOptions) {
return {
enabled: false,
timeoutMinutes: 15,
systemUnlockEnabled: false,
passwordVerifier: null,
};
},
@@ -178,6 +183,9 @@ export function createAppLockBridgeHarness(options: HarnessOptions) {
getResetCount() {
return resetCount;
},
getResetAttempts() {
return [...resetAttempts];
},
getSystemUnlockCount() {
return systemUnlockCount;
},