mirror of
https://github.com/Prowlarr/Prowlarr
synced 2025-12-06 08:34:28 +01:00
Sync UiAuthorizationPolicyProvider with upstream
* Revert "Fixed: Fallback to Forms for removed Basic auth method"
This reverts commit fe198352a3.
* AuthPolicy Var fixes
This commit is contained in:
parent
83754ff349
commit
93a1fd0759
1 changed files with 2 additions and 19 deletions
|
|
@ -2,8 +2,6 @@
|
|||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.Extensions.Options;
|
||||
using NLog;
|
||||
using NzbDrone.Core.Authentication;
|
||||
using NzbDrone.Core.Configuration;
|
||||
|
||||
namespace Prowlarr.Http.Authentication
|
||||
|
|
@ -12,17 +10,14 @@ public class UiAuthorizationPolicyProvider : IAuthorizationPolicyProvider
|
|||
{
|
||||
private const string PolicyName = "UI";
|
||||
private readonly IConfigFileProvider _config;
|
||||
private readonly Logger _logger;
|
||||
|
||||
public DefaultAuthorizationPolicyProvider FallbackPolicyProvider { get; }
|
||||
|
||||
public UiAuthorizationPolicyProvider(IOptions<AuthorizationOptions> options,
|
||||
IConfigFileProvider config,
|
||||
Logger logger)
|
||||
IConfigFileProvider config)
|
||||
{
|
||||
FallbackPolicyProvider = new DefaultAuthorizationPolicyProvider(options);
|
||||
_config = config;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public Task<AuthorizationPolicy> GetDefaultPolicyAsync() => FallbackPolicyProvider.GetDefaultPolicyAsync();
|
||||
|
|
@ -33,19 +28,7 @@ public Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
|
|||
{
|
||||
if (policyName.Equals(PolicyName, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var authenticationMethod = _config.AuthenticationMethod;
|
||||
|
||||
#pragma warning disable CS0618 // Type or member is obsolete
|
||||
if (authenticationMethod == AuthenticationType.Basic)
|
||||
#pragma warning restore CS0618 // Type or member is obsolete
|
||||
{
|
||||
_logger.Error("Basic authentication method was removed, use Forms authentication instead.");
|
||||
|
||||
authenticationMethod = AuthenticationType.Forms;
|
||||
}
|
||||
|
||||
var policy = new AuthorizationPolicyBuilder()
|
||||
.AddAuthenticationSchemes(authenticationMethod.ToString())
|
||||
var policy = new AuthorizationPolicyBuilder(_config.AuthenticationMethod.ToString())
|
||||
.AddRequirements(new BypassableDenyAnonymousAuthorizationRequirement());
|
||||
|
||||
return Task.FromResult(policy.Build());
|
||||
|
|
|
|||
Loading…
Reference in a new issue