huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow query string parameters without values 

Addresses #624
This commit is contained in:
moozzyk 2016-05-19 15:16:51 -07:00
parent 440c6e43e1
commit e854d3aa9a
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.WebUtilities/QueryHelpers.cs
View File

@ -140,7 +140,6 @@ namespace Microsoft.AspNetCore.WebUtilities
scanIndex = 1;
}
int textLength = queryString.Length;
int equalIndex = queryString.IndexOf('=');
if (equalIndex == -1)
@ -171,6 +170,13 @@ namespace Microsoft.AspNetCore.WebUtilities
equalIndex = textLength;
}
}
else
{
if (delimiterIndex > scanIndex)
{
accumulator.Append(queryString.Substring(scanIndex, delimiterIndex - scanIndex), string.Empty);
}
}
scanIndex = delimiterIndex + 1;
}

39
test/Microsoft.AspNetCore.Http.Tests/Features/QueryFeatureTests.cs
View File

@ -24,5 +24,44 @@ namespace Microsoft.AspNetCore.Http.Features
// Assert
Assert.Equal("bar", queryCollection["foo"]);
}
[Theory]
[InlineData("?q", "q")]
[InlineData("?q&", "q")]
[InlineData("?q1=abc&q2", "q2")]
[InlineData("?q=", "q")]
[InlineData("?q=&", "q")]
public void KeyWithoutValuesAddedToQueryCollection(string queryString, string emptyParam)
{
var features = new FeatureCollection();
var request = new HttpRequestFeature();
request.QueryString = queryString;
features[typeof(IHttpRequestFeature)] = request;
var provider = new QueryFeature(features);
var queryCollection = provider.Query;
Assert.True(queryCollection.Keys.Contains(emptyParam));
Assert.Equal(string.Empty, queryCollection[emptyParam]);
}
[Theory]
[InlineData("?&&")]
[InlineData("?&")]
[InlineData("&&")]
public void EmptyKeysNotAddedToQueryCollection(string queryString)
{
var features = new FeatureCollection();
var request = new HttpRequestFeature();
request.QueryString = queryString;
features[typeof(IHttpRequestFeature)] = request;
var provider = new QueryFeature(features);
var queryCollection = provider.Query;
Assert.Equal(0, queryCollection.Count);
}
}
}