Bump webpack to 5.94.0 and regenerate yarn.lock

(cherry picked from commit 30c36fdc3baa686102ff124833c7963fc786f251)

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.24.1'
+  majorVersion: '1.24.3'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'

frontend/src/Store/Actions/systemActions.js

@@ -110,7 +110,6 @@ export const defaultState = {
       {
         name: 'actions',
         columnLabel: () => translate('Actions'),
-        isSortable: true,
         isVisible: true,
         isModifiable: false
       }

package.json

@@ -142,7 +142,7 @@
     "ts-loader": "9.4.2",
     "typescript-plugin-css-modules": "5.0.1",
     "url-loader": "4.1.1",
-    "webpack": "5.89.0",
+    "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
     "webpack-livereload-plugin": "3.0.2"
   }

src/NzbDrone.Core/Prowlarr.Core.csproj

@@ -5,6 +5,7 @@
   <ItemGroup>
     <PackageReference Include="AngleSharp.Xml" Version="1.0.0" />
     <PackageReference Include="Dapper" Version="2.0.151" />
+    <PackageReference Include="Diacritical.Net" Version="1.0.4" />
     <PackageReference Include="MailKit" Version="3.6.0" />
     <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.32" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />

src/NzbDrone.Host/Startup.cs

@@ -135,7 +135,7 @@ namespace NzbDrone.Host
                     Name = "apikey",
                     Type = SecuritySchemeType.ApiKey,
                     Scheme = "apiKey",
-                    Description = "Apikey passed as header",
+                    Description = "Apikey passed as query parameter",
                     In = ParameterLocation.Query,
                     Reference = new OpenApiReference
                     {

src/Prowlarr.Api.V1/History/HistoryController.cs

@@ -25,7 +25,13 @@ namespace Prowlarr.Api.V1.History
         public PagingResource<HistoryResource> GetHistory([FromQuery] PagingRequestResource paging, [FromQuery(Name = "eventType")] int[] eventTypes, bool? successful, string downloadId, [FromQuery] int[] indexerIds = null)
         {
             var pagingResource = new PagingResource<HistoryResource>(paging);
-            var pagingSpec = pagingResource.MapToPagingSpec<HistoryResource, NzbDrone.Core.History.History>("date", SortDirection.Descending);
+            var pagingSpec = pagingResource.MapToPagingSpec<HistoryResource, NzbDrone.Core.History.History>(
+                new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+                {
+                    "date"
+                },
+                "date",
+                SortDirection.Descending);
 
             if (eventTypes != null && eventTypes.Any())
             {

src/Prowlarr.Api.V1/Logs/LogController.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
@@ -29,7 +31,11 @@ namespace Prowlarr.Api.V1.Logs
             }
 
             var pagingResource = new PagingResource<LogResource>(paging);
-            var pageSpec = pagingResource.MapToPagingSpec<LogResource, Log>();
+            var pageSpec = pagingResource.MapToPagingSpec<LogResource, Log>(new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+            {
+                "id",
+                "time"
+            });
 
             if (pageSpec.SortKey == "time")
             {

src/Prowlarr.Api.V1/openapi.json

@@ -6373,7 +6373,7 @@
       },
       "apikey": {
         "type": "apiKey",
-        "description": "Apikey passed as header",
+        "description": "Apikey passed as query parameter",
         "name": "apikey",
         "in": "query"
       }

src/Prowlarr.Http/Authentication/AuthenticationBuilderExtensions.cs

@@ -1,12 +1,18 @@
 using System;
+using System.Text.RegularExpressions;
+using Diacritical;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.Extensions.DependencyInjection;
 using NzbDrone.Core.Authentication;
+using NzbDrone.Core.Configuration;
 
 namespace Prowlarr.Http.Authentication
 {
     public static class AuthenticationBuilderExtensions
     {
+        private static readonly Regex CookieNameRegex = new Regex(@"[^a-z0-9]+", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
         public static AuthenticationBuilder AddApiKey(this AuthenticationBuilder authenticationBuilder, string name, Action<ApiKeyAuthenticationOptions> options)
         {
             return authenticationBuilder.AddScheme<ApiKeyAuthenticationOptions, ApiKeyAuthenticationHandler>(name, options);
@@ -29,19 +35,27 @@ namespace Prowlarr.Http.Authentication
 
         public static AuthenticationBuilder AddAppAuthentication(this IServiceCollection services)
         {
-            return services.AddAuthentication()
-                .AddNone(AuthenticationType.None.ToString())
-                .AddExternal(AuthenticationType.External.ToString())
-                .AddBasic(AuthenticationType.Basic.ToString())
-                .AddCookie(AuthenticationType.Forms.ToString(), options =>
+            services.AddOptions<CookieAuthenticationOptions>(AuthenticationType.Forms.ToString())
+                .Configure<IConfigFileProvider>((options, configFileProvider) =>
                 {
-                    options.Cookie.Name = "ProwlarrAuth";
+                    // Replace diacritics and replace non-word characters to ensure cookie name doesn't contain any valid URL characters not allowed in cookie names
+                    var instanceName = configFileProvider.InstanceName;
+                    instanceName = instanceName.RemoveDiacritics();
+                    instanceName = CookieNameRegex.Replace(instanceName, string.Empty);
+
+                    options.Cookie.Name = $"{instanceName}Auth";
                     options.AccessDeniedPath = "/login?loginFailed=true";
                     options.LoginPath = "/login";
                     options.ExpireTimeSpan = TimeSpan.FromDays(7);
                     options.SlidingExpiration = true;
                     options.ReturnUrlParameter = "returnUrl";
-                })
+                });
+
+            return services.AddAuthentication()
+                .AddNone(AuthenticationType.None.ToString())
+                .AddExternal(AuthenticationType.External.ToString())
+                .AddBasic(AuthenticationType.Basic.ToString())
+                .AddCookie(AuthenticationType.Forms.ToString())
                 .AddApiKey("API", options =>
                 {
                     options.HeaderName = "X-Api-Key";

src/Prowlarr.Http/PagingResource.cs

@@ -38,7 +38,11 @@ namespace Prowlarr.Http
 
     public static class PagingResourceMapper
     {
-        public static PagingSpec<TModel> MapToPagingSpec<TResource, TModel>(this PagingResource<TResource> pagingResource, string defaultSortKey = "Id", SortDirection defaultSortDirection = SortDirection.Ascending)
+        public static PagingSpec<TModel> MapToPagingSpec<TResource, TModel>(
+            this PagingResource<TResource> pagingResource,
+            HashSet<string> allowedSortKeys,
+            string defaultSortKey = "id",
+            SortDirection defaultSortDirection = SortDirection.Ascending)
         {
             var pagingSpec = new PagingSpec<TModel>
             {
@@ -48,14 +52,15 @@ namespace Prowlarr.Http
                 SortDirection = pagingResource.SortDirection,
             };
 
-            if (pagingResource.SortKey == null)
-            {
-                pagingSpec.SortKey = defaultSortKey;
-                if (pagingResource.SortDirection == SortDirection.Default)
-                {
-                    pagingSpec.SortDirection = defaultSortDirection;
-                }
-            }
+            pagingSpec.SortKey = pagingResource.SortKey != null &&
+                                 allowedSortKeys is { Count: > 0 } &&
+                                 allowedSortKeys.Contains(pagingResource.SortKey)
+                ? pagingResource.SortKey
+                : defaultSortKey;
+
+            pagingSpec.SortDirection = pagingResource.SortDirection == SortDirection.Default
+                ? defaultSortDirection
+                : pagingResource.SortDirection;
 
             return pagingSpec;
         }