nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

[PM-22503] Fix manage cipher permission (#5972)

Browse Source 
* Added new tests to validate that the ciphers are being grouped and filtered correctly when assigned to multiple collections and changing order of grouping properties.
This commit is contained in:
Jared McCannon
2025-06-23 12:11:32 -04:00
committed by GitHub
parent cdfe51f9d6
commit d2410747d0
3 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
test/Infrastructure.IntegrationTest/Vault/Repositories/CipherRepositoryTests.cs
View File

@ -571,6 +571,65 @@ public class CipherRepositoryTests
Assert.True(personalDetails.Manage, "Personal ciphers should always have Manage permission");
}
[DatabaseTheory, DatabaseData]
public async Task GetManyByUserIdAsync_WhenOneCipherIsAssignedToTwoCollectionsWithDifferentPermissions_MostPrivilegedAccessIsReturnedOnTheCipher(
ICipherRepository cipherRepository,
IUserRepository userRepository,
ICollectionCipherRepository collectionCipherRepository,
ICollectionRepository collectionRepository,
IOrganizationRepository organizationRepository,
IOrganizationUserRepository organizationUserRepository)
{
//Arrange
var (user, organization, orgUser) = await CreateTestUserAndOrganization(userRepository, organizationRepository, organizationUserRepository);
var cipher = await cipherRepository.CreateAsync(new Cipher
{
Type = CipherType.Login,
OrganizationId = organization.Id,
Data = ""
});
var managedPermissionsCollection = await collectionRepository.CreateAsync(new Collection
{
Name = "Managed",
OrganizationId = organization.Id
});
var unmanagedPermissionsCollection = await collectionRepository.CreateAsync(new Collection
{
Name = "Unmanaged",
OrganizationId = organization.Id
});
await collectionCipherRepository.UpdateCollectionsForAdminAsync(cipher.Id, organization.Id,
[managedPermissionsCollection.Id, unmanagedPermissionsCollection.Id]);
await collectionRepository.UpdateUsersAsync(managedPermissionsCollection.Id, new List<CollectionAccessSelection>
{
new() { Id = orgUser.Id, HidePasswords = false, ReadOnly = false, Manage = true }
});
await collectionRepository.UpdateUsersAsync(unmanagedPermissionsCollection.Id, new List<CollectionAccessSelection>
{
new() { Id = orgUser.Id, HidePasswords = false, ReadOnly = false, Manage = false }
});
// Act
var ciphers = await cipherRepository.GetManyByUserIdAsync(user.Id);
// Assert
Assert.Single(ciphers);
var deletableCipher = ciphers.SingleOrDefault(x => x.Id == cipher.Id);
Assert.NotNull(deletableCipher);
Assert.True(deletableCipher.Manage);
// Annul
await cipherRepository.DeleteAsync(cipher);
await organizationUserRepository.DeleteAsync(orgUser);
await organizationRepository.DeleteAsync(organization);
await userRepository.DeleteAsync(user);
}
private async Task<(User user, Organization org, OrganizationUser orgUser)> CreateTestUserAndOrganization(
IUserRepository userRepository,
IOrganizationRepository organizationRepository,