michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove api key check and simplify conditions

Browse Source
This commit is contained in:
Bill Thornton 2024-05-31 16:31:15 -04:00
parent 7221e7ca68
commit ed1b880359
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jellyfin.Api/Auth/FirstTimeSetupPolicy/FirstTimeSetupHandler.cs
View File

@ -31,20 +31,20 @@ namespace Jellyfin.Api.Auth.FirstTimeSetupPolicy
context.Succeed(requirement); context.Succeed(requirement);
} }
// Succeed if user is admin or api key // Succeed if user is admin
else if (context.User.GetIsApiKey() || context.User.IsInRole(UserRoles.Administrator)) else if (context.User.IsInRole(UserRoles.Administrator))
{ {
context.Succeed(requirement); context.Succeed(requirement);
} }
// Fail if admin is required and user is not admin // Fail if admin is required and user is not admin
else if (requirement.RequireAdmin && !context.User.IsInRole(UserRoles.Administrator)) else if (requirement.RequireAdmin)
{ {
context.Fail(); context.Fail();
} }
// Succeed if admin is not required and user is not guest // Succeed if admin is not required and user is not guest
else if (!requirement.RequireAdmin && context.User.IsInRole(UserRoles.User)) else if (context.User.IsInRole(UserRoles.User))
{ {
context.Succeed(requirement); context.Succeed(requirement);
} }

10
tests/Jellyfin.Api.Tests/Auth/FirstTimeSetupPolicy/FirstTimeSetupHandlerTests.cs
View File

@ -106,16 +106,6 @@ namespace Jellyfin.Api.Tests.Auth.FirstTimeSetupPolicy
Assert.Equal(shouldSucceed, allowed.Succeeded); Assert.Equal(shouldSucceed, allowed.Succeeded);
} }
[Fact]
public async Task ShouldAllowAdminApiKeyIfStartupWizardComplete()
{
TestHelpers.SetupConfigurationManager(_configurationManagerMock, true);
var claims = new ClaimsPrincipal(new ClaimsIdentity([new Claim(InternalClaimTypes.IsApiKey, bool.TrueString)]));
var allowed = await _authorizationService.AuthorizeAsync(claims, "FirstTime");
Assert.True(allowed.Succeeded);
}
[Fact] [Fact]
public async Task ShouldDisallowUserIfOutsideSchedule() public async Task ShouldDisallowUserIfOutsideSchedule()
{ {