Merge pull request #1255 from buttercup/fix/password_prompt

Password prompt rebuild
buttercup · Nov 26, 2023 · 8e5533e · 8e5533e
2 parents 8b000f9 + 1a8c329
commit 8e5533e
Show file tree

Hide file tree

Showing 19 changed files with 375 additions and 302 deletions.
diff --git a/source/main/services/init.ts b/source/main/services/init.ts
@@ -6,7 +6,7 @@ import { applyCurrentTheme } from "./theme";
 import { updateTrayIcon } from "../actions/tray";
 import { updateAppMenu } from "../actions/appMenu";
 import { getConfigValue, initialise as initialiseConfig } from "./config";
-import { getConfigPath, getVaultStoragePath } from "./storage";
+import { getConfigPath, getVaultSettingsPath, getVaultStoragePath } from "./storage";
 import { getOSLocale } from "./locale";
 import { startFileHost } from "./fileHost";
 import { isPortable } from "../library/portability";
@@ -28,6 +28,7 @@ export async function initialise() {
     logInfo(`Logs location: ${getLogPath()}`);
     logInfo(`Config location: ${getConfigPath()}`);
     logInfo(`Vault config storage location: ${getVaultStoragePath()}`);
+    logInfo(`Vault-specific settings path: ${getVaultSettingsPath("<ID>")}`);
     await initialiseConfig();
     const preferences = await getConfigValue("preferences");
     const locale = await getOSLocale();

diff --git a/source/renderer/actions/facade.ts b/source/renderer/actions/facade.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from "electron";
 import { VaultFacade, VaultSourceID } from "buttercup";
-import { setCurrentVault, setCurrentVaultSupportsAttachments } from "../state/vaults";
+import { VAULTS_STATE } from "../state/vaults";
 import { setCurrentFacade } from "../services/facade";
 
 export async function fetchUpdatedFacade(sourceID: VaultSourceID) {
@@ -9,8 +9,8 @@ export async function fetchUpdatedFacade(sourceID: VaultSourceID) {
         sourceID
     );
     const facade: VaultFacade = JSON.parse(rawFacade);
-    setCurrentVaultSupportsAttachments(attachments);
-    setCurrentVault(sourceID);
+    VAULTS_STATE.currentVaultAttachments = !!attachments;
+    VAULTS_STATE.currentVault = sourceID;
     if (!facade) {
         setCurrentFacade(null);
         return;

diff --git a/source/renderer/actions/password.ts b/source/renderer/actions/password.ts
@@ -1,24 +1,28 @@
 import { VaultSourceID } from "buttercup";
 import { getPasswordEmitter } from "../services/password";
 import { sourceHasBiometricAvailability } from "../services/biometrics";
-import { setBiometricSourceID, showPasswordPrompt } from "../state/password";
+import { PASSWORD_STATE } from "../state/password";
 
-export async function getPrimaryPassword(sourceID?: VaultSourceID): Promise<string | null> {
+export async function getPrimaryPassword(
+    sourceID?: VaultSourceID
+): Promise<[password: string | null, biometricsEnabled: boolean, usedBiometrics: boolean]> {
+    let biometricsEnabled: boolean = false;
     if (sourceID) {
         const supportsBiometrics = await sourceHasBiometricAvailability(sourceID);
         if (supportsBiometrics) {
-            setBiometricSourceID(sourceID);
+            PASSWORD_STATE.passwordViaBiometricSource = sourceID;
+            biometricsEnabled = true;
         }
     }
-    showPasswordPrompt(true);
+    PASSWORD_STATE.showPrompt = true;
     const emitter = getPasswordEmitter();
-    const password = await new Promise<string | null>((resolve) => {
-        const callback = (password: string | null) => {
-            resolve(password);
+    const [password, usedBiometrics] = await new Promise<[string | null, boolean]>((resolve) => {
+        const callback = (password: string | null, usedBiometrics: boolean) => {
+            resolve([password, usedBiometrics]);
             emitter.removeListener("password", callback);
         };
         emitter.once("password", callback);
     });
-    setBiometricSourceID(null);
-    return password;
+    PASSWORD_STATE.passwordViaBiometricSource = null;
+    return [password, biometricsEnabled, usedBiometrics];
 }
diff --git a/source/renderer/actions/removeVault.ts b/source/renderer/actions/removeVault.ts
@@ -1,10 +1,10 @@
 import { ipcRenderer } from "electron";
 import { VaultSourceID } from "buttercup";
-import { getCurrentSourceID, setCurrentVault } from "../state/vaults";
+import { VAULTS_STATE } from "../state/vaults";
 
 export async function removeVaultSource(sourceID: VaultSourceID) {
-    if (sourceID === getCurrentSourceID()) {
-        setCurrentVault(null);
+    if (sourceID === VAULTS_STATE.currentVault) {
+        VAULTS_STATE.currentVault = null;
     }
     ipcRenderer.send(
         "remove-source",

diff --git a/source/renderer/actions/unlockVault.ts b/source/renderer/actions/unlockVault.ts
@@ -4,10 +4,11 @@ import { getPrimaryPassword } from "./password";
 import { setBusy } from "../state/app";
 import { showError } from "../services/notifications";
 import { logInfo } from "../library/log";
+import { getVaultSettings, saveVaultSettings } from "../services/vaultSettings";
 import { t } from "../../shared/i18n/trans";
 
 export async function unlockVaultSource(sourceID: VaultSourceID): Promise<boolean> {
-    const password = await getPrimaryPassword(sourceID);
+    const [password, biometricsEnabled, usedBiometrics] = await getPrimaryPassword(sourceID);
     if (!password) return false;
     setBusy(true);
     logInfo(`Unlocking source: ${sourceID}`);
@@ -23,6 +24,47 @@ export async function unlockVaultSource(sourceID: VaultSourceID): Promise<boolea
         return await unlockVaultSource(sourceID);
     }
     setBusy(false);
+    // Update config
+    if (biometricsEnabled) {
+        const vaultSettings = await getVaultSettings(sourceID);
+        const { biometricForcePasswordMaxInterval, biometricForcePasswordCount } = vaultSettings;
+        const maxPasswordCount = parseInt(biometricForcePasswordCount, 10);
+        const maxInterval = parseInt(biometricForcePasswordMaxInterval, 10);
+        if (!isNaN(maxPasswordCount) && maxPasswordCount > 0 && usedBiometrics) {
+            // Max password count enabled, increment count
+            vaultSettings.biometricUnlockCount += 1;
+            logInfo(`biometric unlock count increased: ${vaultSettings.biometricUnlockCount}`);
+        } else {
+            // Not enabled, ensure 0
+            vaultSettings.biometricUnlockCount = 0;
+        }
+        if (!isNaN(maxInterval) && maxInterval > 0 && usedBiometrics) {
+            // Interval enabled, set to now
+            if (
+                typeof vaultSettings.biometricLastManualUnlock === "number" &&
+                vaultSettings.biometricLastManualUnlock > 0
+            ) {
+                logInfo(
+                    `biometric unlock date ignored as already set: ${vaultSettings.biometricLastManualUnlock}`
+                );
+            } else {
+                vaultSettings.biometricLastManualUnlock = Date.now();
+                logInfo(`biometric unlock date set: ${vaultSettings.biometricLastManualUnlock}`);
+            }
+        } else if (
+            typeof vaultSettings.biometricLastManualUnlock === "number" &&
+            vaultSettings.biometricLastManualUnlock > 0
+        ) {
+            // Exceeded: new date
+            vaultSettings.biometricLastManualUnlock = Date.now();
+            logInfo(`biometric unlock date reset: ${vaultSettings.biometricLastManualUnlock}`);
+        } else {
+            // Not enabled: back to null
+            vaultSettings.biometricLastManualUnlock = null;
+        }
+        await saveVaultSettings(sourceID, vaultSettings);
+    }
+    // Return result
     logInfo(`Unlocked source: ${sourceID}`);
     return true;
 }