From 9595aa258eaeab7cc5b73452bfe6a209512e77ce Mon Sep 17 00:00:00 2001 From: crobibero Date: Thu, 27 May 2021 06:31:00 -0600 Subject: [PATCH] Simplify BaseUrlRedirectionMiddleware --- .../Middleware/BaseUrlRedirectionMiddleware.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Jellyfin.Server/Middleware/BaseUrlRedirectionMiddleware.cs b/Jellyfin.Server/Middleware/BaseUrlRedirectionMiddleware.cs index 3abf579e25..f09315de84 100644 --- a/Jellyfin.Server/Middleware/BaseUrlRedirectionMiddleware.cs +++ b/Jellyfin.Server/Middleware/BaseUrlRedirectionMiddleware.cs @@ -50,18 +50,15 @@ namespace Jellyfin.Server.Middleware var startsWithBaseUrl = localPath.StartsWith(baseUrlPrefix, StringComparison.OrdinalIgnoreCase); if (!startsWithBaseUrl - && localPath.EndsWith("/health", StringComparison.OrdinalIgnoreCase)) + && (localPath.Equals("/health", StringComparison.OrdinalIgnoreCase) + || localPath.Equals("/health/", StringComparison.OrdinalIgnoreCase))) { _logger.LogDebug("Redirecting /health check"); httpContext.Response.Redirect(baseUrlPrefix + "/health"); return; } - if (string.Equals(localPath, baseUrlPrefix + "/", StringComparison.OrdinalIgnoreCase) - || string.Equals(localPath, baseUrlPrefix, StringComparison.OrdinalIgnoreCase) - || string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase) - || string.IsNullOrEmpty(localPath) - || !startsWithBaseUrl) + if (!startsWithBaseUrl) { // Always redirect back to the default path if the base prefix is invalid or missing _logger.LogDebug("Normalizing an URL at {LocalPath}", localPath);