If the request contains X-Forwarded-* headers then use those to build…

… the DirectoryPath
OctopusDeploy · Nov 10, 2016 · 861d0aa · matt-richardson · Nov 10, 2016 · 861d0aa
1 parent 41c68b3
commit 861d0aa
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/source/Octopus.Server.Extensibility/HostServices/Web/NancyRequestExtensions.cs b/source/Octopus.Server.Extensibility/HostServices/Web/NancyRequestExtensions.cs
@@ -1,4 +1,5 @@
-using Nancy;
+using System.Linq;
+using Nancy;
 
 namespace Octopus.Server.Extensibility.HostServices.Web
 {
@@ -11,7 +12,17 @@ public static class NancyRequestExtensions
         /// <returns>The full virtual directory path.</returns>
         public static string DirectoryPath(this Request request)
         {
-            return request.Url.SiteBase + request.Url.BasePath;
+            var urlSiteBase = request.Url.SiteBase;
+
+            var forwardedHost = request.Headers["X-Forwarded-Host"].FirstOrDefault();
+            if (forwardedHost != null)
+            {
+                var forwardedProto = request.Headers["X-Forwarded-Proto"].FirstOrDefault();
+
+                urlSiteBase = $"{forwardedProto}://{forwardedHost}";
+            }
+
+            return urlSiteBase + request.Url.BasePath;
         }
     }
 }