nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-07 02:52:50 -05:00
Code Activity

Extract opaque logic to service

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-03-13 14:47:20 +01:00
parent b7673cd450
commit 3cd3495a45
6 changed files with 71 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Api/Auth/Controllers/OpaqueKeyExchangeController.cs
View File

@ -1,7 +1,7 @@
using Bit.Api.Auth.Models.Request.Opaque;
using Bit.Api.Auth.Models.Response.Opaque;
using Bit.Core.Auth.Services;
using Bit.Core.Services;
using Bitwarden.OPAQUE;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@ -11,54 +11,33 @@ namespace Bit.Api.Auth.Controllers;
[Authorize("Web")]
public class OpaqueKeyExchangeController : Controller
{
private readonly IUserService _userService;
private readonly BitwardenOpaqueServer _bitwardenOpaque;
private readonly IOpaqueKeyExchangeService _opaqueKeyExchangeService;
IUserService _userService;
public OpaqueKeyExchangeController(
IOpaqueKeyExchangeService opaqueKeyExchangeService,
IUserService userService
)
{
_opaqueKeyExchangeService = opaqueKeyExchangeService;
_userService = userService;
_bitwardenOpaque = new BitwardenOpaqueServer();
}
[HttpPost("~/opaque/start-registration")]
public async Task<OpaqueRegistrationStartResponse> StartRegistration([FromBody] OpaqueRegistrationStartRequest request)
{
var user = await _userService.GetUserByPrincipalAsync(User);
var registrationRequest = _bitwardenOpaque.StartRegistration(request.CipherConfiguration, null, System.Convert.FromBase64String(request.RegistrationRequest), user.Id.ToString());
var message = registrationRequest.registrationResponse;
var serverSetup = registrationRequest.serverSetup;
// persist server setup
var sessionId = Guid.NewGuid();
SessionStore.RegisterSessions.Add(sessionId, new RegisterSession() { SessionId = sessionId, ServerSetup = serverSetup, cipherConfiguration = request.CipherConfiguration });
return new OpaqueRegistrationStartResponse(sessionId, System.Convert.ToBase64String(message));
var result = await _opaqueKeyExchangeService.StartRegistration(System.Convert.FromBase64String(request.RegistrationRequest), user, request.CipherConfiguration);
return new OpaqueRegistrationStartResponse(result.Item1, System.Convert.ToBase64String(result.Item2));
}
[HttpPost("~/opaque/finish-registration")]
public async Task<String> FinishRegistration([FromBody] OpaqueRegistrationFinishRequest request)
{
await Task.Run(() =>
{
var registerSession = SessionStore.RegisterSessions[request.SessionId];
var registrationFinish = _bitwardenOpaque.FinishRegistration(registerSession.cipherConfiguration, System.Convert.FromBase64String(request.RegistrationUpload));
Console.WriteLine("Registration Finish: " + registrationFinish);
});
await Task.Run(() => { });
return "";
}
}
public class RegisterSession
{
public Guid SessionId { get; set; }
public byte[] ServerSetup { get; set; }
public CipherConfiguration cipherConfiguration { get; set; }
}
public class SessionStore()
{
public static Dictionary<Guid, RegisterSession> RegisterSessions = new Dictionary<Guid, RegisterSession>();
public static Dictionary<Guid, byte[]> LoginSessions = new Dictionary<Guid, byte[]>();
}