mirror of
https://github.com/bitwarden/server.git
synced 2025-06-20 02:48:03 -05:00

* Add signing key repositories, models, and sql migration scripts * Rename UserSigningKeys table to UserSigningKey * Rename signedpublickeyownershipclaim to signedpublickey * Move signedPublicKey to last parameter * Add newline at end of file * Rename to signature key pair * Further rename to signaturekeypair * Rename to UserSignatureKeyPairRepository * Add newline * Rename more instances to UserSignatureKeyPair * Update parameter order * Fix order * Add more renames * Cleanup * Fix sql * Add ef migrations * Fix difference in SQL SP compared to migration SP * Fix difference in SQL SP vs migration * Fix difference in SQL SP vs migration * Attempt to fix sql * Rename migration to start later * Address feedback * Move UserSignatureKeyPair to KM codeownership * Fix build * Fix build * Fix build * Move out entitytypeconfiguration * Use view for reading usersignaturekeypairs * Fix migration script * Fix migration script * Add initial get keys endpoint * Add sync response * Cleanup * Add query and fix types * Add tests and cleanup * Fix test * Drop view if exists * Add km queries * Cleanup * Enable nullable * Cleanup * Cleanup * Enable nullable * Fix incorrect namespace * Remove unused using * Fix test build * Fix build error * Fix build * Attempt to fix tests * Attempt to fix tests * Replace with create or alter view * Attempt to fix tests * Attempt to fix build * Rename to include async suffix * Fix test * Rename repo * Attempt to fix tests * Cleanup * Test * Undo test * Fix tests * Fix test * Switch go generatecomb * Switch to generatecomb * Move signature algorithm * Move useresignaturekeypairentitytypeconfiguration to km ownership * Move userSignatureKeyPair model * Unswap file names * Move sql files to km ownership * Add index on userid for signature keys * Fix wrong filename * Fix build * Remove string length limit * Regenerate EF migrations * Undo changes to program.cs * Update util/Migrator/DbScripts/2025-06-01_00_AddSignatureKeyPairTable.sql Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Update util/Migrator/DbScripts/2025-06-01_00_AddSignatureKeyPairTable.sql Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Update util/Migrator/DbScripts/2025-06-01_00_AddSignatureKeyPairTable.sql Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Update util/Migrator/DbScripts/2025-06-01_00_AddSignatureKeyPairTable.sql Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Rename dbset to plural * Update src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSignatureKeyPairRepository.cs Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Update src/Api/KeyManagement/Models/Response/PrivateKeysResponseModel.cs Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Update src/Api/KeyManagement/Controllers/UsersController.cs Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Cleanup and move query to core * Fix test * Fix build * Fix tests * Update src/Api/KeyManagement/Models/Response/PrivateKeysResponseModel.cs Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Switch away from primary constructor * Use argumentNullException * Add test * Pass user account keys directly to profileresponsemodel * Move registration to core * Update src/Api/Startup.cs Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Update src/Api/Startup.cs Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Remove empty line * Apply suggestions * Fix tests * Fix tests --------- Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
130 lines
4.9 KiB
C#
130 lines
4.9 KiB
C#
using System.Reflection;
|
|
using AutoFixture;
|
|
using AutoFixture.Kernel;
|
|
using AutoMapper;
|
|
using Bit.Core.Settings;
|
|
using Bit.Infrastructure.EFIntegration.Test.Helpers;
|
|
using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
|
|
using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
|
|
using Bit.Infrastructure.EntityFramework.Auth.Models;
|
|
using Bit.Infrastructure.EntityFramework.Dirt.Models;
|
|
using Bit.Infrastructure.EntityFramework.Models;
|
|
using Bit.Infrastructure.EntityFramework.Platform;
|
|
using Bit.Infrastructure.EntityFramework.Repositories;
|
|
using Bit.Infrastructure.EntityFramework.Vault.Models;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging;
|
|
using NSubstitute;
|
|
|
|
namespace Bit.Infrastructure.EFIntegration.Test.AutoFixture;
|
|
|
|
internal class ServiceScopeFactoryBuilder : ISpecimenBuilder
|
|
{
|
|
private DbContextOptions<DatabaseContext> _options { get; set; }
|
|
public ServiceScopeFactoryBuilder(DbContextOptions<DatabaseContext> options)
|
|
{
|
|
_options = options;
|
|
}
|
|
|
|
public object Create(object request, ISpecimenContext context)
|
|
{
|
|
var fixture = new Fixture();
|
|
var serviceProvider = Substitute.For<IServiceProvider>();
|
|
var dbContext = new DatabaseContext(_options);
|
|
serviceProvider.GetService(typeof(DatabaseContext)).Returns(dbContext);
|
|
|
|
var serviceScope = Substitute.For<IServiceScope>();
|
|
serviceScope.ServiceProvider.Returns(serviceProvider);
|
|
|
|
var serviceScopeFactory = Substitute.For<IServiceScopeFactory>();
|
|
serviceScopeFactory.CreateScope().Returns(serviceScope);
|
|
return serviceScopeFactory;
|
|
}
|
|
}
|
|
|
|
public class EfRepositoryListBuilder<T> : ISpecimenBuilder where T : BaseEntityFrameworkRepository
|
|
{
|
|
public object Create(object request, ISpecimenContext context)
|
|
{
|
|
if (context == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(context));
|
|
}
|
|
|
|
var t = request as ParameterInfo;
|
|
if (t == null || t.ParameterType != typeof(List<T>))
|
|
{
|
|
return new NoSpecimen();
|
|
}
|
|
|
|
var list = new List<T>();
|
|
foreach (var option in DatabaseOptionsFactory.Options)
|
|
{
|
|
var fixture = new Fixture();
|
|
fixture.Customize<IServiceScopeFactory>(x => x.FromFactory(new ServiceScopeFactoryBuilder(option)));
|
|
fixture.Customize<IMapper>(x => x.FromFactory(() =>
|
|
new MapperConfiguration(cfg =>
|
|
{
|
|
cfg.AddProfile<AuthRequestMapperProfile>();
|
|
cfg.AddProfile<CipherMapperProfile>();
|
|
cfg.AddProfile<CollectionCipherMapperProfile>();
|
|
cfg.AddProfile<CollectionMapperProfile>();
|
|
cfg.AddProfile<DeviceMapperProfile>();
|
|
cfg.AddProfile<EmergencyAccessMapperProfile>();
|
|
cfg.AddProfile<EventMapperProfile>();
|
|
cfg.AddProfile<FolderMapperProfile>();
|
|
cfg.AddProfile<GrantMapperProfile>();
|
|
cfg.AddProfile<GroupMapperProfile>();
|
|
cfg.AddProfile<GroupUserMapperProfile>();
|
|
cfg.AddProfile<InstallationMapperProfile>();
|
|
cfg.AddProfile<OrganizationMapperProfile>();
|
|
cfg.AddProfile<OrganizationSponsorshipMapperProfile>();
|
|
cfg.AddProfile<OrganizationUserMapperProfile>();
|
|
cfg.AddProfile<ProviderMapperProfile>();
|
|
cfg.AddProfile<ProviderUserMapperProfile>();
|
|
cfg.AddProfile<ProviderOrganizationMapperProfile>();
|
|
cfg.AddProfile<PolicyMapperProfile>();
|
|
cfg.AddProfile<SendMapperProfile>();
|
|
cfg.AddProfile<SsoConfigMapperProfile>();
|
|
cfg.AddProfile<SsoUserMapperProfile>();
|
|
cfg.AddProfile<TaxRateMapperProfile>();
|
|
cfg.AddProfile<TransactionMapperProfile>();
|
|
cfg.AddProfile<UserMapperProfile>();
|
|
cfg.AddProfile<PasswordHealthReportApplicationProfile>();
|
|
cfg.AddProfile<UserSignatureKeyPairMapperProfile>();
|
|
})
|
|
.CreateMapper()));
|
|
|
|
fixture.Customize<ILogger<T>>(x => x.FromFactory(() => Substitute.For<ILogger<T>>()));
|
|
|
|
var repo = fixture.Create<T>();
|
|
list.Add(repo);
|
|
}
|
|
return list;
|
|
}
|
|
}
|
|
|
|
public class IgnoreVirtualMembersCustomization : ISpecimenBuilder
|
|
{
|
|
public object Create(object request, ISpecimenContext context)
|
|
{
|
|
if (context == null)
|
|
{
|
|
throw new ArgumentNullException("context");
|
|
}
|
|
|
|
var pi = request as PropertyInfo;
|
|
if (pi == null)
|
|
{
|
|
return new NoSpecimen();
|
|
}
|
|
|
|
if (pi.GetGetMethod().IsVirtual && pi.DeclaringType != typeof(GlobalSettings))
|
|
{
|
|
return null;
|
|
}
|
|
return new NoSpecimen();
|
|
}
|
|
}
|