mirror of
https://github.com/bitwarden/server.git
synced 2024-12-02 13:53:23 +01:00
b13dda2799
* EF Database Support Init (#1221) * scaffolding for ef support * deleted old postgres repos * added tables to oncreate * updated all the things to .NET 5 * Addition to #1221: Migrated DockerFiles from dotnet/3.1 to 5.0 (#1223) * Migrated DockerFiles from dotnet/3.1 to 5.0 * Migrated SSO/Dockerfile from dotnet 3.1 to 5.0 Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> * EFDatabaseSupport: Updated links and description in README.md and SETUP.md (#1232) * Updated requirements in README.md * Updated link to documentation of app-secrets * upgraded dotnet version to 5.0 * Ef database support implementation examples (#1265) * mostly finished testing the user repo * finished testing user repo * finished org, user, ssoconfig, and ssouser ef implementations * removed unused prop * fixed a sql file * fixed a spacing issue * fixed a spacing issue * removed extra database creation * refactoring * MsSql => SqlServer * refactoring * code review fixes * build fix * code review * continued attempts to fix the the build * skipped another test * finished all create test * initial pass at several repos * continued building out repos * initial pass at several repos * initial pass at device repo * initial pass at collection repo * initial run of all Entity Framework implementations * signup, signin, create/edit ciphers works * sync working * all web vault pages seem to load with 100% 200s * bulkcopy, folders, and favorites * group and collection management * sso, groups, emergency access, send * get basic creates matching on all repos * got everything building again post merge * removed some IDE config files * cleanup * no more notimplemented methods in the cipher repo * no more not implementeds everywhere * cleaned up schema/navigation properties and fixed tests * removed a sql comment that was written in c# style * fixed build issues from merge * removed unsupported db providers * formatting * code review refactors * naming cleanup for queries * added provider methods * cipher repo cleanup * implemented several missing procedures from the EF implementation surround account revision dates, keys, and storage * fixed the build * added a null check * consolidated some cipher repo methods * formatting fix * cleaned up indentation of queries * removed .idea file * generated postgres migrations * added mysql migrations * formatting * Bug Fixes & Formatting * Formatting * fixed a bug with bulk import when using MySql * code review fixes * fixed the build * implemented new methods * formatting * fixed the build * cleaned up select statements in ef queries * formatting * formatting * formatting Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
189 lines
7.6 KiB
C#
189 lines
7.6 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Text.Json;
|
|
using AutoFixture;
|
|
using AutoFixture.Kernel;
|
|
using Bit.Core.Models.Data;
|
|
using Bit.Core.Models.Table;
|
|
using Bit.Core.Repositories.EntityFramework;
|
|
using Bit.Core.Test.AutoFixture.Attributes;
|
|
using Bit.Core.Test.AutoFixture.EntityFrameworkRepositoryFixtures;
|
|
using Bit.Core.Test.AutoFixture.GlobalSettingsFixtures;
|
|
using Bit.Core.Test.AutoFixture.OrganizationFixtures;
|
|
using Bit.Core.Test.AutoFixture.OrganizationUserFixtures;
|
|
using Bit.Core.Test.AutoFixture.Relays;
|
|
using Bit.Core.Test.AutoFixture.TransactionFixtures;
|
|
using Bit.Core.Test.AutoFixture.UserFixtures;
|
|
using Core.Models.Data;
|
|
|
|
namespace Bit.Core.Test.AutoFixture.CipherFixtures
|
|
{
|
|
internal class OrganizationCipher : ICustomization
|
|
{
|
|
public Guid? OrganizationId { get; set; }
|
|
public void Customize(IFixture fixture)
|
|
{
|
|
fixture.Customize<Cipher>(composer => composer
|
|
.With(c => c.OrganizationId, OrganizationId ?? Guid.NewGuid())
|
|
.Without(c => c.UserId));
|
|
fixture.Customize<CipherDetails>(composer => composer
|
|
.With(c => c.OrganizationId, Guid.NewGuid())
|
|
.Without(c => c.UserId));
|
|
}
|
|
}
|
|
|
|
internal class UserCipher : ICustomization
|
|
{
|
|
public Guid? UserId { get; set; }
|
|
public void Customize(IFixture fixture)
|
|
{
|
|
fixture.Customize<Cipher>(composer => composer
|
|
.With(c => c.UserId, UserId ?? Guid.NewGuid())
|
|
.Without(c => c.OrganizationId));
|
|
fixture.Customize<CipherDetails>(composer => composer
|
|
.With(c => c.UserId, Guid.NewGuid())
|
|
.Without(c => c.OrganizationId));
|
|
}
|
|
}
|
|
|
|
internal class CipherBuilder: ISpecimenBuilder
|
|
{
|
|
public bool OrganizationOwned { get; set; }
|
|
public object Create(object request, ISpecimenContext context)
|
|
{
|
|
if (context == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(context));
|
|
}
|
|
|
|
var type = request as Type;
|
|
if (type == null || (type != typeof(Cipher) && type != typeof(List<Cipher>)))
|
|
{
|
|
return new NoSpecimen();
|
|
}
|
|
|
|
var fixture = new Fixture();
|
|
fixture.Customizations.Insert(0, new MaxLengthStringRelay());
|
|
fixture.Customizations.Add(new IgnoreVirtualMembersCustomization());
|
|
|
|
if (!OrganizationOwned)
|
|
{
|
|
fixture.Customize<Cipher>(composer => composer
|
|
.Without(c => c.OrganizationId));
|
|
}
|
|
|
|
// Can't test valid Favorites and Folders without creating those values inide each test,
|
|
// since we won't have any UserIds until the test is running & creating data
|
|
fixture.Customize<Cipher>(c => c
|
|
.Without(e => e.Favorites)
|
|
.Without(e => e.Folders));
|
|
//
|
|
var serializerOptions = new JsonSerializerOptions(){
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
|
|
};
|
|
|
|
if(type == typeof(Cipher))
|
|
{
|
|
var obj = fixture.WithAutoNSubstitutions().Create<Cipher>();
|
|
var cipherData = fixture.WithAutoNSubstitutions().Create<CipherLoginData>();
|
|
var cipherAttachements = fixture.WithAutoNSubstitutions().Create<List<CipherAttachment>>();
|
|
obj.Data = JsonSerializer.Serialize(cipherData, serializerOptions);
|
|
obj.Attachments = JsonSerializer.Serialize(cipherAttachements, serializerOptions);
|
|
|
|
return obj;
|
|
}
|
|
if (type == typeof(List<Cipher>))
|
|
{
|
|
var ciphers = fixture.WithAutoNSubstitutions().CreateMany<Cipher>().ToArray();
|
|
for (var i = 0; i < ciphers.Count(); i++ )
|
|
{
|
|
var cipherData = fixture.WithAutoNSubstitutions().Create<CipherLoginData>();
|
|
var cipherAttachements = fixture.WithAutoNSubstitutions().Create<List<CipherAttachment>>();
|
|
ciphers[i].Data = JsonSerializer.Serialize(cipherData, serializerOptions);
|
|
ciphers[i].Attachments = JsonSerializer.Serialize(cipherAttachements, serializerOptions);
|
|
}
|
|
|
|
return ciphers;
|
|
}
|
|
|
|
return new NoSpecimen();
|
|
}
|
|
}
|
|
|
|
internal class EfCipher: ICustomization
|
|
{
|
|
public bool OrganizationOwned { get; set; }
|
|
public void Customize(IFixture fixture)
|
|
{
|
|
fixture.Customizations.Add(new GlobalSettingsBuilder());
|
|
fixture.Customizations.Add(new CipherBuilder(){
|
|
OrganizationOwned = OrganizationOwned
|
|
});
|
|
fixture.Customizations.Add(new UserBuilder());
|
|
fixture.Customizations.Add(new OrganizationBuilder());
|
|
fixture.Customizations.Add(new OrganizationUserBuilder());
|
|
fixture.Customizations.Add(new EfRepositoryListBuilder<CipherRepository>());
|
|
fixture.Customizations.Add(new EfRepositoryListBuilder<OrganizationRepository>());
|
|
fixture.Customizations.Add(new EfRepositoryListBuilder<OrganizationUserRepository>());
|
|
fixture.Customizations.Add(new EfRepositoryListBuilder<UserRepository>());
|
|
fixture.Customizations.Add(new EfRepositoryListBuilder<CollectionRepository>());
|
|
}
|
|
}
|
|
|
|
internal class UserCipherAutoDataAttribute : CustomAutoDataAttribute
|
|
{
|
|
public UserCipherAutoDataAttribute(string userId = null) : base(new SutProviderCustomization(),
|
|
new UserCipher { UserId = userId == null ? (Guid?)null : new Guid(userId) })
|
|
{ }
|
|
}
|
|
internal class InlineUserCipherAutoDataAttribute : InlineCustomAutoDataAttribute
|
|
{
|
|
public InlineUserCipherAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
|
|
typeof(UserCipher) }, values)
|
|
{ }
|
|
}
|
|
|
|
internal class InlineKnownUserCipherAutoDataAttribute : InlineCustomAutoDataAttribute
|
|
{
|
|
public InlineKnownUserCipherAutoDataAttribute(string userId, params object[] values) : base(new ICustomization[]
|
|
{ new SutProviderCustomization(), new UserCipher { UserId = new Guid(userId) } }, values)
|
|
{ }
|
|
}
|
|
|
|
internal class OrganizationCipherAutoDataAttribute : CustomAutoDataAttribute
|
|
{
|
|
public OrganizationCipherAutoDataAttribute(string organizationId = null) : base(new SutProviderCustomization(),
|
|
new OrganizationCipher { OrganizationId = organizationId == null ? (Guid?)null : new Guid(organizationId) })
|
|
{ }
|
|
}
|
|
|
|
internal class InlineOrganizationCipherAutoDataAttribute : InlineCustomAutoDataAttribute
|
|
{
|
|
public InlineOrganizationCipherAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
|
|
typeof(OrganizationCipher) }, values)
|
|
{ }
|
|
}
|
|
|
|
internal class EfUserCipherAutoDataAttribute : CustomAutoDataAttribute
|
|
{
|
|
public EfUserCipherAutoDataAttribute() : base(new SutProviderCustomization(), new EfCipher())
|
|
{ }
|
|
}
|
|
|
|
internal class EfOrganizationCipherAutoDataAttribute : CustomAutoDataAttribute
|
|
{
|
|
public EfOrganizationCipherAutoDataAttribute() : base(new SutProviderCustomization(), new EfCipher(){
|
|
OrganizationOwned = true,
|
|
})
|
|
{ }
|
|
}
|
|
|
|
internal class InlineEfCipherAutoDataAttribute : InlineCustomAutoDataAttribute
|
|
{
|
|
public InlineEfCipherAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
|
|
typeof(EfCipher) }, values)
|
|
{ }
|
|
}
|
|
}
|