Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add RPO recovery logic to browser extension (#1404)
Leendert de Borste44fb5a76626
diff --git a/apps/browser-extension/src/entrypoints/background.ts b/apps/browser-extension/src/entrypoints/background.tsindex 51abbdfcc..8c126925e 100644--- a/apps/browser-extension/src/entrypoints/background.ts+++ b/apps/browser-extension/src/entrypoints/background.ts@@ -9,7 +9,7 @@ import { handleClipboardCopied, handleCancelClipboardClear, handleGetClipboardClimport { setupContextMenus } from '@/entrypoints/background/ContextMenu';import { handleGetWebAuthnSettings, handleWebAuthnCreate, handleWebAuthnGet, handlePasskeyPopupResponse, handleGetRequestData } from '@/entrypoints/background/PasskeyHandler';import { handleOpenPopup, handlePopupWithItem, handleOpenPopupCreateCredential, handleToggleContextMenu } from '@/entrypoints/background/PopupMessageHandler';-import { handleCheckAuthStatus, handleClearPersistedFormValues, handleClearVault, handleLockVault, handleCreateItem, handleGetFilteredItems, handleGetSearchItems, handleGetDefaultEmailDomain, handleGetDefaultIdentitySettings, handleGetEncryptionKey, handleGetEncryptionKeyDerivationParams, handleGetPasswordSettings, handleGetPersistedFormValues, handleGetVault, handlePersistFormValues, handleStoreEncryptionKey, handleStoreEncryptionKeyDerivationParams, handleStoreVaultMetadata, handleSyncVault, handleUploadVault, handleGetEncryptedVault, handleStoreEncryptedVault, handleGetSyncState, handleMarkVaultClean, handleGetServerRevision } from '@/entrypoints/background/VaultMessageHandler';+import { handleCheckAuthStatus, handleClearPersistedFormValues, handleClearSession, handleClearVaultData, handleLockVault, handleCreateItem, handleGetFilteredItems, handleGetSearchItems, handleGetDefaultEmailDomain, handleGetDefaultIdentitySettings, handleGetEncryptionKey, handleGetEncryptionKeyDerivationParams, handleGetPasswordSettings, handleGetPersistedFormValues, handleGetVault, handlePersistFormValues, handleStoreEncryptionKey, handleStoreEncryptionKeyDerivationParams, handleStoreVaultMetadata, handleSyncVault, handleUploadVault, handleGetEncryptedVault, handleStoreEncryptedVault, handleGetSyncState, handleMarkVaultClean, handleGetServerRevision } from '@/entrypoints/background/VaultMessageHandler';import { GLOBAL_CONTEXT_MENU_ENABLED_KEY } from '@/utils/Constants';import { EncryptionKeyDerivationParams } from "@/utils/dist/core/models/metadata";@@ -48,7 +48,8 @@ export default defineBackground({onMessage('UPLOAD_VAULT', () => handleUploadVault());onMessage('SYNC_VAULT', () => handleSyncVault());onMessage('LOCK_VAULT', () => handleLockVault());- onMessage('CLEAR_VAULT', () => handleClearVault());+ onMessage('CLEAR_SESSION', () => handleClearSession());+ onMessage('CLEAR_VAULT_DATA', () => handleClearVaultData());onMessage('OPEN_POPUP', () => handleOpenPopup());onMessage('OPEN_POPUP_WITH_ITEM', ({ data }) => handlePopupWithItem(data));diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.tsindex 44df51999..1fe6e9820 100644--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts@@ -253,12 +253,36 @@ export function handleLockVault(): messageBoolResponse {}/**- * Clear the vault completely from browser storage (both local: and session:).- * This is used for full logout - removes all vault data.+ * Clear session data (tokens and ephemeral data).+ * This is safe to call during forced logout as it preserves vault data.*/-export function handleClearVault(): messageBoolResponse {- // Clear persistent vault data from local: storage- storage.removeItems([+export async function handleClearSession(): Promise<messageBoolResponse> {+ // Clear auth tokens+ await storage.removeItems([+ 'local:accessToken',+ 'local:refreshToken',+ ]);++ // Clear session-only data (security: encryption key must not persist)+ await storage.removeItems([+ 'session:encryptionKey',+ 'session:persistedFormValues',+ ]);++ // Clear cached client since session ended+ cachedSqliteClient = null;+ cachedVaultBlob = null;++ return { success: true };+}++/**+ * Clear vault data and username.+ * This removes all persistent vault storage.+ */+export async function handleClearVaultData(): Promise<messageBoolResponse> {+ // Clear vault data+ await storage.removeItems(['local:encryptedVault','local:publicEmailDomains','local:privateEmailDomains',@@ -268,18 +292,9 @@ export function handleClearVault(): messageBoolResponse {'local:mutationSequence','local:isOfflineMode','local:encryptionKeyDerivationParams',+ 'local:username',]);- // Clear session-only data- storage.removeItems([- 'session:encryptionKey',- 'session:persistedFormValues',- ]);-- // Clear cached client since vault was cleared- cachedSqliteClient = null;- cachedVaultBlob = null;-return { success: true };}diff --git a/apps/browser-extension/src/entrypoints/popup/context/AppContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/AppContext.tsxindex c4b8bab0a..8e0c68bd1 100644--- a/apps/browser-extension/src/entrypoints/popup/context/AppContext.tsx+++ b/apps/browser-extension/src/entrypoints/popup/context/AppContext.tsx@@ -32,6 +32,9 @@ export const AppProvider: React.FC<{ children: React.ReactNode }> = ({ children/*** Logout the user by revoking tokens and clearing the auth tokens from storage.* Prevents recursive logout calls by tracking logout state.+ *+ * NOTE: This is used for FORCED logout (from logoutEventEmitter). For user-initiated logout,+ * use the Settings page which checks isDirty and shows warning dialog.*/const logout = useCallback(async (errorMessage?: string): Promise<void> => {if (isLoggingOutRef.current) {@@ -41,7 +44,8 @@ export const AppProvider: React.FC<{ children: React.ReactNode }> = ({ childrentry {isLoggingOutRef.current = true;await webApi.revokeTokens();- await auth.clearAuth(errorMessage);+ // Use forced logout to preserve orphaned vault+ await auth.clearAuthForced(errorMessage);} catch (error) {console.error('Error during logout:', error);} finally {diff --git a/apps/browser-extension/src/entrypoints/popup/context/AuthContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/AuthContext.tsxindex c41ac1c75..34582ca7c 100644--- a/apps/browser-extension/src/entrypoints/popup/context/AuthContext.tsx+++ b/apps/browser-extension/src/entrypoints/popup/context/AuthContext.tsx@@ -13,7 +13,8 @@ type AuthContextType = {username: string | null;initializeAuth: () => Promise<boolean>;setAuthTokens: (username: string, accessToken: string, refreshToken: string) => Promise<void>;- clearAuth: (errorMessage?: string) => Promise<void>;+ clearAuthUserInitiated: (errorMessage?: string) => Promise<void>;+ clearAuthForced: (errorMessage?: string) => Promise<void>;globalMessage: string | null;clearGlobalMessage: () => void;}@@ -65,13 +66,19 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children}, []);/**- * Clear authentication data and tokens from storage.- * This is called by AppContext after revoking tokens on the server.+ * Clear authentication data and tokens from storage (user-initiated logout).+ * This is called when the user explicitly clicks the logout button.+ *+ * @param errorMessage Optional error message to display on the login page*/- const clearAuth = useCallback(async (errorMessage?: string) : Promise<void> => {- // Clear vault from background worker and remove local storage tokens.- await sendMessage('CLEAR_VAULT', {}, 'background');- await storage.removeItems(['local:username', 'local:accessToken', 'local:refreshToken']);+ const clearAuthUserInitiated = useCallback(async (errorMessage?: string) : Promise<void> => {+ // Clear session data (tokens + ephemeral data)+ await sendMessage('CLEAR_SESSION', {}, 'background');++ // Clear vault data (vault + username)+ await sendMessage('CLEAR_VAULT_DATA', {}, 'background');++ // Clear in-memory database referencedbContext?.clearDatabase();// Clear PIN unlock data (if any)@@ -90,6 +97,36 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ childrensetUsername(null);}, [dbContext]);+ /**+ * Clear authentication data and tokens from storage (forced logout).+ * This is called when the server forces a logout (401, token revocation, password change).+ * Preserves the encrypted vault + metadata for recovery on next login.+ *+ * Keeps username for login page prefill and vault ownership verification.+ *+ * @param errorMessage Optional error message to display on the login page+ */+ const clearAuthForced = useCallback(async (errorMessage?: string) : Promise<void> => {+ // Only clear session data - vault data is preserved for recovery+ await sendMessage('CLEAR_SESSION', {}, 'background');++ // Clear in-memory database reference+ dbContext?.clearDatabase();++ // Clear PIN unlock data (if any)+ try {+ await removeAndDisablePin();+ } catch (error) {+ console.error('Failed to remove PIN data:', error);+ // Non-fatal error - continue with logout+ }++ // Set local storage global message that will be shown on the login page.+ if (errorMessage) {+ setGlobalMessage(errorMessage);+ }+ }, [dbContext]);+/*** Clear global message (called after displaying the message).*/@@ -102,10 +139,11 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ childrenusername,initializeAuth,setAuthTokens,- clearAuth,+ clearAuthUserInitiated,+ clearAuthForced,globalMessage,clearGlobalMessage,- }), [isInitialized, username, initializeAuth, globalMessage, setAuthTokens, clearAuth, clearGlobalMessage]);+ }), [isInitialized, username, initializeAuth, globalMessage, setAuthTokens, clearAuthUserInitiated, clearAuthForced, clearGlobalMessage]);return (<AuthContext.Provider value={contextValue}>diff --git a/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsxindex e4fc24b6d..e2a30350e 100644--- a/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx+++ b/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx@@ -250,7 +250,6 @@ export const DbProvider: React.FC<{ children: React.ReactNode }> = ({ children }setSqliteClient(null);setDbInitialized(false);setDbAvailable(false);- sendMessage('CLEAR_VAULT', {}, 'background');}, []);const contextValue = useMemo(() => ({diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.tsindex 01b6abcdc..2c203d6db 100644--- a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts@@ -285,6 +285,47 @@ export const useVaultSync = (): { syncVault: (options?: VaultSyncOptions) => ProonSuccess?.(false);return true;}+ } else if (statusResponse.vaultRevision < syncState.serverRevision) {+ /**+ * Server revision DECREASED - server data loss/rollback detected.+ * Client has more advanced revision - upload to recover server state.+ *+ * This will create a revision gap in server history (e.g., 95 → 101),+ * which serves as an audit trail of the recovery event.+ */++ console.warn(+ `Server data loss detected! Server at rev ${statusResponse.vaultRevision}, ` ++ `client at rev ${syncState.serverRevision}. Uploading to recover server state.`+ );++ onStatus?.(t('common.uploadingVault'));++ const uploadResponse = await sendMessage('UPLOAD_VAULT', {}, 'background') as VaultUploadResponse;++ if (uploadResponse.success && uploadResponse.status === 0) {+ // Upload succeeded+ await sendMessage('MARK_VAULT_CLEAN', {+ mutationSeqAtStart: uploadResponse.mutationSeqAtStart,+ newServerRevision: uploadResponse.newRevisionNumber+ }, 'background');+ await dbContext.refreshSyncState();++ console.info(+ `Server recovery complete: rev ${statusResponse.vaultRevision} → ${uploadResponse.newRevisionNumber}`+ );++ onSuccess?.(false);+ return true;+ } else if (uploadResponse.status === 2) {+ // Another client recovered first+ console.info('Another client recovered server first, re-syncing...');+ return syncVault(options);+ } else {+ console.error('Server recovery failed:', uploadResponse.error);+ onError?.(t('common.errors.unknownError'));+ return false;+ }}// Check if upgrade is required (for paths that didn't initialize a new database)diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsxindex 12c9bb7e4..64579da8a 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx@@ -55,10 +55,56 @@ const Login: React.FC = () => {/*** Helper to persist and load vault after successful authentication.+ * Checks if local vault exists from forced logout and preserves it if more advanced.* @returns The initialized SqliteClient*/const persistAndLoadVault = async (vaultResponse: VaultResponse, encryptionKey: string): Promise<SqliteClient> => {- // Persist vault to local storage (fresh from server, not dirty)+ // Check if there's existing vault data (from forced logout)+ const existingVault = await storage.getItem('local:encryptedVault') as string | null;+ const existingRevision = await storage.getItem('local:serverRevision') as number | null;++ let vaultToLoad = vaultResponse.vault.blob;++ if (existingVault && existingRevision !== null) {+ // Try to decrypt existing vault to verify it's valid+ try {+ const decryptedExisting = await EncryptionUtility.symmetricDecrypt(existingVault, encryptionKey);++ // Check if existing vault is more advanced than server+ if (existingRevision >= vaultResponse.vault.currentRevisionNumber) {+ console.info(+ `Existing vault is more advanced (rev ${existingRevision} >= ${vaultResponse.vault.currentRevisionNumber}), ` ++ `preserving local vault and will upload to server`+ );++ // Keep the existing vault - it will be uploaded via sync flow+ vaultToLoad = existingVault;++ /*+ * Don't overwrite the vault - it will be uploaded via sync flow+ * Just update metadata and load existing vault+ */+ await sendMessage('STORE_VAULT_METADATA', {+ publicEmailDomainList: vaultResponse.vault.publicEmailDomainList,+ privateEmailDomainList: vaultResponse.vault.privateEmailDomainList,+ hiddenPrivateEmailDomainList: vaultResponse.vault.hiddenPrivateEmailDomainList,+ }, 'background');++ return dbContext.loadDatabase(decryptedExisting);+ }++ // Server is more advanced - will overwrite local+ console.info(+ `Server vault is more advanced (rev ${vaultResponse.vault.currentRevisionNumber} > ${existingRevision}), ` ++ `using server vault`+ );+ } catch {+ // Decryption failed - password changed or corrupt vault+ console.info('Existing vault could not be decrypted (password changed), using server vault');+ }+ }++ // Normal flow: persist server vault to local storageawait sendMessage('STORE_ENCRYPTED_VAULT', {vaultBlob: vaultResponse.vault.blob,serverRevision: vaultResponse.vault.currentRevisionNumber,@@ -71,7 +117,7 @@ const Login: React.FC = () => {}, 'background');// Decrypt and load the vault into memory- const decryptedVault = await EncryptionUtility.symmetricDecrypt(vaultResponse.vault.blob, encryptionKey);+ const decryptedVault = await EncryptionUtility.symmetricDecrypt(vaultToLoad, encryptionKey);return dbContext.loadDatabase(decryptedVault);};@@ -101,7 +147,13 @@ const Login: React.FC = () => {encryptionSettings: loginResponse.encryptionSettings});- // Persist and load the vault+ /*+ * Persist and load the vault+ * If there was a forced logout, persistAndLoadVault checks existing vault data:+ * - If local vault is more advanced → preserves it (will upload via sync in /reinitialize)+ * - If server is more advanced → uses server vault+ * - If password changed (can't decrypt) → uses server vault+ */const sqliteClient = await persistAndLoadVault(vaultResponseJson, passwordHashBase64);// If there are pending migrations, redirect to the upgrade page.@@ -127,19 +179,26 @@ const Login: React.FC = () => {useEffect(() => {/**- * Load the client URL from the storage.+ * Load the client URL and check for saved username (from forced logout).*/- const loadClientUrl = async () : Promise<void> => {+ const loadInitialData = async () : Promise<void> => {+ // Load client URLconst settingClientUrl = await storage.getItem('local:clientUrl') as string;let clientUrl = AppInfo.DEFAULT_CLIENT_URL;if (settingClientUrl && settingClientUrl.length > 0) {clientUrl = settingClientUrl;}-setClientUrl(clientUrl);++ // Check for saved username (from forced logout) and prefill+ const savedUsername = await storage.getItem('local:username') as string | null;+ if (savedUsername) {+ setCredentials(prev => ({ ...prev, username: savedUsername }));+ }+setIsInitialLoading(false);};- loadClientUrl();+ loadInitialData();}, [setIsInitialLoading]);// Set header buttons on mount and clear on unmountdiff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsxindex 05d4d2b0f..26e085078 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx@@ -6,9 +6,11 @@ import { sendMessage } from 'webext-bridge/popup';import HeaderButton from '@/entrypoints/popup/components/HeaderButton';import { HeaderIconType } from '@/entrypoints/popup/components/Icons/HeaderIcons';import { useApp } from '@/entrypoints/popup/context/AppContext';+import { useAuth } from '@/entrypoints/popup/context/AuthContext';import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsContext';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';import { useTheme } from '@/entrypoints/popup/context/ThemeContext';+import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';import { useApiUrl } from '@/entrypoints/popup/utils/ApiUrlUtility';import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';@@ -23,11 +25,14 @@ const Settings: React.FC = () => {const { t } = useTranslation();const { theme, setTheme } = useTheme();const app = useApp();+ const auth = useAuth();+ const webApi = useWebApi();const { setHeaderButtons } = useHeaderButtons();const { setIsInitialLoading } = useLoading();const { loadApiUrl, getDisplayUrl } = useApiUrl();const navigate = useNavigate();const [showLogoutConfirm, setShowLogoutConfirm] = React.useState(false);+ const [showDirtyLogoutWarning, setShowDirtyLogoutWarning] = React.useState(false);/*** Open the client tab.@@ -108,11 +113,38 @@ const Settings: React.FC = () => {};/**- * Handle logout.+ * Handle logout click - checks if vault has unsynced changes first.+ */+ const handleLogoutClick = async () : Promise<void> => {+ // Check if vault has unsynced changes+ const syncState = await sendMessage('GET_SYNC_STATE', {}, 'background') as {+ isDirty: boolean;+ mutationSequence: number;+ serverRevision: number;+ };++ if (syncState.isDirty) {+ // Show warning about unsynced changes+ setShowDirtyLogoutWarning(true);+ } else {+ // No unsynced changes, show normal logout confirmation+ setShowLogoutConfirm(true);+ }+ };++ /**+ * Handle logout (after confirmation).*/const handleLogout = async () : Promise<void> => {setShowLogoutConfirm(false);- app.logout();+ setShowDirtyLogoutWarning(false);++ try {+ await webApi.revokeTokens();+ await auth.clearAuthUserInitiated();+ } catch (error) {+ console.error('Error during logout:', error);+ }};/**@@ -176,7 +208,7 @@ const Settings: React.FC = () => {return (<>- {/* Logout Confirmation Modal */}+ {/* Logout Confirmation Modal (No Unsynced Changes) */}{showLogoutConfirm && (<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50"><div className="bg-white dark:bg-gray-800 rounded-lg p-6 max-w-sm w-full mx-4">@@ -203,6 +235,43 @@ const Settings: React.FC = () => {</div></div>)}++ {/* Dirty Logout Warning Modal (Unsynced Changes) */}+ {showDirtyLogoutWarning && (+ <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">+ <div className="bg-white dark:bg-gray-800 rounded-lg p-6 max-w-sm w-full mx-4">+ <div className="flex items-start mb-4">+ <div className="flex-shrink-0">+ <svg className="h-6 w-6 text-amber-500" fill="none" viewBox="0 0 24 24" strokeWidth="1.5" stroke="currentColor">+ <path strokeLinecap="round" strokeLinejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z" />+ </svg>+ </div>+ <div className="ml-3">+ <h3 className="text-lg font-semibold text-gray-900 dark:text-white">+ {t('logout.unsyncedChangesTitle')}+ </h3>+ </div>+ </div>+ <p className="text-sm text-gray-600 dark:text-gray-400 mb-6">+ {t('logout.unsyncedChangesWarning')}+ </p>+ <div className="flex gap-3">+ <button+ onClick={() => setShowDirtyLogoutWarning(false)}+ className="flex-1 px-4 py-2 bg-gray-200 hover:bg-gray-300 dark:bg-gray-700 dark:hover:bg-gray-600 text-gray-900 dark:text-white rounded-md transition-colors"+ >+ {t('common.cancel')}+ </button>+ <button+ onClick={handleLogout}+ className="flex-1 px-4 py-2 bg-red-500 hover:bg-red-600 text-white rounded-md transition-colors"+ >+ {t('logout.logoutAnyway')}+ </button>+ </div>+ </div>+ </div>+ )}<div className="space-y-6"><div className="flex justify-between items-center mb-4"><h2 className="text-gray-900 dark:text-white text-xl">{t('common.settings')}</h2>@@ -252,7 +321,7 @@ const Settings: React.FC = () => {</svg></button><button- onClick={() => setShowLogoutConfirm(true)}+ onClick={handleLogoutClick}title={t('common.logout')}className="p-2 bg-red-100 hover:bg-red-200 dark:bg-red-900/30 dark:hover:bg-red-900/50 text-red-600 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 rounded-md transition-colors">diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.jsonindex 43ab4b46f..7632717e0 100644--- a/apps/browser-extension/src/i18n/locales/en.json+++ b/apps/browser-extension/src/i18n/locales/en.json@@ -487,5 +487,10 @@"upgradeFailed": "Upgrade Failed","failedToApplyMigration": "Failed to apply migration ({{current}} of {{total}})"}+ },+ "logout": {+ "unsyncedChangesTitle": "Unsynced Changes",+ "unsyncedChangesWarning": "You have unsynced changes that will be lost if you log out now. Are you sure you want to continue?",+ "logoutAnyway": "Log out anyway"}}\ No newline at end of file