2023-07-01 00:41:11 +02:00
|
|
|
|
using System.Text.Json;
|
2023-11-29 00:18:08 +01:00
|
|
|
|
using Bit.Core.AdminConsole.Entities;
|
2023-07-01 00:41:11 +02:00
|
|
|
|
using Bit.Core.Entities;
|
2022-12-02 20:24:30 +01:00
|
|
|
|
using Bit.Core.Enums;
|
2023-05-30 19:25:55 +02:00
|
|
|
|
using Bit.Core.Models.Data;
|
2022-12-02 20:24:30 +01:00
|
|
|
|
using Bit.Core.Repositories;
|
2023-03-02 19:23:38 +01:00
|
|
|
|
using Bit.Core.Vault.Entities;
|
|
|
|
|
using Bit.Core.Vault.Enums;
|
|
|
|
|
using Bit.Core.Vault.Models.Data;
|
|
|
|
|
using Bit.Core.Vault.Repositories;
|
2022-12-02 20:24:30 +01:00
|
|
|
|
using Xunit;
|
|
|
|
|
|
|
|
|
|
namespace Bit.Infrastructure.IntegrationTest.Repositories;
|
|
|
|
|
|
|
|
|
|
public class CipherRepositoryTests
|
|
|
|
|
{
|
|
|
|
|
[DatabaseTheory, DatabaseData]
|
|
|
|
|
public async Task DeleteAsync_UpdatesUserRevisionDate(
|
|
|
|
|
IUserRepository userRepository,
|
2023-10-12 11:15:02 +02:00
|
|
|
|
ICipherRepository cipherRepository)
|
2022-12-02 20:24:30 +01:00
|
|
|
|
{
|
|
|
|
|
var user = await userRepository.CreateAsync(new User
|
|
|
|
|
{
|
|
|
|
|
Name = "Test User",
|
2023-05-30 19:25:55 +02:00
|
|
|
|
Email = $"test+{Guid.NewGuid()}@email.com",
|
2022-12-02 20:24:30 +01:00
|
|
|
|
ApiKey = "TEST",
|
|
|
|
|
SecurityStamp = "stamp",
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var cipher = await cipherRepository.CreateAsync(new Cipher
|
|
|
|
|
{
|
|
|
|
|
Type = CipherType.Login,
|
|
|
|
|
UserId = user.Id,
|
2023-05-30 19:25:55 +02:00
|
|
|
|
Data = "", // TODO: EF does not enforce this as NOT NULL
|
2022-12-02 20:24:30 +01:00
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
await cipherRepository.DeleteAsync(cipher);
|
|
|
|
|
|
|
|
|
|
var deletedCipher = await cipherRepository.GetByIdAsync(cipher.Id);
|
|
|
|
|
|
|
|
|
|
Assert.Null(deletedCipher);
|
|
|
|
|
var updatedUser = await userRepository.GetByIdAsync(user.Id);
|
|
|
|
|
Assert.NotEqual(updatedUser.AccountRevisionDate, user.AccountRevisionDate);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[DatabaseTheory, DatabaseData]
|
2023-05-17 12:14:36 +02:00
|
|
|
|
public async Task CreateAsync_UpdateWithCollections_Works(
|
2022-12-02 20:24:30 +01:00
|
|
|
|
IUserRepository userRepository,
|
|
|
|
|
IOrganizationRepository organizationRepository,
|
|
|
|
|
IOrganizationUserRepository organizationUserRepository,
|
|
|
|
|
ICollectionRepository collectionRepository,
|
|
|
|
|
ICipherRepository cipherRepository,
|
2023-10-12 11:15:02 +02:00
|
|
|
|
ICollectionCipherRepository collectionCipherRepository)
|
2022-12-02 20:24:30 +01:00
|
|
|
|
{
|
|
|
|
|
var user = await userRepository.CreateAsync(new User
|
|
|
|
|
{
|
|
|
|
|
Name = "Test User",
|
2023-05-30 19:25:55 +02:00
|
|
|
|
Email = $"test+{Guid.NewGuid()}@email.com",
|
2022-12-02 20:24:30 +01:00
|
|
|
|
ApiKey = "TEST",
|
|
|
|
|
SecurityStamp = "stamp",
|
|
|
|
|
});
|
|
|
|
|
|
2023-05-30 19:25:55 +02:00
|
|
|
|
user = await userRepository.GetByIdAsync(user.Id);
|
|
|
|
|
|
2022-12-02 20:24:30 +01:00
|
|
|
|
var organization = await organizationRepository.CreateAsync(new Organization
|
|
|
|
|
{
|
|
|
|
|
Name = "Test Organization",
|
2023-05-30 19:25:55 +02:00
|
|
|
|
BillingEmail = user.Email,
|
|
|
|
|
Plan = "Test" // TODO: EF does not enforce this as NOT NULL
|
2022-12-02 20:24:30 +01:00
|
|
|
|
});
|
|
|
|
|
|
2023-05-30 19:25:55 +02:00
|
|
|
|
var orgUser = await organizationUserRepository.CreateAsync(new OrganizationUser
|
2022-12-02 20:24:30 +01:00
|
|
|
|
{
|
|
|
|
|
UserId = user.Id,
|
|
|
|
|
OrganizationId = organization.Id,
|
2023-05-30 19:25:55 +02:00
|
|
|
|
Status = OrganizationUserStatusType.Confirmed,
|
2022-12-02 20:24:30 +01:00
|
|
|
|
Type = OrganizationUserType.Owner,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var collection = await collectionRepository.CreateAsync(new Collection
|
|
|
|
|
{
|
|
|
|
|
Name = "Test Collection",
|
|
|
|
|
OrganizationId = organization.Id
|
|
|
|
|
});
|
|
|
|
|
|
2023-05-30 19:25:55 +02:00
|
|
|
|
await Task.Delay(100);
|
|
|
|
|
|
|
|
|
|
await collectionRepository.UpdateUsersAsync(collection.Id, new[]
|
|
|
|
|
{
|
|
|
|
|
new CollectionAccessSelection
|
|
|
|
|
{
|
|
|
|
|
Id = orgUser.Id,
|
|
|
|
|
HidePasswords = true,
|
|
|
|
|
ReadOnly = true,
|
[AC-1373] Flexible Collections (#3245)
* [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
---------
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: Shane Melton <smelton@bitwarden.com>
Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com>
2023-11-01 10:30:52 +01:00
|
|
|
|
Manage = true
|
2023-05-30 19:25:55 +02:00
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
await Task.Delay(100);
|
|
|
|
|
|
2022-12-02 20:24:30 +01:00
|
|
|
|
await cipherRepository.CreateAsync(new CipherDetails
|
|
|
|
|
{
|
|
|
|
|
Type = CipherType.Login,
|
|
|
|
|
OrganizationId = organization.Id,
|
2023-05-30 19:25:55 +02:00
|
|
|
|
Data = "", // TODO: EF does not enforce this as NOT NULL
|
2022-12-02 20:24:30 +01:00
|
|
|
|
}, new List<Guid>
|
|
|
|
|
{
|
|
|
|
|
collection.Id,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var updatedUser = await userRepository.GetByIdAsync(user.Id);
|
|
|
|
|
|
2023-05-30 19:25:55 +02:00
|
|
|
|
Assert.True(updatedUser.AccountRevisionDate - user.AccountRevisionDate > TimeSpan.Zero,
|
|
|
|
|
"The AccountRevisionDate is expected to be changed");
|
2022-12-02 20:24:30 +01:00
|
|
|
|
|
|
|
|
|
var collectionCiphers = await collectionCipherRepository.GetManyByOrganizationIdAsync(organization.Id);
|
|
|
|
|
Assert.NotEmpty(collectionCiphers);
|
|
|
|
|
}
|
2023-07-01 00:41:11 +02:00
|
|
|
|
|
|
|
|
|
[DatabaseTheory, DatabaseData]
|
|
|
|
|
public async Task ReplaceAsync_SuccessfullyMovesCipherToOrganization(IUserRepository userRepository,
|
|
|
|
|
ICipherRepository cipherRepository,
|
|
|
|
|
IOrganizationRepository organizationRepository,
|
|
|
|
|
IOrganizationUserRepository organizationUserRepository,
|
2023-10-12 11:15:02 +02:00
|
|
|
|
IFolderRepository folderRepository)
|
2023-07-01 00:41:11 +02:00
|
|
|
|
{
|
|
|
|
|
// This tests what happens when a cipher is moved into an organizations
|
|
|
|
|
var user = await userRepository.CreateAsync(new User
|
|
|
|
|
{
|
|
|
|
|
Name = "Test User",
|
|
|
|
|
Email = $"test+{Guid.NewGuid()}@email.com",
|
|
|
|
|
ApiKey = "TEST",
|
|
|
|
|
SecurityStamp = "stamp",
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
user = await userRepository.GetByIdAsync(user.Id);
|
|
|
|
|
|
|
|
|
|
// Create cipher in personal vault
|
|
|
|
|
var createdCipher = await cipherRepository.CreateAsync(new Cipher
|
|
|
|
|
{
|
|
|
|
|
UserId = user.Id,
|
|
|
|
|
Data = "", // TODO: EF does not enforce this as NOT NULL
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var organization = await organizationRepository.CreateAsync(new Organization
|
|
|
|
|
{
|
|
|
|
|
Name = "Test Organization",
|
|
|
|
|
BillingEmail = user.Email,
|
|
|
|
|
Plan = "Test" // TODO: EF does not enforce this as NOT NULL
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
_ = await organizationUserRepository.CreateAsync(new OrganizationUser
|
|
|
|
|
{
|
|
|
|
|
UserId = user.Id,
|
|
|
|
|
OrganizationId = organization.Id,
|
|
|
|
|
Status = OrganizationUserStatusType.Confirmed,
|
|
|
|
|
Type = OrganizationUserType.Owner,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var folder = await folderRepository.CreateAsync(new Folder
|
|
|
|
|
{
|
|
|
|
|
Name = "FolderName",
|
|
|
|
|
UserId = user.Id,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Move cipher to organization vault
|
|
|
|
|
await cipherRepository.ReplaceAsync(new CipherDetails
|
|
|
|
|
{
|
|
|
|
|
Id = createdCipher.Id,
|
|
|
|
|
UserId = user.Id,
|
|
|
|
|
OrganizationId = organization.Id,
|
|
|
|
|
FolderId = folder.Id,
|
|
|
|
|
Data = "", // TODO: EF does not enforce this as NOT NULL
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var updatedCipher = await cipherRepository.GetByIdAsync(createdCipher.Id);
|
|
|
|
|
|
|
|
|
|
Assert.Null(updatedCipher.UserId);
|
|
|
|
|
Assert.Equal(organization.Id, updatedCipher.OrganizationId);
|
|
|
|
|
Assert.NotNull(updatedCipher.Folders);
|
|
|
|
|
|
|
|
|
|
using var foldersJsonDocument = JsonDocument.Parse(updatedCipher.Folders);
|
|
|
|
|
var foldersJsonElement = foldersJsonDocument.RootElement;
|
|
|
|
|
Assert.Equal(JsonValueKind.Object, foldersJsonElement.ValueKind);
|
|
|
|
|
|
|
|
|
|
// TODO: Should we force similar casing for guids across DB's
|
|
|
|
|
// I'd rather we only interact with them as the actual Guid type
|
|
|
|
|
var userProperty = foldersJsonElement
|
|
|
|
|
.EnumerateObject()
|
|
|
|
|
.FirstOrDefault(jp => string.Equals(jp.Name, user.Id.ToString(), StringComparison.OrdinalIgnoreCase));
|
|
|
|
|
|
|
|
|
|
Assert.NotEqual(default, userProperty);
|
|
|
|
|
Assert.Equal(folder.Id, userProperty.Value.GetGuid());
|
|
|
|
|
}
|
2022-12-02 20:24:30 +01:00
|
|
|
|
}
|