Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Include SrpPurpose in the SRP ephemeral server side cache (#2469)
Leendert de Borst4d9e1d743d2c
diff --git a/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs b/apps/server/AliasVault.Api/Controllers/V1/AuthController.csindex 296e3490d..56f2f36bc 100644--- a/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs@@ -14,6 +14,7 @@ using System.Text;using AliasServerDb;using AliasVault.Api.Headers;using AliasVault.Api.Helpers;+using AliasVault.Api.Models;using AliasVault.Auth;using AliasVault.Auth.IpAddress;using AliasVault.Cryptography;@@ -170,14 +171,9 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMvar srpIdentity = AuthHelper.GetSrpIdentity(user);- // Server creates ephemeral and sends to client- var ephemeral = Srp.GenerateEphemeralServer(latestVaultEncryptionSettings.Verifier);+ var serverEphemeral = AuthHelper.CreateSrpEphemeral(cache, user, SrpPurpose.Login, latestVaultEncryptionSettings);- // Store the server ephemeral in memory cache for Validate() endpoint to use.- // Use SrpIdentity as the cache key to ensure consistency.- cache.Set(AuthHelper.CachePrefixEphemeral + srpIdentity, ephemeral.Secret, TimeSpan.FromMinutes(5));-- return Ok(new LoginInitiateResponse(latestVaultEncryptionSettings.Salt, ephemeral.Public, latestVaultEncryptionSettings.EncryptionType, latestVaultEncryptionSettings.EncryptionSettings, srpIdentity));+ return Ok(new LoginInitiateResponse(latestVaultEncryptionSettings.Salt, serverEphemeral, latestVaultEncryptionSettings.EncryptionType, latestVaultEncryptionSettings.EncryptionSettings, srpIdentity));}/// <summary>@@ -474,14 +470,9 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMvar srpIdentity = AuthHelper.GetSrpIdentity(user);- // Server creates ephemeral and sends to client- var ephemeral = Srp.GenerateEphemeralServer(latestVaultEncryptionSettings.Verifier);-- // Store the server ephemeral in memory cache for the Vault update (and set new password) endpoint to use.- // Use SrpIdentity as the cache key to ensure consistency.- cache.Set(AuthHelper.CachePrefixEphemeral + srpIdentity, ephemeral.Secret, TimeSpan.FromMinutes(5));+ var serverEphemeral = AuthHelper.CreateSrpEphemeral(cache, user, SrpPurpose.PasswordChange, latestVaultEncryptionSettings);- return Ok(new PasswordChangeInitiateResponse(latestVaultEncryptionSettings.Salt, ephemeral.Public, latestVaultEncryptionSettings.EncryptionType, latestVaultEncryptionSettings.EncryptionSettings, srpIdentity));+ return Ok(new PasswordChangeInitiateResponse(latestVaultEncryptionSettings.Salt, serverEphemeral, latestVaultEncryptionSettings.EncryptionType, latestVaultEncryptionSettings.EncryptionSettings, srpIdentity));}/// <summary>@@ -552,16 +543,11 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMvar srpIdentity = AuthHelper.GetSrpIdentity(user);- // Server creates ephemeral and sends to client- var ephemeral = Srp.GenerateEphemeralServer(latestVaultEncryptionSettings.Verifier);-- // Store the server ephemeral in memory cache for confirmation endpoint.- // Use SrpIdentity as the cache key to ensure consistency.- cache.Set(AuthHelper.CachePrefixEphemeral + srpIdentity, ephemeral.Secret, TimeSpan.FromMinutes(5));+ var serverEphemeral = AuthHelper.CreateSrpEphemeral(cache, user, SrpPurpose.AccountDeletion, latestVaultEncryptionSettings);return Ok(new LoginInitiateResponse(latestVaultEncryptionSettings.Salt,- ephemeral.Public,+ serverEphemeral,latestVaultEncryptionSettings.EncryptionType,latestVaultEncryptionSettings.EncryptionSettings,srpIdentity));@@ -636,7 +622,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM// Validate the SRP session (actual password check).await using var context = await dbContextFactory.CreateDbContextAsync();- var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, model.ClientPublicEphemeral, model.ClientSessionProof);+ var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, SrpPurpose.AccountDeletion, model.ClientPublicEphemeral, model.ClientSessionProof);if (srpResult.Session is null){await authLoggingService.LogAuthEventFailAsync(user.UserName!, AuthEventType.AccountDeletion, srpResult.FailureReason);@@ -814,7 +800,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM// Validate the SRP session (actual password check).await using var context = await dbContextFactory.CreateDbContextAsync();- var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, model.ClientPublicEphemeral, model.ClientSessionProof);+ var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, SrpPurpose.Login, model.ClientPublicEphemeral, model.ClientSessionProof);if (srpResult.Session is null){if (srpResult.ActiveSessionFound)diff --git a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V1/VaultController.csindex 2e1ba7c3e..16d0fe34e 100644--- a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs@@ -11,6 +11,7 @@ using System.ComponentModel.DataAnnotations;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Helpers;+using AliasVault.Api.Models;using AliasVault.Api.Services;using AliasVault.Api.Vault;using AliasVault.Api.Vault.RetentionRules;@@ -242,7 +243,7 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont}// Validate the SRP session (actual password check).- var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, model.CurrentClientPublicEphemeral, model.CurrentClientSessionProof);+ var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, SrpPurpose.PasswordChange, model.CurrentClientPublicEphemeral, model.CurrentClientSessionProof);if (srpResult.Session is null){if (srpResult.ActiveSessionFound)diff --git a/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs b/apps/server/AliasVault.Api/Controllers/V2/AuthController.csindex 3c38df3af..e802e5c39 100644--- a/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs@@ -125,14 +125,9 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMvar srpIdentity = AuthHelper.GetSrpIdentity(user);- // Server creates ephemeral and sends to client- var ephemeral = Srp.GenerateEphemeralServer(latestVaultEncryptionSettings.Verifier);+ var serverEphemeral = AuthHelper.CreateSrpEphemeral(cache, user, SrpPurpose.Login, latestVaultEncryptionSettings);- // Store the server ephemeral in memory cache for Validate() endpoint to use.- // Use SrpIdentity as the cache key to ensure consistency.- cache.Set(AuthHelper.CachePrefixEphemeral + srpIdentity, ephemeral.Secret, TimeSpan.FromMinutes(5));-- return Ok(new LoginInitiateResponse(latestVaultEncryptionSettings.Salt, ephemeral.Public, latestVaultEncryptionSettings.EncryptionType, latestVaultEncryptionSettings.EncryptionSettings, srpIdentity));+ return Ok(new LoginInitiateResponse(latestVaultEncryptionSettings.Salt, serverEphemeral, latestVaultEncryptionSettings.EncryptionType, latestVaultEncryptionSettings.EncryptionSettings, srpIdentity));}/// <summary>@@ -597,14 +592,9 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMvar srpIdentity = AuthHelper.GetSrpIdentity(user);- // Server creates ephemeral and sends to client- var ephemeral = Srp.GenerateEphemeralServer(latestVaultEncryptionSettings.Verifier);-- // Store the server ephemeral in memory cache for the Vault update (and set new password) endpoint to use.- // Use SrpIdentity as the cache key to ensure consistency.- cache.Set(AuthHelper.CachePrefixEphemeral + srpIdentity, ephemeral.Secret, TimeSpan.FromMinutes(5));+ var serverEphemeral = AuthHelper.CreateSrpEphemeral(cache, user, SrpPurpose.PasswordChange, latestVaultEncryptionSettings);- return Ok(new PasswordChangeInitiateResponse(latestVaultEncryptionSettings.Salt, ephemeral.Public, latestVaultEncryptionSettings.EncryptionType, latestVaultEncryptionSettings.EncryptionSettings, srpIdentity));+ return Ok(new PasswordChangeInitiateResponse(latestVaultEncryptionSettings.Salt, serverEphemeral, latestVaultEncryptionSettings.EncryptionType, latestVaultEncryptionSettings.EncryptionSettings, srpIdentity));}/// <summary>@@ -639,7 +629,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM}// Validate the SRP session (actual current password check).- var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, model.CurrentClientPublicEphemeral, model.CurrentClientSessionProof);+ var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, SrpPurpose.PasswordChange, model.CurrentClientPublicEphemeral, model.CurrentClientSessionProof);if (srpResult.Session is null){if (srpResult.ActiveSessionFound)@@ -787,16 +777,11 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMvar srpIdentity = AuthHelper.GetSrpIdentity(user);- // Server creates ephemeral and sends to client- var ephemeral = Srp.GenerateEphemeralServer(latestVaultEncryptionSettings.Verifier);-- // Store the server ephemeral in memory cache for confirmation endpoint.- // Use SrpIdentity as the cache key to ensure consistency.- cache.Set(AuthHelper.CachePrefixEphemeral + srpIdentity, ephemeral.Secret, TimeSpan.FromMinutes(5));+ var serverEphemeral = AuthHelper.CreateSrpEphemeral(cache, user, SrpPurpose.AccountDeletion, latestVaultEncryptionSettings);return Ok(new LoginInitiateResponse(latestVaultEncryptionSettings.Salt,- ephemeral.Public,+ serverEphemeral,latestVaultEncryptionSettings.EncryptionType,latestVaultEncryptionSettings.EncryptionSettings,srpIdentity));@@ -1095,7 +1080,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM// Validate the SRP session (actual password check).await using var context = await dbContextFactory.CreateDbContextAsync();- var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, model.ClientPublicEphemeral, model.ClientSessionProof);+ var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, SrpPurpose.AccountDeletion, model.ClientPublicEphemeral, model.ClientSessionProof);if (srpResult.Session is null){await authLoggingService.LogAuthEventFailAsync(user.UserName!, AuthEventType.AccountDeletion, srpResult.FailureReason);@@ -1358,7 +1343,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM// Validate the SRP session (actual password check).await using var context = await dbContextFactory.CreateDbContextAsync();- var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, model.ClientPublicEphemeral, model.ClientSessionProof);+ var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, user, SrpPurpose.Login, model.ClientPublicEphemeral, model.ClientSessionProof);if (srpResult.Session is null){if (srpResult.ActiveSessionFound)diff --git a/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs b/apps/server/AliasVault.Api/Controllers/V2/GroupsController.csindex d2226fd97..686429695 100644--- a/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs@@ -11,8 +11,8 @@ using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Filters;using AliasVault.Api.Helpers;+using AliasVault.Api.Models;using AliasVault.Auth;-using AliasVault.Cryptography;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;using AliasVault.Shared.Models.WebApi.V2.Auth;@@ -457,13 +457,12 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Use}var latestVaultEncryptionSettings = await AuthHelper.GetUserLatestVaultEncryptionSettingsAsync(context, me);- var ephemeral = Srp.GenerateEphemeralServer(latestVaultEncryptionSettings.Verifier);+ var serverEphemeral = AuthHelper.CreateSrpEphemeral(cache, me, SrpPurpose.SharedManifestDeletion, latestVaultEncryptionSettings);var srpIdentity = AuthHelper.GetSrpIdentity(me);- cache.Set(AuthHelper.CachePrefixEphemeral + srpIdentity, ephemeral.Secret, TimeSpan.FromMinutes(5));return Ok(new LoginInitiateResponse(latestVaultEncryptionSettings.Salt,- ephemeral.Public,+ serverEphemeral,latestVaultEncryptionSettings.EncryptionType,latestVaultEncryptionSettings.EncryptionSettings,srpIdentity));@@ -498,7 +497,7 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Use}// Validate the SRP session (actual password check).- var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, me, model.ClientPublicEphemeral, model.ClientSessionProof);+ var srpResult = await AuthHelper.ValidateSrpSessionAsync(cache, context, me, SrpPurpose.SharedManifestDeletion, model.ClientPublicEphemeral, model.ClientSessionProof);if (srpResult.Session is null){await authLoggingService.LogAuthEventFailAsync(me.UserName!, AuthEventType.SharedVaultDeletion, srpResult.FailureReason);diff --git a/apps/server/AliasVault.Api/Helpers/AuthHelper.cs b/apps/server/AliasVault.Api/Helpers/AuthHelper.csindex c576a22fb..ab9a5383b 100644--- a/apps/server/AliasVault.Api/Helpers/AuthHelper.cs+++ b/apps/server/AliasVault.Api/Helpers/AuthHelper.cs@@ -21,9 +21,14 @@ using Microsoft.Extensions.Caching.Memory;public static class AuthHelper{/// <summary>- /// Cache prefix for storing generated login ephemeral.+ /// Cache prefix for the server ephemeral of an SRP exchange, followed by the purpose and the SRP identity./// </summary>- public static readonly string CachePrefixEphemeral = "LoginEphemeral_";+ private const string CachePrefixEphemeral = "SrpEphemeral_";++ /// <summary>+ /// How long a client has to answer a server ephemeral.+ /// </summary>+ private static readonly TimeSpan EphemeralLifetime = TimeSpan.FromMinutes(5);/// <summary>/// Gets the SRP identity to use for a user, falling back to the lowercase username for accounts that were created@@ -42,34 +47,52 @@ public static class AuthHelperpublic static string ResolveSrpIdentity(string? srpIdentity, string username) => string.IsNullOrEmpty(srpIdentity) ? username.ToLowerInvariant() : srpIdentity;/// <summary>- /// Helper method that validates the SRP session based on provided SRP identity, ephemeral and proof.+ /// Start an SRP exchange: create a server ephemeral for the given credentials and cache it for the confirm step of this flow.+ /// </summary>+ /// <param name="cache">IMemoryCache instance.</param>+ /// <param name="user">The user object.</param>+ /// <param name="purpose">The flow the exchange belongs to.</param>+ /// <param name="credentials">The credentials the client has to prove, as returned by <see cref="GetUserLatestVaultEncryptionSettingsAsync"/>.</param>+ /// <returns>The public server ephemeral to send to the client.</returns>+ public static string CreateSrpEphemeral(IMemoryCache cache, AliasVaultUser user, SrpPurpose purpose, UserSrpCredentials credentials)+ {+ var ephemeral = Srp.GenerateEphemeralServer(credentials.Verifier);+ cache.Set(EphemeralCacheKey(purpose, user), new CachedEphemeral(ephemeral.Secret, credentials.UnlockKeyId), EphemeralLifetime);+ return ephemeral.Public;+ }++ /// <summary>+ /// Validate a client's SRP proof against the ephemeral cached by <see cref="CreateSrpEphemeral"/> for the same flow./// </summary>/// <param name="cache">IMemoryCache instance.</param>/// <param name="context">Database context, used to resolve the user's current SRP credentials.</param>/// <param name="user">The user object.</param>+ /// <param name="purpose">The flow the exchange belongs to.</param>/// <param name="clientEphemeral">The client ephemeral value.</param>/// <param name="clientSessionProof">The client session proof.</param>/// <returns>The validation outcome, carrying the unlock method whose secret was proven.</returns>- public static async Task<SrpValidationResult> ValidateSrpSessionAsync(IMemoryCache cache, AliasServerDbContext context, AliasVaultUser user, string clientEphemeral, string clientSessionProof)+ public static async Task<SrpValidationResult> ValidateSrpSessionAsync(IMemoryCache cache, AliasServerDbContext context, AliasVaultUser user, SrpPurpose purpose, string clientEphemeral, string clientSessionProof){- var srpIdentity = GetSrpIdentity(user);-- if (!cache.TryGetValue(CachePrefixEphemeral + srpIdentity, out var serverSecretEphemeral) || serverSecretEphemeral is not string)+ if (!cache.TryGetValue(EphemeralCacheKey(purpose, user), out CachedEphemeral? cached) || cached is null){- // No login was initiated for this user, or the server ephemeral has expired.+ // No exchange was initiated for this flow, or the server ephemeral has expired.return new SrpValidationResult(null, false, null);}- // Retrieve latest vault of user which contains the current salt and verifier.+ // The proof must answer the unlock method chosen at initiate; if that changed since (legacy account upgraded), the exchange is stale.var credentials = await GetUserLatestVaultEncryptionSettingsAsync(context, user);+ if (credentials.UnlockKeyId != cached.UnlockKeyId)+ {+ return new SrpValidationResult(null, false, null);+ }// Use SrpIdentity for the SRP session derivation. This is the fixed identity that was used// when the verifier was originally created, ensuring username changes don't break authentication.var serverSession = Srp.DeriveSessionServer(- serverSecretEphemeral.ToString() ?? string.Empty,+ cached.Secret,clientEphemeral,credentials.Salt,- srpIdentity,+ GetSrpIdentity(user),credentials.Verifier,clientSessionProof);@@ -161,4 +184,14 @@ public static class AuthHelperreturn string.Join('|', parts);}++ /// <summary>+ /// The cache key of the server ephemeral of one flow for one user.+ /// </summary>+ private static string EphemeralCacheKey(SrpPurpose purpose, AliasVaultUser user) => $"{CachePrefixEphemeral}{purpose}_{GetSrpIdentity(user)}";++ /// <summary>+ /// A cached server ephemeral and the unlock method whose verifier it was created for (null for a legacy account).+ /// </summary>+ private sealed record CachedEphemeral(string Secret, Guid? UnlockKeyId);}diff --git a/apps/server/AliasVault.Api/Models/SrpPurpose.cs b/apps/server/AliasVault.Api/Models/SrpPurpose.csnew file mode 100644index 000000000..0828ef801--- /dev/null+++ b/apps/server/AliasVault.Api/Models/SrpPurpose.cs@@ -0,0 +1,34 @@+//-----------------------------------------------------------------------+// <copyright file="SrpPurpose.cs" company="aliasvault">+// Copyright (c) aliasvault. All rights reserved.+// Licensed under the AGPLv3 license. See LICENSE.md file in the project root for full license information.+// </copyright>+//-----------------------------------------------------------------------++namespace AliasVault.Api.Models;++/// <summary>+/// The flow an SRP exchange belongs to; each flow keeps its own server ephemeral so one cannot overwrite another.+/// </summary>+public enum SrpPurpose+{+ /// <summary>+ /// Login, including the 2FA and recovery code steps that re-check the same proof.+ /// </summary>+ Login,++ /// <summary>+ /// Password change.+ /// </summary>+ PasswordChange,++ /// <summary>+ /// Account deletion.+ /// </summary>+ AccountDeletion,++ /// <summary>+ /// Deletion of a shared manifest.+ /// </summary>+ SharedManifestDeletion,+}