mirror of
https://github.com/bitwarden/server.git
synced 2024-11-23 12:25:16 +01:00
5aba9f7549
* Return revised ciphers on restore api call * Return restored date from restore sproc * Test Restore updates passed in ciphers This is necessary for CipherController to appropriately return the up-to-date ciphers without an extra db call to read them. * Add missing SELECT
162 lines
7.8 KiB
C#
162 lines
7.8 KiB
C#
using System;
|
|
using System.Threading.Tasks;
|
|
using Bit.Core.Repositories;
|
|
using Bit.Core.Services;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
using Bit.Core.Exceptions;
|
|
using Bit.Core.Models.Table;
|
|
using Core.Models.Data;
|
|
using Bit.Core.Test.AutoFixture.CipherFixtures;
|
|
using System.Collections.Generic;
|
|
using Bit.Core.Test.AutoFixture;
|
|
using System.Linq;
|
|
using Castle.Core.Internal;
|
|
|
|
namespace Bit.Core.Test.Services
|
|
{
|
|
public class CipherServiceTests
|
|
{
|
|
[Theory, UserCipherAutoData]
|
|
public async Task SaveAsync_WrongRevisionDate_Throws(SutProvider<CipherService> sutProvider, Cipher cipher)
|
|
{
|
|
var lastKnownRevisionDate = cipher.RevisionDate.AddDays(-1);
|
|
|
|
var exception = await Assert.ThrowsAsync<BadRequestException>(
|
|
() => sutProvider.Sut.SaveAsync(cipher, cipher.UserId.Value, lastKnownRevisionDate));
|
|
Assert.Contains("out of date", exception.Message);
|
|
}
|
|
|
|
[Theory, UserCipherAutoData]
|
|
public async Task SaveDetailsAsync_WrongRevisionDate_Throws(SutProvider<CipherService> sutProvider,
|
|
CipherDetails cipherDetails)
|
|
{
|
|
var lastKnownRevisionDate = cipherDetails.RevisionDate.AddDays(-1);
|
|
|
|
var exception = await Assert.ThrowsAsync<BadRequestException>(
|
|
() => sutProvider.Sut.SaveDetailsAsync(cipherDetails, cipherDetails.UserId.Value, lastKnownRevisionDate));
|
|
Assert.Contains("out of date", exception.Message);
|
|
}
|
|
|
|
[Theory, UserCipherAutoData]
|
|
public async Task ShareAsync_WrongRevisionDate_Throws(SutProvider<CipherService> sutProvider, Cipher cipher,
|
|
Organization organization, List<Guid> collectionIds)
|
|
{
|
|
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organization.Id).Returns(organization);
|
|
var lastKnownRevisionDate = cipher.RevisionDate.AddDays(-1);
|
|
|
|
var exception = await Assert.ThrowsAsync<BadRequestException>(
|
|
() => sutProvider.Sut.ShareAsync(cipher, cipher, organization.Id, collectionIds, cipher.UserId.Value,
|
|
lastKnownRevisionDate));
|
|
Assert.Contains("out of date", exception.Message);
|
|
}
|
|
|
|
[Theory, UserCipherAutoData("99ab4f6c-44f8-4ff5-be7a-75c37c33c69e")]
|
|
public async Task ShareManyAsync_WrongRevisionDate_Throws(SutProvider<CipherService> sutProvider,
|
|
IEnumerable<Cipher> ciphers, Guid organizationId, List<Guid> collectionIds)
|
|
{
|
|
var cipherInfos = ciphers.Select(c => (c, (DateTime?)c.RevisionDate.AddDays(-1)));
|
|
|
|
var exception = await Assert.ThrowsAsync<BadRequestException>(
|
|
() => sutProvider.Sut.ShareManyAsync(cipherInfos, organizationId, collectionIds, ciphers.First().UserId.Value));
|
|
Assert.Contains("out of date", exception.Message);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineUserCipherAutoData("")]
|
|
[InlineUserCipherAutoData("Correct Time")]
|
|
public async Task SaveAsync_CorrectRevisionDate_Passes(string revisionDateString,
|
|
SutProvider<CipherService> sutProvider, Cipher cipher)
|
|
{
|
|
var lastKnownRevisionDate = string.IsNullOrEmpty(revisionDateString) ? (DateTime?)null : cipher.RevisionDate;
|
|
|
|
await sutProvider.Sut.SaveAsync(cipher, cipher.UserId.Value, lastKnownRevisionDate);
|
|
await sutProvider.GetDependency<ICipherRepository>().Received(1).ReplaceAsync(cipher);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineUserCipherAutoData("")]
|
|
[InlineUserCipherAutoData("Correct Time")]
|
|
public async Task SaveDetailsAsync_CorrectRevisionDate_Passes(string revisionDateString,
|
|
SutProvider<CipherService> sutProvider, CipherDetails cipherDetails)
|
|
{
|
|
var lastKnownRevisionDate = string.IsNullOrEmpty(revisionDateString) ? (DateTime?)null : cipherDetails.RevisionDate;
|
|
|
|
await sutProvider.Sut.SaveDetailsAsync(cipherDetails, cipherDetails.UserId.Value, lastKnownRevisionDate);
|
|
await sutProvider.GetDependency<ICipherRepository>().Received(1).ReplaceAsync(cipherDetails);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineUserCipherAutoData("")]
|
|
[InlineUserCipherAutoData("Correct Time")]
|
|
public async Task ShareAsync_CorrectRevisionDate_Passes(string revisionDateString,
|
|
SutProvider<CipherService> sutProvider, Cipher cipher, Organization organization, List<Guid> collectionIds)
|
|
{
|
|
var lastKnownRevisionDate = string.IsNullOrEmpty(revisionDateString) ? (DateTime?)null : cipher.RevisionDate;
|
|
var cipherRepository = sutProvider.GetDependency<ICipherRepository>();
|
|
cipherRepository.ReplaceAsync(cipher, collectionIds).Returns(true);
|
|
sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organization.Id).Returns(organization);
|
|
|
|
await sutProvider.Sut.ShareAsync(cipher, cipher, organization.Id, collectionIds, cipher.UserId.Value,
|
|
lastKnownRevisionDate);
|
|
await cipherRepository.Received(1).ReplaceAsync(cipher, collectionIds);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineKnownUserCipherAutoData(userId: "99ab4f6c-44f8-4ff5-be7a-75c37c33c69e", "")]
|
|
[InlineKnownUserCipherAutoData(userId: "99ab4f6c-44f8-4ff5-be7a-75c37c33c69e", "CorrectTime")]
|
|
public async Task ShareManyAsync_CorrectRevisionDate_Passes(string revisionDateString,
|
|
SutProvider<CipherService> sutProvider, IEnumerable<Cipher> ciphers, Organization organization, List<Guid> collectionIds)
|
|
{
|
|
var cipherInfos = ciphers.Select(c => (c,
|
|
string.IsNullOrEmpty(revisionDateString) ? null : (DateTime?)c.RevisionDate));
|
|
var sharingUserId = ciphers.First().UserId.Value;
|
|
|
|
await sutProvider.Sut.ShareManyAsync(cipherInfos, organization.Id, collectionIds, sharingUserId);
|
|
await sutProvider.GetDependency<ICipherRepository>().Received(1).UpdateCiphersAsync(sharingUserId,
|
|
Arg.Is<IEnumerable<Cipher>>(arg => arg.Except(ciphers).IsNullOrEmpty()));
|
|
}
|
|
|
|
[Theory]
|
|
[InlineKnownUserCipherAutoData("c64d8a15-606e-41d6-9c7e-174d4d8f3b2e", "c64d8a15-606e-41d6-9c7e-174d4d8f3b2e")]
|
|
[InlineOrganizationCipherAutoData("c64d8a15-606e-41d6-9c7e-174d4d8f3b2e")]
|
|
public async Task RestoreAsync_UpdatesCipher(Guid restoringUserId, Cipher cipher, SutProvider<CipherService> sutProvider)
|
|
{
|
|
sutProvider.GetDependency<ICipherRepository>().GetCanEditByIdAsync(restoringUserId, cipher.Id).Returns(true);
|
|
|
|
var initialRevisionDate = new DateTime(1970, 1, 1, 0, 0, 0);
|
|
cipher.DeletedDate = initialRevisionDate;
|
|
cipher.RevisionDate = initialRevisionDate;
|
|
|
|
await sutProvider.Sut.RestoreAsync(cipher, restoringUserId, cipher.OrganizationId.HasValue);
|
|
|
|
Assert.Null(cipher.DeletedDate);
|
|
Assert.NotEqual(initialRevisionDate, cipher.RevisionDate);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineKnownUserCipherAutoData("c64d8a15-606e-41d6-9c7e-174d4d8f3b2e", "c64d8a15-606e-41d6-9c7e-174d4d8f3b2e")]
|
|
public async Task RestoreManyAsync_UpdatesCiphers(Guid restoringUserId, IEnumerable<CipherDetails> ciphers,
|
|
SutProvider<CipherService> sutProvider)
|
|
{
|
|
var previousRevisionDate = DateTime.UtcNow;
|
|
foreach (var cipher in ciphers)
|
|
{
|
|
cipher.RevisionDate = previousRevisionDate;
|
|
}
|
|
|
|
var revisionDate = previousRevisionDate + TimeSpan.FromMinutes(1);
|
|
sutProvider.GetDependency<ICipherRepository>().RestoreAsync(Arg.Any<IEnumerable<Guid>>(), restoringUserId)
|
|
.Returns(revisionDate);
|
|
|
|
await sutProvider.Sut.RestoreManyAsync(ciphers, restoringUserId);
|
|
|
|
foreach (var cipher in ciphers)
|
|
{
|
|
Assert.Null(cipher.DeletedDate);
|
|
Assert.Equal(revisionDate, cipher.RevisionDate);
|
|
}
|
|
}
|
|
}
|
|
}
|