joshpatra/allstarr
1
0
Fork 0
mirror of https://github.com/SoPat712/allstarr.git synced 2026-02-09 23:55:10 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: forward client auth headers for login

Browse Source
This commit is contained in:
Josh Patra
2026-01-30 22:09:09 -05:00
parent a339574f05
commit 6176777d0f
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
allstarr/Services/Jellyfin/JellyfinProxyService.cs
View File

@@ -297,8 +297,10 @@ public class JellyfinProxyService
{ {
if (header.Key.Equals("X-Emby-Authorization", StringComparison.OrdinalIgnoreCase)) if (header.Key.Equals("X-Emby-Authorization", StringComparison.OrdinalIgnoreCase))
{ {
request.Headers.TryAddWithoutValidation("X-Emby-Authorization", header.Value.ToString()); var headerValue = header.Value.ToString();
request.Headers.TryAddWithoutValidation("X-Emby-Authorization", headerValue);
authHeaderAdded = true; authHeaderAdded = true;
_logger.LogDebug("Forwarded X-Emby-Authorization from client");
break; break;
} }
} }
@@ -309,21 +311,38 @@ public class JellyfinProxyService
{ {
if (header.Key.Equals("Authorization", StringComparison.OrdinalIgnoreCase)) if (header.Key.Equals("Authorization", StringComparison.OrdinalIgnoreCase))
{ {
request.Headers.TryAddWithoutValidation("Authorization", header.Value.ToString()); var headerValue = header.Value.ToString();
// Check if it's MediaBrowser/Jellyfin format
if (headerValue.Contains("MediaBrowser", StringComparison.OrdinalIgnoreCase) ||
headerValue.Contains("Client=", StringComparison.OrdinalIgnoreCase))
{
// Forward as X-Emby-Authorization
request.Headers.TryAddWithoutValidation("X-Emby-Authorization", headerValue);
_logger.LogDebug("Converted Authorization to X-Emby-Authorization");
}
else
{
// Standard Bearer token
request.Headers.TryAddWithoutValidation("Authorization", headerValue);
_logger.LogDebug("Forwarded Authorization header");
}
authHeaderAdded = true; authHeaderAdded = true;
break; break;
} }
} }
} }
// For login requests without auth headers, provide a minimal client auth header // For non-auth requests without headers, use API key
if (!authHeaderAdded) // For auth requests, client MUST provide their own client info
if (!authHeaderAdded && !endpoint.Contains("Authenticate", StringComparison.OrdinalIgnoreCase))
{ {
var clientAuthHeader = $"MediaBrowser Client=\"{_settings.ClientName}\", " + var clientAuthHeader = $"MediaBrowser Client=\"{_settings.ClientName}\", " +
$"Device=\"{_settings.DeviceName}\", " + $"Device=\"{_settings.DeviceName}\", " +
$"DeviceId=\"{_settings.DeviceId}\", " + $"DeviceId=\"{_settings.DeviceId}\", " +
$"Version=\"{_settings.ClientVersion}\""; $"Version=\"{_settings.ClientVersion}\"";
request.Headers.TryAddWithoutValidation("X-Emby-Authorization", clientAuthHeader); request.Headers.TryAddWithoutValidation("X-Emby-Authorization", clientAuthHeader);
_logger.LogDebug("Using server API key for non-auth request");
} }
request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));