# Conflicts: # Directory.Packages.props # build/azure-pipelines.yml # src/Umbraco.Core/MonitorLock.cs # src/Umbraco.PublishedCache.NuCache/ContentStore.cs # src/Umbraco.PublishedCache.NuCache/DependencyInjection/UmbracoBuilderExtensions.cs # src/Umbraco.PublishedCache.NuCache/SnapDictionary.cs # src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs # src/Umbraco.Web.UI.Client~v14_dev # tests/Umbraco.Tests.AcceptanceTest/package-lock.json # tests/Umbraco.Tests.AcceptanceTest/package.json # tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowAtRoot.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowVaryByCulture.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedTemplates.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithListViewContent.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/ListViewMedia.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/CreatedPackages.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/PackagesPackages.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithApprovedColor.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithCheckboxList.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithContentPicker.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithDatePicker.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithDropdown.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithImageCropper.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithNumeric.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithRadiobox.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithTags.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithTextarea.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithTextstring.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RenderingContent/RenderingContentWithTrueFalse.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeTemplatesTab.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/ContentStartNodes.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/MediaStartNodes.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/User/UICulture.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentStartNodes.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MediaStartNodes.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/MemberSection.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts # tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/UserGroups.spec.ts
117 lines
4.4 KiB
C#
117 lines
4.4 KiB
C#
using System.Globalization;
|
|
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.AspNetCore.Http.Headers;
|
|
using Microsoft.Extensions.Options;
|
|
using Microsoft.Net.Http.Headers;
|
|
using SixLabors.ImageSharp.Formats.Webp;
|
|
using SixLabors.ImageSharp.Web.Commands;
|
|
using SixLabors.ImageSharp.Web.Middleware;
|
|
using SixLabors.ImageSharp.Web.Processors;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
|
|
namespace Umbraco.Cms.Imaging.ImageSharp;
|
|
|
|
/// <summary>
|
|
/// Configures the ImageSharp middleware options.
|
|
/// </summary>
|
|
/// <seealso cref="IConfigureOptions{ImageSharpMiddlewareOptions}" />
|
|
public sealed class ConfigureImageSharpMiddlewareOptions : IConfigureOptions<ImageSharpMiddlewareOptions>
|
|
{
|
|
private readonly Configuration _configuration;
|
|
private readonly ImagingSettings _imagingSettings;
|
|
|
|
/// <summary>
|
|
/// Initializes a new instance of the <see cref="ConfigureImageSharpMiddlewareOptions" /> class.
|
|
/// </summary>
|
|
/// <param name="configuration">The ImageSharp configuration.</param>
|
|
/// <param name="imagingSettings">The Umbraco imaging settings.</param>
|
|
public ConfigureImageSharpMiddlewareOptions(Configuration configuration, IOptions<ImagingSettings> imagingSettings)
|
|
{
|
|
_configuration = configuration;
|
|
_imagingSettings = imagingSettings.Value;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public void Configure(ImageSharpMiddlewareOptions options)
|
|
{
|
|
options.Configuration = _configuration;
|
|
|
|
options.HMACSecretKey = _imagingSettings.HMACSecretKey;
|
|
options.BrowserMaxAge = _imagingSettings.Cache.BrowserMaxAge;
|
|
options.CacheMaxAge = _imagingSettings.Cache.CacheMaxAge;
|
|
options.CacheHashLength = _imagingSettings.Cache.CacheHashLength;
|
|
|
|
// Use configurable maximum width and height
|
|
options.OnParseCommandsAsync = context =>
|
|
{
|
|
if (context.Commands.Count == 0 || _imagingSettings.HMACSecretKey.Length > 0)
|
|
{
|
|
// Nothing to parse or using HMAC authentication
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
if (context.Commands.Contains(ResizeWebProcessor.Width))
|
|
{
|
|
if (!int.TryParse(
|
|
context.Commands.GetValueOrDefault(ResizeWebProcessor.Width),
|
|
NumberStyles.Integer,
|
|
CultureInfo.InvariantCulture,
|
|
out var width)
|
|
|| width < 0
|
|
|| width >= _imagingSettings.Resize.MaxWidth)
|
|
{
|
|
context.Commands.Remove(ResizeWebProcessor.Width);
|
|
}
|
|
}
|
|
|
|
if (context.Commands.Contains(ResizeWebProcessor.Height))
|
|
{
|
|
if (!int.TryParse(
|
|
context.Commands.GetValueOrDefault(ResizeWebProcessor.Height),
|
|
NumberStyles.Integer,
|
|
CultureInfo.InvariantCulture,
|
|
out var height)
|
|
|| height < 0
|
|
|| height >= _imagingSettings.Resize.MaxHeight)
|
|
{
|
|
context.Commands.Remove(ResizeWebProcessor.Height);
|
|
}
|
|
}
|
|
|
|
return Task.CompletedTask;
|
|
};
|
|
|
|
// Change Cache-Control header when cache buster value is present
|
|
options.OnPrepareResponseAsync = context =>
|
|
{
|
|
if (context.Request.Query.ContainsKey("rnd") || context.Request.Query.ContainsKey("v"))
|
|
{
|
|
ResponseHeaders headers = context.Response.GetTypedHeaders();
|
|
|
|
CacheControlHeaderValue cacheControl = headers.CacheControl ?? new CacheControlHeaderValue()
|
|
{
|
|
Public = true
|
|
};
|
|
|
|
// ImageSharp enables cache revalidation by default, so disable and add immutable directive
|
|
cacheControl.MustRevalidate = false;
|
|
cacheControl.Extensions.Add(new NameValueHeaderValue("immutable"));
|
|
|
|
// Set updated value
|
|
headers.CacheControl = cacheControl;
|
|
}
|
|
|
|
return Task.CompletedTask;
|
|
};
|
|
|
|
options.Configuration.ImageFormatsManager.SetEncoder(
|
|
WebpFormat.Instance,
|
|
new WebpEncoder
|
|
{
|
|
// Default to Lossy encoding like in ImageSharp 2.x.
|
|
// ImageSharp 3.x seems to use Lossless for PNGs which creates files 10x larger than Lossy.
|
|
FileFormat = WebpFileFormatType.Lossy,
|
|
});
|
|
}
|
|
}
|