mirror of
https://github.com/bitwarden/server.git
synced 2024-11-25 12:45:18 +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
86 lines
2.5 KiB
C#
86 lines
2.5 KiB
C#
using System.Net;
|
|
using AngleSharp.Dom;
|
|
using Bit.Icons.Models;
|
|
using Bit.Icons.Services;
|
|
using Microsoft.Extensions.Logging;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
|
|
namespace Bit.Icons.Test.Models;
|
|
|
|
public class IconLinkTests
|
|
{
|
|
private readonly IElement _element;
|
|
private readonly Uri _uri = new("https://icon.test");
|
|
private readonly ILogger<IIconFetchingService> _logger = Substitute.For<ILogger<IIconFetchingService>>();
|
|
private readonly IHttpClientFactory _httpClientFactory;
|
|
private readonly IUriService _uriService;
|
|
private readonly string _baseUrlPath = "/";
|
|
|
|
public IconLinkTests()
|
|
{
|
|
_element = Substitute.For<IElement>();
|
|
_httpClientFactory = Substitute.For<IHttpClientFactory>();
|
|
_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;
|
|
});
|
|
}
|
|
|
|
[Fact]
|
|
public void WithNoHref_IsNotUsable()
|
|
{
|
|
_element.GetAttribute("href").Returns(string.Empty);
|
|
|
|
var result = new IconLink(_element, _uri, _baseUrlPath).IsUsable();
|
|
|
|
Assert.False(result);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(null, false)]
|
|
[InlineData("", false)]
|
|
[InlineData(" ", false)]
|
|
[InlineData("unusable", false)]
|
|
[InlineData("ico", true)]
|
|
public void WithNoRel_IsUsable(string extension, bool expectedResult)
|
|
{
|
|
SetAttributeValue("href", $"/favicon.{extension}");
|
|
|
|
var result = new IconLink(_element, _uri, _baseUrlPath).IsUsable();
|
|
|
|
Assert.Equal(expectedResult, result);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("icon", true)]
|
|
[InlineData("stylesheet", false)]
|
|
public void WithRel_IsUsable(string rel, bool expectedResult)
|
|
{
|
|
SetAttributeValue("href", "/favicon.ico");
|
|
SetAttributeValue("rel", rel);
|
|
|
|
var result = new IconLink(_element, _uri, _baseUrlPath).IsUsable();
|
|
|
|
Assert.Equal(expectedResult, result);
|
|
}
|
|
|
|
[Fact]
|
|
public void FetchAsync_Unvalidated_ReturnsNull()
|
|
{
|
|
var result = new IconLink(_element, _uri, _baseUrlPath).FetchAsync(_logger, _httpClientFactory, _uriService);
|
|
|
|
Assert.Null(result.Result);
|
|
}
|
|
|
|
private void SetAttributeValue(string attribute, string value)
|
|
{
|
|
var attr = Substitute.For<IAttr>();
|
|
attr.Value.Returns(value);
|
|
|
|
_element.Attributes[attribute].Returns(attr);
|
|
}
|
|
}
|