Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unescape query parameter name #33401

Merged
merged 3 commits into from
Jun 18, 2021
Merged

Unescape query parameter name #33401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ddf2fa
Unescape query parameter name
campersau Jun 9, 2021
539a1d9
Add more tests for ParseQuery with encoded key and value
campersau Jun 9, 2021
b7acb25
Unescape query parameter name in ParseNullableQueryInternal
campersau Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Http/Http/src/Features/QueryFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ public IQueryCollection Query
{
if (!querySegment.IsEmpty)
{
accumulator.Append(querySegment);
var name = SpanHelper.ReplacePlusWithSpace(querySegment);

accumulator.Append(Uri.UnescapeDataString(name));
}
}

Expand Down
70 changes: 70 additions & 0 deletions src/Http/Http/test/Features/QueryFeatureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,5 +150,75 @@ public void ParseEmptyOrNullQueryWorks(string queryString)

Assert.Empty(queryCollection);
}

[Fact]
public void ParseQueryWithEncodedKeyWorks()
{
var features = new FeatureCollection();
features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = "?fields+%5BtodoItems%5D" };

var provider = new QueryFeature(features);

var queryCollection = provider.Query;

Assert.Single(queryCollection);
Assert.Equal("", queryCollection["fields [todoItems]"].FirstOrDefault());
}

[Fact]
public void ParseQueryWithEncodedValueWorks()
{
var features = new FeatureCollection();
features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = "?=fields+%5BtodoItems%5D" };

var provider = new QueryFeature(features);

var queryCollection = provider.Query;

Assert.Single(queryCollection);
Assert.Equal("fields [todoItems]", queryCollection[""].FirstOrDefault());
}

[Fact]
public void ParseQueryWithEncodedKeyEmptyValueWorks()
{
var features = new FeatureCollection();
features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = "?fields+%5BtodoItems%5D=" };

var provider = new QueryFeature(features);

var queryCollection = provider.Query;

Assert.Single(queryCollection);
Assert.Equal("", queryCollection["fields [todoItems]"].FirstOrDefault());
}

[Fact]
public void ParseQueryWithEncodedKeyEncodedValueWorks()
{
var features = new FeatureCollection();
features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = "?fields+%5BtodoItems%5D=%5B+1+%5D" };

var provider = new QueryFeature(features);

var queryCollection = provider.Query;

Assert.Single(queryCollection);
Assert.Equal("[ 1 ]", queryCollection["fields [todoItems]"].FirstOrDefault());
}

[Fact]
public void ParseQueryWithEncodedKeyEncodedValuesWorks()
{
var features = new FeatureCollection();
features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = "?fields+%5BtodoItems%5D=%5B+1+%5D&fields+%5BtodoItems%5D=%5B+2+%5D" };

var provider = new QueryFeature(features);

var queryCollection = provider.Query;

Assert.Single(queryCollection);
Assert.Equal(new[] { "[ 1 ]", "[ 2 ]" }, queryCollection["fields [todoItems]"]);
}
}
}
5 changes: 4 additions & 1 deletion src/Http/WebUtilities/src/QueryHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,10 @@ public static Dictionary<string, StringValues> ParseQuery(string? queryString)
{
if (delimiterIndex > scanIndex)
{
accumulator.Append(queryString.Substring(scanIndex, delimiterIndex - scanIndex), string.Empty);
string name = queryString.Substring(scanIndex, delimiterIndex - scanIndex);
accumulator.Append(
Uri.UnescapeDataString(name.Replace('+', ' ')),
string.Empty);
}
}
scanIndex = delimiterIndex + 1;
Expand Down
40 changes: 40 additions & 0 deletions src/Http/WebUtilities/test/QueryHelpersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,46 @@ public void ParseQueryWithEmptyKeyWorks()
Assert.Equal(new[] { "value1", "" }, collection[""]);
}

[Fact]
public void ParseQueryWithEncodedKeyWorks()
{
var collection = QueryHelpers.ParseQuery("?fields+%5BtodoItems%5D");
Assert.Single(collection);
Assert.Equal("", collection["fields [todoItems]"].FirstOrDefault());
}

[Fact]
public void ParseQueryWithEncodedValueWorks()
{
var collection = QueryHelpers.ParseQuery("?=fields+%5BtodoItems%5D");
Assert.Single(collection);
Assert.Equal("fields [todoItems]", collection[""].FirstOrDefault());
}

[Fact]
public void ParseQueryWithEncodedKeyEmptyValueWorks()
{
var collection = QueryHelpers.ParseQuery("?fields+%5BtodoItems%5D=");
Assert.Single(collection);
Assert.Equal("", collection["fields [todoItems]"].FirstOrDefault());
}

[Fact]
public void ParseQueryWithEncodedKeyEncodedValueWorks()
{
var collection = QueryHelpers.ParseQuery("?fields+%5BtodoItems%5D=%5B+1+%5D");
Assert.Single(collection);
Assert.Equal("[ 1 ]", collection["fields [todoItems]"].FirstOrDefault());
}

[Fact]
public void ParseQueryWithEncodedKeyEncodedValuesWorks()
{
var collection = QueryHelpers.ParseQuery("?fields+%5BtodoItems%5D=%5B+1+%5D&fields+%5BtodoItems%5D=%5B+2+%5D");
Assert.Single(collection);
Assert.Equal(new[] { "[ 1 ]", "[ 2 ]" }, collection["fields [todoItems]"]);
}

[Theory]
[InlineData("?")]
[InlineData("")]
Expand Down