Skip to content

Commit

Permalink
Feature/issue with path and query string ThreeMammals#458 (ThreeMamma…
Browse files Browse the repository at this point in the history 
…ls#565)

* ThreeMammals#548 added failing test

* ThreeMammals#548 fixed failing tests for issue where using /{everything} didnt build path correctly
  • Loading branch information
@TomPallister
TomPallister authored Aug 20, 2018
1 parent 7e01caf commit 00a6000
Show file tree
Hide file tree
Showing 5 changed files with 616 additions and 509 deletions.
300 changes: 150 additions & 150 deletions src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlPathPlaceholderNameAndValueFinder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,150 +1,150 @@
using System.Collections.Generic;
using Ocelot.Responses;

namespace Ocelot.DownstreamRouteFinder.UrlMatcher
{
public class UrlPathPlaceholderNameAndValueFinder : IPlaceholderNameAndValueFinder
{
public Response<List<PlaceholderNameAndValue>> Find(string path, string query, string pathTemplate)
{
var placeHolderNameAndValues = new List<PlaceholderNameAndValue>();

path = $"{path}{query}";

int counterForPath = 0;

var delimiter = '/';
var nextDelimiter = '/';

for (int counterForTemplate = 0; counterForTemplate < pathTemplate.Length; counterForTemplate++)
{
if ((path.Length > counterForPath) && CharactersDontMatch(pathTemplate[counterForTemplate], path[counterForPath]) && ContinueScanningUrl(counterForPath,path.Length))
{
if (IsPlaceholder(pathTemplate[counterForTemplate]))
{
//should_find_multiple_query_string make test pass
if (PassedQueryString(pathTemplate, counterForTemplate))
{
delimiter = '&';
nextDelimiter = '&';
}

//should_find_multiple_query_string_and_path makes test pass
if (NotPassedQueryString(pathTemplate, counterForTemplate) && NoMoreForwardSlash(pathTemplate, counterForTemplate))
{
delimiter = '?';
nextDelimiter = '?';
}

var placeholderName = GetPlaceholderName(pathTemplate, counterForTemplate);

var placeholderValue = GetPlaceholderValue(pathTemplate, query, placeholderName, path, counterForPath, delimiter);

placeHolderNameAndValues.Add(new PlaceholderNameAndValue(placeholderName, placeholderValue));

counterForTemplate = GetNextCounterPosition(pathTemplate, counterForTemplate, '}');

counterForPath = GetNextCounterPosition(path, counterForPath, nextDelimiter);

continue;
}

return new OkResponse<List<PlaceholderNameAndValue>>(placeHolderNameAndValues);
}
else if(IsCatchAll(path, counterForPath, pathTemplate))
{
var endOfPlaceholder = GetNextCounterPosition(pathTemplate, counterForTemplate, '}');

var placeholderName = GetPlaceholderName(pathTemplate, 1);

if(NothingAfterFirstForwardSlash(path))
{
placeHolderNameAndValues.Add(new PlaceholderNameAndValue(placeholderName, ""));
}
else
{
var placeholderValue = GetPlaceholderValue(pathTemplate, query, placeholderName, path, counterForPath + 1, '/');
placeHolderNameAndValues.Add(new PlaceholderNameAndValue(placeholderName, placeholderValue));
}

counterForTemplate = endOfPlaceholder;
}

counterForPath++;
}

return new OkResponse<List<PlaceholderNameAndValue>>(placeHolderNameAndValues);
}

private static bool NoMoreForwardSlash(string pathTemplate, int counterForTemplate)
{
return !pathTemplate.Substring(counterForTemplate).Contains("/");
}

private static bool NotPassedQueryString(string pathTemplate, int counterForTemplate)
{
return !pathTemplate.Substring(0, counterForTemplate).Contains("?");
}

private static bool PassedQueryString(string pathTemplate, int counterForTemplate)
{
return pathTemplate.Substring(0, counterForTemplate).Contains("?");
}

private bool IsCatchAll(string path, int counterForPath, string pathTemplate)
{
return string.IsNullOrEmpty(path) || (path.Length > counterForPath && path[counterForPath] == '/') && pathTemplate.Length > 1
&& pathTemplate.Substring(0, 2) == "/{"
&& pathTemplate.IndexOf('}') == pathTemplate.Length - 1;
}

private bool NothingAfterFirstForwardSlash(string path)
{
return path.Length == 1 || path.Length == 0;
}

private string GetPlaceholderValue(string urlPathTemplate, string query, string variableName, string urlPath, int counterForUrl, char delimiter)
{
var positionOfNextSlash = urlPath.IndexOf(delimiter, counterForUrl);

if (positionOfNextSlash == -1 || (urlPathTemplate.Trim(delimiter).EndsWith(variableName) && string.IsNullOrEmpty(query)))
{
positionOfNextSlash = urlPath.Length;
}

var variableValue = urlPath.Substring(counterForUrl, positionOfNextSlash - counterForUrl);

return variableValue;
}

private string GetPlaceholderName(string urlPathTemplate, int counterForTemplate)
{
var postitionOfPlaceHolderClosingBracket = urlPathTemplate.IndexOf('}', counterForTemplate) + 1;

var variableName = urlPathTemplate.Substring(counterForTemplate, postitionOfPlaceHolderClosingBracket - counterForTemplate);

return variableName;
}

private int GetNextCounterPosition(string urlTemplate, int counterForTemplate, char delimiter)
{
var closingPlaceHolderPositionOnTemplate = urlTemplate.IndexOf(delimiter, counterForTemplate);
return closingPlaceHolderPositionOnTemplate + 1;
}

private bool CharactersDontMatch(char characterOne, char characterTwo)
{
return char.ToLower(characterOne) != char.ToLower(characterTwo);
}

private bool ContinueScanningUrl(int counterForUrl, int urlLength)
{
return counterForUrl < urlLength;
}

private bool IsPlaceholder(char character)
{
return character == '{';
}
}
}
using System.Collections.Generic;
using Ocelot.Responses;

