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

Clean up error handling. Check for control frame fragmentation.

This commit is contained in:
Chris Ross 2014-10-22 17:09:57 -07:00
parent 7d11034790
commit 31c76a0032
2 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/Microsoft.AspNet.WebSockets.Protocol/CommonWebSocket.cs
View File

@ -221,12 +221,7 @@ namespace Microsoft.AspNet.WebSockets.Protocol
{ {
if (!_firstDataOpCode.HasValue) if (!_firstDataOpCode.HasValue)
{ {
if (State == WebSocketState.Open) await SendErrorAbortAndThrow(WebSocketCloseStatus.ProtocolError, "Invalid continuation frame", cancellationToken);
{
await CloseOutputAsync(WebSocketCloseStatus.ProtocolError, "Invalid continuation frame", cancellationToken);
Abort();
}
throw new InvalidOperationException("A continuation can't be the first frame"); // TODO: WebSocketException
} }
opCode = _firstDataOpCode.Value; opCode = _firstDataOpCode.Value;
} }
@ -261,12 +256,7 @@ namespace Microsoft.AspNet.WebSockets.Protocol
if (messageType == WebSocketMessageType.Text if (messageType == WebSocketMessageType.Text
&& !Utilities.TryValidateUtf8(new ArraySegment<byte>(buffer.Array, buffer.Offset, bytesToCopy), _frameInProgress.Fin, _incomingUtf8MessageState)) && !Utilities.TryValidateUtf8(new ArraySegment<byte>(buffer.Array, buffer.Offset, bytesToCopy), _frameInProgress.Fin, _incomingUtf8MessageState))
{ {
if (State == WebSocketState.Open) await SendErrorAbortAndThrow(WebSocketCloseStatus.InvalidPayloadData, "Invalid UTF-8", cancellationToken);
{
await CloseOutputAsync(WebSocketCloseStatus.InvalidPayloadData, "Invalid UTF-8", cancellationToken);
Abort();
}
throw new InvalidOperationException("An invalid UTF-8 payload was received."); // TODO: WebSocketException
} }
if (bytesToCopy == _frameBytesRemaining) if (bytesToCopy == _frameBytesRemaining)
@ -303,47 +293,41 @@ namespace Microsoft.AspNet.WebSockets.Protocol
if (_frameInProgress.AreReservedSet()) if (_frameInProgress.AreReservedSet())
{ {
if (State == WebSocketState.Open) await SendErrorAbortAndThrow(WebSocketCloseStatus.ProtocolError, "Unexpected reserved bits set", cancellationToken);
{
await CloseOutputAsync(WebSocketCloseStatus.ProtocolError, "Unexpected reserved bits set", cancellationToken);
Abort();
}
throw new InvalidOperationException("Unexpected reserved bits are set."); // TODO: WebSocketException
} }
if (_unmaskInput != _frameInProgress.Masked) if (_unmaskInput != _frameInProgress.Masked)
{ {
if (State == WebSocketState.Open) await SendErrorAbortAndThrow(WebSocketCloseStatus.ProtocolError, "Incorrect masking", cancellationToken);
{
await CloseOutputAsync(WebSocketCloseStatus.ProtocolError, "Incorrect masking", cancellationToken);
Abort();
}
throw new InvalidOperationException("Unmasking settings out of sync with data."); // TODO: WebSocketException
} }
if (_frameInProgress.OpCode == Constants.OpCodes.PingFrame || _frameInProgress.OpCode == Constants.OpCodes.PongFrame) if (_frameInProgress.IsControlFrame)
{ {
if (_frameBytesRemaining > 125) if (_frameBytesRemaining > 125)
{ {
if (State == WebSocketState.Open) await SendErrorAbortAndThrow(WebSocketCloseStatus.ProtocolError, "Invalid control frame size", cancellationToken);
{
await CloseOutputAsync(WebSocketCloseStatus.ProtocolError, "Invalid control frame size", cancellationToken);
Abort();
}
throw new InvalidOperationException("Control frame too large."); // TODO: WebSocketException
} }
// Drain it, should be less than 125 bytes
await EnsureDataAvailableOrReadAsync((int)_frameBytesRemaining, cancellationToken);
if (_frameInProgress.OpCode == Constants.OpCodes.PingFrame) if (!_frameInProgress.Fin)
{ {
await SendPongReplyAsync(cancellationToken); await SendErrorAbortAndThrow(WebSocketCloseStatus.ProtocolError, "Fragmented control frame", cancellationToken);
} }
_receiveBufferOffset += (int)_frameBytesRemaining; if (_frameInProgress.OpCode == Constants.OpCodes.PingFrame || _frameInProgress.OpCode == Constants.OpCodes.PongFrame)
_receiveBufferBytes -= (int)_frameBytesRemaining; {
_frameBytesRemaining = 0; // Drain it, should be less than 125 bytes
_frameInProgress = null; await EnsureDataAvailableOrReadAsync((int)_frameBytesRemaining, cancellationToken);
if (_frameInProgress.OpCode == Constants.OpCodes.PingFrame)
{
await SendPongReplyAsync(cancellationToken);
}
_receiveBufferOffset += (int)_frameBytesRemaining;
_receiveBufferBytes -= (int)_frameBytesRemaining;
_frameBytesRemaining = 0;
_frameInProgress = null;
}
} }
} }
@ -587,5 +571,15 @@ namespace Microsoft.AspNet.WebSockets.Protocol
throw new ArgumentOutOfRangeException("buffer.Count", buffer.Count, string.Empty); throw new ArgumentOutOfRangeException("buffer.Count", buffer.Count, string.Empty);
} }
} }
private async Task SendErrorAbortAndThrow(WebSocketCloseStatus error, string message, CancellationToken cancellationToken)
{
if (State == WebSocketState.Open)
{
await CloseOutputAsync(error, message, cancellationToken);
}
Abort();
throw new InvalidOperationException(message); // TODO: WebSocketException
}
} }
} }

8
src/Microsoft.AspNet.WebSockets.Protocol/FrameHeader.cs
View File

@ -209,6 +209,14 @@ namespace Microsoft.AspNet.WebSockets.Protocol
} }
} }
public bool IsControlFrame
{
get
{
return OpCode >= Constants.OpCodes.CloseFrame;
}
}
// bits 1-3. // bits 1-3.
internal bool AreReservedSet() internal bool AreReservedSet()
{ {