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

Reject non-ASCII chars in headers in addition to control chars

This commit is contained in:
Stephen Halter 2016-05-31 15:53:20 -07:00
parent bb92cc1c29
commit f609f41a7c
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameHeaders.cs
View File

@ -224,9 +224,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
{ {
foreach (var ch in headerCharacters) foreach (var ch in headerCharacters)
{ {
if (ch < 0x20) if (ch < 0x20 || ch > 0x7E)
{ {
throw new InvalidOperationException(string.Format("Invalid control character in header: 0x{0:X2}", (byte)ch)); throw new InvalidOperationException(string.Format("Invalid non-ASCII or control character in header: 0x{0:X4}", (ushort)ch));
} }
} }
} }

17
test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseHeadersTests.cs
View File

@ -49,12 +49,27 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
[InlineData("Server\r", "Data")] [InlineData("Server\r", "Data")]
[InlineData("Ser\0ver", "Data")] [InlineData("Ser\0ver", "Data")]
[InlineData("Server\r\n", "Data")] [InlineData("Server\r\n", "Data")]
[InlineData("\u0000Server", "Data")]
[InlineData("Server", "Data\u0000")]
[InlineData("\u001FServer", "Data")] [InlineData("\u001FServer", "Data")]
[InlineData("Unknown-Header\r\n", "Data")] [InlineData("Unknown-Header\r\n", "Data")]
[InlineData("\0Unknown-Header", "Data")] [InlineData("\0Unknown-Header", "Data")]
[InlineData("Unknown\r-Header", "Data")] [InlineData("Unknown\r-Header", "Data")]
[InlineData("Unk\nown-Header", "Data")] [InlineData("Unk\nown-Header", "Data")]
public void AddingControlCharactersToHeadersThrows(string key, string value) [InlineData("Server", "Da\u007Fta")]
[InlineData("Unknown\u007F-Header", "Data")]
[InlineData("Ser\u0080ver", "Data")]
[InlineData("Server", "Da\u0080ta")]
[InlineData("Unknown\u0080-Header", "Data")]
[InlineData("Ser™ver", "Data")]
[InlineData("Server", "Da™ta")]
[InlineData("Unknown™-Header", "Data")]
[InlineData("Ser™ver", "Data")]
[InlineData("šerver", "Data")]
[InlineData("Server", "Dašta")]
[InlineData("Unknownš-Header", "Data")]
[InlineData("Seršver", "Data")]
public void AddingControlOrNonAsciiCharactersToHeadersThrows(string key, string value)
{ {
var responseHeaders = new FrameResponseHeaders(); var responseHeaders = new FrameResponseHeaders();