mirror of
https://github.com/bitwarden/server.git
synced 2024-11-30 13:33:24 +01:00
4377c7a897
* Rewrite Icon fetching * Move validation to IconUri, Uri, or UriBuilder * `dotnet format` 🤖 * PR suggestions * Add not null compiler hint * Add twitter to test case * Move Uri manipulation to UriService * Implement MockedHttpClient Presents better, fluent handling of message matching and response building. * Add redirect handling tests * Add testing to models * More aggressively dispose content in icon link * Format 🤖 * Update icon lockfile * Convert to cloned stream for HttpResponseBuilder Content was being disposed when HttResponseMessage was being disposed. This avoids losing our reference to our content and allows multiple usages of the same `MockedHttpMessageResponse` * Move services to extension Extension is shared by testing and allows access to services from our service tests * Remove unused `using` * Prefer awaiting asyncs for better exception handling * `dotnet format` 🤖 * Await async * Update tests to use test TLD and ip ranges * Remove unused interfaces * Make assignments static when possible * Prefer invariant comparer to downcasing * Prefer injecting interface services to implementations * Prefer comparer set in HashSet initialization * Allow SVG icons * Filter out icons with unknown formats * Seek to beginning of MemoryStream after writing it * More appropriate to not return icon if it's invalid * Add svg icon test
39 lines
1.4 KiB
C#
39 lines
1.4 KiB
C#
using System.Net;
|
|
using Bit.Icons.Models;
|
|
using Bit.Icons.Services;
|
|
using Bit.Test.Common.MockedHttpClient;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using Microsoft.Net.Http.Headers;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
|
|
namespace Bit.Icons.Test.Models;
|
|
|
|
public class IconHttpRequestTests
|
|
{
|
|
[Fact]
|
|
public async Task FetchAsync_FollowsTwoRedirectsAsync()
|
|
{
|
|
var handler = new MockedHttpMessageHandler();
|
|
|
|
var request = handler
|
|
.Fallback
|
|
.WithStatusCode(HttpStatusCode.Redirect)
|
|
.WithContent("text/html", "<html><head><title>Redirect 2</title></head><body><a href=\"https://icon.test\">Redirect 3</a></body></html>")
|
|
.WithHeader(HeaderNames.Location, "https://icon.test");
|
|
|
|
var clientFactory = Substitute.For<IHttpClientFactory>();
|
|
clientFactory.CreateClient("Icons").Returns(handler.ToHttpClient());
|
|
|
|
var uriService = Substitute.For<IUriService>();
|
|
uriService.TryGetUri(Arg.Any<Uri>(), out Arg.Any<IconUri>()).Returns(x =>
|
|
{
|
|
x[1] = new IconUri(new Uri("https://icon.test"), IPAddress.Parse("192.0.2.1"));
|
|
return true;
|
|
});
|
|
var result = await IconHttpRequest.FetchAsync(new Uri("https://icon.test"), NullLogger<IIconFetchingService>.Instance, clientFactory, uriService);
|
|
|
|
Assert.Equal(3, request.NumberOfResponses); // Initial + 2 redirects
|
|
}
|
|
}
|