Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add TOTP autofill background message handlers (#1634)
Leendert de Borstc785bdb20eae
diff --git a/apps/browser-extension/src/entrypoints/background.ts b/apps/browser-extension/src/entrypoints/background.tsindex e74819b82..5a2cd7ba9 100644--- a/apps/browser-extension/src/entrypoints/background.ts+++ b/apps/browser-extension/src/entrypoints/background.ts@@ -11,7 +11,7 @@ import { handleGetWebAuthnSettings, handleWebAuthnCreate, handleWebAuthnGet, hanimport { handleOpenPopup, handlePopupWithItem, handleOpenPopupCreateCredential, handleToggleContextMenu } from '@/entrypoints/background/PopupMessageHandler';import { handleStoreSavePromptState, handleGetSavePromptState, handleClearSavePromptState } from '@/entrypoints/background/SavePromptStateHandler';import { handleStoreTwoFactorState, handleGetTwoFactorState, handleClearTwoFactorState } from '@/entrypoints/background/TwoFactorStateHandler';-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, handleFullVaultSync, handleCheckLoginDuplicate, handleSaveLoginCredential, handleGetLoginSaveSettings, handleSetLoginSaveEnabled } 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, handleFullVaultSync, handleCheckLoginDuplicate, handleSaveLoginCredential, handleGetLoginSaveSettings, handleSetLoginSaveEnabled, handleGetItemsWithTotp, handleSearchItemsWithTotp, handleGetTotpSecrets, handleGenerateTotpCode } from '@/entrypoints/background/VaultMessageHandler';import { EncryptionKeyDerivationParams } from "@/utils/dist/core/models/metadata";import type { LoginResponse } from "@/utils/dist/core/models/webapi";@@ -71,6 +71,12 @@ export default defineBackground({onMessage('GET_LOGIN_SAVE_SETTINGS', () => handleGetLoginSaveSettings());onMessage('SET_LOGIN_SAVE_ENABLED', ({ data }) => handleSetLoginSaveEnabled(data as boolean));+ // TOTP autofill messages+ onMessage('GET_ITEMS_WITH_TOTP', ({ data }) => handleGetItemsWithTotp(data as { currentUrl: string, pageTitle: string, matchingMode?: string }));+ onMessage('SEARCH_ITEMS_WITH_TOTP', ({ data }) => handleSearchItemsWithTotp(data as { searchTerm: string }));+ onMessage('GET_TOTP_SECRETS', ({ data }) => handleGetTotpSecrets(data as { itemIds: string[] }));+ onMessage('GENERATE_TOTP_CODE', ({ data }) => handleGenerateTotpCode(data as { itemId: string }));+// Remember login save state (for surviving page navigation)onMessage('STORE_SAVE_PROMPT_STATE', ({ data, sender }) => handleStoreSavePromptState({ tabId: sender.tabId!, state: data as SavePromptPersistedState }));onMessage('GET_SAVE_PROMPT_STATE', ({ sender }) => handleGetSavePromptState({ tabId: sender.tabId! }));diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.tsindex 3c572e096..9828976bb 100644--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts@@ -1,10 +1,12 @@/* eslint-disable @typescript-eslint/no-explicit-any */+import * as OTPAuth from 'otpauth';import { storage } from 'wxt/utils/storage';import type { EncryptionKeyDerivationParams } from '@/utils/dist/core/models/metadata';-import type { Item } from '@/utils/dist/core/models/vault';+import { FieldKey, ItemTypes, createSystemField, type Item } from '@/utils/dist/core/models/vault';import type { Vault, VaultResponse, VaultPostResponse } from '@/utils/dist/core/models/webapi';import { EncryptionUtility } from '@/utils/EncryptionUtility';+import { filterItems, AutofillMatchingMode } from '@/utils/itemMatcher/ItemMatcher';import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import { SqliteClient } from '@/utils/SqliteClient';import { getItemWithFallback } from '@/utils/StorageUtility';@@ -343,6 +345,59 @@ export async function handleCreateItem(}}+/**+ * Filter items by URL matching.+ *+ * @param items - The items to filter+ * @param currentUrl - The current URL of the page+ * @param pageTitle - The title of the page+ * @param matchingModeStr - The matching mode to use (default: DEFAULT)+ * @returns The filtered items+ */+function filterItemsByUrl(items: Item[], currentUrl: string, pageTitle: string, matchingModeStr?: string): Promise<Item[]> {+ const matchingMode = matchingModeStr ? (matchingModeStr as typeof AutofillMatchingMode[keyof typeof AutofillMatchingMode]) : AutofillMatchingMode.DEFAULT;+ return filterItems(items, currentUrl, pageTitle, matchingMode);+}++/**+ * Filter items by search term.+ *+ * @param items - The items to filter+ * @param searchTerm - The search term to use+ * @returns The filtered items+ */+function filterItemsBySearchTerm(items: Item[], searchTerm: string): Item[] {+ if (!searchTerm || searchTerm.trim() === '') {+ return [];+ }++ const normalizedTerm = searchTerm.toLowerCase().trim();++ const searchableFieldKeys = [+ FieldKey.LoginUsername,+ FieldKey.LoginEmail,+ FieldKey.LoginUrl,+ FieldKey.AliasFirstName,+ FieldKey.AliasLastName+ ];++ return items.filter((item: Item) => {+ // Search in item name+ if (item.Name?.toLowerCase().includes(normalizedTerm)) {+ return true;+ }++ // Search in field values+ return item.Fields?.some((field: { FieldKey: string; Value: string | string[] }) => {+ if ((searchableFieldKeys as string[]).includes(field.FieldKey)) {+ const value = Array.isArray(field.Value) ? field.Value.join(' ') : field.Value;+ return value?.toLowerCase().includes(normalizedTerm);+ }+ return false;+ });+ }).sort((a: Item, b: Item) => (a.Name ?? '').localeCompare(b.Name ?? ''));+}+/*** Get items filtered by URL matching (for autofill).* Filters items in the background script before sending to reduce message payload size.@@ -362,22 +417,7 @@ export async function handleGetFilteredItems(try {const sqliteClient = await createVaultSqliteClient();const allItems = sqliteClient.items.getAll();-- const { filterItems, AutofillMatchingMode } = await import('@/utils/itemMatcher/ItemMatcher');-- // Parse matching mode from string- let matchingMode = AutofillMatchingMode.DEFAULT;- if (message.matchingMode) {- matchingMode = message.matchingMode as typeof AutofillMatchingMode[keyof typeof AutofillMatchingMode];- }-- // Filter items in background to reduce payload size (~95% reduction)- const filteredItems = await filterItems(- allItems,- message.currentUrl,- message.pageTitle,- matchingMode- );+ const filteredItems = await filterItemsByUrl(allItems, message.currentUrl, message.pageTitle, message.matchingMode);return { success: true, items: filteredItems };} catch (error) {@@ -406,42 +446,7 @@ export async function handleGetSearchItems(try {const sqliteClient = await createVaultSqliteClient();const allItems = sqliteClient.items.getAll();-- // If search term is empty, return empty array- if (!message.searchTerm || message.searchTerm.trim() === '') {- return { success: true, items: [] };- }-- const searchTerm = message.searchTerm.toLowerCase().trim();- const { FieldKey } = await import('@/utils/dist/core/models/vault');-- // Filter items by search term across multiple fields- const searchResults = allItems.filter((item: Item) => {- // Search in item name- if (item.Name?.toLowerCase().includes(searchTerm)) {- return true;- }-- // Search in field values- const searchableFieldKeys = [- FieldKey.LoginUsername,- FieldKey.LoginEmail,- FieldKey.LoginUrl,- FieldKey.AliasFirstName,- FieldKey.AliasLastName- ];-- return item.Fields?.some((field: { FieldKey: string; Value: string | string[] }) => {- if ((searchableFieldKeys as string[]).includes(field.FieldKey)) {- const value = Array.isArray(field.Value) ? field.Value.join(' ') : field.Value;- return value?.toLowerCase().includes(searchTerm);- }- return false;- });- }).sort((a: Item, b: Item) => {- // Sort by name- return (a.Name ?? '').localeCompare(b.Name ?? '');- });+ const searchResults = filterItemsBySearchTerm(allItems, message.searchTerm);return { success: true, items: searchResults };} catch (error) {@@ -662,7 +667,6 @@ async function uploadNewVaultToServer(sqliteClient: SqliteClient) : Promise<Vaul* are permanently deleted (IsDeleted = true) as part of the sync process.*/try {- const { vaultMergeService } = await import('@/utils/VaultMergeService');const pruneResult = await vaultMergeService.prune(updatedVaultData, 30);if (pruneResult.success && pruneResult.statementCount > 0) {console.info(`[VaultSync] Pruned expired items from trash (${pruneResult.statementCount} statements)`);@@ -1244,8 +1248,6 @@ export async function handleCheckLoginDuplicate(const sqliteClient = await createVaultSqliteClient();const allItems = sqliteClient.items.getAll();- const { FieldKey } = await import('@/utils/dist/core/models/vault');-// Find items with matching domain and usernameconst normalizedDomain = message.domain.toLowerCase();const normalizedUsername = message.username.toLowerCase();@@ -1329,8 +1331,6 @@ export async function handleSaveLoginCredential(}try {- const { ItemTypes, FieldKey, createSystemField } = await import('@/utils/dist/core/models/vault');-const sqliteClient = await createVaultSqliteClient();const currentDateTime = new Date().toISOString();@@ -1486,3 +1486,137 @@ export async function handleSetLoginSaveEnabled(return { success: false, error: formatErrorWithCode(await t('common.errors.unknownError'), AppErrorCode.STORAGE_WRITE_FAILED) };}}++/**+ * Get items that have TOTP codes, filtered by URL matching.+ * Used for TOTP autofill popup to show only items with 2FA codes.+ *+ * @param message - Filtering parameters: currentUrl, pageTitle, matchingMode+ */+export async function handleGetItemsWithTotp(+ message: { currentUrl: string, pageTitle: string, matchingMode?: string }+): Promise<messageItemsResponse> {+ const encryptionKey = await handleGetEncryptionKey();++ if (!encryptionKey) {+ return { success: false, error: formatErrorWithCode(await t('common.errors.vaultIsLocked'), AppErrorCode.VAULT_LOCKED) };+ }++ try {+ const sqliteClient = await createVaultSqliteClient();+ const allItems = sqliteClient.items.getAll();++ // Filter to only items with TOTP codes+ const itemsWithTotp = allItems.filter((item: Item) => item.HasTotp === true);++ // Then filter by URL matching using shared logic+ const filteredItems = await filterItemsByUrl(itemsWithTotp, message.currentUrl, message.pageTitle, message.matchingMode);++ return { success: true, items: filteredItems };+ } catch (error) {+ console.error('Error getting items with TOTP:', error);+ return { success: false, error: formatErrorWithCode(await t('common.errors.unknownError'), AppErrorCode.ITEM_READ_FAILED) };+ }+}++/**+ * Search items that have TOTP codes by search term.+ * Used for TOTP autofill popup search functionality.+ *+ * @param message - Search parameters: searchTerm+ */+export async function handleSearchItemsWithTotp(+ message: { searchTerm: string }+): Promise<messageItemsResponse> {+ const encryptionKey = await handleGetEncryptionKey();++ if (!encryptionKey) {+ return { success: false, error: formatErrorWithCode(await t('common.errors.vaultIsLocked'), AppErrorCode.VAULT_LOCKED) };+ }++ try {+ const sqliteClient = await createVaultSqliteClient();+ const allItems = sqliteClient.items.getAll();++ // Filter to only items with TOTP codes+ const itemsWithTotp = allItems.filter((item: Item) => item.HasTotp === true);++ // Then search using shared logic+ const searchResults = filterItemsBySearchTerm(itemsWithTotp, message.searchTerm);++ return { success: true, items: searchResults };+ } catch (error) {+ console.error('Error searching items with TOTP:', error);+ return { success: false, error: formatErrorWithCode(await t('common.errors.unknownError'), AppErrorCode.ITEM_READ_FAILED) };+ }+}++/**+ * Get TOTP secret keys for items.+ * Used by content script to generate codes locally for live preview.+ *+ * @param message - Array of item IDs to get TOTP secrets for+ */+export async function handleGetTotpSecrets(+ message: { itemIds: string[] }+): Promise<{ success: boolean; secrets?: Record<string, string>; error?: string }> {+ const encryptionKey = await handleGetEncryptionKey();++ if (!encryptionKey) {+ return { success: false, error: formatErrorWithCode(await t('common.errors.vaultIsLocked'), AppErrorCode.VAULT_LOCKED) };+ }++ try {+ const sqliteClient = await createVaultSqliteClient();+ const secrets: Record<string, string> = {};++ for (const itemId of message.itemIds) {+ const totpCodes = sqliteClient.settings.getTotpCodesForItem(itemId);+ if (totpCodes.length > 0) {+ secrets[itemId] = totpCodes[0].SecretKey;+ }+ }++ return { success: true, secrets };+ } catch (error) {+ console.error('Error getting TOTP secrets:', error);+ return { success: false, error: formatErrorWithCode(await t('common.errors.unknownError'), AppErrorCode.ITEM_READ_FAILED) };+ }+}++/**+ * Generate a TOTP code for a specific item.+ * Used by content script to fill TOTP fields.+ *+ * @param message - The item ID to generate TOTP code for+ */+export async function handleGenerateTotpCode(+ message: { itemId: string }+): Promise<{ success: boolean; code?: string; error?: string }> {+ const encryptionKey = await handleGetEncryptionKey();++ if (!encryptionKey) {+ return { success: false, error: formatErrorWithCode(await t('common.errors.vaultIsLocked'), AppErrorCode.VAULT_LOCKED) };+ }++ try {+ const sqliteClient = await createVaultSqliteClient();+ const totpCodes = sqliteClient.settings.getTotpCodesForItem(message.itemId);++ if (totpCodes.length === 0) {+ return { success: false, error: 'No TOTP codes found for this item' };+ }++ const totp = new OTPAuth.TOTP({+ secret: totpCodes[0].SecretKey,+ algorithm: 'SHA1',+ digits: 6,+ period: 30+ });++ return { success: true, code: totp.generate() };+ } catch (error) {+ console.error('Error generating TOTP code:', error);+ return { success: false, error: formatErrorWithCode(await t('common.errors.unknownError'), AppErrorCode.ITEM_READ_FAILED) };+ }+}