From 56074155e9a408b7399447ddc1fb80d59bd9c265 Mon Sep 17 00:00:00 2001
From: flightlevel <flightlevel@users.noreply.github.com>
Date: Fri, 13 Jul 2018 22:15:09 +1000
Subject: [PATCH] Reverse proxy support for Kestrel

---
 .../ServerConfigurationController.cs          | 17 +++++++++++--
 src/Jackett.Server/Middleware/RewriteRules.cs | 25 -------------------
 src/Jackett.Server/Startup.cs                 | 14 ++++++++++-
 3 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 src/Jackett.Server/Middleware/RewriteRules.cs

diff --git a/src/Jackett.Server/Controllers/ServerConfigurationController.cs b/src/Jackett.Server/Controllers/ServerConfigurationController.cs
index 9f6ecf801..1fcc9ee57 100644
--- a/src/Jackett.Server/Controllers/ServerConfigurationController.cs
+++ b/src/Jackett.Server/Controllers/ServerConfigurationController.cs
@@ -72,6 +72,8 @@ namespace Jackett.Server.Controllers
         [HttpPost]
         public IActionResult UpdateConfig([FromBody]Common.Models.DTO.ServerConfig config)
         {
+            bool webHostRestartNeeded = false;
+
             var originalPort = serverConfig.Port;
             var originalAllowExternal = serverConfig.AllowExternal;
             int port = config.port;
@@ -91,6 +93,11 @@ namespace Jackett.Server.Controllers
             string omdbApiKey = config.omdbkey;
             string omdbApiUrl = config.omdburl;
 
+            if (config.basepathoverride != serverConfig.BasePathOverride)
+            {
+                webHostRestartNeeded = true;
+            }
+
             serverConfig.UpdateDisabled = updateDisabled;
             serverConfig.UpdatePrerelease = preRelease;
             serverConfig.BasePathOverride = basePathOverride;
@@ -164,8 +171,7 @@ namespace Jackett.Server.Controllers
                     }
                 }
 
-                Thread.Sleep(500);
-                Helper.RestartWebHost();
+                webHostRestartNeeded = true;
             }
 
             if (saveDir != serverConfig.BlackholeDir)
@@ -182,6 +188,13 @@ namespace Jackett.Server.Controllers
                 configService.SaveConfig(serverConfig);
             }
 
+            if (webHostRestartNeeded)
+            {
+                Thread.Sleep(500);
+                logger.Info("Restarting webhost due to configuration change");
+                Helper.RestartWebHost();
+            }
+
             serverConfig.ConfigChanged();
 
             return Json(serverConfig);
diff --git a/src/Jackett.Server/Middleware/RewriteRules.cs b/src/Jackett.Server/Middleware/RewriteRules.cs
deleted file mode 100644
index 2ff2fc2fd..000000000
--- a/src/Jackett.Server/Middleware/RewriteRules.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Rewrite;
-using System;
-
-namespace Jackett.Server.Middleware
-{
-    public class RewriteRules
-    {
-        public static void RewriteBasePath(RewriteContext context)
-        {
-            var request = context.HttpContext.Request;
-
-            string serverBasePath = Helper.ServerService.BasePath() ?? string.Empty;
-
-            if (request.Path != null && request.Path.HasValue && serverBasePath.Length > 0
-                && (request.Path.Value.StartsWith(serverBasePath + "/", StringComparison.Ordinal)
-                    || request.Path.Value.Equals(serverBasePath, StringComparison.Ordinal)))
-            {
-                string path = request.Path.Value.Substring(serverBasePath.Length);
-                path = string.IsNullOrEmpty(path) ? "/" : path;
-                request.Path = new PathString(path);
-            }
-        }
-    }
-}
diff --git a/src/Jackett.Server/Startup.cs b/src/Jackett.Server/Startup.cs
index d7f3f0d3e..328e4caf8 100644
--- a/src/Jackett.Server/Startup.cs
+++ b/src/Jackett.Server/Startup.cs
@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.AspNetCore.Rewrite;
@@ -107,8 +108,19 @@ namespace Jackett.Server
 
             app.UseCustomExceptionHandler();
 
+            string serverBasePath = Helper.ServerService.BasePath() ?? string.Empty;
+
+            if (!string.IsNullOrEmpty(serverBasePath))
+            {
+                app.UsePathBase(serverBasePath);
+            }
+
+            app.UseForwardedHeaders(new ForwardedHeadersOptions
+            {
+                ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
+            });
+
             var rewriteOptions = new RewriteOptions()
-                .Add(RewriteRules.RewriteBasePath)
                 .AddRewrite(@"^torznab\/([\w-]*)", "api/v2.0/indexers/$1/results/torznab", skipRemainingRules: true) //legacy torznab route
                 .AddRewrite(@"^potato\/([\w-]*)", "api/v2.0/indexers/$1/results/potato", skipRemainingRules: true) //legacy potato route
                 .Add(RedirectRules.RedirectToDashboard);