Implements Public Access in netcore (#10137)
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* bah, far out this keeps getting recommitted. sorry
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-20 15:11:45 +10:00
|
|
|
using System.Collections.Generic;
|
|
|
|
|
using System.Threading.Tasks;
|
|
|
|
|
using Microsoft.Extensions.Configuration;
|
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
|
using SixLabors.ImageSharp.Memory;
|
|
|
|
|
using SixLabors.ImageSharp.Web.Caching;
|
|
|
|
|
using SixLabors.ImageSharp.Web.Commands;
|
|
|
|
|
using SixLabors.ImageSharp.Web.DependencyInjection;
|
|
|
|
|
using SixLabors.ImageSharp.Web.Processors;
|
|
|
|
|
using SixLabors.ImageSharp.Web.Providers;
|
|
|
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
|
|
|
using Umbraco.Cms.Core.DependencyInjection;
|
2021-07-08 13:48:44 +02:00
|
|
|
using Umbraco.Cms.Web.Common.ImageProcessors;
|
Implements Public Access in netcore (#10137)
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* bah, far out this keeps getting recommitted. sorry
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-20 15:11:45 +10:00
|
|
|
|
|
|
|
|
namespace Umbraco.Extensions
|
|
|
|
|
{
|
|
|
|
|
public static partial class UmbracoBuilderExtensions
|
|
|
|
|
{
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Adds Image Sharp with Umbraco settings
|
|
|
|
|
/// </summary>
|
|
|
|
|
public static IServiceCollection AddUmbracoImageSharp(this IUmbracoBuilder builder)
|
|
|
|
|
{
|
|
|
|
|
IConfiguration configuration = builder.Config;
|
|
|
|
|
IServiceCollection services = builder.Services;
|
|
|
|
|
|
|
|
|
|
ImagingSettings imagingSettings = configuration.GetSection(Cms.Core.Constants.Configuration.ConfigImaging)
|
|
|
|
|
.Get<ImagingSettings>() ?? new ImagingSettings();
|
|
|
|
|
|
|
|
|
|
services.AddImageSharp(options =>
|
|
|
|
|
{
|
|
|
|
|
options.Configuration = SixLabors.ImageSharp.Configuration.Default;
|
|
|
|
|
options.BrowserMaxAge = imagingSettings.Cache.BrowserMaxAge;
|
|
|
|
|
options.CacheMaxAge = imagingSettings.Cache.CacheMaxAge;
|
|
|
|
|
options.CachedNameLength = imagingSettings.Cache.CachedNameLength;
|
|
|
|
|
options.OnParseCommandsAsync = context =>
|
|
|
|
|
{
|
|
|
|
|
RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Width, imagingSettings.Resize.MaxWidth);
|
|
|
|
|
RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Height, imagingSettings.Resize.MaxHeight);
|
|
|
|
|
|
|
|
|
|
return Task.CompletedTask;
|
|
|
|
|
};
|
|
|
|
|
options.OnBeforeSaveAsync = _ => Task.CompletedTask;
|
|
|
|
|
options.OnProcessedAsync = _ => Task.CompletedTask;
|
|
|
|
|
options.OnPrepareResponseAsync = _ => Task.CompletedTask;
|
|
|
|
|
})
|
|
|
|
|
.SetRequestParser<QueryCollectionRequestParser>()
|
|
|
|
|
.Configure<PhysicalFileSystemCacheOptions>(options =>
|
|
|
|
|
{
|
|
|
|
|
options.CacheFolder = imagingSettings.Cache.CacheFolder;
|
|
|
|
|
})
|
|
|
|
|
.SetCache<PhysicalFileSystemCache>()
|
|
|
|
|
.SetCacheHash<CacheHash>()
|
2021-07-09 09:26:19 +02:00
|
|
|
.ClearProcessors()
|
2021-07-09 08:13:49 +02:00
|
|
|
.RemoveProcessor<ResizeWebProcessor>() // The Resize processor is added by default, so remove it to ensure that the crop processor runs first
|
2021-07-08 13:48:44 +02:00
|
|
|
.AddProcessor<CropWebProcessor>()
|
Implements Public Access in netcore (#10137)
* Getting new netcore PublicAccessChecker in place
* Adds full test coverage for PublicAccessChecker
* remove PublicAccessComposer
* adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller
* Implements the required methods on IMemberManager, removes old migrated code
* Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops
* adds note
* adds note
* Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling.
* Changes name to IUmbracoEndpointBuilder
* adds note
* Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect
* fixing build
* Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware.
* adds note
* removes unused filter, fixes build
* fixes WebPath and tests
* Looks up entities in one query
* remove usings
* Fix test, remove stylesheet
* Set status code before we write to response to avoid error
* Ensures that users and members are validated when logging in. Shares more code between users and members.
* Fixes RepositoryCacheKeys to ensure the keys are normalized
* oops didn't mean to commit this
* Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy
* bah, far out this keeps getting recommitted. sorry
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-20 15:11:45 +10:00
|
|
|
.AddProcessor<ResizeWebProcessor>()
|
|
|
|
|
.AddProcessor<FormatWebProcessor>()
|
|
|
|
|
.AddProcessor<BackgroundColorWebProcessor>();
|
|
|
|
|
|
|
|
|
|
return services;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static void RemoveIntParamenterIfValueGreatherThen(IDictionary<string, string> commands, string parameter, int maxValue)
|
|
|
|
|
{
|
|
|
|
|
if (commands.TryGetValue(parameter, out var command))
|
|
|
|
|
{
|
|
|
|
|
if (int.TryParse(command, out var i))
|
|
|
|
|
{
|
|
|
|
|
if (i > maxValue)
|
|
|
|
|
{
|
|
|
|
|
commands.Remove(parameter);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|