Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update verify password flow to use local cached params exclusively (#2159)

Leendert de Borstf78b1a56989b
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ImportExport.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ImportExport.razor
index 5a999b521..50a820d8b 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ImportExport.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ImportExport.razor
@@ -138,7 +138,6 @@
private static readonly bool IsDebugBuild = false;
#endif
- private string _username = string.Empty;
private bool _showPasswordConfirmation;
private string _passwordError = string.Empty;
private bool _showExportPasswordModal;
@@ -158,9 +157,6 @@
{
await base.OnInitializedAsync();
BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = Localizer["PageTitle"] });
-
- // Get username for password verification
- _username = await GetUsernameAsync();
}
private async Task ShowExportConfirmation(ExportType exportType)
@@ -211,7 +207,7 @@
try
{
- var result = await AuthService.VerifyPasswordAsync(_username, password);
+ var result = await AuthService.VerifyPasswordAsync(password);
switch (result)
{
@@ -237,7 +233,7 @@
StateHasChanged();
break;
- case PasswordVerificationResult.ServerError:
+ case PasswordVerificationResult.VerificationError:
default:
GlobalLoadingSpinner.Hide();
_passwordError = Localizer["PasswordVerificationFailed"];
diff --git a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ResetVault.razor b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ResetVault.razor
index 42cbfde94..c93afe1c6 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ResetVault.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Settings/ImportExport/ResetVault.razor
@@ -132,11 +132,8 @@
try
{
- // Get current username
- var username = await GetUsernameAsync();
-
// Verify the password using centralized service
- var verificationResult = await AuthService.VerifyPasswordAsync(username, _passwordModel.Password);
+ var verificationResult = await AuthService.VerifyPasswordAsync(_passwordModel.Password);
switch (verificationResult)
{
@@ -144,7 +141,7 @@
GlobalNotificationService.AddErrorMessage(Localizer["ResetVaultPasswordIncorrect"], true);
return;
- case PasswordVerificationResult.ServerError:
+ case PasswordVerificationResult.VerificationError:
GlobalNotificationService.AddErrorMessage(Localizer["ResetVaultErrorMessage"], true);
return;
diff --git a/apps/server/AliasVault.Client/Services/Auth/AuthService.cs b/apps/server/AliasVault.Client/Services/Auth/AuthService.cs
index 99b531d31..aa8ccda1b 100644
--- a/apps/server/AliasVault.Client/Services/Auth/AuthService.cs
+++ b/apps/server/AliasVault.Client/Services/Auth/AuthService.cs
@@ -351,46 +351,34 @@ public sealed class AuthService(HttpClient httpClient, ILocalStorageService loca
}
/// <summary>
- /// Verifies a password.
+ /// Verifies the master password against the locally cached key material, without contacting the server.
/// </summary>
- /// <param name="username">The username for the account.</param>
/// <param name="password">The password to verify.</param>
/// <returns>A result indicating success or the type of failure.</returns>
- public async Task<PasswordVerificationResult> VerifyPasswordAsync(string username, string password)
+ public async Task<PasswordVerificationResult> VerifyPasswordAsync(string password)
{
try
{
- // Get user's encryption parameters from server
- var result = await httpClient.PostAsJsonAsync("v2/Auth/login", new LoginInitiateRequest(username));
- var responseContent = await result.Content.ReadAsStringAsync();
-
- if (!result.IsSuccessStatusCode)
- {
- return PasswordVerificationResult.ServerError;
- }
-
- var loginResponse = JsonSerializer.Deserialize<LoginInitiateResponse>(responseContent);
- if (loginResponse == null)
+ // The derivation parameters are cached on login and refreshed with every vault key fetch.
+ var parameters = await vaultKeyService.GetDerivationParamsAsync();
+ if (parameters is null)
{
- return PasswordVerificationResult.ServerError;
+ logger.LogWarning("No key derivation parameters are cached, the password cannot be verified.");
+ return PasswordVerificationResult.VerificationError;
}
- // Derive the KEK using server parameters
- byte[] derivedKey = await rustCoreService.Argon2DeriveKeyAsync(password, loginResponse.Salt, loginResponse.EncryptionSettings);
+ byte[] derivedKey = await rustCoreService.Argon2DeriveKeyAsync(password, parameters.Salt, parameters.EncryptionSettings);
// An account on the key chain proves the password by opening the chain; a legacy account by the test string.
var opensChain = await vaultKeyService.TryOpenCachedChainAsync(Convert.ToBase64String(derivedKey));
var isValidPassword = opensChain ?? await ValidateEncryptionKeyAsync(derivedKey);
- if (!isValidPassword)
- {
- return PasswordVerificationResult.InvalidPassword;
- }
- return PasswordVerificationResult.Success;
+ return isValidPassword ? PasswordVerificationResult.Success : PasswordVerificationResult.InvalidPassword;
}
- catch
+ catch (Exception ex)
{
- return PasswordVerificationResult.ServerError;
+ logger.LogError(ex, "Password verification failed unexpectedly.");
+ return PasswordVerificationResult.VerificationError;
}
}
diff --git a/apps/server/AliasVault.Client/Services/Auth/Enums/PasswordVerificationResult.cs b/apps/server/AliasVault.Client/Services/Auth/Enums/PasswordVerificationResult.cs
index b2af29023..befbcfb61 100644
--- a/apps/server/AliasVault.Client/Services/Auth/Enums/PasswordVerificationResult.cs
+++ b/apps/server/AliasVault.Client/Services/Auth/Enums/PasswordVerificationResult.cs
@@ -23,7 +23,7 @@ public enum PasswordVerificationResult
InvalidPassword,
/// <summary>
- /// A server error occurred during verification.
+ /// The password could not be verified, for example because no key derivation parameters are cached.
/// </summary>
- ServerError,
+ VerificationError,
}