mirror of
https://github.com/bitwarden/server.git
synced 2024-11-22 12:15:36 +01:00
5537470703
* Get limited life attachment download URL This change limits url download to a 1min lifetime. This requires moving to a new container to allow for non-public blob access. Clients will have to call GetAttachmentData api function to receive the download URL. For backwards compatibility, attachment URLs are still present, but will not work for attachments stored in non-public access blobs. * Make GlobalSettings interface for testing * Test LocalAttachmentStorageService equivalence * Remove comment * Add missing globalSettings using * Simplify default attachment container * Default to attachments containe for existing methods A new upload method will be made for uploading to attachments-v2. For compatibility for clients which don't use these new methods, we need to still use the old container. The new container will be used only for new uploads * Remove Default MetaData fixture. * Keep attachments container blob-level security for all instances * Close unclosed FileStream * Favor default value for noop services
80 lines
2.2 KiB
C#
80 lines
2.2 KiB
C#
using System;
|
|
using System.Threading.Tasks;
|
|
using Amazon.SQS;
|
|
using Bit.Core.Services;
|
|
using Bit.Core.Settings;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
|
|
namespace Bit.Core.Test.Services
|
|
{
|
|
public class AmazonSqsBlockIpServiceTests : IDisposable
|
|
{
|
|
private readonly AmazonSqsBlockIpService _sut;
|
|
|
|
private readonly GlobalSettings _globalSettings;
|
|
private readonly IAmazonSQS _amazonSqs;
|
|
|
|
public AmazonSqsBlockIpServiceTests()
|
|
{
|
|
_globalSettings = new GlobalSettings
|
|
{
|
|
Amazon =
|
|
{
|
|
AccessKeyId = "AccessKeyId-AmazonSesMailDeliveryServiceTests",
|
|
AccessKeySecret = "AccessKeySecret-AmazonSesMailDeliveryServiceTests",
|
|
Region = "Region-AmazonSesMailDeliveryServiceTests"
|
|
}
|
|
};
|
|
|
|
_amazonSqs = Substitute.For<IAmazonSQS>();
|
|
|
|
_sut = new AmazonSqsBlockIpService(_globalSettings, _amazonSqs);
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
_sut?.Dispose();
|
|
}
|
|
|
|
[Fact]
|
|
public async Task BlockIpAsync_UnblockCalled_WhenNotPermanent()
|
|
{
|
|
const string expectedIp = "ip";
|
|
|
|
await _sut.BlockIpAsync(expectedIp, false);
|
|
|
|
await _amazonSqs.Received(2).SendMessageAsync(
|
|
Arg.Any<string>(),
|
|
Arg.Is(expectedIp));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task BlockIpAsync_UnblockNotCalled_WhenPermanent()
|
|
{
|
|
const string expectedIp = "ip";
|
|
|
|
await _sut.BlockIpAsync(expectedIp, true);
|
|
|
|
await _amazonSqs.Received(1).SendMessageAsync(
|
|
Arg.Any<string>(),
|
|
Arg.Is(expectedIp));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task BlockIpAsync_NotBlocked_WhenAlreadyBlockedRecently()
|
|
{
|
|
const string expectedIp = "ip";
|
|
|
|
await _sut.BlockIpAsync(expectedIp, true);
|
|
|
|
// The second call should hit the already blocked guard clause
|
|
await _sut.BlockIpAsync(expectedIp, true);
|
|
|
|
await _amazonSqs.Received(1).SendMessageAsync(
|
|
Arg.Any<string>(),
|
|
Arg.Is(expectedIp));
|
|
}
|
|
}
|
|
}
|