Skip to content

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

Add block checks to API (#2131)

Leendert de Borst94ab59ab08b5
diff --git a/apps/server/AliasVault.Api/Controllers/AuthController.cs b/apps/server/AliasVault.Api/Controllers/AuthController.cs
index dd4111951..0df87a46d 100644
--- a/apps/server/AliasVault.Api/Controllers/AuthController.cs
+++ b/apps/server/AliasVault.Api/Controllers/AuthController.cs
@@ -15,6 +15,7 @@ using AliasServerDb;
using AliasVault.Api.Headers;
using AliasVault.Api.Helpers;
using AliasVault.Auth;
+using AliasVault.Auth.IpAddress;
using AliasVault.Cryptography.Client;
using AliasVault.Cryptography.Server;
using AliasVault.Shared.Core;
@@ -47,10 +48,11 @@ using SecureRemotePassword;
/// <param name="config">Config instance.</param>
/// <param name="settingsService">ServerSettingsService instance.</param>
/// <param name="registrationRateLimitService">RegistrationRateLimitService instance.</param>
+/// <param name="ipBlockListService">IpBlockListService instance.</param>
[Route("v{version:apiVersion}/[controller]")]
[ApiController]
[ApiVersion("1")]
-public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, SignInManager<AliasVaultUser> signInManager, IConfiguration configuration, IMemoryCache cache, ITimeProvider timeProvider, AuthLoggingService authLoggingService, Config config, ServerSettingsService settingsService, RegistrationRateLimitService registrationRateLimitService) : ControllerBase
+public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, SignInManager<AliasVaultUser> signInManager, IConfiguration configuration, IMemoryCache cache, ITimeProvider timeProvider, AuthLoggingService authLoggingService, Config config, ServerSettingsService settingsService, RegistrationRateLimitService registrationRateLimitService, IpBlockListService ipBlockListService) : ControllerBase
{
/// <summary>
/// Timeout in minutes for mobile login requests. Clients use 2 minutes for countdown, we use 3 here to give a bit of extra buffer time.
@@ -436,9 +438,17 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM
return BadRequest(ApiErrorCodeHelper.CreateValidationErrorResponse(ApiErrorCode.PUBLIC_REGISTRATION_DISABLED, 400));
}
+ // Check the IP blocklist using the raw IP address.
+ var rawIpAddress = IpAddressUtility.GetRawIpAddressFromContext(HttpContext);
+ if (await ipBlockListService.IsBlockedForRegistrationAsync(rawIpAddress))
+ {
+ await authLoggingService.LogAuthEventFailAsync(model.Username, AuthEventType.Register, AuthFailureReason.IpBlocked);
+ return BadRequest(ApiErrorCodeHelper.CreateValidationErrorResponse(ApiErrorCode.REGISTRATION_FAILED, 400));
+ }
+
// Check IP-based registration rate limit
var settings = await settingsService.GetAllSettingsAsync();
- var ipAddress = IpAddressUtility.GetIpFromContext(HttpContext, config.IpLoggingEnabled);
+ var ipAddress = IpAddressUtility.GetAnonymizedIpFromContext(HttpContext, config.IpLoggingEnabled);
if (await registrationRateLimitService.IsRateLimitExceededAsync(ipAddress, settings.MaxRegistrationsPerIpPer24Hours))
{
await authLoggingService.LogAuthEventFailAsync(model.Username, AuthEventType.Register, AuthFailureReason.RegistrationRateLimitExceeded);
@@ -632,7 +642,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM
Id = requestId,
ClientPublicKey = model.ClientPublicKey,
CreatedAt = timeProvider.UtcNow,
- ClientIpAddress = IpAddressUtility.GetIpFromContext(HttpContext, config.IpLoggingEnabled),
+ ClientIpAddress = IpAddressUtility.GetAnonymizedIpFromContext(HttpContext, config.IpLoggingEnabled),
};
context.MobileLoginRequests.Add(loginRequest);
@@ -803,7 +813,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM
loginRequest.EncryptedDecryptionKey = model.EncryptedDecryptionKey;
loginRequest.UserId = user.Id;
loginRequest.FulfilledAt = timeProvider.UtcNow;
- loginRequest.MobileIpAddress = IpAddressUtility.GetIpFromContext(HttpContext, config.IpLoggingEnabled);
+ loginRequest.MobileIpAddress = IpAddressUtility.GetAnonymizedIpFromContext(HttpContext, config.IpLoggingEnabled);
await context.SaveChangesAsync();
@@ -1144,7 +1154,7 @@ public class AuthController(IAliasServerDbContextFactory dbContextFactory, UserM
{
UserId = user.Id,
DeviceIdentifier = deviceIdentifier,
- IpAddress = IpAddressUtility.GetIpFromContext(HttpContext, config.IpLoggingEnabled),
+ IpAddress = IpAddressUtility.GetAnonymizedIpFromContext(HttpContext, config.IpLoggingEnabled),
Value = refreshToken,
PreviousTokenValue = existingTokenValue,
ExpireDate = timeProvider.UtcNow.Add(newTokenLifetime),
diff --git a/apps/server/AliasVault.Api/Controllers/Email/EmailBoxController.cs b/apps/server/AliasVault.Api/Controllers/Email/EmailBoxController.cs
index 39ab33f64..e6e3734b8 100644
--- a/apps/server/AliasVault.Api/Controllers/Email/EmailBoxController.cs
+++ b/apps/server/AliasVault.Api/Controllers/Email/EmailBoxController.cs
@@ -9,6 +9,7 @@ namespace AliasVault.Api.Controllers.Email;
using AliasServerDb;
using AliasVault.Api.Controllers.Abstracts;
+using AliasVault.Auth.IpAddress;
using AliasVault.Shared.Models.Spamok;
using AliasVault.Shared.Models.WebApi;
using AliasVault.Shared.Models.WebApi.Email;
@@ -22,8 +23,9 @@ using Microsoft.EntityFrameworkCore;
/// </summary>
/// <param name="dbContextFactory">DbContext instance.</param>
/// <param name="userManager">UserManager instance.</param>
+/// <param name="ipBlockListService">IpBlockListService used to shadow-ban email retrieval from blocked IPs.</param>
[ApiVersion("1")]
-public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager) : AuthenticatedRequestController(userManager)
+public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, IpBlockListService ipBlockListService) : AuthenticatedRequestController(userManager)
{
/// <summary>
/// Returns a list of emails for the provided email address.
@@ -41,6 +43,12 @@ public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, U
return Unauthorized("Not authenticated.");
}
+ // Shadow-blocked: a shadow-blocked account or blocked IP gets an empty mailbox rather than an explicit error.
+ if (await IsEmailRetrievalShadowBlockedAsync(user))
+ {
+ return Ok(new MailboxApiModel { Address = to, Subscribed = false, Mails = [] });
+ }
+
var sanitizedEmail = to.Trim().ToLower();
// See if this user has a valid claim to the email address.
@@ -120,6 +128,19 @@ public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, U
return Unauthorized("Not authenticated.");
}
+ // Shadow-blocked: a shadow-blocked account or blocked IP gets an empty result rather than an explicit error.
+ if (await IsEmailRetrievalShadowBlockedAsync(user))
+ {
+ return Ok(new MailboxBulkResponse
+ {
+ Addresses = [],
+ Mails = [],
+ PageSize = Math.Min(model.PageSize, 50),
+ CurrentPage = model.Page,
+ TotalRecords = 0,
+ });
+ }
+
// Sanitize input.
model.Addresses = model.Addresses.Select(x => x.Trim().ToLower()).ToList();
model.PageSize = Math.Min(model.PageSize, 50);
@@ -175,4 +196,13 @@ public class EmailBoxController(IAliasServerDbContextFactory dbContextFactory, U
return Ok(returnValue);
}
+
+ /// <summary>
+ /// Determines whether email retrieval for the current request should be shadow-blocked, either because the
+ /// account is shadow-blocked or because the request originates from a shadow-blocked IP range.
+ /// </summary>
+ /// <param name="user">The authenticated user.</param>
+ /// <returns>True if email retrieval should return an empty result.</returns>
+ private async Task<bool> IsEmailRetrievalShadowBlockedAsync(AliasVaultUser user)
+ => user.ShadowBlocked || await ipBlockListService.IsBlockedForEmailsAsync(IpAddressUtility.GetRawIpAddressFromContext(HttpContext));
}
diff --git a/apps/server/AliasVault.Api/Controllers/Email/EmailController.cs b/apps/server/AliasVault.Api/Controllers/Email/EmailController.cs
index 8a88923b0..1abf8c014 100644
--- a/apps/server/AliasVault.Api/Controllers/Email/EmailController.cs
+++ b/apps/server/AliasVault.Api/Controllers/Email/EmailController.cs
@@ -9,6 +9,7 @@ namespace AliasVault.Api.Controllers.Email;
using AliasServerDb;
using AliasVault.Api.Controllers.Abstracts;
+using AliasVault.Auth.IpAddress;
using AliasVault.Shared.Models.Spamok;
using Asp.Versioning;
using Microsoft.AspNetCore.Identity;
@@ -21,8 +22,9 @@ using Microsoft.EntityFrameworkCore;
/// <param name="logger">ILogger instance.</param>
/// <param name="dbContextFactory">DbContext instance.</param>
/// <param name="userManager">UserManager instance.</param>
+/// <param name="ipBlockListService">IpBlockListService used to shadow-block email retrieval from blocked IPs.</param>
[ApiVersion("1")]
-public class EmailController(ILogger<VaultController> logger, IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager) : AuthenticatedRequestController(userManager)
+public class EmailController(ILogger<VaultController> logger, IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, IpBlockListService ipBlockListService) : AuthenticatedRequestController(userManager)
{
/// <summary>
/// Get the email with the specified ID.
@@ -151,6 +153,12 @@ public class EmailController(ILogger<VaultController> logger, IAliasServerDbCont
return (null, Unauthorized("Not authenticated."));
}
+ // Shadow-blocked: a shadow-blocked account or blocked IP behaves as if the email does not exist.
+ if (user.ShadowBlocked || await ipBlockListService.IsBlockedForEmailsAsync(IpAddressUtility.GetRawIpAddressFromContext(HttpContext)))
+ {
+ return (null, NotFound());
+ }
+
// Retrieve email from database.
var email = await context.Emails
.Include(x => x.Attachments)
diff --git a/apps/server/AliasVault.Api/Controllers/VaultController.cs b/apps/server/AliasVault.Api/Controllers/VaultController.cs
index 1da925eaa..be32c860c 100644
--- a/apps/server/AliasVault.Api/Controllers/VaultController.cs
+++ b/apps/server/AliasVault.Api/Controllers/VaultController.cs
@@ -20,6 +20,7 @@ using AliasVault.Shared.Models.WebApi;
using AliasVault.Shared.Models.WebApi.PasswordChange;
using AliasVault.Shared.Models.WebApi.Vault;
using AliasVault.Shared.Providers.Time;
+using AliasVault.Shared.Server.Services;
using Asp.Versioning;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
@@ -36,8 +37,9 @@ using Microsoft.Extensions.Caching.Memory;
/// <param name="authLoggingService">AuthLoggingService instance.</param>
/// <param name="cache">IMemoryCache instance.</param>
/// <param name="config">Config instance.</param>
+/// <param name="settingsService">ServerSettingsService instance.</param>
[ApiVersion("1")]
-public class VaultController(ILogger<VaultController> logger, IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, ITimeProvider timeProvider, AuthLoggingService authLoggingService, IMemoryCache cache, Config config) : AuthenticatedRequestController(userManager)
+public class VaultController(ILogger<VaultController> logger, IAliasServerDbContextFactory dbContextFactory, UserManager<AliasVaultUser> userManager, ITimeProvider timeProvider, AuthLoggingService authLoggingService, IMemoryCache cache, Config config, ServerSettingsService settingsService) : AuthenticatedRequestController(userManager)
{
/// <summary>
/// Default retention policy for vaults.
@@ -373,6 +375,13 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont
// Get list of supported private domains from config
var supportedPrivateDomains = config.PrivateEmailDomains;
+ // Determine the new-account alias creation limit (abuse mitigation). When enabled, accounts younger than
+ // NewAccountAliasLimitDays may not have more than MaxAliasesForNewAccounts active aliases. Both 0 = disabled.
+ var settings = await settingsService.GetAllSettingsAsync();
+ var aliasLimitActive = settings.NewAccountAliasLimitDays > 0 && settings.MaxAliasesForNewAccounts > 0 && user.CreatedAt > timeProvider.UtcNow.AddDays(-settings.NewAccountAliasLimitDays);
+ var activeAliasCount = userOwnedEmailClaims.Count(x => !x.Disabled);
+ var aliasLimitLogged = false;
+
// Register new email addresses.
foreach (var email in newEmailAddresses)
{
@@ -421,6 +430,19 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont
continue;
}
+ // Enforce the new-account alias creation limit: once the account is at its cap, silently skip creating
+ // additional aliases (logged once so the limit being hit is visible for audits).
+ if (aliasLimitActive && activeAliasCount >= settings.MaxAliasesForNewAccounts)
+ {
+ if (!aliasLimitLogged)
+ {
+ logger.LogWarning("{User} reached the new-account alias limit of {Limit}; skipping creation of additional aliases.", user.UserName, settings.MaxAliasesForNewAccounts);
+ aliasLimitLogged = true;
+ }
+
+ continue;
+ }
+
// If we get to this point, the email address is new and not claimed by another user, so we can add it.
try
{
@@ -433,6 +455,7 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbCont
CreatedAt = timeProvider.UtcNow,
UpdatedAt = timeProvider.UtcNow,
});
+ activeAliasCount++;
}
catch (DbUpdateException ex)
{
diff --git a/apps/server/AliasVault.Api/Program.cs b/apps/server/AliasVault.Api/Program.cs
index cc89a7182..7fd290343 100644
--- a/apps/server/AliasVault.Api/Program.cs
+++ b/apps/server/AliasVault.Api/Program.cs
@@ -16,6 +16,7 @@ using AliasVault.Api;
using AliasVault.Api.Jwt;
using AliasVault.Api.Services;
using AliasVault.Auth;
+using AliasVault.Auth.IpAddress;
using AliasVault.Cryptography.Server;
using AliasVault.Logging;
using AliasVault.Shared.Models.Configuration;
@@ -85,6 +86,7 @@ builder.Services.AddScoped<TimeValidationJwtBearerEvents>();
builder.Services.AddScoped<AuthLoggingService>();
builder.Services.AddScoped<ServerSettingsService>();
builder.Services.AddScoped<RegistrationRateLimitService>();
+builder.Services.AddScoped<IpBlockListService>();
builder.Services.AddSingleton<FaviconRateLimitService>();
builder.Services.AddHttpContextAccessor();