mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.10.0.47

Browse Source 
Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
external/corefx/src/System.Web.HttpUtility/src/System/Web/HttpUtility.cs vendored
View File

@@ -2,6 +2,34 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
// Authors:
// Patrik Torstensson (Patrik.Torstensson@labs2.com)
// Wictor Wilén (decode/encode functions) (wictor@ibizkit.se)
// Tim Coleman (tim@timcoleman.com)
// Gonzalo Paniagua Javier (gonzalo@ximian.com)
//
// Copyright (C) 2005-2010 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System.Collections.Specialized;
using System.Globalization;
using System.IO;
@@ -44,47 +72,37 @@ namespace System.Web
public static NameValueCollection ParseQueryString(string query, Encoding encoding)
{
if (query == null)
{
throw new ArgumentNullException(nameof(query));
}
if (encoding == null)
{
throw new ArgumentNullException(nameof(encoding));
}
if ((query.Length > 0) && (query[0] == '?'))
query = query.Substring(1);
HttpQSCollection result = new HttpQSCollection();
int queryLength = query.Length;
int namePos = queryLength > 0 && query[0] == '?' ? 1 : 0;
if (queryLength == namePos)
{
return result;
}
var result = new HttpQSCollection();
ParseQueryString(query, encoding, result);
return result;
}
private static void ParseQueryString(string query, Encoding encoding, NameValueCollection result)
{
if (query.Length == 0)
return;
var decoded = HtmlDecode(query);
var decodedLength = decoded.Length;
var namePos = 0;
var first = true;
while (namePos <= decodedLength)
while (namePos <= queryLength)
{
int valuePos = -1, valueEnd = -1;
for (var q = namePos; q < decodedLength; q++)
if ((valuePos == -1) && (decoded[q] == '='))
for (int q = namePos; q < queryLength; q++)
{
if (valuePos == -1 && query[q] == '=')
{
valuePos = q + 1;
}
else if (decoded[q] == '&')
else if (query[q] == '&')
{
valueEnd = q;
break;
}
if (first)
{
first = false;
if (decoded[namePos] == '?')
namePos++;
}
string name;
@@ -95,23 +113,20 @@ namespace System.Web
}
else
{
name = UrlDecode(decoded.Substring(namePos, valuePos - namePos - 1), encoding);
name = UrlDecode(query.Substring(namePos, valuePos - namePos - 1), encoding);
}
if (valueEnd < 0)
{
namePos = -1;
valueEnd = decoded.Length;
valueEnd = query.Length;
}
else
{
namePos = valueEnd + 1;
}
var value = UrlDecode(decoded.Substring(valuePos, valueEnd - valuePos), encoding);
namePos = valueEnd + 1;
string value = UrlDecode(query.Substring(valuePos, valueEnd - valuePos), encoding);
result.Add(name, value);
if (namePos == -1)
break;
}
return result;
}
public static string HtmlDecode(string s)
@@ -298,4 +313,4 @@ namespace System.Web
return addDoubleQuotes ? "\"" + encoded + "\"" : encoded;
}
}
}
}

163
external/corefx/src/System.Web.HttpUtility/tests/HttpUtility/HttpUtilityTest.cs vendored
View File

