admin/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2026-01-31 14:13:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert org import logic to preserve archive status for importing org user

Browse Source
This commit is contained in:
John Harrington
2026-01-27 16:36:16 -07:00
parent 05dc452d17
commit 2cac99d6ef
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Tools/ImportFeatures/ImportCiphersCommand.cs
View File

@@ -146,10 +146,11 @@ public class ImportCiphersCommand : IImportCiphersCommand
// Init. ids for ciphers
cipher.SetNewId();
/*
* Archive functionality is a per-user function and should only ever be presented to the user who set the archive
* bit to ON for the item. No admin, other user or task should mark items as archived for other users.
*/
if (cipher.ArchivedDate.HasValue)
{
cipher.Archives = $"{{\"{importingUserId.ToString().ToUpperInvariant()}\":\"" +
$"{cipher.ArchivedDate.Value:yyyy-MM-ddTHH:mm:ss.fffffffZ}\"}}";
}
}
var organizationCollectionsIds = (await _collectionRepository.GetManyByOrganizationIdAsync(org.Id)).Select(c => c.Id).ToList();

11
test/Core.Test/Tools/ImportFeatures/ImportCiphersAsyncCommandTests.cs
View File

@@ -361,11 +361,12 @@ public class ImportCiphersAsyncCommandTests
}
/*
* Archive functionality is a per-user function and should only ever be presented to the user who set the archive
* bit to ON for the item. No admin, other user or task should mark items as archived for other users
* Archive functionality is a per-user function. When importing archived ciphers into an organization vault,
* the Archives field should be set for the importing user only. This allows the importing user to see
* items as archived, while other organization members will not see them as archived.
*/
[Theory, BitAutoData]
public async Task ImportIntoOrganizationalVaultAsync_WithArchivedCiphers_DoesNotSetArchives(
public async Task ImportIntoOrganizationalVaultAsync_WithArchivedCiphers_SetsArchivesForImportingUserOnly(
Organization organization,
Guid importingUserId,
OrganizationUser importingOrganizationUser,
@@ -415,7 +416,9 @@ public class ImportCiphersAsyncCommandTests
.CreateAsync(
Arg.Is<List<CipherDetails>>(c =>
c[0].ArchivedDate == archivedDate &&
c[0].Archives == null),
c[0].Archives != null &&
c[0].Archives.Contains(importingUserId.ToString().ToUpperInvariant()) &&
c[0].Archives.Contains(archivedDate.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ"))),
Arg.Any<IEnumerable<Collection>>(),
Arg.Any<IEnumerable<CollectionCipher>>(),
Arg.Any<IEnumerable<CollectionUser>>());