unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests 2 Packages Projects Releases Wiki Activity

Append base URL if the published server URL override omits it. Fleshed out unit tests to cover that and https->http reverse proxy scenario(s).

Browse Source
This commit is contained in:
WizardOfYendor1
2026-07-17 10:50:53 -04:00
parent 6f189bf2b8
commit 97e666c566
2 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jellyfin.Api/Helpers/MediaInfoHelper.cs
+15 -6
View File
@@ -555,11 +555,6 @@ public class MediaInfoHelper
return;
}
if (mediaSource.Protocol != MediaProtocol.Http)
{
return;
}
var baseUrl = _serverConfigurationManager.GetNetworkConfiguration().BaseUrl;
var publishedPath = GetPublishedLiveStreamPath(_appHost.GetSmartApiUrl(request), mediaSource.Path, mediaSource.Protocol, baseUrl);
@@ -613,6 +608,20 @@ public class MediaInfoHelper
return null;
}
return smartApiUrl.TrimEnd('/') + relativePath;
var prefix = smartApiUrl.TrimEnd('/');
if (!string.IsNullOrEmpty(baseUrl))
{
var includesBaseUrl = Uri.TryCreate(prefix, UriKind.Absolute, out var publishedUri)
&& Uri.UnescapeDataString(publishedUri.AbsolutePath)
.TrimEnd('/')
.EndsWith(baseUrl, StringComparison.OrdinalIgnoreCase);
if (!includesBaseUrl)
{
prefix += baseUrl;
}
}
return prefix + relativePath;
}
}
tests/Jellyfin.Api.Tests/Helpers/MediaInfoHelperTests.cs
+42
View File
@@ -433,6 +433,48 @@ namespace Jellyfin.Api.Tests.Helpers
MediaProtocol.Http,
"",
"https://media.example.com" + LiveStreamFilesPath)]
[InlineData(
"https://media.example.com",
"https://172.19.0.3:8920" + LiveStreamFilesPath,
MediaProtocol.Http,
"",
"https://media.example.com" + LiveStreamFilesPath)]
[InlineData(
"https://media.example.com",
"http://192.168.1.10:8096" + LiveStreamFilesPath,
MediaProtocol.Http,
"",
"https://media.example.com" + LiveStreamFilesPath)]
[InlineData(
"https://media.example.com:8920",
"http://172.19.0.3:8096" + LiveStreamFilesPath,
MediaProtocol.Http,
"",
"https://media.example.com:8920" + LiveStreamFilesPath)]
[InlineData(
"https://media.example.com",
"http://172.19.0.3:8096/jellyfin" + LiveStreamFilesPath,
MediaProtocol.Http,
"/jellyfin",
"https://media.example.com/jellyfin" + LiveStreamFilesPath)]
[InlineData(
"https://jellyfin",
"http://172.19.0.3:8096/jellyfin" + LiveStreamFilesPath,
MediaProtocol.Http,
"/jellyfin",
"https://jellyfin/jellyfin" + LiveStreamFilesPath)]
[InlineData(
"https://media.example.com/jellyfin",
"http://172.19.0.3:8096/jellyfin" + LiveStreamFilesPath,
MediaProtocol.Http,
"/jellyfin",
"https://media.example.com/jellyfin" + LiveStreamFilesPath)]
[InlineData(
"https://media.example.com/jellyfin/",
"http://172.19.0.3:8096/jellyfin" + LiveStreamFilesPath,
MediaProtocol.Http,
"/jellyfin",
"https://media.example.com/jellyfin" + LiveStreamFilesPath)]
[InlineData(
"https://media.example.com",
"http://172.19.0.3:8096/jellyfin2" + LiveStreamFilesPath,