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

Fix ReaderThrowsResetExceptionOnInvalidBody (#1420)

This commit is contained in:
Pavel Krymets 2018-09-20 12:38:35 -07:00 committed by GitHub
parent d28468ca8f
commit d463b5e613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/Common.Tests/Utilities/TestConnections.cs
View File

@ -62,18 +62,15 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
public async Task Send(params string[] lines) public async Task Send(params string[] lines)
{ {
var text = string.Join("\r\n", lines); var bytes = Encoding.ASCII.GetBytes(string.Join("\r\n", lines));
var writer = new StreamWriter(_stream, Encoding.GetEncoding("iso-8859-1"));
for (var index = 0; index < text.Length; index++) for (var index = 0; index < bytes.Length; index++)
{ {
var ch = text[index]; await _stream.WriteAsync(bytes, index, 1).ConfigureAwait(false);
writer.Write(ch); await _stream.FlushAsync().ConfigureAwait(false);
await writer.FlushAsync().ConfigureAwait(false);
// Re-add delay to help find socket input consumption bugs more consistently // Re-add delay to help find socket input consumption bugs more consistently
//await Task.Delay(TimeSpan.FromMilliseconds(5)); //await Task.Delay(TimeSpan.FromMilliseconds(5));
} }
await writer.FlushAsync().ConfigureAwait(false);
await _stream.FlushAsync().ConfigureAwait(false);
} }
public async Task<int> ReadCharAsync() public async Task<int> ReadCharAsync()

15
test/IIS.Tests/ClientDisconnectTests.cs
View File

@ -206,6 +206,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
[ConditionalFact] [ConditionalFact]
public async Task ReaderThrowsResetExceptionOnInvalidBody() public async Task ReaderThrowsResetExceptionOnInvalidBody()
{ {
var requestStartedCompletionSource = CreateTaskCompletionSource();
var requestCompletedCompletionSource = CreateTaskCompletionSource(); var requestCompletedCompletionSource = CreateTaskCompletionSource();
Exception exception = null; Exception exception = null;
@ -213,6 +214,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
var data = new byte[1024]; var data = new byte[1024];
using (var testServer = await TestServer.Create(async ctx => using (var testServer = await TestServer.Create(async ctx =>
{ {
requestStartedCompletionSource.SetResult(true);
try try
{ {
await ctx.Request.Body.ReadAsync(data); await ctx.Request.Body.ReadAsync(data);
@ -233,10 +235,19 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
"Host: localhost", "Host: localhost",
"Connection: close", "Connection: close",
"", "",
"ZZZ",
""); "");
await requestCompletedCompletionSource.Task.DefaultTimeout();
await requestStartedCompletionSource.Task;
await connection.Send(
"ZZZZZZZZZZZZZ");
await connection.Receive(
"HTTP/1.1 400 Bad Request",
""
);
} }
await requestCompletedCompletionSource.Task.DefaultTimeout();
} }
Assert.IsType<ConnectionResetException>(exception); Assert.IsType<ConnectionResetException>(exception);