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

Fix ContentLengthReadAsyncSingleBytesAtATime (#23641)

This commit is contained in:
Stephen Halter 2020-07-06 09:48:07 -07:00 committed by GitHub
parent a7ab15a2f5
commit a57a80fcfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs
View File

@ -1048,27 +1048,52 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
} }
[Fact] [Fact]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/23628")]
public async Task ContentLengthReadAsyncSingleBytesAtATime() public async Task ContentLengthReadAsyncSingleBytesAtATime()
{ {
var testContext = new TestServiceContext(LoggerFactory); var testContext = new TestServiceContext(LoggerFactory);
var tcs = new TaskCompletionSource(); var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var tcs2 = new TaskCompletionSource(); var tcs2 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
static async Task<ReadResult> ReadAtLeastAsync(PipeReader reader, int numBytes)
{
var result = await reader.ReadAsync();
while (!result.IsCompleted && result.Buffer.Length < numBytes)
{
reader.AdvanceTo(result.Buffer.Start, result.Buffer.End);
result = await reader.ReadAsync();
}
if (result.Buffer.Length < numBytes)
{
throw new IOException("Unexpected end of content.");
}
return result;
}
await using (var server = new TestServer(async httpContext => await using (var server = new TestServer(async httpContext =>
{ {
var readResult = await httpContext.Request.BodyReader.ReadAsync(); // Buffer 3 bytes.
var readResult = await ReadAtLeastAsync(httpContext.Request.BodyReader, numBytes: 3);
Assert.Equal(3, readResult.Buffer.Length); Assert.Equal(3, readResult.Buffer.Length);
tcs.SetResult(); tcs.SetResult();
httpContext.Request.BodyReader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); httpContext.Request.BodyReader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End);
// Buffer 1 more byte.
readResult = await httpContext.Request.BodyReader.ReadAsync(); readResult = await httpContext.Request.BodyReader.ReadAsync();
httpContext.Request.BodyReader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End); httpContext.Request.BodyReader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End);
tcs2.SetResult(); tcs2.SetResult();
// Buffer 1 last byte.
readResult = await httpContext.Request.BodyReader.ReadAsync(); readResult = await httpContext.Request.BodyReader.ReadAsync();
Assert.Equal(5, readResult.Buffer.Length); Assert.Equal(5, readResult.Buffer.Length);
// Do one more read to ensure completion is always observed.
httpContext.Request.BodyReader.AdvanceTo(readResult.Buffer.Start, readResult.Buffer.End);
readResult = await httpContext.Request.BodyReader.ReadAsync();
Assert.True(readResult.IsCompleted);
}, testContext)) }, testContext))
{ {
using (var connection = server.CreateConnection()) using (var connection = server.CreateConnection())
@ -1766,7 +1791,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
[Fact] [Fact]
public async Task ContentLengthRequestCallCancelPendingReadWorks() public async Task ContentLengthRequestCallCancelPendingReadWorks()
{ {
var tcs = new TaskCompletionSource(); var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var testContext = new TestServiceContext(LoggerFactory); var testContext = new TestServiceContext(LoggerFactory);
await using (var server = new TestServer(async httpContext => await using (var server = new TestServer(async httpContext =>
@ -1863,7 +1888,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
{ {
var testContext = new TestServiceContext(LoggerFactory); var testContext = new TestServiceContext(LoggerFactory);
var tcs = new TaskCompletionSource(); var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
await using (var server = new TestServer(async httpContext => await using (var server = new TestServer(async httpContext =>
{ {
var request = httpContext.Request; var request = httpContext.Request;