From 55af1cf0467f7511800a6d30099bed378260c82f Mon Sep 17 00:00:00 2001 From: Diego Heras Date: Mon, 24 Oct 2022 00:01:32 +0200 Subject: [PATCH] core: use baseurloverride config in download links. resolves #13113 (#13673) --- .../Controllers/ServerConfigurationController.cs | 3 ++- src/Jackett.Server/Services/ServerService.cs | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Jackett.Server/Controllers/ServerConfigurationController.cs b/src/Jackett.Server/Controllers/ServerConfigurationController.cs index c4ac7b607..bac4834a0 100644 --- a/src/Jackett.Server/Controllers/ServerConfigurationController.cs +++ b/src/Jackett.Server/Controllers/ServerConfigurationController.cs @@ -100,7 +100,8 @@ namespace Jackett.Server.Controllers if (string.IsNullOrWhiteSpace(baseUrlOverride)) baseUrlOverride = ""; else if (!Uri.TryCreate(baseUrlOverride, UriKind.Absolute, out var uri) - || !(uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)) + || !(uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps) + || !Uri.IsWellFormedUriString(baseUrlOverride, UriKind.Absolute)) throw new Exception("Base URL Override is invalid. Example: http://jackett:9117"); serverConfig.BaseUrlOverride = baseUrlOverride; diff --git a/src/Jackett.Server/Services/ServerService.cs b/src/Jackett.Server/Services/ServerService.cs index 9d3b027b1..fe5497c4e 100644 --- a/src/Jackett.Server/Services/ServerService.cs +++ b/src/Jackett.Server/Services/ServerService.cs @@ -369,6 +369,9 @@ namespace Jackett.Server.Services public string GetServerUrl(HttpRequest request) { + if (!string.IsNullOrEmpty(config.BaseUrlOverride)) + return $"{config.BaseUrlOverride}{BasePath()}/"; + var scheme = request.Scheme; var port = request.HttpContext.Request.Host.Port;