mirror of
https://github.com/bitwarden/server.git
synced 2025-12-10 00:42:07 -06:00
[PM-26316] Prevent users from sharing archived cipher (#6443)
* prevent users from sharing an archived cipher * move check outside of encrypted check * add check for cipher stored in the DB does not have an archive date
This commit is contained in:
parent
84534eb8f9
commit
42568b6494
@ -754,6 +754,11 @@ public class CiphersController : Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (cipher.ArchivedDate.HasValue)
|
||||||
|
{
|
||||||
|
throw new BadRequestException("Cannot move an archived item to an organization.");
|
||||||
|
}
|
||||||
|
|
||||||
ValidateClientVersionForFido2CredentialSupport(cipher);
|
ValidateClientVersionForFido2CredentialSupport(cipher);
|
||||||
|
|
||||||
var original = cipher.Clone();
|
var original = cipher.Clone();
|
||||||
@ -1263,6 +1268,11 @@ public class CiphersController : Controller
|
|||||||
_logger.LogError("Cipher was not encrypted for the current user. CipherId: {CipherId}, CurrentUser: {CurrentUserId}, EncryptedFor: {EncryptedFor}", cipher.Id, userId, cipher.EncryptedFor);
|
_logger.LogError("Cipher was not encrypted for the current user. CipherId: {CipherId}, CurrentUser: {CurrentUserId}, EncryptedFor: {EncryptedFor}", cipher.Id, userId, cipher.EncryptedFor);
|
||||||
throw new BadRequestException("Cipher was not encrypted for the current user. Please try again.");
|
throw new BadRequestException("Cipher was not encrypted for the current user. Please try again.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (cipher.ArchivedDate.HasValue)
|
||||||
|
{
|
||||||
|
throw new BadRequestException("Cannot move archived items to an organization.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var shareCiphers = new List<(CipherDetails, DateTime?)>();
|
var shareCiphers = new List<(CipherDetails, DateTime?)>();
|
||||||
@ -1275,6 +1285,11 @@ public class CiphersController : Controller
|
|||||||
|
|
||||||
ValidateClientVersionForFido2CredentialSupport(existingCipher);
|
ValidateClientVersionForFido2CredentialSupport(existingCipher);
|
||||||
|
|
||||||
|
if (existingCipher.ArchivedDate.HasValue)
|
||||||
|
{
|
||||||
|
throw new BadRequestException("Cannot move archived items to an organization.");
|
||||||
|
}
|
||||||
|
|
||||||
shareCiphers.Add((cipher.ToCipherDetails(existingCipher), cipher.LastKnownRevisionDate));
|
shareCiphers.Add((cipher.ToCipherDetails(existingCipher), cipher.LastKnownRevisionDate));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1790,6 +1790,118 @@ public class CiphersControllerTests
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Theory, BitAutoData]
|
||||||
|
public async Task PutShareMany_ArchivedCipher_ThrowsBadRequestException(
|
||||||
|
Guid organizationId,
|
||||||
|
Guid userId,
|
||||||
|
CipherWithIdRequestModel request,
|
||||||
|
SutProvider<CiphersController> sutProvider)
|
||||||
|
{
|
||||||
|
request.EncryptedFor = userId;
|
||||||
|
request.OrganizationId = organizationId.ToString();
|
||||||
|
request.ArchivedDate = DateTime.UtcNow;
|
||||||
|
var model = new CipherBulkShareRequestModel
|
||||||
|
{
|
||||||
|
Ciphers = [request],
|
||||||
|
CollectionIds = [Guid.NewGuid().ToString()]
|
||||||
|
};
|
||||||
|
|
||||||
|
sutProvider.GetDependency<ICurrentContext>()
|
||||||
|
.OrganizationUser(organizationId)
|
||||||
|
.Returns(Task.FromResult(true));
|
||||||
|
sutProvider.GetDependency<IUserService>()
|
||||||
|
.GetProperUserId(default)
|
||||||
|
.ReturnsForAnyArgs(userId);
|
||||||
|
|
||||||
|
var exception = await Assert.ThrowsAsync<BadRequestException>(
|
||||||
|
() => sutProvider.Sut.PutShareMany(model)
|
||||||
|
);
|
||||||
|
|
||||||
|
Assert.Equal("Cannot move archived items to an organization.", exception.Message);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory, BitAutoData]
|
||||||
|
public async Task PutShareMany_ExistingCipherArchived_ThrowsBadRequestException(
|
||||||
|
Guid organizationId,
|
||||||
|
Guid userId,
|
||||||
|
CipherWithIdRequestModel request,
|
||||||
|
SutProvider<CiphersController> sutProvider)
|
||||||
|
{
|
||||||
|
// Request model does not have ArchivedDate (only the existing cipher does)
|
||||||
|
request.EncryptedFor = userId;
|
||||||
|
request.OrganizationId = organizationId.ToString();
|
||||||
|
request.ArchivedDate = null;
|
||||||
|
|
||||||
|
var model = new CipherBulkShareRequestModel
|
||||||
|
{
|
||||||
|
Ciphers = [request],
|
||||||
|
CollectionIds = [Guid.NewGuid().ToString()]
|
||||||
|
};
|
||||||
|
|
||||||
|
// The existing cipher from the repository IS archived
|
||||||
|
var existingCipher = new CipherDetails
|
||||||
|
{
|
||||||
|
Id = request.Id!.Value,
|
||||||
|
UserId = userId,
|
||||||
|
Type = CipherType.Login,
|
||||||
|
Data = JsonSerializer.Serialize(new CipherLoginData()),
|
||||||
|
ArchivedDate = DateTime.UtcNow
|
||||||
|
};
|
||||||
|
|
||||||
|
sutProvider.GetDependency<ICurrentContext>()
|
||||||
|
.OrganizationUser(organizationId)
|
||||||
|
.Returns(Task.FromResult(true));
|
||||||
|
sutProvider.GetDependency<IUserService>()
|
||||||
|
.GetProperUserId(default)
|
||||||
|
.ReturnsForAnyArgs(userId);
|
||||||
|
sutProvider.GetDependency<ICipherRepository>()
|
||||||
|
.GetManyByUserIdAsync(userId, withOrganizations: false)
|
||||||
|
.Returns(Task.FromResult((ICollection<CipherDetails>)[existingCipher]));
|
||||||
|
|
||||||
|
var exception = await Assert.ThrowsAsync<BadRequestException>(
|
||||||
|
() => sutProvider.Sut.PutShareMany(model)
|
||||||
|
);
|
||||||
|
|
||||||
|
Assert.Equal("Cannot move archived items to an organization.", exception.Message);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory, BitAutoData]
|
||||||
|
public async Task PutShare_ArchivedCipher_ThrowsBadRequestException(
|
||||||
|
Guid cipherId,
|
||||||
|
Guid organizationId,
|
||||||
|
User user,
|
||||||
|
CipherShareRequestModel model,
|
||||||
|
SutProvider<CiphersController> sutProvider)
|
||||||
|
{
|
||||||
|
model.Cipher.OrganizationId = organizationId.ToString();
|
||||||
|
model.Cipher.EncryptedFor = user.Id;
|
||||||
|
|
||||||
|
var cipher = new Cipher
|
||||||
|
{
|
||||||
|
Id = cipherId,
|
||||||
|
UserId = user.Id,
|
||||||
|
ArchivedDate = DateTime.UtcNow.AddDays(-1),
|
||||||
|
Type = CipherType.Login,
|
||||||
|
Data = JsonSerializer.Serialize(new CipherLoginData())
|
||||||
|
};
|
||||||
|
|
||||||
|
sutProvider.GetDependency<IUserService>()
|
||||||
|
.GetUserByPrincipalAsync(Arg.Any<ClaimsPrincipal>())
|
||||||
|
.Returns(user);
|
||||||
|
sutProvider.GetDependency<ICipherRepository>()
|
||||||
|
.GetByIdAsync(cipherId)
|
||||||
|
.Returns(cipher);
|
||||||
|
sutProvider.GetDependency<ICurrentContext>()
|
||||||
|
.OrganizationUser(organizationId)
|
||||||
|
.Returns(Task.FromResult(true));
|
||||||
|
|
||||||
|
var exception = await Assert.ThrowsAsync<BadRequestException>(
|
||||||
|
() => sutProvider.Sut.PutShare(cipherId, model)
|
||||||
|
);
|
||||||
|
|
||||||
|
Assert.Equal("Cannot move an archived item to an organization.", exception.Message);
|
||||||
|
}
|
||||||
|
|
||||||
[Theory, BitAutoData]
|
[Theory, BitAutoData]
|
||||||
public async Task PostPurge_WhenUserNotFound_ThrowsUnauthorizedAccessException(
|
public async Task PostPurge_WhenUserNotFound_ThrowsUnauthorizedAccessException(
|
||||||
SecretVerificationRequestModel model,
|
SecretVerificationRequestModel model,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user