Merge branch 'samirsyed-master'

Author: TomPallister

docs/features/headerstransformation.rst

@@ -85,6 +85,7 @@ Ocelot allows placeholders that can be used in header transformation.
 {BaseUrl} - This will use Ocelot's base url e.g. http://localhost:5000 as its value.
 {DownstreamBaseUrl} - This will use the downstream services base url e.g. http://localhost:5000 as its value. This only works for DownstreamHeaderTransform at the moment.
 {TraceId} - This will use the Butterfly APM Trace Id. This only works for DownstreamHeaderTransform at the moment.
+{UpstreamHost} - This will look for the incoming Host header.
 
 Handling 302 Redirects
 ^^^^^^^^^^^^^^^^^^^^^^

src/Ocelot/Infrastructure/Placeholders.cs

@@ -7,6 +7,7 @@ namespace Ocelot.Infrastructure
     using Ocelot.Responses;
     using System;
     using System.Collections.Generic;
+    using System.Linq;
 
     public class Placeholders : IPlaceholders
     {
@@ -25,12 +26,13 @@ public Placeholders(IBaseUrlFinder finder, IRequestScopedDataRepository repo, IH
             {
                 { "{BaseUrl}", GetBaseUrl() },
                 { "{TraceId}", GetTraceId() },
-                { "{RemoteIpAddress}", GetRemoteIpAddress() }
+                { "{RemoteIpAddress}", GetRemoteIpAddress() },
+                { "{UpstreamHost}", GetUpstreamHost() },
             };
 
             _requestPlaceholders = new Dictionary<string, Func<DownstreamRequest, string>>
             {
-                { "{DownstreamBaseUrl}", GetDownstreamBaseUrl() }
+                { "{DownstreamBaseUrl}", GetDownstreamBaseUrl() },
             };
         }
 
@@ -130,5 +132,25 @@ private Func<Response<string>> GetBaseUrl()
         {
             return () => new OkResponse<string>(_finder.Find());
         }
+
+        private Func<Response<string>> GetUpstreamHost()
+        {
+            return () =>
+            {
+                try
+                {
+                    if (_httpContextAccessor.HttpContext.Request.Headers.TryGetValue("Host", out var upstreamHost))
+                    {
+                        return new OkResponse<string>(upstreamHost.First());
+                    }
+
+                    return new ErrorResponse<string>(new CouldNotFindPlaceholderError("{UpstreamHost}"));
+                }
+                catch
+                {
+                    return new ErrorResponse<string>(new CouldNotFindPlaceholderError("{UpstreamHost}"));
+                }
+            };
+        }
     }
 }

test/Ocelot.UnitTests/Infrastructure/PlaceholdersTests.cs

@@ -123,5 +123,33 @@ public void should_return_error_when_removed()
             result.IsError.ShouldBeTrue();
             result.Errors[0].Message.ShouldBe("Unable to remove placeholder: {Test}, placeholder does not exists");
         }
+
+        [Fact]
+        public void should_return_upstreamHost()
+        {
+            var upstreamHost = "UpstreamHostA";
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Headers.Add("Host", upstreamHost);
+            _accessor.Setup(x => x.HttpContext).Returns(httpContext);
+            var result = _placeholders.Get("{UpstreamHost}");
+            result.Data.ShouldBe(upstreamHost);
+        }
+
+        [Fact]
+        public void should_return_error_when_finding_upstbecause_Host_not_set()
+        {
+            var httpContext = new DefaultHttpContext();
+            _accessor.Setup(x => x.HttpContext).Returns(httpContext);
+            var result = _placeholders.Get("{UpstreamHost}");
+            result.IsError.ShouldBeTrue();
+        }
+
+        [Fact]
+        public void should_return_error_when_finding_upstream_host_because_exception_thrown()
+        {
+            _accessor.Setup(x => x.HttpContext).Throws(new Exception());
+            var result = _placeholders.Get("{UpstreamHost}");
+            result.IsError.ShouldBeTrue();
+        }
     }
 }