nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

Attempt to fix tests

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-03-18 16:28:02 +01:00
parent 81ba6e456b
commit 26d6852388
No known key found for this signature in database
5 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Identity/Controllers/AccountsController.cs
View File

@ -261,12 +261,12 @@ public class AccountsController : Controller
public async Task<PreloginResponseModel> PostPrelogin([FromBody] PreloginRequestModel model)
{
var kdfInformation = await _userRepository.GetKdfInformationByEmailAsync(model.Email);
if (kdfInformation == null)
var user = await _userRepository.GetByEmailAsync(model.Email);
if (kdfInformation == null || user == null)
{
kdfInformation = GetDefaultKdf(model.Email);
}
var user = await _userRepository.GetByEmailAsync(model.Email);
var credential = await _opaqueKeyExchangeCredentialRepository.GetByUserIdAsync(user.Id);
if (credential != null)
{

23
src/Infrastructure.EntityFramework/Auth/Repositories/OpaqueKeyExchangeCredentialRepository.cs Normal file
View File

@ -0,0 +1,23 @@
using AutoMapper;
using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.Repositories;
using Bit.Core.KeyManagement.UserKey;
using Bit.Infrastructure.EntityFramework.Repositories;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
#nullable enable
namespace Bit.Infrastructure.Dapper.Auth.Repositories;
public class OpaqueKeyExchangeCredentialRepository : Repository<OpaqueKeyExchangeCredential, OpaqueKeyExchangeCredential, Guid>, IOpaqueKeyExchangeCredentialRepository
{
public OpaqueKeyExchangeCredentialRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper, Func<DatabaseContext, DbSet<OpaqueKeyExchangeCredential>> getDbSet) : base(serviceScopeFactory, mapper, getDbSet)
{
}
public Task<OpaqueKeyExchangeCredential?> GetByUserIdAsync(Guid userId) => throw new NotImplementedException();
public UpdateEncryptedDataForKeyRotation UpdateKeysForRotationAsync(Guid userId, IEnumerable<OpaqueKeyExchangeRotateKeyData> credentials) => throw new NotImplementedException();
}

2
src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs
View File

@ -9,6 +9,7 @@ using Bit.Core.Repositories;
using Bit.Core.SecretsManager.Repositories;
using Bit.Core.Tools.Repositories;
using Bit.Core.Vault.Repositories;
using Bit.Infrastructure.Dapper.Auth.Repositories;
using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
using Bit.Infrastructure.EntityFramework.Auth.Repositories;
using Bit.Infrastructure.EntityFramework.Billing.Repositories;
@ -87,6 +88,7 @@ public static class EntityFrameworkServiceCollectionExtensions
services.AddSingleton<IProviderUserRepository, ProviderUserRepository>();
services.AddSingleton<ISendRepository, SendRepository>();
services.AddSingleton<ISsoConfigRepository, SsoConfigRepository>();
services.AddSingleton<IOpaqueKeyExchangeCredentialRepository, OpaqueKeyExchangeCredentialRepository>();
services.AddSingleton<ISsoUserRepository, SsoUserRepository>();
services.AddSingleton<ITransactionRepository, TransactionRepository>();
services.AddSingleton<IUserRepository, UserRepository>();

2
src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
View File

@ -110,6 +110,7 @@ public static class ServiceCollectionExtensions
public static void AddBaseServices(this IServiceCollection services, IGlobalSettings globalSettings)
{
services.AddScoped<ICipherService, CipherService>();
services.AddSingleton<IOpaqueKeyExchangeService, OpaqueKeyExchangeService>();
services.AddUserServices(globalSettings);
services.AddTrialInitiationServices();
services.AddOrganizationServices(globalSettings);
@ -118,7 +119,6 @@ public static class ServiceCollectionExtensions
services.AddScoped<IGroupService, GroupService>();
services.AddScoped<IEventService, EventService>();
services.AddScoped<IEmergencyAccessService, EmergencyAccessService>();
services.AddScoped<IOpaqueKeyExchangeService, OpaqueKeyExchangeService>();
services.AddSingleton<IDeviceService, DeviceService>();
services.AddScoped<ISsoConfigService, SsoConfigService>();
services.AddScoped<IAuthRequestService, AuthRequestService>();

15
test/Identity.Test/Controllers/AccountsControllerTests.cs
View File

@ -97,6 +97,11 @@ public class AccountsControllerTests : IDisposable
KdfIterations = AuthConstants.PBKDF2_ITERATIONS.Default
};
_userRepository.GetKdfInformationByEmailAsync(Arg.Any<string>()).Returns(userKdfInfo);
var mockUser = new User
{
Email = "user@example.com"
};
_userRepository.GetByEmailAsync(Arg.Any<string>()).Returns(mockUser);
var response = await _sut.PostPrelogin(new PreloginRequestModel { Email = "user@example.com" });
@ -109,6 +114,11 @@ public class AccountsControllerTests : IDisposable
{
SetDefaultKdfHmacKey(null);
_userRepository.GetKdfInformationByEmailAsync(Arg.Any<string>()).Returns(Task.FromResult<UserKdfInformation?>(null));
var mockUser = new User
{
Email = "user@example.com"
};
_userRepository.GetByEmailAsync(Arg.Any<string>()).Returns(mockUser);
var response = await _sut.PostPrelogin(new PreloginRequestModel { Email = "user@example.com" });
@ -125,6 +135,11 @@ public class AccountsControllerTests : IDisposable
SetDefaultKdfHmacKey(defaultKey);
_userRepository.GetKdfInformationByEmailAsync(Arg.Any<string>()).Returns(Task.FromResult<UserKdfInformation?>(null));
var mockUser = new User
{
Email = "user@example.com"
};
_userRepository.GetByEmailAsync(Arg.Any<string>()).Returns(mockUser);
var fieldInfo = typeof(AccountsController).GetField("_defaultKdfResults", BindingFlags.NonPublic | BindingFlags.Static);
if (fieldInfo == null)