Feature/issue with path and query string #458 (#565)

* #548 added failing test

* #548 fixed failing tests for issue where using /{everything} didnt build path correctly

src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs

@@ -63,7 +63,7 @@ namespace Ocelot.DownstreamRouteFinder.UrlMatcher
                     }
                     else
                     {
-                        var placeholderValue = GetPlaceholderValue(pathTemplate, query, placeholderName, path, counterForPath + 1, '/');
+                        var placeholderValue = GetPlaceholderValue(pathTemplate, query, placeholderName, path, counterForPath + 1, '?');
                         placeHolderNameAndValues.Add(new PlaceholderNameAndValue(placeholderName, placeholderValue));
                     }
 

src/Ocelot/Responder/HttpContextResponder.cs

@@ -38,7 +38,10 @@ namespace Ocelot.Responder
 
             var content = await response.Content.ReadAsStreamAsync();
 
-            AddHeaderIfDoesntExist(context, new Header("Content-Length", new []{ content.Length.ToString() }) );
+            if(response.Content.Headers.ContentLength != null)
+            {
+                AddHeaderIfDoesntExist(context, new Header("Content-Length", new []{ response.Content.Headers.ContentLength.ToString() }) );
+            }
 
             context.Response.OnStarting(state =>
             {

test/Ocelot.AcceptanceTests/RoutingTests.cs

@@ -915,6 +915,41 @@ namespace Ocelot.AcceptanceTests
                 .BDDfy();
         }
 
+        [Fact]
+        public void should_match_multiple_paths_with_catch_all()
+        {
+            var port = 61999;
+            var configuration = new FileConfiguration
+            {
+                ReRoutes = new List<FileReRoute>
+                    {
+                        new FileReRoute
+                        {
+                            DownstreamPathTemplate = "/{everything}",
+                            DownstreamScheme = "http",
+                            UpstreamPathTemplate = "/{everything}",
+                            UpstreamHttpMethod = new List<string> { "Get" },
+                            DownstreamHostAndPorts = new List<FileHostAndPort>
+                            {
+                                new FileHostAndPort
+                                {
+                                    Host = "localhost",
+                                    Port = port,
+                                }
+                            },
+                        }
+                    }
+            };
+
+            this.Given(x => x.GivenThereIsAServiceRunningOn($"http://localhost:{port}/", "/test/toot", 200, "Hello from Laura"))
+                .And(x => _steps.GivenThereIsAConfiguration(configuration))
+                .And(x => _steps.GivenOcelotIsRunning())
+                .When(x => _steps.WhenIGetUrlOnTheApiGateway("/test/toot"))
+                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
+                .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
+                .BDDfy();
+        }
+
         [Fact]
         public void should_fix_issue_271()
         {

test/Ocelot.AcceptanceTests/RoutingWithQueryStringTests.cs

@@ -56,6 +56,44 @@ namespace Ocelot.AcceptanceTests
                 .BDDfy();
         }
 
+        [Fact]
+        public void should_return_response_200_with_odata_query_string()
+        {
+            var subscriptionId = Guid.NewGuid().ToString();
+            var unitId = Guid.NewGuid().ToString();
+            var port = 57359;
+
+            var configuration = new FileConfiguration
+            {
+                ReRoutes = new List<FileReRoute>
+                    {
+                        new FileReRoute
+                        {
+                            DownstreamPathTemplate = "/{everything}",
+                            DownstreamScheme = "http",
+                            DownstreamHostAndPorts = new List<FileHostAndPort>
+                            {
+                                new FileHostAndPort
+                                {
+                                    Host = "localhost",
+                                    Port = port,
+                                }
+                            },
+                            UpstreamPathTemplate = "/{everything}",
+                            UpstreamHttpMethod = new List<string> { "Get" },
+                        }
+                    }
+            };
+
+            this.Given(x => x.GivenThereIsAServiceRunningOn($"http://localhost:{port}", $"/odata/customers", "?$filter=Name%20eq%20'Sam'", 200, "Hello from Laura"))
+                .And(x => _steps.GivenThereIsAConfiguration(configuration))
+                .And(x => _steps.GivenOcelotIsRunning())
+                .When(x => _steps.WhenIGetUrlOnTheApiGateway($"/odata/customers?$filter=Name eq 'Sam' "))
+                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
+                .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
+                .BDDfy();
+        }
+
         [Fact]
         public void should_return_response_200_with_query_string_upstream_template()
         {
@@ -206,7 +244,7 @@ namespace Ocelot.AcceptanceTests
         {
             _serviceHandler.GivenThereIsAServiceRunningOn(baseUrl, basePath, async context =>
             {
-                if (context.Request.PathBase.Value != basePath || context.Request.QueryString.Value != queryString)
+                if ((context.Request.PathBase.Value != basePath) || context.Request.QueryString.Value != queryString)
                 {
                     context.Response.StatusCode = 500;
                     await context.Response.WriteAsync("downstream path didnt match base path");

test/Ocelot.UnitTests/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinderTests.cs

@@ -61,6 +61,37 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder.UrlMatcher
                 .BDDfy();
         }
 
+        [Fact]
+        public void should_match_everything_in_path_with_query()
+        {
+            var expectedTemplates = new List<PlaceholderNameAndValue> 
+            {
+                new PlaceholderNameAndValue("{everything}", "test/toot")
+            };
+
+            this.Given(x => x.GivenIHaveAUpstreamPath("/test/toot"))
+                .And(x => GivenIHaveAQuery("?$filter=Name%20eq%20'Sam'"))
+                .And(x => x.GivenIHaveAnUpstreamUrlTemplate("/{everything}"))
+                .When(x => x.WhenIFindTheUrlVariableNamesAndValues())
+                .And(x => x.ThenTheTemplatesVariablesAre(expectedTemplates))
+                .BDDfy();
+        }
+
+        [Fact]
+        public void should_match_everything_in_path()
+        {
+            var expectedTemplates = new List<PlaceholderNameAndValue> 
+            {
+                new PlaceholderNameAndValue("{everything}", "test/toot")
+            };
+
+            this.Given(x => x.GivenIHaveAUpstreamPath("/test/toot"))
+                .And(x => x.GivenIHaveAnUpstreamUrlTemplate("/{everything}"))
+                .When(x => x.WhenIFindTheUrlVariableNamesAndValues())
+                .And(x => x.ThenTheTemplatesVariablesAre(expectedTemplates))
+                .BDDfy();
+        }
+
         [Fact]
         public void can_match_down_stream_url_with_forward_slash_then_placeholder_no_value_is_blank()
         {