Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update shared models and update browser extension MobileLoginUtility (#1347)
Leendert de Borstf9d7918e0a45
diff --git a/apps/browser-extension/src/entrypoints/popup/utils/MobileLoginUtility.ts b/apps/browser-extension/src/entrypoints/popup/utils/MobileLoginUtility.tsindex 828721d9a..f8007e3be 100644--- a/apps/browser-extension/src/entrypoints/popup/utils/MobileLoginUtility.ts+++ b/apps/browser-extension/src/entrypoints/popup/utils/MobileLoginUtility.ts@@ -1,6 +1,6 @@import { Buffer } from 'buffer';-import type { MobileLoginInitiateResponse, MobileLoginPollResponse } from '@/utils/dist/shared/models/webapi';+import type { LoginResponse, MobileLoginInitiateResponse, MobileLoginPollResponse } from '@/utils/dist/shared/models/webapi';import EncryptionUtility from '@/utils/EncryptionUtility';import type { WebApiService } from '@/utils/WebApiService';@@ -96,33 +96,46 @@ export class MobileLoginUtility {const data = await response.json() as MobileLoginPollResponse;- if (data.fulfilled && data.encryptedDecryptionKey && data.username && data.token && data.salt && data.encryptionType && data.encryptionSettings) {+ if (data.fulfilled && data.encryptedSymmetricKey) {// Stop pollingthis.stopPolling();- // Decrypt the decryption key using private key- const decryptionKeyBytes = await EncryptionUtility.decryptWithPrivateKey(- data.encryptedDecryptionKey,- this.privateKey!- );-- // Convert to base64 string+ // Decrypt the encrypted decryption key with RSA private key+ const decryptionKeyBytes = await EncryptionUtility.decryptWithPrivateKey(data.encryptedDecryptionKey!, this.privateKey!);const decryptionKey = Buffer.from(decryptionKeyBytes).toString('base64');+ // Decrypt the other encrypted fields with the symmetric key+ const symmetricKeyBytes = await EncryptionUtility.decryptWithPrivateKey(data.encryptedSymmetricKey, this.privateKey!);+ const symmetricKey = Buffer.from(symmetricKeyBytes).toString('base64');++ const token = await EncryptionUtility.symmetricDecrypt(data.encryptedToken!, symmetricKey);+ const refreshToken = await EncryptionUtility.symmetricDecrypt(data.encryptedRefreshToken!, symmetricKey);+ const username = await EncryptionUtility.symmetricDecrypt(data.encryptedUsername!, symmetricKey);+// Clear sensitive datathis.privateKey = null;this.requestId = null;- // Call success callback- onSuccess(- data.username,- data.token.token,- data.token.refreshToken,- decryptionKey,- data.salt,- data.encryptionType,- data.encryptionSettings- );+ // Call /login endpoint with username to get salt and encryption settings+ const loginResponse = await this.webApi.rawFetch('auth/login', {+ method: 'POST',+ headers: {+ 'Content-Type': 'application/json',+ },+ body: JSON.stringify({+ username,+ }),+ });++ if (!loginResponse.ok) {+ onError('Failed to retrieve encryption settings');+ return;+ }++ const loginData = await loginResponse.json() as LoginResponse;++ // Call success callback with all data+ onSuccess(username, token, refreshToken, decryptionKey, loginData.salt, loginData.encryptionType, loginData.encryptionSettings);}} catch (error) {this.stopPolling();diff --git a/apps/browser-extension/src/utils/dist/shared/models/webapi/index.d.ts b/apps/browser-extension/src/utils/dist/shared/models/webapi/index.d.tsindex d4abb474e..dfaf25875 100644--- a/apps/browser-extension/src/utils/dist/shared/models/webapi/index.d.ts+++ b/apps/browser-extension/src/utils/dist/shared/models/webapi/index.d.ts@@ -413,12 +413,11 @@ type MobileLoginSubmitRequest = {*/type MobileLoginPollResponse = {fulfilled: boolean;+ encryptedSymmetricKey: string | null;+ encryptedToken: string | null;+ encryptedRefreshToken: string | null;encryptedDecryptionKey: string | null;- username: string | null;- token: TokenModel | null;- salt: string | null;- encryptionType: string | null;- encryptionSettings: string | null;+ encryptedUsername: string | null;};export { type ApiErrorResponse, AuthEventType, type AuthLogModel, type BadRequestResponse, type DeleteAccountInitiateRequest, type DeleteAccountInitiateResponse, type DeleteAccountRequest, type Email, type EmailAttachment, type FaviconExtractModel, type LoginRequest, type LoginResponse, type MailboxBulkRequest, type MailboxBulkResponse, type MailboxEmail, type MobileLoginInitiateRequest, type MobileLoginInitiateResponse, type MobileLoginPollResponse, type MobileLoginSubmitRequest, type PasswordChangeInitiateResponse, type RefreshToken, type StatusResponse, type TokenModel, type ValidateLoginRequest, type ValidateLoginRequest2Fa, type ValidateLoginResponse, type Vault, type VaultPasswordChangeRequest, type VaultPostResponse, type VaultResponse };diff --git a/apps/mobile-app/utils/dist/shared/models/webapi/index.d.ts b/apps/mobile-app/utils/dist/shared/models/webapi/index.d.tsindex d4abb474e..dfaf25875 100644--- a/apps/mobile-app/utils/dist/shared/models/webapi/index.d.ts+++ b/apps/mobile-app/utils/dist/shared/models/webapi/index.d.ts@@ -413,12 +413,11 @@ type MobileLoginSubmitRequest = {*/type MobileLoginPollResponse = {fulfilled: boolean;+ encryptedSymmetricKey: string | null;+ encryptedToken: string | null;+ encryptedRefreshToken: string | null;encryptedDecryptionKey: string | null;- username: string | null;- token: TokenModel | null;- salt: string | null;- encryptionType: string | null;- encryptionSettings: string | null;+ encryptedUsername: string | null;};export { type ApiErrorResponse, AuthEventType, type AuthLogModel, type BadRequestResponse, type DeleteAccountInitiateRequest, type DeleteAccountInitiateResponse, type DeleteAccountRequest, type Email, type EmailAttachment, type FaviconExtractModel, type LoginRequest, type LoginResponse, type MailboxBulkRequest, type MailboxBulkResponse, type MailboxEmail, type MobileLoginInitiateRequest, type MobileLoginInitiateResponse, type MobileLoginPollResponse, type MobileLoginSubmitRequest, type PasswordChangeInitiateResponse, type RefreshToken, type StatusResponse, type TokenModel, type ValidateLoginRequest, type ValidateLoginRequest2Fa, type ValidateLoginResponse, type Vault, type VaultPasswordChangeRequest, type VaultPostResponse, type VaultResponse };diff --git a/apps/server/AliasVault.Api/Controllers/AuthController.cs b/apps/server/AliasVault.Api/Controllers/AuthController.csindex bec017f33..9c07558bd 100644--- a/apps/server/AliasVault.Api/Controllers/AuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/AuthController.cs@@ -625,13 +625,15 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM// Generate token for the uservar tokenModel = await GenerateNewTokensForUser(user, extendedLifetime: true);+ // Get encrypted decryption key from the login request and put it in memory+ var encryptedDecryptionKey = loginRequest.EncryptedDecryptionKey!;+// Generate a single symmetric key for encrypting all fieldsvar symmetricKey = Cryptography.Server.Encryption.GenerateRandomSymmetricKey();// Encrypt each field with the symmetric key (returns base64)var encryptedToken = Cryptography.Server.Encryption.SymmetricEncrypt(tokenModel.Token, symmetricKey);var encryptedRefreshToken = Cryptography.Server.Encryption.SymmetricEncrypt(tokenModel.RefreshToken, symmetricKey);- var encryptedDecryptionKey = Cryptography.Server.Encryption.SymmetricEncrypt(loginRequest.EncryptedDecryptionKey!, symmetricKey);var encryptedUsername = Cryptography.Server.Encryption.SymmetricEncrypt(user.UserName!, symmetricKey);// Encrypt the symmetric key with the client's RSA public key (returns base64)@@ -640,7 +642,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM// Log successful mobile login authenticationawait authLoggingService.LogAuthEventSuccessAsync(user.UserName!, AuthEventType.MobileLogin);- // Mark as retrieved and clear sensitive data+ // Mark as retrieved and clear sensitive data from databaseloginRequest.ClientPublicKey = string.Empty;loginRequest.EncryptedDecryptionKey = null;loginRequest.RetrievedAt = timeProvider.UtcNow;diff --git a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.cs b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.csindex f8d6ca80b..91104cc48 100644--- a/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.cs+++ b/apps/server/Shared/AliasVault.Shared/Models/WebApi/Auth/MobileLoginPollResponse.cs@@ -16,7 +16,7 @@ namespace AliasVault.Shared.Models.WebApi.Auth;/// <param name="EncryptedSymmetricKey">The AES symmetric key encrypted with client's RSA public key (base64 encoded). Used to decrypt all encrypted fields. Null if not fulfilled.</param>/// <param name="EncryptedToken">The JWT token encrypted with AES symmetric key (base64 encoded). Null if not fulfilled.</param>/// <param name="EncryptedRefreshToken">The refresh token encrypted with AES symmetric key (base64 encoded). Null if not fulfilled.</param>-/// <param name="EncryptedDecryptionKey">The vault decryption key encrypted with AES symmetric key (base64 encoded). Null if not fulfilled.</param>+/// <param name="EncryptedDecryptionKey">The vault decryption key encrypted with client's RSA public key (base64 encoded). Null if not fulfilled.</param>/// <param name="EncryptedUsername">The username encrypted with AES symmetric key (base64 encoded). Retrieved from User via UserId FK. Null if not fulfilled.</param>public record MobileLoginPollResponse(bool Fulfilled,diff --git a/shared/models/src/webapi/MobileLogin.ts b/shared/models/src/webapi/MobileLogin.tsindex e4112e651..3b514d407 100644--- a/shared/models/src/webapi/MobileLogin.ts+++ b/shared/models/src/webapi/MobileLogin.ts@@ -1,5 +1,3 @@-import type { TokenModel } from './ValidateLogin';-/*** Mobile login initiate request type.*/@@ -28,10 +26,9 @@ export type MobileLoginSubmitRequest = {*/export type MobileLoginPollResponse = {fulfilled: boolean;+ encryptedSymmetricKey: string | null;+ encryptedToken: string | null;+ encryptedRefreshToken: string | null;encryptedDecryptionKey: string | null;- username: string | null;- token: TokenModel | null;- salt: string | null;- encryptionType: string | null;- encryptionSettings: string | null;+ encryptedUsername: string | null;}