namespace Ocelot.DownstreamRouteFinder.UrlMatcher
{
public class UrlPathPlaceholderNameAndValueFinder : IPlaceholderNameAndValueFinder
{
public Response<List<PlaceholderNameAndValue>> Find(string path, string query, string pathTemplate)
{
var placeHolderNameAndValues = new List<PlaceholderNameAndValue>();

path = $"{path}{query}";

int counterForPath = 0;

var delimiter = '/';
var nextDelimiter = '/';

for (int counterForTemplate = 0; counterForTemplate < pathTemplate.Length; counterForTemplate++)
{
if ((path.Length > counterForPath) && CharactersDontMatch(pathTemplate[counterForTemplate], path[counterForPath]) && ContinueScanningUrl(counterForPath,path.Length))
{
if (IsPlaceholder(pathTemplate[counterForTemplate]))
{
//should_find_multiple_query_string make test pass
if (PassedQueryString(pathTemplate, counterForTemplate))
{
delimiter = '&';
nextDelimiter = '&';
}

//should_find_multiple_query_string_and_path makes test pass
if (NotPassedQueryString(pathTemplate, counterForTemplate) && NoMoreForwardSlash(pathTemplate, counterForTemplate))
{
delimiter = '?';
nextDelimiter = '?';
}

var placeholderName = GetPlaceholderName(pathTemplate, counterForTemplate);

var placeholderValue = GetPlaceholderValue(pathTemplate, query, placeholderName, path, counterForPath, delimiter);

placeHolderNameAndValues.Add(new PlaceholderNameAndValue(placeholderName, placeholderValue));

counterForTemplate = GetNextCounterPosition(pathTemplate, counterForTemplate, '}');

counterForPath = GetNextCounterPosition(path, counterForPath, nextDelimiter);

continue;
}

return new OkResponse<List<PlaceholderNameAndValue>>(placeHolderNameAndValues);
}
else if(IsCatchAll(path, counterForPath, pathTemplate))
{
var endOfPlaceholder = GetNextCounterPosition(pathTemplate, counterForTemplate, '}');

var placeholderName = GetPlaceholderName(pathTemplate, 1);

if(NothingAfterFirstForwardSlash(path))
{
placeHolderNameAndValues.Add(new PlaceholderNameAndValue(placeholderName, ""));
}
else
{
var placeholderValue = GetPlaceholderValue(pathTemplate, query, placeholderName, path, counterForPath + 1, '?');
placeHolderNameAndValues.Add(new PlaceholderNameAndValue(placeholderName, placeholderValue));
}

counterForTemplate = endOfPlaceholder;
}

counterForPath++;
}

return new OkResponse<List<PlaceholderNameAndValue>>(placeHolderNameAndValues);
}

private static bool NoMoreForwardSlash(string pathTemplate, int counterForTemplate)
{
return !pathTemplate.Substring(counterForTemplate).Contains("/");
}

private static bool NotPassedQueryString(string pathTemplate, int counterForTemplate)
{
return !pathTemplate.Substring(0, counterForTemplate).Contains("?");
}

private static bool PassedQueryString(string pathTemplate, int counterForTemplate)
{
return pathTemplate.Substring(0, counterForTemplate).Contains("?");
}

private bool IsCatchAll(string path, int counterForPath, string pathTemplate)
{
return string.IsNullOrEmpty(path) || (path.Length > counterForPath && path[counterForPath] == '/') && pathTemplate.Length > 1
&& pathTemplate.Substring(0, 2) == "/{"
&& pathTemplate.IndexOf('}') == pathTemplate.Length - 1;
}

private bool NothingAfterFirstForwardSlash(string path)
{
return path.Length == 1 || path.Length == 0;
}

private string GetPlaceholderValue(string urlPathTemplate, string query, string variableName, string urlPath, int counterForUrl, char delimiter)
{
var positionOfNextSlash = urlPath.IndexOf(delimiter, counterForUrl);

if (positionOfNextSlash == -1 || (urlPathTemplate.Trim(delimiter).EndsWith(variableName) && string.IsNullOrEmpty(query)))
{
positionOfNextSlash = urlPath.Length;
}

var variableValue = urlPath.Substring(counterForUrl, positionOfNextSlash - counterForUrl);

return variableValue;
}

private string GetPlaceholderName(string urlPathTemplate, int counterForTemplate)
{
var postitionOfPlaceHolderClosingBracket = urlPathTemplate.IndexOf('}', counterForTemplate) + 1;

var variableName = urlPathTemplate.Substring(counterForTemplate, postitionOfPlaceHolderClosingBracket - counterForTemplate);

return variableName;
}

private int GetNextCounterPosition(string urlTemplate, int counterForTemplate, char delimiter)
{
var closingPlaceHolderPositionOnTemplate = urlTemplate.IndexOf(delimiter, counterForTemplate);
return closingPlaceHolderPositionOnTemplate + 1;
}

private bool CharactersDontMatch(char characterOne, char characterTwo)
{
return char.ToLower(characterOne) != char.ToLower(characterTwo);
}

private bool ContinueScanningUrl(int counterForUrl, int urlLength)
{
return counterForUrl < urlLength;
}

private bool IsPlaceholder(char character)
{
return character == '{';
}
}
}
5 changes: 4 additions & 1 deletion src/Ocelot/Responder/HttpContextResponder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ public async Task SetResponseOnHttpContext(HttpContext context, DownstreamRespon

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 =>
{
Expand Down
35 changes: 35 additions & 0 deletions test/Ocelot.AcceptanceTests/RoutingTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -915,6 +915,41 @@ public void should_use_priority()
.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()
{
Expand Down
Loading

0 comments on commit 00a6000

Please sign in to comment.