lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify BaseUrlRedirectionMiddleware

Browse Source
This commit is contained in:
crobibero 2021-05-27 06:31:00 -06:00
parent 01e8ff8ddf
commit 9595aa258e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,18 +50,15 @@ namespace Jellyfin.Server.Middleware
var startsWithBaseUrl = localPath.StartsWith(baseUrlPrefix, StringComparison.OrdinalIgnoreCase); var startsWithBaseUrl = localPath.StartsWith(baseUrlPrefix, StringComparison.OrdinalIgnoreCase);
if (!startsWithBaseUrl if (!startsWithBaseUrl
&& localPath.EndsWith("/health", StringComparison.OrdinalIgnoreCase)) && (localPath.Equals("/health", StringComparison.OrdinalIgnoreCase)
|| localPath.Equals("/health/", StringComparison.OrdinalIgnoreCase)))
{ {
_logger.LogDebug("Redirecting /health check"); _logger.LogDebug("Redirecting /health check");
httpContext.Response.Redirect(baseUrlPrefix + "/health"); httpContext.Response.Redirect(baseUrlPrefix + "/health");
return; return;
} }
if (string.Equals(localPath, baseUrlPrefix + "/", StringComparison.OrdinalIgnoreCase) if (!startsWithBaseUrl)
|| string.Equals(localPath, baseUrlPrefix, StringComparison.OrdinalIgnoreCase)
|| string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase)
|| string.IsNullOrEmpty(localPath)
|| !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);