Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify baseUrl check

Browse Source
This commit is contained in:
crobibero 2021-04-14 06:44:11 -06:00
parent b11718a01d
commit 78791a932f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jellyfin.Server/Middleware/BaseUrlRedirectionMiddleware.cs
View File

@ -47,7 +47,9 @@ namespace Jellyfin.Server.Middleware
if (!string.IsNullOrEmpty(baseUrlPrefix)) if (!string.IsNullOrEmpty(baseUrlPrefix))
{ {
if (!localPath.StartsWith(baseUrlPrefix, StringComparison.OrdinalIgnoreCase) var startsWithBaseUrl = localPath.StartsWith(baseUrlPrefix, StringComparison.OrdinalIgnoreCase);
if (!startsWithBaseUrl
&& localPath.EndsWith("/health", StringComparison.OrdinalIgnoreCase)) && localPath.EndsWith("/health", StringComparison.OrdinalIgnoreCase))
{ {
_logger.LogDebug("Redirecting /health check"); _logger.LogDebug("Redirecting /health check");
@ -59,7 +61,7 @@ namespace Jellyfin.Server.Middleware
|| string.Equals(localPath, baseUrlPrefix, StringComparison.OrdinalIgnoreCase) || string.Equals(localPath, baseUrlPrefix, StringComparison.OrdinalIgnoreCase)
|| string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase) || string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase)
|| string.IsNullOrEmpty(localPath) || string.IsNullOrEmpty(localPath)
|| !localPath.StartsWith(baseUrlPrefix, StringComparison.OrdinalIgnoreCase)) || !startsWithBaseUrl)
{ {
// Always redirect back to the default path if the base prefix is invalid or missing // Always redirect back to the default path if the base prefix is invalid or missing
_logger.LogDebug("Normalizing an URL at {LocalPath}", localPath); _logger.LogDebug("Normalizing an URL at {LocalPath}", localPath);