mirror of
https://github.com/Govor-team/Govor.git
synced 2026-11-16 20:56:03 +00:00
Add SRP password recovery and E2EE reset
Add proof-based password registration, login, enrollment, and change flows, with rate limiting and encrypted recovery-key envelopes. Support explicit E2EE identity resets while preserving historical signer verification, and document and test the new recovery workflows.
This commit is contained in:
@@ -33,6 +33,8 @@ public static class ConfigurationProgramExtensions
|
||||
public static void AddServices(this IServiceCollection services)
|
||||
{
|
||||
services.AddScoped<Govor.Application.E2ee.E2eeService>();
|
||||
services.AddSingleton<PasswordChallenges>();
|
||||
services.AddScoped<PasswordAccountService>();
|
||||
services.AddSingleton<IPasswordHasher, PasswordHasher>();
|
||||
services.AddSingleton<IUsernameValidator, UsernameValidator>();
|
||||
services.AddSingleton<IJwtTokenHasher, JwtTokenHasher>();
|
||||
|
||||
@@ -6,11 +6,15 @@ using Govor.Contracts.Requests;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using SmartRes;
|
||||
using Govor.Application.Infrastructure.Extensions;
|
||||
using Microsoft.AspNetCore.RateLimiting;
|
||||
using System.Security.Cryptography;
|
||||
|
||||
namespace Govor.API.Controllers.Authentication;
|
||||
|
||||
[ApiController]
|
||||
[AllowAnonymous]
|
||||
[Authorize(Roles = "User,Admin")]
|
||||
[ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
|
||||
[Route("api/[controller]")]
|
||||
public class AuthController : Controller
|
||||
{
|
||||
@@ -19,28 +23,46 @@ public class AuthController : Controller
|
||||
private IAccountService _accountService;
|
||||
private ILogger<AuthController> _logger;
|
||||
private readonly IChatNotificationService _notifier;
|
||||
private readonly PasswordAccountService _passwords;
|
||||
private readonly ICurrentUserService _current;
|
||||
private readonly ICurrentUserSessionService _currentSession;
|
||||
|
||||
public AuthController(
|
||||
IAccountService accountService,
|
||||
IInvitesService invitesService,
|
||||
IUserSessionOpener userSessionOpener,
|
||||
ILogger<AuthController> logger,
|
||||
IChatNotificationService notifier)
|
||||
IChatNotificationService notifier,
|
||||
PasswordAccountService passwords = null,
|
||||
ICurrentUserService current = null,
|
||||
ICurrentUserSessionService currentSession = null)
|
||||
{
|
||||
_userSession = userSessionOpener;
|
||||
_accountService = accountService;
|
||||
_invitesService = invitesService;
|
||||
_logger = logger;
|
||||
_notifier = notifier;
|
||||
_passwords = passwords;
|
||||
_current = current;
|
||||
_currentSession = currentSession;
|
||||
}
|
||||
|
||||
[HttpPost("register")] // api/auth/register
|
||||
[AllowAnonymous, EnableRateLimiting("password-auth"), HttpPost("register")] // api/auth/register
|
||||
public async Task<IActionResult> Register([FromBody] RegistrationRequest request)
|
||||
{
|
||||
_logger.LogInformation("Processing registration request for: {Name}", request.Name);
|
||||
|
||||
PasswordCredentials credentials = null;
|
||||
if (request.SrpVerifier is not null)
|
||||
{
|
||||
credentials = new(1, request.SrpSalt, request.SrpIdentity, request.SrpVerifier);
|
||||
try { PasswordProtocol.Validate(credentials); }
|
||||
catch (CryptographicException) { return BadRequest("Invalid SRP credentials."); }
|
||||
}
|
||||
var result = await _invitesService.ValidateAsync(request.InviteLink)
|
||||
.BindAsync(invite => _accountService.RegistrationAsync(request.Name, request.Password, invite))
|
||||
.BindAsync(invite => credentials is null
|
||||
? _accountService.RegistrationAsync(request.Name, request.Password, invite)
|
||||
: _accountService.RegistrationWithPasswordProofAsync(request.Name, credentials, invite))
|
||||
.TapAsync(user => _logger.LogInformation("User {Username} ({Id}) registered successfully", user.Username, user.Id))
|
||||
.BindAsync(async user =>
|
||||
{
|
||||
@@ -62,7 +84,7 @@ public class AuthController : Controller
|
||||
return result.ToActionResult();
|
||||
}
|
||||
|
||||
[HttpPost("login")] // api/auth/login
|
||||
[AllowAnonymous, EnableRateLimiting("password-auth"), HttpPost("login")] // api/auth/login
|
||||
public async Task<IActionResult> Login([FromBody] LoginRequest request)
|
||||
{
|
||||
_logger.LogInformation("Processing registration request for: {Name}", request.Name);
|
||||
@@ -83,4 +105,77 @@ public class AuthController : Controller
|
||||
|
||||
return result.ToActionResult();
|
||||
}
|
||||
[AllowAnonymous, EnableRateLimiting("password-auth"), HttpPost("password/challenge")]
|
||||
public Task<IActionResult> Challenge(PasswordChallengeRequest request) =>
|
||||
Execute(async () => Ok(await _passwords.StartAsync(request)));
|
||||
|
||||
[AllowAnonymous, EnableRateLimiting("password-auth"), HttpPost("password/login")]
|
||||
public Task<IActionResult> Login(PasswordProof proof) => Execute(async () =>
|
||||
{
|
||||
return Ok(await _passwords.LoginAsync(proof, _userSession));
|
||||
});
|
||||
|
||||
[HttpGet("password")]
|
||||
public Task<IActionResult> Configuration() =>
|
||||
Execute(async () => Ok(await _passwords.GetAsync(_current.GetCurrentUserId())));
|
||||
|
||||
[HttpPut("password/enrollment")]
|
||||
public Task<IActionResult> Enroll(PasswordEnrollmentRequest request) => Execute(async () =>
|
||||
{
|
||||
await _passwords.EnrollAsync(_current.GetCurrentUserId(), request);
|
||||
return Ok(new { enrolled = true });
|
||||
});
|
||||
|
||||
[HttpPut("password/recovery")]
|
||||
public Task<IActionResult> SaveEnvelope(SavePasswordEnvelope request) => Execute(async () =>
|
||||
{
|
||||
await _passwords.SaveEnvelopeAsync(_current.GetCurrentUserId(), request.Envelope);
|
||||
return Ok(new { saved = true });
|
||||
});
|
||||
|
||||
[EnableRateLimiting("password-auth"), HttpPost("password/{purpose:regex(^(change|reset)$)}/challenge")]
|
||||
public Task<IActionResult> ActionChallenge(string purpose, PasswordChallengeRequest request) => Execute(async () =>
|
||||
Ok(await _passwords.StartAsync(request, purpose, _current.GetCurrentUserId(), _currentSession.GetUserSessionId())));
|
||||
|
||||
[EnableRateLimiting("password-auth"), HttpPost("password/{purpose:regex(^(change|reset)$)}/authorize")]
|
||||
public Task<IActionResult> AuthorizeAction(string purpose, PasswordProof proof) => Execute(async () =>
|
||||
Ok(await _passwords.AuthorizeAsync(_current.GetCurrentUserId(), _currentSession.GetUserSessionId(), proof,
|
||||
purpose)));
|
||||
|
||||
[HttpPost("password/change")]
|
||||
public Task<IActionResult> Change(ChangePasswordRequest request) => Execute(async () =>
|
||||
{
|
||||
await _passwords.ChangeAsync(_current.GetCurrentUserId(), _currentSession.GetUserSessionId(), request);
|
||||
return Ok(new { changed = true });
|
||||
});
|
||||
|
||||
[HttpPost("password/reset-encryption")]
|
||||
[RequestSizeLimit(4_120_000)]
|
||||
public Task<IActionResult> Reset(ResetEncryptionRequest request) => Execute(async () =>
|
||||
Ok(await _passwords.ResetAsync(_current.GetCurrentUserId(), _currentSession.GetUserSessionId(), request)));
|
||||
|
||||
private async Task<IActionResult> Execute(Func<Task<IActionResult>> action)
|
||||
{
|
||||
try
|
||||
{
|
||||
return await action();
|
||||
}
|
||||
catch (UnauthorizedAccessException)
|
||||
{
|
||||
return Unauthorized("Password proof is incorrect or expired.");
|
||||
}
|
||||
catch (Microsoft.EntityFrameworkCore.DbUpdateException)
|
||||
{
|
||||
return Conflict("Account changed. Retry the operation.");
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return Conflict(ex.Message);
|
||||
}
|
||||
catch (Exception ex) when (ex is CryptographicException or ArgumentException or FormatException or
|
||||
System.Text.Json.JsonException or KeyNotFoundException)
|
||||
{
|
||||
return BadRequest("Invalid password authentication data.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,6 +40,13 @@ public sealed class E2eeController(
|
||||
[HttpGet("recovery")]
|
||||
public async Task<IActionResult> Recovery() => Ok(await e2ee.GetRecoveryAsync(user.GetCurrentUserId()));
|
||||
|
||||
[HttpGet("identities/{peer:guid}/changes")]
|
||||
public async Task<IActionResult> IdentityChanges(Guid peer)
|
||||
{
|
||||
try { return Ok(await e2ee.GetIdentityChangesAsync(user.GetCurrentUserId(), peer)); }
|
||||
catch (UnauthorizedAccessException) { return Forbid(); }
|
||||
}
|
||||
|
||||
[HttpGet("devices")]
|
||||
public async Task<IActionResult> Devices() => Ok(await e2ee.GetOwnDevicesAsync(user.GetCurrentUserId()));
|
||||
|
||||
@@ -55,12 +62,13 @@ public sealed class E2eeController(
|
||||
}
|
||||
|
||||
[HttpGet("conversations/{type:int}/{conversationId:guid}/signers/{deviceSession:guid}")]
|
||||
public async Task<IActionResult> HistoricalSigner(int type, Guid conversationId, Guid deviceSession)
|
||||
public async Task<IActionResult> HistoricalSigner(int type, Guid conversationId, Guid deviceSession, [FromQuery] string identityKey = null)
|
||||
{
|
||||
if (type is < 0 or > 1) return BadRequest();
|
||||
try
|
||||
{
|
||||
var key = await e2ee.GetHistoricalSignerAsync(user.GetCurrentUserId(), conversationId, (RecipientType)type, deviceSession);
|
||||
if (identityKey?.Length > 1000) return BadRequest();
|
||||
var key = await e2ee.GetHistoricalSignerAsync(user.GetCurrentUserId(), conversationId, (RecipientType)type, deviceSession, identityKey);
|
||||
return key is null ? NotFound() : Ok(key);
|
||||
}
|
||||
catch (UnauthorizedAccessException) { return Forbid(); }
|
||||
|
||||
@@ -105,6 +105,13 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
|
||||
});
|
||||
|
||||
builder.Services.AddAuthorization();
|
||||
builder.Services.AddRateLimiter(options =>
|
||||
{
|
||||
options.RejectionStatusCode = StatusCodes.Status429TooManyRequests;
|
||||
options.AddPolicy("password-auth", context => System.Threading.RateLimiting.RateLimitPartition.GetFixedWindowLimiter(
|
||||
context.Connection.RemoteIpAddress?.ToString() ?? "unknown", _ => new System.Threading.RateLimiting.FixedWindowRateLimiterOptions
|
||||
{ PermitLimit = 30, Window = TimeSpan.FromMinutes(1), QueueLimit = 0 }));
|
||||
});
|
||||
|
||||
builder.Services.AddControllers();
|
||||
|
||||
@@ -175,6 +182,7 @@ app.UseSwaggerUI();
|
||||
//app.UseHttpsRedirection();
|
||||
|
||||
app.UseRouting();
|
||||
app.UseRateLimiter();
|
||||
app.UseCors("AllowFrontend");
|
||||
|
||||
app.UseAuthentication();
|
||||
@@ -210,4 +218,4 @@ app.MapSwagger()
|
||||
|
||||
app.Map("/", () => "Not for browsers");
|
||||
|
||||
app.Run();
|
||||
app.Run();
|
||||
|
||||
Reference in New Issue
Block a user