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

Fix reading DATA frames with maximum length.

This commit is contained in:
Cesar Blum Silveira 2017-09-19 11:32:38 -07:00 committed by Cesar Blum Silveira
parent c8f9364e3e
commit 9944c0fd43
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Kestrel.Core/Internal/Http2/Http2Frame.Data.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2
{ {
var padded = padLength != null; var padded = padLength != null;
Length = MinAllowedMaxFrameSize - HeaderLength; Length = MinAllowedMaxFrameSize;
Type = Http2FrameType.DATA; Type = Http2FrameType.DATA;
DataFlags = padded ? Http2DataFrameFlags.PADDED : Http2DataFrameFlags.NONE; DataFlags = padded ? Http2DataFrameFlags.PADDED : Http2DataFrameFlags.NONE;
StreamId = streamId; StreamId = streamId;

2
src/Kestrel.Core/Internal/Http2/Http2Frame.cs
View File

@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2
private const int StreamIdOffset = 5; private const int StreamIdOffset = 5;
private const int PayloadOffset = 9; private const int PayloadOffset = 9;
private readonly byte[] _data = new byte[MinAllowedMaxFrameSize]; private readonly byte[] _data = new byte[HeaderLength + MinAllowedMaxFrameSize];
public ArraySegment<byte> Raw => new ArraySegment<byte>(_data, 0, HeaderLength + Length); public ArraySegment<byte> Raw => new ArraySegment<byte>(_data, 0, HeaderLength + Length);

27
test/Kestrel.Core.Tests/Http2ConnectionTests.cs
View File

@ -71,6 +71,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
private static readonly byte[] _worldBytes = Encoding.ASCII.GetBytes("world"); private static readonly byte[] _worldBytes = Encoding.ASCII.GetBytes("world");
private static readonly byte[] _helloWorldBytes = Encoding.ASCII.GetBytes("hello, world"); private static readonly byte[] _helloWorldBytes = Encoding.ASCII.GetBytes("hello, world");
private static readonly byte[] _noData = new byte[0]; private static readonly byte[] _noData = new byte[0];
private static readonly byte[] _maxData = Encoding.ASCII.GetBytes(new string('a', Http2Frame.MinAllowedMaxFrameSize));
private readonly PipeFactory _pipeFactory = new PipeFactory(); private readonly PipeFactory _pipeFactory = new PipeFactory();
private readonly (IPipeConnection Transport, IPipeConnection Application) _pair; private readonly (IPipeConnection Transport, IPipeConnection Application) _pair;
@ -248,6 +249,32 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
Assert.Equal(dataFrame.DataPayload, _helloWorldBytes); Assert.Equal(dataFrame.DataPayload, _helloWorldBytes);
} }
[Fact]
public async Task DATA_Received_MaxSize_ReadByStream()
{
await InitializeConnectionAsync(_echoApplication);
await StartStreamAsync(1, _browserRequestHeaders, endStream: false);
await SendDataAsync(1, _maxData, endStream: true);
await ExpectAsync(Http2FrameType.HEADERS,
withLength: 37,
withFlags: (byte)Http2HeadersFrameFlags.END_HEADERS,
withStreamId: 1);
var dataFrame = await ExpectAsync(Http2FrameType.DATA,
withLength: _maxData.Length,
withFlags: (byte)Http2DataFrameFlags.NONE,
withStreamId: 1);
await ExpectAsync(Http2FrameType.DATA,
withLength: 0,
withFlags: (byte)Http2DataFrameFlags.END_STREAM,
withStreamId: 1);
await StopConnectionAsync(expectedLastStreamId: 1, ignoreNonGoAwayFrames: false);
Assert.Equal(dataFrame.DataPayload, _maxData);
}
[Fact] [Fact]
public async Task DATA_Received_Multiple_ReadByStream() public async Task DATA_Received_Multiple_ReadByStream()
{ {