2022-06-30 01:46:41 +02:00
|
|
|
|
using System.Reflection;
|
2020-11-23 15:48:05 +01:00
|
|
|
|
using AutoFixture;
|
|
|
|
|
using AutoFixture.Kernel;
|
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
namespace Bit.Test.Common.AutoFixture;
|
|
|
|
|
|
|
|
|
|
public class SutProvider<TSut> : ISutProvider
|
2020-11-23 15:48:05 +01:00
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
private Dictionary<Type, Dictionary<string, object>> _dependencies;
|
|
|
|
|
private readonly IFixture _fixture;
|
|
|
|
|
private readonly ConstructorParameterRelay<TSut> _constructorParameterRelay;
|
2020-11-23 15:48:05 +01:00
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
public TSut Sut { get; private set; }
|
|
|
|
|
public Type SutType => typeof(TSut);
|
2022-08-29 20:53:16 +02:00
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
public SutProvider() : this(new Fixture()) { }
|
|
|
|
|
|
|
|
|
|
public SutProvider(IFixture fixture)
|
|
|
|
|
{
|
|
|
|
|
_dependencies = new Dictionary<Type, Dictionary<string, object>>();
|
|
|
|
|
_fixture = (fixture ?? new Fixture()).WithAutoNSubstitutions().Customize(new GlobalSettings());
|
|
|
|
|
_constructorParameterRelay = new ConstructorParameterRelay<TSut>(this, _fixture);
|
|
|
|
|
_fixture.Customizations.Add(_constructorParameterRelay);
|
|
|
|
|
}
|
2021-02-04 19:54:21 +01:00
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
public SutProvider<TSut> SetDependency<T>(T dependency, string parameterName = "")
|
|
|
|
|
=> SetDependency(typeof(T), dependency, parameterName);
|
|
|
|
|
public SutProvider<TSut> SetDependency(Type dependencyType, object dependency, string parameterName = "")
|
|
|
|
|
{
|
|
|
|
|
if (_dependencies.ContainsKey(dependencyType))
|
2020-11-23 15:48:05 +01:00
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
_dependencies[dependencyType][parameterName] = dependency;
|
2020-11-23 15:48:05 +01:00
|
|
|
|
}
|
2022-08-29 22:06:55 +02:00
|
|
|
|
else
|
2020-11-23 15:48:05 +01:00
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
_dependencies[dependencyType] = new Dictionary<string, object> { { parameterName, dependency } };
|
2022-08-29 20:53:16 +02:00
|
|
|
|
}
|
2022-08-29 21:53:48 +02:00
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
return this;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public T GetDependency<T>(string parameterName = "") => (T)GetDependency(typeof(T), parameterName);
|
|
|
|
|
public object GetDependency(Type dependencyType, string parameterName = "")
|
|
|
|
|
{
|
|
|
|
|
if (DependencyIsSet(dependencyType, parameterName))
|
2022-08-29 20:53:16 +02:00
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
return _dependencies[dependencyType][parameterName];
|
|
|
|
|
}
|
|
|
|
|
else if (_dependencies.ContainsKey(dependencyType))
|
|
|
|
|
{
|
|
|
|
|
var knownDependencies = _dependencies[dependencyType];
|
|
|
|
|
if (knownDependencies.Values.Count == 1)
|
2022-08-29 21:53:48 +02:00
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
return _dependencies[dependencyType].Values.Single();
|
2020-11-23 15:48:05 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
throw new ArgumentException(string.Concat($"Dependency of type {dependencyType.Name} and name ",
|
|
|
|
|
$"{parameterName} does not exist. Available dependency names are: ",
|
|
|
|
|
string.Join(", ", knownDependencies.Keys)));
|
2020-11-23 15:48:05 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2022-08-29 22:06:55 +02:00
|
|
|
|
else
|
2020-11-23 15:48:05 +01:00
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
throw new ArgumentException($"Dependency of type {dependencyType.Name} and name {parameterName} has not been set.");
|
2020-11-23 15:48:05 +01:00
|
|
|
|
}
|
2022-08-29 22:06:55 +02:00
|
|
|
|
}
|
2020-11-23 15:48:05 +01:00
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
public void Reset()
|
|
|
|
|
{
|
|
|
|
|
_dependencies = new Dictionary<Type, Dictionary<string, object>>();
|
|
|
|
|
Sut = default;
|
|
|
|
|
}
|
2022-08-29 20:53:16 +02:00
|
|
|
|
|
[AC-1696] Fix Provider permissions for Flexible Collections (#3381)
* [AC-1117] Add manage permission (#3126)
* Update sql files to add Manage permission
* Add migration script
* Rename collection manage migration file to remove duplicate migration date
* Migrations
* Add manage to models
* Add manage to repository
* Add constraint to Manage columns
* Migration lint fixes
* Add manage to OrganizationUserUserDetails_ReadWithCollectionsById
* Add missing manage fields
* Add 'Manage' to UserCollectionDetails
* Use CREATE OR ALTER where possible
* [AC-1374] Limit collection creation/deletion to Owner/Admin (#3145)
* feat: update org table with new column, write migration, refs AC-1374
* feat: update views with new column, refs AC-1374
* feat: Alter sprocs (org create/update) to include new column, refs AC-1374
* feat: update entity/data/request/response models to handle new column, refs AC-1374
* feat: update necessary Provider related views during migration, refs AC-1374
* fix: update org create to default new column to false, refs AC-1374
* feat: added new API/request model for collection management and removed property from update request model, refs AC-1374
* fix: renamed migration script to be after secrets manage beta column changes, refs AC-1374
* fix: dotnet format, refs AC-1374
* feat: add ef migrations to reflect mssql changes, refs AC-1374
* fix: dotnet format, refs AC-1374
* feat: update API signature to accept Guid and explain Cd verbiage, refs AC-1374
* fix: merge conflict resolution
* [AC-1174] CollectionUser and CollectionGroup authorization handlers (#3194)
* [AC-1174] Introduce BulkAuthorizationHandler.cs
* [AC-1174] Introduce CollectionUserAuthorizationHandler
* [AC-1174] Add CreateForNewCollection CollectionUser requirement
* [AC-1174] Add some more details to CollectionCustomization
* [AC-1174] Formatting
* [AC-1174] Add CollectionGroupOperation.cs
* [AC-1174] Introduce CollectionGroupAuthorizationHandler.cs
* [AC-1174] Cleanup CollectionFixture customization
Implement and use re-usable extension method to support seeded Guids
* [AC-1174] Introduce WithValueFromList AutoFixtureExtensions
Modify CollectionCustomization to use multiple organization Ids for auto generated test data
* [AC-1174] Simplify CollectionUserAuthorizationHandler.cs
Modify the authorization handler to only perform authorization logic. Validation logic will need to be handled by any calling commands/controllers instead.
* [AC-1174] Introduce shared CollectionAccessAuthorizationHandlerBase
A shared base authorization handler was created for both CollectionUser and CollectionGroup resources, as they share the same underlying management authorization logic.
* [AC-1174] Update CollectionUserAuthorizationHandler and CollectionGroupAuthorizationHandler to use the new CollectionAccessAuthorizationHandlerBase class
* [AC-1174] Formatting
* [AC-1174] Cleanup typo and redundant ToList() call
* [AC-1174] Add check for provider users
* [AC-1174] Reduce nested loops
* [AC-1174] Introduce ICollectionAccess.cs
* [AC-1174] Remove individual CollectionGroup and CollectionUser auth handlers and use base class instead
* [AC-1174] Tweak unit test to fail minimally
* [AC-1174] Reorganize authorization handlers in Core project
* [AC-1174] Introduce new AddCoreAuthorizationHandlers() extension method
* [AC-1174] Move CollectionAccessAuthorizationHandler into Api project
* [AC-1174] Move CollectionFixture to Vault folder
* [AC-1174] Rename operation to CreateUpdateDelete
* [AC-1174] Require single organization for collection access authorization handler
- Add requirement that all target collections must belong to the same organization
- Simplify logic related to multiple organizations
- Update tests and helpers
- Use ToHashSet to improve lookup time
* [AC-1174] Fix null reference exception
* [AC-1174] Throw bad request exception when collections belong to different organizations
* [AC-1174] Switch to CollectionAuthorizationHandler instead of CollectionAccessAuthorizationHandler to reduce complexity
* Fix improper merge conflict resolution
* fix: add permission check for collection management api, refs AC-1647 (#3252)
* [AC-1125] Enforce org setting for creating/deleting collections (#3241)
* [AC-1117] Add manage permission (#3126)
* Update sql files to add Manage permission
* Add migration script
* Rename collection manage migration file to remove duplicate migration date
* Migrations
* Add manage to models
* Add manage to repository
* Add constraint to Manage columns
* Migration lint fixes
* Add manage to OrganizationUserUserDetails_ReadWithCollectionsById
* Add missing manage fields
* Add 'Manage' to UserCollectionDetails
* Use CREATE OR ALTER where possible
* [AC-1374] Limit collection creation/deletion to Owner/Admin (#3145)
* feat: update org table with new column, write migration, refs AC-1374
* feat: update views with new column, refs AC-1374
* feat: Alter sprocs (org create/update) to include new column, refs AC-1374
* feat: update entity/data/request/response models to handle new column, refs AC-1374
* feat: update necessary Provider related views during migration, refs AC-1374
* fix: update org create to default new column to false, refs AC-1374
* feat: added new API/request model for collection management and removed property from update request model, refs AC-1374
* fix: renamed migration script to be after secrets manage beta column changes, refs AC-1374
* fix: dotnet format, refs AC-1374
* feat: add ef migrations to reflect mssql changes, refs AC-1374
* fix: dotnet format, refs AC-1374
* feat: update API signature to accept Guid and explain Cd verbiage, refs AC-1374
* feat: created collection auth handler/operations, added LimitCollectionCdOwnerAdmin to CurrentContentOrganization, refs AC-1125
* feat: create vault service collection extensions and register with base services, refs AC-1125
* feat: deprecated CurrentContext.CreateNewCollections, refs AC-1125
* feat: deprecate DeleteAnyCollection for single resource usages, refs AC-1125
* feat: move service registration to api, update references, refs AC-1125
* feat: add bulk delete authorization handler, refs AC-1125
* feat: always assign user and give manage access on create, refs AC-1125
* fix: updated CurrentContextOrganization type, refs AC-1125
* feat: combined existing collection authorization handlers/operations, refs AC-1125
* fix: OrganizationServiceTests -> CurrentContentOrganization typo, refs AC-1125
* fix: format, refs AC-1125
* fix: update collection controller tests, refs AC-1125
* fix: dotnet format, refs AC-1125
* feat: removed extra BulkAuthorizationHandler, refs AC-1125
* fix: dotnet format, refs AC-1125
* fix: change string to guid for org id, update bulk delete request model, refs AC-1125
* fix: remove delete many collection check, refs AC-1125
* fix: clean up collection auth handler, refs AC-1125
* fix: format fix for CollectionOperations, refs AC-1125
* fix: removed unnecessary owner check, add org null check to custom permission validation, refs AC-1125
* fix: remove unused methods in CurrentContext, refs AC-1125
* fix: removed obsolete test, fixed failling delete many test, refs AC-1125
* fix: CollectionAuthorizationHandlerTests fixes, refs AC-1125
* fix: OrganizationServiceTests fix broken test by mocking GetOrganization, refs AC-1125
* fix: CollectionAuthorizationHandler - remove unused repository, refs AC-1125
* feat: moved UserId null check to common method, refs AC-1125
* fix: updated auth handler tests to remove dependency on requirement for common code checks, refs AC-1125
* feat: updated conditionals/comments for create/delete methods within colleciton auth handler, refs AC-1125
* feat: added create/delete collection auth handler success methods, refs AC-1125
* fix: new up permissions to prevent excessive null checks, refs AC-1125
* fix: remove old reference to CreateNewCollections, refs AC-1125
* fix: typo within ViewAssignedCollections method, refs AC-1125
---------
Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>
* refactor: remove organizationId from CollectionBulkDeleteRequestModel, refs AC-1649 (#3282)
* [AC-1174] Bulk Collection Management (#3229)
* [AC-1174] Update SelectionReadOnlyRequestModel to use Guid for Id property
* [AC-1174] Introduce initial bulk-access collection endpoint
* [AC-1174] Introduce BulkAddCollectionAccessCommand and validation logic/tests
* [AC-1174] Add CreateOrUpdateAccessMany method to CollectionRepository
* [AC-1174] Add event logs for bulk add collection access command
* [AC-1174] Add User_BumpAccountRevisionDateByCollectionIds and database migration script
* [AC-1174] Implement EF repository method
* [AC-1174] Improve null checks
* [AC-1174] Remove unnecessary BulkCollectionAccessRequestModel helpers
* [AC-1174] Add unit tests for new controller endpoint
* [AC-1174] Fix formatting
* [AC-1174] Remove comment
* [AC-1174] Remove redundant organizationId parameter
* [AC-1174] Ensure user and group Ids are distinct
* [AC-1174] Cleanup tests based on PR feedback
* [AC-1174] Formatting
* [AC-1174] Update CollectionGroup alias in the sproc
* [AC-1174] Add some additional comments to SQL sproc
* [AC-1174] Add comment explaining additional SaveChangesAsync call
---------
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
* [AC-1646] Rename LimitCollectionCdOwnerAdmin column (#3300)
* Rename LimitCollectionCdOwnerAdmin -> LimitCollectionCreationDeletion
* Rename and bump migration script
* [AC-1666] Removed EditAnyCollection from Create/Delete permission checks (#3301)
* fix: remove EditAnyCollection from Create/Delete permission check, refs AC-1666
* fix: updated comment, refs AC-1666
* [AC-1669] Bug - Remove obsolete assignUserId from CollectionService.SaveAsync(...) (#3312)
* fix: remove AssignUserId from CollectionService.SaveAsync, refs AC-1669
* fix: add manage access conditional before creating collection, refs AC-1669
* fix: move access logic for create/update, fix all tests, refs AC-1669
* fix: add CollectionAccessSelection fixture, update tests, update bad reqeuest message, refs AC-1669
* fix: format, refs AC-1669
* fix: update null params with specific arg.is null checks, refs Ac-1669
* fix: update attribute class name, refs AC-1669
* [AC-1713] [Flexible collections] Add feature flags to server (#3334)
* Add feature flags for FlexibleCollections and BulkCollectionAccess
* Flag new routes and behaviour
---------
Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com>
* Add joint codeownership for auth handlers (#3346)
* [AC-1717] Update default values for LimitCollectionCreationDeletion (#3365)
* Change default value in organization create sproc to 1
* Drop old column name still present in some QA instances
* Set LimitCollectionCreationDeletion value in code based on feature flag
* Fix: add missing namespace after merging in master
* Fix: add missing namespace after merging in master
* [AC-1683] Fix DB migrations for new Manage permission (#3307)
* [AC-1683] Update migration script and introduce V2 procedures and types
* [AC-1683] Update repository calls to use new V2 procedures / types
* [AC-1684] Update bulk add collection migration script to use new V2 type
* [AC-1683] Undo Manage changes to more original procedures
* [AC-1683] Restore whitespace changes
* [AC-1683] Clarify comments regarding explicit column lists
* [AC-1683] Update migration script dates
* [AC-1683] Split the migration script for readability
* [AC-1683] Re-name SelectReadOnlyArray_V2 to CollectionAccessSelectionType
* [AC-1648] [Flexible Collections] Bump migration scripts before feature branch merge (#3371)
* Bump dates on sql migration scripts
* Bump date on ef migrations
* [AC-1696] Rework collection auth handler to account for provider users
- Add additional check for providers only if the org membership is null, and if the user is a provider, do not early return
- Modify conditionals to use pattern matching to allow for null organization contexts from provider users
- Save the target organization id as a private field to avoid additional parameter passing because org can now be null
* [AC-1696] Add unit tests to collection auth handler for provider users
Includes helper test method/enum for creating an xUnit theory for each collection operation.
* [AC-1696] Further refactor private methods and remove provider check from public method
Updates logic in private methods to only use context.Succeed() to allow for fallback permission checking for provider access.
* [AC-1696] Ensure the correct organization id is provided when testing
* [AC-1696] Refactor provider test to remove additional operation enum
* [AC-1696] Formatting
---------
Co-authored-by: Robyn MacCallum <robyntmaccallum@gmail.com>
Co-authored-by: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com>
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com>
2023-11-22 03:09:27 +01:00
|
|
|
|
public void Recreate()
|
|
|
|
|
{
|
|
|
|
|
_dependencies = new Dictionary<Type, Dictionary<string, object>>();
|
|
|
|
|
Sut = _fixture.Create<TSut>();
|
|
|
|
|
}
|
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
ISutProvider ISutProvider.Create() => Create();
|
|
|
|
|
public SutProvider<TSut> Create()
|
|
|
|
|
{
|
|
|
|
|
Sut = _fixture.Create<TSut>();
|
|
|
|
|
return this;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private bool DependencyIsSet(Type dependencyType, string parameterName = "")
|
|
|
|
|
=> _dependencies.ContainsKey(dependencyType) && _dependencies[dependencyType].ContainsKey(parameterName);
|
|
|
|
|
|
|
|
|
|
private object GetDefault(Type type) => type.IsValueType ? Activator.CreateInstance(type) : null;
|
2020-11-23 15:48:05 +01:00
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
private class ConstructorParameterRelay<T> : ISpecimenBuilder
|
|
|
|
|
{
|
|
|
|
|
private readonly SutProvider<T> _sutProvider;
|
|
|
|
|
private readonly IFixture _fixture;
|
2020-11-23 15:48:05 +01:00
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
public ConstructorParameterRelay(SutProvider<T> sutProvider, IFixture fixture)
|
2020-11-23 15:48:05 +01:00
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
_sutProvider = sutProvider;
|
|
|
|
|
_fixture = fixture;
|
|
|
|
|
}
|
2020-11-23 15:48:05 +01:00
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
public object Create(object request, ISpecimenContext context)
|
|
|
|
|
{
|
|
|
|
|
if (context == null)
|
|
|
|
|
{
|
|
|
|
|
throw new ArgumentNullException(nameof(context));
|
|
|
|
|
}
|
|
|
|
|
if (!(request is ParameterInfo parameterInfo))
|
|
|
|
|
{
|
|
|
|
|
return new NoSpecimen();
|
|
|
|
|
}
|
|
|
|
|
if (parameterInfo.Member.DeclaringType != typeof(T) ||
|
|
|
|
|
parameterInfo.Member.MemberType != MemberTypes.Constructor)
|
2020-11-23 15:48:05 +01:00
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
return new NoSpecimen();
|
2020-11-23 15:48:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
2022-08-29 22:06:55 +02:00
|
|
|
|
if (_sutProvider.DependencyIsSet(parameterInfo.ParameterType, parameterInfo.Name))
|
|
|
|
|
{
|
|
|
|
|
return _sutProvider.GetDependency(parameterInfo.ParameterType, parameterInfo.Name);
|
|
|
|
|
}
|
|
|
|
|
// Return default type if set
|
|
|
|
|
else if (_sutProvider.DependencyIsSet(parameterInfo.ParameterType, ""))
|
2020-11-23 15:48:05 +01:00
|
|
|
|
{
|
2022-08-29 22:06:55 +02:00
|
|
|
|
return _sutProvider.GetDependency(parameterInfo.ParameterType, "");
|
2020-11-23 15:48:05 +01:00
|
|
|
|
}
|
2022-08-29 22:06:55 +02:00
|
|
|
|
|
|
|
|
|
// This is the equivalent of _fixture.Create<parameterInfo.ParameterType>, but no overload for
|
|
|
|
|
// Create(Type type) exists.
|
|
|
|
|
var dependency = new SpecimenContext(_fixture).Resolve(new SeededRequest(parameterInfo.ParameterType,
|
|
|
|
|
_sutProvider.GetDefault(parameterInfo.ParameterType)));
|
|
|
|
|
_sutProvider.SetDependency(parameterInfo.ParameterType, dependency, parameterInfo.Name);
|
|
|
|
|
return dependency;
|
2020-11-23 15:48:05 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|