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

Merge pull request #3029 from dotnet-maestro-bot/merge/release/2.2-to-master 

[automated] Merge branch 'release/2.2' => 'master'
This commit is contained in:
Chris Ross 2018-10-18 11:22:00 -07:00 committed by GitHub
parent 5d337fbd9d 1d3090f056
commit 8f8a09fdf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Kestrel.Core/Internal/Http/Http1MessageBody.cs
View File

@ -137,9 +137,25 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
return Task.CompletedTask; return Task.CompletedTask;
} }
// PumpTask catches all Exceptions internally.
if (_pumpTask.IsCompleted)
{
// At this point both the request body pipe reader and writer should be completed.
_context.RequestBodyPipe.Reset();
return Task.CompletedTask;
}
return StopAsyncAwaited();
}
private async Task StopAsyncAwaited()
{
_canceled = true; _canceled = true;
_context.Input.CancelPendingRead(); _context.Input.CancelPendingRead();
return _pumpTask; await _pumpTask;
// At this point both the request body pipe reader and writer should be completed.
_context.RequestBodyPipe.Reset();
} }
protected override Task OnConsumeAsync() protected override Task OnConsumeAsync()

3
src/Kestrel.Core/Internal/Http/HttpProtocol.cs
View File

@ -630,9 +630,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
// Wait for MessageBody.PumpAsync() to call RequestBodyPipe.Writer.Complete(). // Wait for MessageBody.PumpAsync() to call RequestBodyPipe.Writer.Complete().
await messageBody.StopAsync(); await messageBody.StopAsync();
// At this point both the request body pipe reader and writer should be completed.
RequestBodyPipe.Reset();
} }
} }
} }

46
test/Kestrel.Core.Tests/MessageBodyTests.cs
View File

@ -47,6 +47,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
count = stream.Read(buffer, 0, buffer.Length); count = stream.Read(buffer, 0, buffer.Length);
Assert.Equal(0, count); Assert.Equal(0, count);
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -73,6 +74,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
count = await stream.ReadAsync(buffer, 0, buffer.Length); count = await stream.ReadAsync(buffer, 0, buffer.Length);
Assert.Equal(0, count); Assert.Equal(0, count);
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -101,6 +103,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
count = stream.Read(buffer, 0, buffer.Length); count = stream.Read(buffer, 0, buffer.Length);
Assert.Equal(0, count); Assert.Equal(0, count);
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -127,6 +130,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
count = await stream.ReadAsync(buffer, 0, buffer.Length); count = await stream.ReadAsync(buffer, 0, buffer.Length);
Assert.Equal(0, count); Assert.Equal(0, count);
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -152,6 +156,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.Equal(5, await readTask.DefaultTimeout()); Assert.Equal(5, await readTask.DefaultTimeout());
Assert.Equal(0, await stream.ReadAsync(buffer, 0, buffer.Length)); Assert.Equal(0, await stream.ReadAsync(buffer, 0, buffer.Length));
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -173,6 +178,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.IsType<OverflowException>(ex.InnerException); Assert.IsType<OverflowException>(ex.InnerException);
Assert.Equal(CoreStrings.BadRequest_BadChunkSizeData, ex.Message); Assert.Equal(CoreStrings.BadRequest_BadChunkSizeData, ex.Message);
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -194,6 +200,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.Equal(CoreStrings.BadRequest_BadChunkSizeData, ex.Message); Assert.Equal(CoreStrings.BadRequest_BadChunkSizeData, ex.Message);
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -221,6 +228,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
input.Fin(); input.Fin();
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -246,6 +254,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
input.Fin(); input.Fin();
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -316,6 +325,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.Equal(8197, requestArray.Length); Assert.Equal(8197, requestArray.Length);
AssertASCII(largeInput + "Hello", new ArraySegment<byte>(requestArray, 0, requestArray.Length)); AssertASCII(largeInput + "Hello", new ArraySegment<byte>(requestArray, 0, requestArray.Length));
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -381,6 +391,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.Equal(0, await body.ReadAsync(new ArraySegment<byte>(new byte[1]))); Assert.Equal(0, await body.ReadAsync(new ArraySegment<byte>(new byte[1])));
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -398,6 +409,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.Equal(0, await body.ReadAsync(new ArraySegment<byte>(new byte[1]))); Assert.Equal(0, await body.ReadAsync(new ArraySegment<byte>(new byte[1])));
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -494,6 +506,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
input.Fin(); input.Fin();
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -520,6 +533,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
input.Fin(); input.Fin();
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -543,34 +557,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
input.Add("b"); input.Add("b");
Assert.Equal(1, await stream.ReadAsync(new byte[1], 0, 1)); Assert.Equal(1, await stream.ReadAsync(new byte[1], 0, 1));
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
[Fact]
public async Task StopAsyncPreventsFurtherDataConsumption()
{
using (var input = new TestInput())
{
var body = Http1MessageBody.For(HttpVersion.Http11, new HttpRequestHeaders { HeaderContentLength = "2" }, input.Http1Connection);
var stream = new HttpRequestStream(Mock.Of<IHttpBodyControlFeature>());
stream.StartAcceptingReads(body);
// Add some input and consume it to ensure PumpAsync is running
input.Add("a");
Assert.Equal(1, await stream.ReadAsync(new byte[1], 0, 1));
await body.StopAsync();
// Add some more data. Checking for cancellation and exiting the loop
// should take priority over reading this data.
input.Add("b");
// There shouldn't be any additional data available
Assert.Equal(0, await stream.ReadAsync(new byte[1], 0, 1));
}
}
[Fact] [Fact]
public async Task ReadAsyncThrowsOnTimeout() public async Task ReadAsyncThrowsOnTimeout()
{ {
@ -592,6 +583,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
var exception = await Assert.ThrowsAsync<BadHttpRequestException>(async () => await body.ReadAsync(new Memory<byte>(new byte[1]))); var exception = await Assert.ThrowsAsync<BadHttpRequestException>(async () => await body.ReadAsync(new Memory<byte>(new byte[1])));
Assert.Equal(StatusCodes.Status408RequestTimeout, exception.StatusCode); Assert.Equal(StatusCodes.Status408RequestTimeout, exception.StatusCode);
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -622,6 +614,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
It.IsAny<string>(), It.IsAny<string>(),
It.Is<BadHttpRequestException>(ex => ex.Reason == RequestRejectionReason.RequestBodyTimeout))); It.Is<BadHttpRequestException>(ex => ex.Reason == RequestRejectionReason.RequestBodyTimeout)));
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -650,6 +643,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.Equal(StatusCodes.Status408RequestTimeout, exception.StatusCode); Assert.Equal(StatusCodes.Status408RequestTimeout, exception.StatusCode);
} }
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -676,6 +670,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
input.Fin(); input.Fin();
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -706,6 +701,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
await logEvent.Task.DefaultTimeout(); await logEvent.Task.DefaultTimeout();
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -765,6 +761,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
input.Add("a"); input.Add("a");
await readTask; await readTask;
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }
@ -797,6 +794,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
mockTimeoutControl.Verify(timeoutControl => timeoutControl.PauseTimingReads(), Times.Never); mockTimeoutControl.Verify(timeoutControl => timeoutControl.PauseTimingReads(), Times.Never);
mockTimeoutControl.Verify(timeoutControl => timeoutControl.ResumeTimingReads(), Times.Never); mockTimeoutControl.Verify(timeoutControl => timeoutControl.ResumeTimingReads(), Times.Never);
input.Http1Connection.RequestBodyPipe.Reader.Complete();
await body.StopAsync(); await body.StopAsync();
} }
} }