Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 04:05:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add option to disable deprecated legacy authorization options (#13306)

Browse Source
This commit is contained in:
Niels van Velzen 2025-01-11 17:37:13 +01:00 committed by GitHub
parent 3b8e614819
commit fd3057b549
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
View File

@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Jellyfin.Data.Queries; using Jellyfin.Data.Queries;
using Jellyfin.Extensions; using Jellyfin.Extensions;
using MediaBrowser.Controller; using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Devices; using MediaBrowser.Controller.Devices;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;
@ -22,17 +23,20 @@ namespace Jellyfin.Server.Implementations.Security
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IDeviceManager _deviceManager; private readonly IDeviceManager _deviceManager;
private readonly IServerApplicationHost _serverApplicationHost; private readonly IServerApplicationHost _serverApplicationHost;
private readonly IServerConfigurationManager _configurationManager;
public AuthorizationContext( public AuthorizationContext(
IDbContextFactory<JellyfinDbContext> jellyfinDb, IDbContextFactory<JellyfinDbContext> jellyfinDb,
IUserManager userManager, IUserManager userManager,
IDeviceManager deviceManager, IDeviceManager deviceManager,
IServerApplicationHost serverApplicationHost) IServerApplicationHost serverApplicationHost,
IServerConfigurationManager configurationManager)
{ {
_jellyfinDbProvider = jellyfinDb; _jellyfinDbProvider = jellyfinDb;
_userManager = userManager; _userManager = userManager;
_deviceManager = deviceManager; _deviceManager = deviceManager;
_serverApplicationHost = serverApplicationHost; _serverApplicationHost = serverApplicationHost;
_configurationManager = configurationManager;
} }
public Task<AuthorizationInfo> GetAuthorizationInfo(HttpContext requestContext) public Task<AuthorizationInfo> GetAuthorizationInfo(HttpContext requestContext)
@ -85,12 +89,12 @@ namespace Jellyfin.Server.Implementations.Security
auth.TryGetValue("Token", out token); auth.TryGetValue("Token", out token);
} }
if (string.IsNullOrEmpty(token)) if (_configurationManager.Configuration.EnableLegacyAuthorization && string.IsNullOrEmpty(token))
{ {
token = headers["X-Emby-Token"]; token = headers["X-Emby-Token"];
} }
if (string.IsNullOrEmpty(token)) if (_configurationManager.Configuration.EnableLegacyAuthorization && string.IsNullOrEmpty(token))
{ {
token = headers["X-MediaBrowser-Token"]; token = headers["X-MediaBrowser-Token"];
} }
@ -100,8 +104,7 @@ namespace Jellyfin.Server.Implementations.Security
token = queryString["ApiKey"]; token = queryString["ApiKey"];
} }
// TODO deprecate this query parameter. if (_configurationManager.Configuration.EnableLegacyAuthorization && string.IsNullOrEmpty(token))
if (string.IsNullOrEmpty(token))
{ {
token = queryString["api_key"]; token = queryString["api_key"];
} }
@ -128,10 +131,7 @@ namespace Jellyfin.Server.Implementations.Security
await using (dbContext.ConfigureAwait(false)) await using (dbContext.ConfigureAwait(false))
{ {
var device = _deviceManager.GetDevices( var device = _deviceManager.GetDevices(
new DeviceQuery new DeviceQuery { AccessToken = token }).Items.FirstOrDefault();
{
AccessToken = token
}).Items.FirstOrDefault();
if (device is not null) if (device is not null)
{ {
@ -227,13 +227,13 @@ namespace Jellyfin.Server.Implementations.Security
/// </summary> /// </summary>
/// <param name="httpReq">The HTTP request.</param> /// <param name="httpReq">The HTTP request.</param>
/// <returns>Dictionary{System.StringSystem.String}.</returns> /// <returns>Dictionary{System.StringSystem.String}.</returns>
private static Dictionary<string, string>? GetAuthorizationDictionary(HttpRequest httpReq) private Dictionary<string, string>? GetAuthorizationDictionary(HttpRequest httpReq)
{ {
var auth = httpReq.Headers["X-Emby-Authorization"]; var auth = httpReq.Headers[HeaderNames.Authorization];
if (string.IsNullOrEmpty(auth)) if (_configurationManager.Configuration.EnableLegacyAuthorization && string.IsNullOrEmpty(auth))
{ {
auth = httpReq.Headers[HeaderNames.Authorization]; auth = httpReq.Headers["X-Emby-Authorization"];
} }
return auth.Count > 0 ? GetAuthorization(auth[0]) : null; return auth.Count > 0 ? GetAuthorization(auth[0]) : null;
@ -244,7 +244,7 @@ namespace Jellyfin.Server.Implementations.Security
/// </summary> /// </summary>
/// <param name="authorizationHeader">The authorization header.</param> /// <param name="authorizationHeader">The authorization header.</param>
/// <returns>Dictionary{System.StringSystem.String}.</returns> /// <returns>Dictionary{System.StringSystem.String}.</returns>
private static Dictionary<string, string>? GetAuthorization(ReadOnlySpan<char> authorizationHeader) private Dictionary<string, string>? GetAuthorization(ReadOnlySpan<char> authorizationHeader)
{ {
var firstSpace = authorizationHeader.IndexOf(' '); var firstSpace = authorizationHeader.IndexOf(' ');
@ -256,8 +256,10 @@ namespace Jellyfin.Server.Implementations.Security
var name = authorizationHeader[..firstSpace]; var name = authorizationHeader[..firstSpace];
if (!name.Equals("MediaBrowser", StringComparison.OrdinalIgnoreCase) var validName = name.Equals("MediaBrowser", StringComparison.OrdinalIgnoreCase);
&& !name.Equals("Emby", StringComparison.OrdinalIgnoreCase)) validName = validName || (_configurationManager.Configuration.EnableLegacyAuthorization && name.Equals("Emby", StringComparison.OrdinalIgnoreCase));
if (!validName)
{ {
return null; return null;
} }

5
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -276,4 +276,9 @@ public class ServerConfiguration : BaseApplicationConfiguration
/// </summary> /// </summary>
/// <value>The trickplay options.</value> /// <value>The trickplay options.</value>
public TrickplayOptions TrickplayOptions { get; set; } = new TrickplayOptions(); public TrickplayOptions TrickplayOptions { get; set; } = new TrickplayOptions();
/// <summary>
/// Gets or sets a value indicating whether old authorization methods are allowed.
/// </summary>
public bool EnableLegacyAuthorization { get; set; } = true;
} }