Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add per IP rate limit to login endpoint and refactor services namespace
Leendert de Borste36083faa31d
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor b/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razorindex 16748aaa1..d03f55645 100644--- a/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor+++ b/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor@@ -39,6 +39,11 @@<input type="number" @bind="Settings.MaxMobileLoginRequestsPerIpPerMinute" id="maxMobileLoginRequestsPerIp" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"><p class="mt-1 text-sm text-gray-500 dark:text-gray-400">Maximum number of QR code mobile login requests that can be started from a single IP address (/24 range) within one minute. Set to 0 to disable rate limiting. Recommended: 10 for most deployments.</p></div>+ <div>+ <label for="maxLoginAttemptsPerIp" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Max Login Attempts per IP per Minute</label>+ <input type="number" @bind="Settings.MaxLoginAttemptsPerIpPerMinute" id="maxLoginAttemptsPerIp" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500">+ <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">Maximum number of logins (across all accounts) that can be started from a single IP address within one minute. Counted on the full IP (IPv6 per /64), never stored. Users behind a shared IP (office, VPN, carrier NAT) count together; raise it when many users share one IP. Set to 0 to disable. Recommended: 10.</p>+ </div></div></div>diff --git a/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs b/apps/server/AliasVault.Api/Controllers/V1/AuthController.csindex 2bf518bcf..b26688a91 100644--- a/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/AuthController.cs@@ -16,6 +16,8 @@ using AliasVault.Api.Filters;using AliasVault.Api.Headers;using AliasVault.Api.Helpers;using AliasVault.Api.Models;+using AliasVault.Api.Services.RateLimiting;+using AliasVault.Api.Services.RateLimiting.Helpers;using AliasVault.Auth;using AliasVault.Auth.IpAddress;using AliasVault.Cryptography;@@ -137,9 +139,10 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM/// Login endpoint used to process login attempt using credentials./// </summary>/// <param name="model">Login model.</param>+ /// <param name="loginRateLimitService">LoginRateLimitService instance.</param>/// <returns>IActionResult.</returns>[HttpPost("login")]- public async Task<IActionResult> Login([FromBody] LoginInitiateRequest model)+ public async Task<IActionResult> Login([FromBody] LoginInitiateRequest model, [FromServices] LoginRateLimitService loginRateLimitService){// Check the IP blocklist.if (await ipBlockListService.IsBlockedForLoginAsync(IpAddressUtility.GetRawIpAddressFromContext(HttpContext)))@@ -148,6 +151,13 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMreturn BadRequest(ApiErrorCodeHelper.CreateValidationErrorResponse(ApiErrorCode.ACCOUNT_BLOCKED, 400));}+ // Cap the logins one IP starts across accounts.+ if (!loginRateLimitService.TryRecordLogin(HttpContext, (await settingsService.GetAllSettingsAsync()).MaxLoginAttemptsPerIpPerMinute))+ {+ await authLoggingService.LogAuthEventFailAsync(model.Username, AuthEventType.Login, AuthFailureReason.LoginRateLimitExceeded);+ return StatusCode(429, ApiErrorCodeHelper.CreateErrorResponse(ApiErrorCode.RATE_LIMIT_EXCEEDED, 429));+ }+var user = await userManager.FindByNameAsync(model.Username);// A non-existent user answers like an upgraded account (as v2 does), to prevent user enumeration attacks.diff --git a/apps/server/AliasVault.Api/Controllers/V1/FaviconController.cs b/apps/server/AliasVault.Api/Controllers/V1/FaviconController.csindex 23c8d8984..69c30b7dd 100644--- a/apps/server/AliasVault.Api/Controllers/V1/FaviconController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/FaviconController.cs@@ -9,7 +9,7 @@ namespace AliasVault.Api.Controllers.V1;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;using AliasVault.Shared.Models.WebApi.V1.Favicon;using Asp.Versioning;using Microsoft.AspNetCore.Identity;diff --git a/apps/server/AliasVault.Api/Controllers/V1/IdentityController.cs b/apps/server/AliasVault.Api/Controllers/V1/IdentityController.csindex 5dbaf203c..50057bac3 100644--- a/apps/server/AliasVault.Api/Controllers/V1/IdentityController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/IdentityController.cs@@ -10,7 +10,8 @@ namespace AliasVault.Api.Controllers.V1;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Helpers;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;+using AliasVault.Api.Services.RateLimiting.Helpers;using Asp.Versioning;using Microsoft.AspNetCore.Identity;using Microsoft.AspNetCore.Mvc;diff --git a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V1/VaultController.csindex cfa994de9..45775ceeb 100644--- a/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs+++ b/apps/server/AliasVault.Api/Controllers/V1/VaultController.cs@@ -12,7 +12,7 @@ using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Helpers;using AliasVault.Api.Models;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;using AliasVault.Api.Vault;using AliasVault.Api.Vault.RetentionRules;using AliasVault.Auth;diff --git a/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs b/apps/server/AliasVault.Api/Controllers/V2/AuthController.csindex 6a1e872d1..66a4debfa 100644--- a/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/AuthController.cs@@ -17,6 +17,8 @@ using AliasVault.Api.Headers;using AliasVault.Api.Helpers;using AliasVault.Api.Models;using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;+using AliasVault.Api.Services.RateLimiting.Helpers;using AliasVault.Auth;using AliasVault.Auth.IpAddress;using AliasVault.Cryptography;@@ -58,9 +60,10 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM/// Login endpoint used to process login attempt using credentials./// </summary>/// <param name="model">Login model.</param>+ /// <param name="loginRateLimitService">LoginRateLimitService instance.</param>/// <returns>IActionResult.</returns>[HttpPost("login")]- public async Task<IActionResult> Login([FromBody] LoginInitiateRequest model)+ public async Task<IActionResult> Login([FromBody] LoginInitiateRequest model, [FromServices] LoginRateLimitService loginRateLimitService){// Check the IP blocklist.if (await ipBlockListService.IsBlockedForLoginAsync(IpAddressUtility.GetRawIpAddressFromContext(HttpContext)))@@ -69,6 +72,13 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserMreturn ApiError.Result(ApiErrorCode.ACCOUNT_BLOCKED, 400);}+ // Cap the logins one IP starts across accounts.+ if (!loginRateLimitService.TryRecordLogin(HttpContext, (await settingsService.GetAllSettingsAsync()).MaxLoginAttemptsPerIpPerMinute))+ {+ await authLoggingService.LogAuthEventFailAsync(model.Username, AuthEventType.Login, AuthFailureReason.LoginRateLimitExceeded);+ return ApiError.Result(ApiErrorCode.RATE_LIMIT_EXCEEDED, 429);+ }+var user = await userManager.FindByNameAsync(model.Username);// If user doesn't exist, generate or retrieve fake data to prevent user enumeration attacks.diff --git a/apps/server/AliasVault.Api/Controllers/V2/Email/EmailBoxController.cs b/apps/server/AliasVault.Api/Controllers/V2/Email/EmailBoxController.csindex f093a37ea..351733c71 100644--- a/apps/server/AliasVault.Api/Controllers/V2/Email/EmailBoxController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/Email/EmailBoxController.cs@@ -10,7 +10,8 @@ namespace AliasVault.Api.Controllers.V2.Email;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Helpers;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;+using AliasVault.Api.Services.RateLimiting.Helpers;using AliasVault.Auth.IpAddress;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;diff --git a/apps/server/AliasVault.Api/Controllers/V2/FaviconController.cs b/apps/server/AliasVault.Api/Controllers/V2/FaviconController.csindex 62e23bfda..a7a8d24f6 100644--- a/apps/server/AliasVault.Api/Controllers/V2/FaviconController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/FaviconController.cs@@ -10,7 +10,7 @@ namespace AliasVault.Api.Controllers.V2;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Helpers;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi.V2.Favicon;using Asp.Versioning;diff --git a/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs b/apps/server/AliasVault.Api/Controllers/V2/GroupsController.csindex 4dae875d4..02e07d743 100644--- a/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs@@ -12,7 +12,7 @@ using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Filters;using AliasVault.Api.Helpers;using AliasVault.Api.Models;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;using AliasVault.Auth;using AliasVault.Cryptography;using AliasVault.Shared.Models.Enums;diff --git a/apps/server/AliasVault.Api/Controllers/V2/IdentityController.cs b/apps/server/AliasVault.Api/Controllers/V2/IdentityController.csindex a73ec7e73..25641617c 100644--- a/apps/server/AliasVault.Api/Controllers/V2/IdentityController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/IdentityController.cs@@ -10,7 +10,8 @@ namespace AliasVault.Api.Controllers.V2;using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Helpers;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;+using AliasVault.Api.Services.RateLimiting.Helpers;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi.V2.Identity;using Asp.Versioning;diff --git a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs b/apps/server/AliasVault.Api/Controllers/V2/VaultController.csindex c1e3c2bb0..48935c407 100644--- a/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/VaultController.cs@@ -11,7 +11,7 @@ using AliasServerDb;using AliasVault.Api.Controllers.Abstracts;using AliasVault.Api.Helpers;using AliasVault.Api.Models;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;using AliasVault.Cryptography;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;diff --git a/apps/server/AliasVault.Api/Program.cs b/apps/server/AliasVault.Api/Program.csindex b8951f5d3..bd2548853 100644--- a/apps/server/AliasVault.Api/Program.cs+++ b/apps/server/AliasVault.Api/Program.cs@@ -16,6 +16,8 @@ using AliasVault.Api.Filters;using AliasVault.Api.Helpers;using AliasVault.Api.Jwt;using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;+using AliasVault.Api.Services.RateLimiting.Helpers;using AliasVault.Auth;using AliasVault.Auth.IpAddress;using AliasVault.Cryptography;@@ -99,6 +101,7 @@ builder.Services.AddScoped<IpBlockListService>();builder.Services.AddScoped<MobileLoginRateLimitService>();builder.Services.AddSingleton<FaviconRateLimitService>();builder.Services.AddSingleton<TakenAliasLookupRateLimitService>();+builder.Services.AddSingleton<LoginRateLimitService>();builder.Services.AddSingleton<AccountFingerprintLookupRateLimitService>();builder.Services.AddScoped<RateLimitService>();builder.Services.AddScoped<CapabilityService>();diff --git a/apps/server/AliasVault.Api/Services/AccountFingerprintLookupRateLimitService.cs b/apps/server/AliasVault.Api/Services/RateLimiting/AccountFingerprintLookupRateLimitService.cssimilarity index 97%rename from apps/server/AliasVault.Api/Services/AccountFingerprintLookupRateLimitService.csrename to apps/server/AliasVault.Api/Services/RateLimiting/AccountFingerprintLookupRateLimitService.csindex bfc02f885..f74c95d21 100644--- a/apps/server/AliasVault.Api/Services/AccountFingerprintLookupRateLimitService.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/AccountFingerprintLookupRateLimitService.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Services;+namespace AliasVault.Api.Services.RateLimiting;using System;using System.Threading.RateLimiting;diff --git a/apps/server/AliasVault.Api/Services/FaviconRateLimitService.cs b/apps/server/AliasVault.Api/Services/RateLimiting/FaviconRateLimitService.cssimilarity index 83%rename from apps/server/AliasVault.Api/Services/FaviconRateLimitService.csrename to apps/server/AliasVault.Api/Services/RateLimiting/FaviconRateLimitService.csindex f09deb30a..2410b5c58 100644--- a/apps/server/AliasVault.Api/Services/FaviconRateLimitService.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/FaviconRateLimitService.cs@@ -5,17 +5,15 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Services;+namespace AliasVault.Api.Services.RateLimiting;using System;using System.Collections.Concurrent;+using AliasVault.Api.Services.RateLimiting.Models;/// <summary>-/// In-memory per-user rate limiter for the favicon extraction API. Each successful extraction-/// (single or one URL inside a batch) consumes one unit; the limit is enforced over a rolling-/// 24-hour window. State is held in process so it is not shared across instances — a deliberate-/// trade-off, since the limit's purpose is to bound the SSRF/DDoS amplification an individual-/// user could cause from a single API instance, not to provide a hard global ceiling.+/// In-memory per-user limit on favicon extractions (each URL counts once) over a rolling 24 hours. Held in process on+/// purpose: it bounds the outbound requests one user can trigger from one instance, not a global total./// </summary>public sealed class FaviconRateLimitService{diff --git a/apps/server/AliasVault.Api/Services/RateLimitResolver.cs b/apps/server/AliasVault.Api/Services/RateLimiting/Helpers/RateLimitResolver.cssimilarity index 97%rename from apps/server/AliasVault.Api/Services/RateLimitResolver.csrename to apps/server/AliasVault.Api/Services/RateLimiting/Helpers/RateLimitResolver.csindex d3d02021e..22e326cfa 100644--- a/apps/server/AliasVault.Api/Services/RateLimitResolver.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/Helpers/RateLimitResolver.cs@@ -5,9 +5,10 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Services;+namespace AliasVault.Api.Services.RateLimiting.Helpers;using AliasServerDb;+using AliasVault.Api.Services.RateLimiting.Models;/// <summary>/// Rate limit resolver logic which determines the limits that apply to a given group.diff --git a/apps/server/AliasVault.Api/Helpers/RegistrationCheckRateLimit.cs b/apps/server/AliasVault.Api/Services/RateLimiting/Helpers/RegistrationCheckRateLimit.cssimilarity index 97%rename from apps/server/AliasVault.Api/Helpers/RegistrationCheckRateLimit.csrename to apps/server/AliasVault.Api/Services/RateLimiting/Helpers/RegistrationCheckRateLimit.csindex e20f8e25d..14a694fa1 100644--- a/apps/server/AliasVault.Api/Helpers/RegistrationCheckRateLimit.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/Helpers/RegistrationCheckRateLimit.cs@@ -5,11 +5,12 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Helpers;+namespace AliasVault.Api.Services.RateLimiting.Helpers;using System.Net;using System.Net.Sockets;using System.Threading.RateLimiting;+using AliasVault.Api.Helpers;using AliasVault.Auth.IpAddress;using AliasVault.Shared.Models.Enums;using AliasVault.Shared.Models.WebApi;diff --git a/apps/server/AliasVault.Api/Services/RateLimiting/LoginRateLimitService.cs b/apps/server/AliasVault.Api/Services/RateLimiting/LoginRateLimitService.csnew file mode 100644index 000000000..808041c44--- /dev/null+++ b/apps/server/AliasVault.Api/Services/RateLimiting/LoginRateLimitService.cs@@ -0,0 +1,125 @@+//-----------------------------------------------------------------------+// <copyright file="LoginRateLimitService.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.Services.RateLimiting;++using System;+using System.Collections.Concurrent;+using System.Linq;+using AliasVault.Api.Services.RateLimiting.Helpers;+using Microsoft.AspNetCore.Http;+using Microsoft.Extensions.Hosting;++/// <summary>+/// In-memory per-IP limit on logins started per minute, across all accounts.+/// </summary>+/// <param name="timeProvider">The clock the windows run on.</param>+/// <param name="environment">The host environment.</param>+public sealed class LoginRateLimitService(TimeProvider timeProvider, IHostEnvironment environment)+{+ /// <summary>+ /// Request header with which a request in Development opts in to the limit, with the header value as the limit.+ /// </summary>+ public const string TestLimitHeader = "X-AliasVault-Test-Login-Rate-Limit";++ /// <summary>+ /// Request header that gives an opted-in request in Development its own bucket, so test runs never share a count.+ /// </summary>+ public const string TestBucketHeader = "X-AliasVault-Test-Login-Rate-Limit-Bucket";++ private static readonly TimeSpan WindowDuration = TimeSpan.FromMinutes(1);++ private readonly ConcurrentDictionary<string, Window> _byIp = new();+ private DateTime _lastPrunedAt = DateTime.MinValue;++ /// <summary>+ /// Counts a login started by the client of <paramref name="httpContext"/> when its IP still has room in the current minute.+ /// </summary>+ /// <param name="httpContext">The login request.</param>+ /// <param name="maxPerMinute">The configured limit; 0 or less disables it.</param>+ /// <returns>True when the login may proceed; false when the IP has reached the limit.</returns>+ public bool TryRecordLogin(HttpContext httpContext, int maxPerMinute)+ {+ var ipKey = RegistrationCheckRateLimit.GetClientKey(httpContext);++ // E2E tests log in in bulk from one IP, so in Development only a request that opts in is limited.+ if (environment.IsDevelopment())+ {+ var headers = httpContext.Request.Headers;+ if (!int.TryParse(headers[TestLimitHeader], out maxPerMinute))+ {+ return true;+ }++ ipKey += ":" + headers[TestBucketHeader];+ }++ return TryRecord(ipKey, maxPerMinute);+ }++ /// <summary>+ /// Counts a login started from <paramref name="ipKey"/> when the IP still has room in the current minute.+ /// </summary>+ /// <param name="ipKey">The client IP key.</param>+ /// <param name="maxPerMinute">The limit; 0 or less disables it.</param>+ /// <returns>True when the login may proceed; false when the IP has reached the limit.</returns>+ public bool TryRecord(string ipKey, int maxPerMinute)+ {+ if (maxPerMinute <= 0)+ {+ return true;+ }++ var now = timeProvider.GetUtcNow().UtcDateTime;+ PruneExpired(now);++ var window = _byIp.GetOrAdd(ipKey, _ => new Window(now));+ lock (window)+ {+ if (now - window.StartedAt >= WindowDuration)+ {+ window.StartedAt = now;+ window.Count = 0;+ }++ if (window.Count >= maxPerMinute)+ {+ return false;+ }++ window.Count++;+ return true;+ }+ }++ /// <summary>+ /// Drop the windows of IPs that have been quiet for a full window, at most once per window.+ /// </summary>+ private void PruneExpired(DateTime now)+ {+ if (now - _lastPrunedAt < WindowDuration)+ {+ return;+ }++ _lastPrunedAt = now;+ foreach (var expired in _byIp.Where(e => now - e.Value.StartedAt >= WindowDuration).ToList())+ {+ _byIp.TryRemove(expired);+ }+ }++ /// <summary>+ /// The logins one IP started in its current window.+ /// </summary>+ private sealed class Window(DateTime startedAt)+ {+ public DateTime StartedAt { get; set; } = startedAt;++ public int Count { get; set; }+ }+}diff --git a/apps/server/Utilities/AliasVault.Auth/MobileLoginRateLimitService.cs b/apps/server/AliasVault.Api/Services/RateLimiting/MobileLoginRateLimitService.cssimilarity index 97%rename from apps/server/Utilities/AliasVault.Auth/MobileLoginRateLimitService.csrename to apps/server/AliasVault.Api/Services/RateLimiting/MobileLoginRateLimitService.csindex 3303d74b5..14bf52830 100644--- a/apps/server/Utilities/AliasVault.Auth/MobileLoginRateLimitService.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/MobileLoginRateLimitService.cs@@ -5,12 +5,13 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Auth;+namespace AliasVault.Api.Services.RateLimiting;using System;using System.Linq;using System.Threading.Tasks;using AliasServerDb;+using AliasVault.Auth;using AliasVault.Auth.IpAddress;using Microsoft.EntityFrameworkCore;diff --git a/apps/server/AliasVault.Api/Services/EffectiveRateLimit.cs b/apps/server/AliasVault.Api/Services/RateLimiting/Models/EffectiveRateLimit.cssimilarity index 93%rename from apps/server/AliasVault.Api/Services/EffectiveRateLimit.csrename to apps/server/AliasVault.Api/Services/RateLimiting/Models/EffectiveRateLimit.csindex 57a7a5df2..4cdabd1e5 100644--- a/apps/server/AliasVault.Api/Services/EffectiveRateLimit.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/Models/EffectiveRateLimit.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Services;+namespace AliasVault.Api.Services.RateLimiting.Models;/// <summary>/// A resolved limit for a user: <paramref name="MaxCount"/> over a window (<paramref name="WindowSeconds"/> 0 =diff --git a/apps/server/AliasVault.Api/Services/FaviconUserUsage.cs b/apps/server/AliasVault.Api/Services/RateLimiting/Models/FaviconUserUsage.cssimilarity index 52%rename from apps/server/AliasVault.Api/Services/FaviconUserUsage.csrename to apps/server/AliasVault.Api/Services/RateLimiting/Models/FaviconUserUsage.csindex e10442b12..760a1220b 100644--- a/apps/server/AliasVault.Api/Services/FaviconUserUsage.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/Models/FaviconUserUsage.cs@@ -5,40 +5,34 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Services;+namespace AliasVault.Api.Services.RateLimiting.Models;using System;using System.Collections.Generic;/// <summary>-/// Per-user usage record for <see cref="FaviconRateLimitService"/>. Tracks recent extractions-/// in per-minute buckets so a power-user re-downloading thousands of favicons in quick succession-/// still produces a bounded number of entries.+/// The favicon extractions of one user within the rolling window of <see cref="FaviconRateLimitService"/>, counted per minute./// </summary>internal sealed class FaviconUserUsage{- // Bucket entries by the minute they happened in. A power-user re-downloading a 5k-item- // vault produces at most ~minutes-of-batches entries this way, even though the underlying- // unit count can be in the thousands — keeps memory bounded without losing accuracy.+ // One entry per minute instead of per extraction, so re-downloading thousands of favicons stays a few entries.private readonly LinkedList<(DateTime BucketStart, int Count)> _entries = new();/// <summary>- /// Gets the lock guarding mutations to this usage record. Callers must hold this lock- /// across read-modify-write sequences (Prune + Add) to keep TryConsume atomic.+ /// Gets the lock a caller holds across Prune, the limit check and Add./// </summary>public object SyncRoot { get; } = new object();/// <summary>- /// Gets the total number of units consumed inside the currently retained window.+ /// Gets the number of extractions in the retained buckets./// </summary>public int Total { get; private set; }/// <summary>- /// Records <paramref name="count"/> consumed units at <paramref name="now"/>, merging into- /// the last bucket when it falls in the same minute.+ /// Count <paramref name="count"/> extractions in the bucket of the minute of <paramref name="now"/>./// </summary>- /// <param name="now">The timestamp to record under (typically <see cref="DateTime.UtcNow"/>).</param>- /// <param name="count">Number of units consumed.</param>+ /// <param name="now">The current UTC time.</param>+ /// <param name="count">The number of extractions.</param>public void Add(DateTime now, int count){var bucket = new DateTime(now.Year, now.Month, now.Day, now.Hour, now.Minute, 0, DateTimeKind.Utc);@@ -56,10 +50,9 @@ internal sealed class FaviconUserUsage}/// <summary>- /// Drops buckets older than <paramref name="cutoff"/> from the front of the list, which is- /// where the oldest entries live since Add only appends.+ /// Drop the buckets that started before <paramref name="cutoff"/>./// </summary>- /// <param name="cutoff">Buckets strictly older than this are removed.</param>+ /// <param name="cutoff">The start of the window.</param>public void Prune(DateTime cutoff){while (_entries.First is { Value.BucketStart: var first } node && first < cutoff)diff --git a/apps/server/AliasVault.Api/Services/RateLimitService.cs b/apps/server/AliasVault.Api/Services/RateLimiting/RateLimitService.cssimilarity index 96%rename from apps/server/AliasVault.Api/Services/RateLimitService.csrename to apps/server/AliasVault.Api/Services/RateLimiting/RateLimitService.csindex 74c4444d8..b770662d1 100644--- a/apps/server/AliasVault.Api/Services/RateLimitService.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/RateLimitService.cs@@ -5,9 +5,11 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Services;+namespace AliasVault.Api.Services.RateLimiting;using AliasServerDb;+using AliasVault.Api.Services.RateLimiting.Helpers;+using AliasVault.Api.Services.RateLimiting.Models;using Microsoft.EntityFrameworkCore;using Microsoft.Extensions.Caching.Memory;diff --git a/apps/server/Utilities/AliasVault.Auth/RegistrationRateLimitService.cs b/apps/server/AliasVault.Api/Services/RateLimiting/RegistrationRateLimitService.cssimilarity index 97%rename from apps/server/Utilities/AliasVault.Auth/RegistrationRateLimitService.csrename to apps/server/AliasVault.Api/Services/RateLimiting/RegistrationRateLimitService.csindex ed897da8a..ed1c9cfad 100644--- a/apps/server/Utilities/AliasVault.Auth/RegistrationRateLimitService.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/RegistrationRateLimitService.cs@@ -5,12 +5,13 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Auth;+namespace AliasVault.Api.Services.RateLimiting;using System;using System.Linq;using System.Threading.Tasks;using AliasServerDb;+using AliasVault.Auth;using AliasVault.Shared.Models.Enums;using Microsoft.EntityFrameworkCore;diff --git a/apps/server/AliasVault.Api/Services/TakenAliasLookupRateLimitService.cs b/apps/server/AliasVault.Api/Services/RateLimiting/TakenAliasLookupRateLimitService.cssimilarity index 99%rename from apps/server/AliasVault.Api/Services/TakenAliasLookupRateLimitService.csrename to apps/server/AliasVault.Api/Services/RateLimiting/TakenAliasLookupRateLimitService.csindex ca01dc9dd..92e349718 100644--- a/apps/server/AliasVault.Api/Services/TakenAliasLookupRateLimitService.cs+++ b/apps/server/AliasVault.Api/Services/RateLimiting/TakenAliasLookupRateLimitService.cs@@ -5,7 +5,7 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.Api.Services;+namespace AliasVault.Api.Services.RateLimiting;using System;using System.Collections.Concurrent;diff --git a/apps/server/Databases/AliasServerDb/AuthLog.cs b/apps/server/Databases/AliasServerDb/AuthLog.csindex 081fe0b6c..83470102e 100644--- a/apps/server/Databases/AliasServerDb/AuthLog.cs+++ b/apps/server/Databases/AliasServerDb/AuthLog.cs@@ -82,6 +82,11 @@ public enum AuthFailureReason/// </summary>InvalidInviteCode = 13,+ /// <summary>+ /// Indicates that the login attempt was blocked because the client IP started too many logins in a short period.+ /// </summary>+ LoginRateLimitExceeded = 14,+/// <summary>/// Indicates that the failure reason was unknown./// </summary>diff --git a/apps/server/Shared/AliasVault.Shared.Server/Models/ServerSettingsModel.cs b/apps/server/Shared/AliasVault.Shared.Server/Models/ServerSettingsModel.csindex f65462a3b..f6d65c55f 100644--- a/apps/server/Shared/AliasVault.Shared.Server/Models/ServerSettingsModel.cs+++ b/apps/server/Shared/AliasVault.Shared.Server/Models/ServerSettingsModel.cs@@ -102,4 +102,9 @@ public class ServerSettingsModel/// one minute. Defaults to 10. Set to 0 to disable mobile login rate limiting./// </summary>public int MaxMobileLoginRequestsPerIpPerMinute { get; set; } = 10;++ /// <summary>+ /// Gets or sets the maximum number of logins a single IP address may start within one minute. Set to 0 to disable.+ /// </summary>+ public int MaxLoginAttemptsPerIpPerMinute { get; set; } = 10;}diff --git a/apps/server/Shared/AliasVault.Shared.Server/Services/ServerSettingsService.cs b/apps/server/Shared/AliasVault.Shared.Server/Services/ServerSettingsService.csindex f4ac5a1c0..6d12d5044 100644--- a/apps/server/Shared/AliasVault.Shared.Server/Services/ServerSettingsService.cs+++ b/apps/server/Shared/AliasVault.Shared.Server/Services/ServerSettingsService.cs@@ -211,6 +211,11 @@ public class ServerSettingsService(IAliasServerDbContextFactory dbContextFactorymodel.MaxMobileLoginRequestsPerIpPerMinute = maxMobileLoginRequests;}+ if (int.TryParse(settings.GetValueOrDefault("MaxLoginAttemptsPerIpPerMinute"), out var maxLoginAttempts))+ {+ model.MaxLoginAttemptsPerIpPerMinute = maxLoginAttempts;+ }+if (int.TryParse(settings.GetValueOrDefault("MobileLoginLogRetentionDays"), out var mobileLoginDays)){model.MobileLoginLogRetentionDays = mobileLoginDays;@@ -242,6 +247,7 @@ public class ServerSettingsService(IAliasServerDbContextFactory dbContextFactoryawait SetSettingAsync("RefreshTokenLifetimeLong", model.RefreshTokenLifetimeLong.ToString());await SetSettingAsync("MaxRegistrationsPerIpPer24Hours", model.MaxRegistrationsPerIpPer24Hours.ToString());await SetSettingAsync("MaxMobileLoginRequestsPerIpPerMinute", model.MaxMobileLoginRequestsPerIpPerMinute.ToString());+ await SetSettingAsync("MaxLoginAttemptsPerIpPerMinute", model.MaxLoginAttemptsPerIpPerMinute.ToString());await SetSettingAsync("MobileLoginLogRetentionDays", model.MobileLoginLogRetentionDays.ToString());}diff --git a/apps/server/Tests/AliasVault.UnitTests/Services/RateLimiting/LoginRateLimitServiceTests.cs b/apps/server/Tests/AliasVault.UnitTests/Services/RateLimiting/LoginRateLimitServiceTests.csnew file mode 100644index 000000000..3939ff567--- /dev/null+++ b/apps/server/Tests/AliasVault.UnitTests/Services/RateLimiting/LoginRateLimitServiceTests.cs@@ -0,0 +1,115 @@+//-----------------------------------------------------------------------+// <copyright file="LoginRateLimitServiceTests.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.UnitTests.Services.RateLimiting;++using AliasVault.Api.Services.RateLimiting;+using Microsoft.AspNetCore.Http;+using Microsoft.Extensions.FileProviders;+using Microsoft.Extensions.Hosting;++/// <summary>+/// Tests for <see cref="LoginRateLimitService"/>.+/// </summary>+public class LoginRateLimitServiceTests+{+ /// <summary>+ /// One IP may start at most the configured number of logins per minute.+ /// </summary>+ [Test]+ public void LimitsLoginsPerIpTest()+ {+ var limiter = new LoginRateLimitService(new ManualTimeProvider(), new TestHostEnvironment(Environments.Production));+ for (var i = 0; i < 5; i++)+ {+ Assert.That(limiter.TryRecord("1.2.3.4", 5), Is.True);+ }++ Assert.That(limiter.TryRecord("1.2.3.4", 5), Is.False);+ Assert.That(limiter.TryRecord("1.2.3.5", 5), Is.True);+ }++ /// <summary>+ /// The limit resets once the minute has passed.+ /// </summary>+ [Test]+ public void ResetsAfterWindowTest()+ {+ var clock = new ManualTimeProvider();+ var limiter = new LoginRateLimitService(clock, new TestHostEnvironment(Environments.Production));+ Assert.That(limiter.TryRecord("1.2.3.4", 1), Is.True);+ Assert.That(limiter.TryRecord("1.2.3.4", 1), Is.False);++ clock.Advance(TimeSpan.FromMinutes(1));+ Assert.That(limiter.TryRecord("1.2.3.4", 1), Is.True);+ }++ /// <summary>+ /// A limit of 0 disables the limit.+ /// </summary>+ [Test]+ public void DisabledByZeroTest()+ {+ var limiter = new LoginRateLimitService(new ManualTimeProvider(), new TestHostEnvironment(Environments.Production));+ for (var i = 0; i < 10; i++)+ {+ Assert.That(limiter.TryRecord("1.2.3.4", 0), Is.True);+ }+ }++ /// <summary>+ /// In Development only a request with the test header is limited, by the header's limit and within its own bucket.+ /// </summary>+ [Test]+ public void DevelopmentOnlyLimitsOptedInRequestsTest()+ {+ var limiter = new LoginRateLimitService(new ManualTimeProvider(), new TestHostEnvironment(Environments.Development));+ for (var i = 0; i < 10; i++)+ {+ Assert.That(limiter.TryRecordLogin(new DefaultHttpContext(), 1), Is.True);+ }++ Assert.That(limiter.TryRecordLogin(OptedIn("a"), 1), Is.True);+ Assert.That(limiter.TryRecordLogin(OptedIn("a"), 1), Is.True);+ Assert.That(limiter.TryRecordLogin(OptedIn("a"), 1), Is.False);+ Assert.That(limiter.TryRecordLogin(OptedIn("b"), 1), Is.True);+ }++ private static DefaultHttpContext OptedIn(string bucket)+ {+ var context = new DefaultHttpContext();+ context.Request.Headers[LoginRateLimitService.TestLimitHeader] = "2";+ context.Request.Headers[LoginRateLimitService.TestBucketHeader] = bucket;+ return context;+ }++ /// <summary>+ /// A clock that only moves when told to.+ /// </summary>+ private sealed class ManualTimeProvider : TimeProvider+ {+ private DateTimeOffset _now = new(2026, 1, 1, 0, 0, 0, TimeSpan.Zero);++ public override DateTimeOffset GetUtcNow() => _now;++ public void Advance(TimeSpan by) => _now += by;+ }++ /// <summary>+ /// A host environment with only its name set.+ /// </summary>+ private sealed class TestHostEnvironment(string environmentName) : IHostEnvironment+ {+ public string EnvironmentName { get; set; } = environmentName;++ public string ApplicationName { get; set; } = "AliasVault.UnitTests";++ public string ContentRootPath { get; set; } = string.Empty;++ public IFileProvider ContentRootFileProvider { get; set; } = new NullFileProvider();+ }+}diff --git a/apps/server/Tests/AliasVault.UnitTests/Services/RateLimitResolverTests.cs b/apps/server/Tests/AliasVault.UnitTests/Services/RateLimiting/RateLimitResolverTests.cssimilarity index 98%rename from apps/server/Tests/AliasVault.UnitTests/Services/RateLimitResolverTests.csrename to apps/server/Tests/AliasVault.UnitTests/Services/RateLimiting/RateLimitResolverTests.csindex 5cd56bb86..5bb9b92e3 100644--- a/apps/server/Tests/AliasVault.UnitTests/Services/RateLimitResolverTests.cs+++ b/apps/server/Tests/AliasVault.UnitTests/Services/RateLimiting/RateLimitResolverTests.cs@@ -5,10 +5,12 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.UnitTests.Services;+namespace AliasVault.UnitTests.Services.RateLimiting;using AliasServerDb;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;+using AliasVault.Api.Services.RateLimiting.Helpers;+using AliasVault.Api.Services.RateLimiting.Models;/// <summary>/// Tests for <see cref="RateLimitResolver"/> with various rule combinations.diff --git a/apps/server/Tests/AliasVault.UnitTests/Services/TakenAliasLookupRateLimitServiceTests.cs b/apps/server/Tests/AliasVault.UnitTests/Services/RateLimiting/TakenAliasLookupRateLimitServiceTests.cssimilarity index 96%rename from apps/server/Tests/AliasVault.UnitTests/Services/TakenAliasLookupRateLimitServiceTests.csrename to apps/server/Tests/AliasVault.UnitTests/Services/RateLimiting/TakenAliasLookupRateLimitServiceTests.csindex a8d2cb3fc..e3cd55613 100644--- a/apps/server/Tests/AliasVault.UnitTests/Services/TakenAliasLookupRateLimitServiceTests.cs+++ b/apps/server/Tests/AliasVault.UnitTests/Services/RateLimiting/TakenAliasLookupRateLimitServiceTests.cs@@ -5,9 +5,9 @@// </copyright>//------------------------------------------------------------------------namespace AliasVault.UnitTests.Services;+namespace AliasVault.UnitTests.Services.RateLimiting;-using AliasVault.Api.Services;+using AliasVault.Api.Services.RateLimiting;using Microsoft.Extensions.Logging.Abstractions;/// <summary>diff --git a/apps/web/tests/e2e/11-authentication.spec.ts b/apps/web/tests/e2e/11-authentication.spec.tsindex 0fb940894..64c3213c3 100644--- a/apps/web/tests/e2e/11-authentication.spec.ts+++ b/apps/web/tests/e2e/11-authentication.spec.ts@@ -2,6 +2,7 @@* Category 11: Authentication (requires API)*/import { test, expect } from '../fixtures';+import { createTestUser, TEST_LOGIN_RATE_LIMIT_BUCKET_HEADER, TEST_LOGIN_RATE_LIMIT_HEADER } from '../helpers/test-api';test.describe('11. Authentication', () => {test('11.1 should log in and log out', async ({ app, testUser }) => {@@ -97,4 +98,49 @@ test.describe('11. Authentication', () => {expect((await v1('POST', 'Auth/revoke', { token: testUser.token, refreshToken: 'unknown' }, null)).status).toBe(200);});});++ test('11.5 should limit the logins one IP starts across accounts', async ({ app, apiUrl, testUser, newApp }) => {+ const { page } = app;+ const loginLimit = 15;+ const lockoutAfter = 10;+ const otherUser = await createTestUser(apiUrl);+ await page.context().setExtraHTTPHeaders({ [TEST_LOGIN_RATE_LIMIT_HEADER]: String(loginLimit), [TEST_LOGIN_RATE_LIMIT_BUCKET_HEADER]: crypto.randomUUID() });++ /**+ * Submit the login form and return the status of the login request it starts.+ */+ const attempt = async (username: string, password: string): Promise<number> => {+ const response = page.waitForResponse((r) => /\/v2\/Auth\/login$/i.test(r.url()) && r.request().method() === 'POST');+ await app.submitLogin(username, password);+ return (await response).status();+ };++ await page.goto('/user/login');++ await test.step('wrong passwords lock the first account', async () => {+ for (let i = 0; i < lockoutAfter; i++) {+ expect(await attempt(testUser.username, 'wrong-password')).toBe(200);+ await expect(page.getByText(/Invalid username or password|Account temporarily locked/)).toBeVisible();+ await expect(page.locator('#login-button')).toBeEnabled();+ }+ });++ await test.step('the locked account is refused, even with its password', async () => {+ for (let i = lockoutAfter; i < loginLimit; i++) {+ expect(await attempt(testUser.username, testUser.password)).toBe(400);+ await expect(page.getByText('Account temporarily locked')).toBeVisible();+ await expect(page.locator('#login-button')).toBeEnabled();+ }+ });++ await test.step('a second account from the same IP is refused by the rate limit', async () => {+ expect(await attempt(otherUser.username, otherUser.password)).toBe(429);+ await expect(page).toHaveURL(/\/user\/login$/);+ });++ await test.step('the second account logs in outside the limited bucket', async () => {+ const other = await newApp();+ await other.login(otherUser.username, otherUser.password);+ });+ });});diff --git a/apps/web/tests/helpers/test-api.ts b/apps/web/tests/helpers/test-api.tsindex 61b789f95..7985be775 100644--- a/apps/web/tests/helpers/test-api.ts+++ b/apps/web/tests/helpers/test-api.ts@@ -89,6 +89,16 @@ export async function isApiAvailable(apiUrl: string): Promise<boolean> {*/export const TEST_DISABLE_PUBLIC_REGISTRATION_HEADER = 'X-AliasVault-Test-Disable-Public-Registration';+/**+ * Request header with which the API (Development) applies the per-IP login limit to that request, with the value as the limit.+ */+export const TEST_LOGIN_RATE_LIMIT_HEADER = 'X-AliasVault-Test-Login-Rate-Limit';++/**+ * Request header that gives an opted-in login request its own count, so other tests and retries never share it.+ */+export const TEST_LOGIN_RATE_LIMIT_BUCKET_HEADER = 'X-AliasVault-Test-Login-Rate-Limit-Bucket';+/*** Create a registration invite via the DEBUG-only test controller, as the admin panel would.* @returns The invite code