@@ -33,7 +33,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Web;
using Xunit;
namespace System.Web.Tests
@@ -51,6 +50,8 @@ namespace System.Web.Tests
new object[] {"&lt;script>", "<script>"},
new object[] {"&quot;a&amp;b&quot;", "\"a&b\""},
new object[] {"&#39;string&#39;", "'string'"},
new object[] {"abc + def!", "abc + def!"},
new object[] {"This is an &lt;element>!", "This is an <element>!"},
};
[Theory]
@@ -240,11 +241,9 @@ namespace System.Web.Tests
{
"\u00A0¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ",
@"&#160;&#161;&#162;&#163;&#164;&#165;&#166;&#167;&#168;&#169;&#170;&#171;&#172;&#173;&#174;&#175;&#176;&#177;&#178;&#179;&#180;&#181;&#182;&#183;&#184;&#185;&#186;&#187;&#188;&#189;&#190;&#191;&#192;&#193;&#194;&#195;&#196;&#197;&#198;&#199;&#200;&#201;&#202;&#203;&#204;&#205;&#206;&#207;&#208;&#209;&#210;&#211;&#212;&#213;&#214;&#215;&#216;&#217;&#218;&#219;&#220;&#221;&#222;&#223;&#224;&#225;&#226;&#227;&#228;&#229;&#230;&#231;&#232;&#233;&#234;&#235;&#236;&#237;&#238;&#239;&#240;&#241;&#242;&#243;&#244;&#245;&#246;&#247;&#248;&#249;&#250;&#251;&#252;&#253;&#254;&#255;",
},
}
};
[Theory]
[MemberData(nameof(HtmlEncodeDecodeData))]
[MemberData(nameof(HtmlEncodeData))]
@@ -254,6 +253,16 @@ namespace System.Web.Tests
Assert.Equal(encoded, HttpUtility.HtmlEncode(decoded));
}
[Theory]
[MemberData(nameof(HtmlEncodeDecodeData))]
[MemberData(nameof(HtmlEncodeData))]
[InlineData(null, null)]
[InlineData(2, "2")]
public void HtmlEncodeObject(string decoded, string encoded)
{
Assert.Equal(encoded, HttpUtility.HtmlEncode((object)decoded));
}
[Theory]
[MemberData(nameof(HtmlEncodeDecodeData))]
[MemberData(nameof(HtmlEncodeData))]
@@ -284,6 +293,8 @@ namespace System.Web.Tests
{
yield return new object[] { null, "" };
yield return new object[] { "", "" };
yield return new object[] {"No escaping needed.", "No escaping needed."};
yield return new object[] {"The \t and \n will need to be escaped.", "The \\t and \\n will need to be escaped."};
for (char c = char.MinValue; c < TestMaxChar; c++)
{
if (c >= 0 && c <= 7 || c == 11 || c >= 14 && c <= 31 || c == 38 || c == 39 || c == 60 || c == 62 || c == 133 || c == 8232 || c == 8233)
@@ -365,10 +376,18 @@ namespace System.Web.Tests
new[] {new[] {UnicodeStr}}
},
new object[] {"name=value=test", new[] {"name"}, new[] {new[] {"value=test"}}},
new object[] { "name=value&#xe9;", new[] {"name", null}, new[] {new[] {"value"}, new[] { "#xe9;" } }},
new object[] { "name=value&amp;name2=value2", new[] {"name", "amp;name2"}, new[] {new[] {"value"}, new[] { "value2" } }},
new object[] {"name=value=test+phrase", new[] {"name"}, new[] {new[] {"value=test phrase"}}},
};
public static IEnumerable<object[]> ParseQueryStringDataQ =>
ParseQueryStringData.Select(a => new object[] { "?" + (string)a[0] }.Concat(a.Skip(1)).ToArray());
ParseQueryStringData.Select(a => new object[] { "?" + (string)a[0] }.Concat(a.Skip(1)).ToArray())
.Concat(new[]
{
new object[] { "??name=value=test", new[] { "?name" }, new[] { new[] { "value=test" }}},
new object[] { "?", Array.Empty<string>(), Array.Empty<IList<string>>()}
});
[Theory]
[MemberData(nameof(ParseQueryStringData))]
@@ -407,10 +426,12 @@ namespace System.Web.Tests
public void ParseQueryString_ToString()
{
var parsed = HttpUtility.ParseQueryString("");
Assert.Empty(parsed.ToString());
parsed.Add("ReturnUrl", @"http://localhost/login/authenticate?ReturnUrl=http://localhost/secured_area&__provider__=google");
var expected = "ReturnUrl=http%3a%2f%2flocalhost%2flogin%2fauthenticate%3fReturnUrl%3dhttp%3a%2f%2flocalhost%2fsecured_area%26__provider__%3dgoogle";
Assert.Equal(expected, parsed.ToString());
Assert.Equal(expected, HttpUtility.ParseQueryString(expected).ToString());
}
#endregion ParseQueryString
@@ -428,6 +449,12 @@ namespace System.Web.Tests
new object[] {"http://127.0.0.1:8080/appDir/page.aspx?foo=bar", "http://127.0.0.1:8080/appDir/page.aspx?foo=b%u0061r"},
new object[] {"http://127.0.0.1:8080/appDir/page.aspx?foo=b%ar", "http://127.0.0.1:8080/appDir/page.aspx?foo=b%%u0061r"},
new object[] {"http://127.0.0.1:8080/appDir/page.aspx?foo=b%uu0061r", "http://127.0.0.1:8080/appDir/page.aspx?foo=b%uu0061r"},
new object[] {"http://127.0.0.1:8080/appDir/page.aspx?foo=bar baz", "http://127.0.0.1:8080/appDir/page.aspx?foo=bar+baz"},
new object[] { "http://example.net/\U00010000", "http://example.net/\U00010000" },
new object[] { "http://example.net/\uFFFD", "http://example.net/\uD800" },
new object[] { "http://example.net/\uFFFDa", "http://example.net/\uD800a" },
new object[] { "http://example.net/\uFFFD", "http://example.net/\uDC00" },
new object[] { "http://example.net/\uFFFDa", "http://example.net/\uDC00a" }
};
public static IEnumerable<object[]> UrlDecodeDataToBytes =>
@@ -441,6 +468,12 @@ namespace System.Web.Tests
new object[] {"http://127.0.0.1:8080/appDir/page.aspx?foo=b%uu0061r", "http://127.0.0.1:8080/appDir/page.aspx?foo=b%uu0061r"},
new object[] {"http://127.0.0.1:8080/appDir/page.aspx?foo=b%u0061r", "http://127.0.0.1:8080/appDir/page.aspx?foo=b%u0061r"},
new object[] {"http://127.0.0.1:8080/appDir/page.aspx?foo=b%%u0061r", "http://127.0.0.1:8080/appDir/page.aspx?foo=b%%u0061r"},
new object[] {"http://127.0.0.1:8080/appDir/page.aspx?foo=bar baz", "http://127.0.0.1:8080/appDir/page.aspx?foo=bar+baz"},
new object[] { "http://example.net/\U00010000", "http://example.net/\U00010000" },
new object[] { "http://example.net/\uFFFD", "http://example.net/\uD800" },
new object[] { "http://example.net/\uFFFDa", "http://example.net/\uD800a" },
new object[] { "http://example.net/\uFFFD", "http://example.net/\uDC00" },
new object[] { "http://example.net/\uFFFDa", "http://example.net/\uDC00a" }
};
[Theory]
@@ -450,6 +483,26 @@ namespace System.Web.Tests
Assert.Equal(decoded, HttpUtility.UrlDecode(encoded));
}
[Fact]
public void UrlDecode_null()
{
Assert.Null(HttpUtility.UrlDecode(default(string), Encoding.UTF8));
Assert.Null(HttpUtility.UrlDecode(default(byte[]), Encoding.UTF8));
Assert.Null(HttpUtility.UrlDecode(null));
Assert.Null(HttpUtility.UrlDecode(null, 2, 0, Encoding.UTF8));
Assert.Throws<ArgumentNullException>("bytes", () => HttpUtility.UrlDecode(null, 2, 3, Encoding.UTF8));
}
[Fact]
public void UrlDecode_OutOfRange()
{
byte[] bytes = { 0, 1, 2 };
Assert.Throws<ArgumentOutOfRangeException>("offset", () => HttpUtility.UrlDecode(bytes, -1, 2, Encoding.UTF8));
Assert.Throws<ArgumentOutOfRangeException>("offset", () => HttpUtility.UrlDecode(bytes, 14, 2, Encoding.UTF8));
Assert.Throws<ArgumentOutOfRangeException>("count", () => HttpUtility.UrlDecode(bytes, 1, 12, Encoding.UTF8));
Assert.Throws<ArgumentOutOfRangeException>("count", () => HttpUtility.UrlDecode(bytes, 1, -12, Encoding.UTF8));
}
[Theory]
[MemberData(nameof(UrlDecodeDataToBytes))]
public void UrlDecodeToBytes(string decoded, string encoded)
@@ -457,6 +510,33 @@ namespace System.Web.Tests
Assert.Equal(decoded, Encoding.UTF8.GetString(HttpUtility.UrlDecodeToBytes(encoded, Encoding.UTF8)));
}
[Theory]
[MemberData(nameof(UrlDecodeDataToBytes))]
public void UrlDecodeToBytes_DefaultEncoding(string decoded, string encoded)
{
Assert.Equal(decoded, Encoding.UTF8.GetString(HttpUtility.UrlDecodeToBytes(encoded)));
}
[Fact]
public void UrlDecodeToBytes_null()
{
Assert.Null(HttpUtility.UrlDecodeToBytes(default(byte[])));
Assert.Null(HttpUtility.UrlDecodeToBytes(default(string)));
Assert.Null(HttpUtility.UrlDecodeToBytes(default(string), Encoding.UTF8));
Assert.Null(HttpUtility.UrlDecodeToBytes(default(byte[]), 2, 0));
Assert.Throws<ArgumentNullException>("bytes", () => HttpUtility.UrlDecodeToBytes(default(byte[]), 2, 3));
}
[Fact]
public void UrlDecodeToBytes_OutOfRange()
{
byte[] bytes = { 0, 1, 2 };
Assert.Throws<ArgumentOutOfRangeException>("offset", () => HttpUtility.UrlDecodeToBytes(bytes, -1, 2));
Assert.Throws<ArgumentOutOfRangeException>("offset", () => HttpUtility.UrlDecodeToBytes(bytes, 14, 2));
Assert.Throws<ArgumentOutOfRangeException>("count", () => HttpUtility.UrlDecodeToBytes(bytes, 1, 12));
Assert.Throws<ArgumentOutOfRangeException>("count", () => HttpUtility.UrlDecodeToBytes(bytes, 1, -12));
}
[Theory]
[MemberData(nameof(UrlDecodeData))]
public void UrlDecode_ByteArray(string decoded, string encoded)
@@ -529,10 +609,57 @@ namespace System.Web.Tests
Assert.Equal(encoded, Encoding.UTF8.GetString(HttpUtility.UrlEncodeToBytes(decoded, Encoding.UTF8)));
}
[Theory]
[MemberData(nameof(UrlEncodeData))]
public void UrlEncodeToBytes_DefaultEncoding(string decoded, string encoded)
{
Assert.Equal(encoded, Encoding.UTF8.GetString(HttpUtility.UrlEncodeToBytes(decoded)));
}
[Theory, MemberData(nameof(UrlEncodeData))]
public void UrlEncodeToBytesExplicitSize(string decoded, string encoded)
{
byte[] bytes = Encoding.UTF8.GetBytes(decoded);
Assert.Equal(encoded, Encoding.UTF8.GetString(HttpUtility.UrlEncodeToBytes(bytes, 0, bytes.Length)));
}
[Theory]
[InlineData(" abc defgh", "abc+def", 1, 7)]
[InlineData(" abc defgh", "", 1, 0)]
public void UrlEncodeToBytesExplicitSize(string decoded, string encoded, int offset, int count)
{
byte[] bytes = Encoding.UTF8.GetBytes(decoded);
Assert.Equal(encoded, Encoding.UTF8.GetString(HttpUtility.UrlEncodeToBytes(bytes, offset, count)));
}
[Theory]
[InlineData("abc def", " abc+defgh", 1, 7)]
[InlineData("", " abc defgh", 1, 0)]
public void UrlDecodeToBytesExplicitSize(string decoded, string encoded, int offset, int count)
{
byte[] bytes = Encoding.UTF8.GetBytes(encoded);
Assert.Equal(decoded, Encoding.UTF8.GetString(HttpUtility.UrlDecodeToBytes(bytes, offset, count)));
}
[Fact]
public void UrlEncodeToBytes_null()
{
Assert.Null(HttpUtility.UrlEncodeToBytes(null, Encoding.UTF8));
Assert.Null(HttpUtility.UrlEncodeToBytes(default(byte[])));
Assert.Null(HttpUtility.UrlEncodeToBytes(default(string)));
Assert.Null(HttpUtility.UrlEncodeToBytes(null, 2, 0));
Assert.Throws<ArgumentNullException>("bytes", () => HttpUtility.UrlEncodeToBytes(null, 2, 3));
}
[Fact]
public void UrlEncodeToBytes_OutOfRange()
{
byte[] bytes = { 0, 1, 2 };
Assert.Throws<ArgumentOutOfRangeException>("offset", () => HttpUtility.UrlEncodeToBytes(bytes, -1, 2));
Assert.Throws<ArgumentOutOfRangeException>("offset", () => HttpUtility.UrlEncodeToBytes(bytes, 14, 2));
Assert.Throws<ArgumentOutOfRangeException>("count", () => HttpUtility.UrlEncodeToBytes(bytes, 1, 12));
Assert.Throws<ArgumentOutOfRangeException>("count", () => HttpUtility.UrlEncodeToBytes(bytes, 1, -12));
}
[Theory]
@@ -543,9 +670,22 @@ namespace System.Web.Tests
}
[Fact]
public void UrlEncode_ByteArray_null()
public void UrlEncode_null()
{
Assert.Null(HttpUtility.UrlEncode((byte[]) null));
Assert.Null(HttpUtility.UrlEncode((byte[])null));
Assert.Null(HttpUtility.UrlEncode((string)null));
Assert.Null(HttpUtility.UrlEncode(null, Encoding.UTF8));
Assert.Null(HttpUtility.UrlEncode(null, 2, 3));
}
[Fact]
public void UrlEncode_OutOfRange()
{
byte[] bytes = {0, 1, 2};
Assert.Throws<ArgumentOutOfRangeException>("offset", () => HttpUtility.UrlEncode(bytes, -1, 2));
Assert.Throws<ArgumentOutOfRangeException>("offset", () => HttpUtility.UrlEncode(bytes, 14, 2));
Assert.Throws<ArgumentOutOfRangeException>("count", () => HttpUtility.UrlEncode(bytes, 1, 12));
Assert.Throws<ArgumentOutOfRangeException>("count", () => HttpUtility.UrlEncode(bytes, 1, -12));
}
#endregion UrlEncode(ToBytes)
@@ -591,6 +731,15 @@ namespace System.Web.Tests
[InlineData(" ", "%20")]
[InlineData("\n", "%0a")]
[InlineData("default.xxx?sdsd=sds", "default.xxx?sdsd=sds")]
[InlineData("?sdsd=sds", "?sdsd=sds")]
[InlineData("", "")]
[InlineData("http://example.net/default.xxx?sdsd=sds", "http://example.net/default.xxx?sdsd=sds")]
[InlineData("http://example.net:8080/default.xxx?sdsd=sds", "http://example.net:8080/default.xxx?sdsd=sds")]
[InlineData("http://eXample.net:80/default.xxx?sdsd=sds", "http://eXample.net:80/default.xxx?sdsd=sds")]
[InlineData("http://EXAMPLE.NET/default.xxx?sdsd=sds", "http://EXAMPLE.NET/default.xxx?sdsd=sds")]
[InlineData("http://EXAMPLE.NET/défault.xxx?sdsd=sds", "http://EXAMPLE.NET/d%c3%a9fault.xxx?sdsd=sds")]
[InlineData("file:///C/Users", "file:///C/Users")]
[InlineData("mailto:user@example.net", "mailto:user@example.net")]
public void UrlPathEncode(string decoded, string encoded)
{
Assert.Equal(encoded, HttpUtility.UrlPathEncode(decoded));