From 85593d8d25205344d512cbc976aa890a51f5f974 Mon Sep 17 00:00:00 2001 From: teravus Date: Fri, 4 Oct 2013 20:37:59 -0500 Subject: * Add an initial complete frame timeout to the WebSocket processor to make it easier to write WebSocket service code that is resistant to Denial of Service attacks. --- .../Servers/HttpServer/WebsocketServerHandler.cs | 67 +++++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) (limited to 'OpenSim/Framework/Servers/HttpServer') diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs index de89e2e..c2925e3 100644 --- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs @@ -28,8 +28,10 @@ using System; using System.Collections.Generic; using System.IO; +using System.Net; using System.Security.Cryptography; using System.Text; +using System.Threading; using HttpServer; namespace OpenSim.Framework.Servers.HttpServer @@ -98,6 +100,8 @@ namespace OpenSim.Framework.Servers.HttpServer /// public ValidateHandshake HandshakeValidateMethodOverride = null; + private ManualResetEvent _receiveDone = new ManualResetEvent(false); + private OSHttpRequest _request; private HTTPNetworkContext _networkContext; private IHttpClientContext _clientContext; @@ -109,6 +113,8 @@ namespace OpenSim.Framework.Servers.HttpServer private bool _closing; private bool _upgraded; private int _maxPayloadBytes = 41943040; + private int _initialMsgTimeout = 0; + private int _defaultReadTimeout = 10000; private const string HandshakeAcceptText = "HTTP/1.1 101 Switching Protocols\r\n" + @@ -131,6 +137,7 @@ namespace OpenSim.Framework.Servers.HttpServer { _request = preq; _networkContext = pContext.GiveMeTheNetworkStreamIKnowWhatImDoing(); + _networkContext.Stream.ReadTimeout = _defaultReadTimeout; _clientContext = pContext; _bufferLength = bufferlen; _buffer = new byte[_bufferLength]; @@ -206,6 +213,16 @@ namespace OpenSim.Framework.Servers.HttpServer } /// + /// Set this to the maximum amount of milliseconds to wait for the first complete message to be sent or received on the websocket after upgrading + /// Default, it waits forever. Use this when your Websocket consuming code opens a connection and waits for a message from the other side to avoid a Denial of Service vector. + /// + public int InitialMsgTimeout + { + get { return _initialMsgTimeout; } + set { _initialMsgTimeout = value; } + } + + /// /// This triggers the websocket start the upgrade process /// public void HandshakeAndUpgrade() @@ -245,6 +262,7 @@ namespace OpenSim.Framework.Servers.HttpServer string rawaccept = string.Format(HandshakeAcceptText, acceptKey); SendUpgradeSuccess(rawaccept); + } else { @@ -258,6 +276,10 @@ namespace OpenSim.Framework.Servers.HttpServer SendUpgradeSuccess(rawaccept); } } + public IPEndPoint GetRemoteIPEndpoint() + { + return _request.RemoteIPEndPoint; + } /// /// Generates a handshake response key string based on the client's @@ -290,9 +312,16 @@ namespace OpenSim.Framework.Servers.HttpServer WebSocketState socketState = new WebSocketState() { ReceivedBytes = new List(), Header = WebsocketFrameHeader.HeaderDefault(), FrameComplete = true}; byte[] bhandshakeResponse = Encoding.UTF8.GetBytes(pHandshakeResponse); + + + + try { - + if (_initialMsgTimeout > 0) + { + _receiveDone.Reset(); + } // Begin reading the TCP stream before writing the Upgrade success message to the other side of the stream. _networkContext.Stream.BeginRead(_buffer, 0, _bufferLength, OnReceive, socketState); @@ -303,6 +332,11 @@ namespace OpenSim.Framework.Servers.HttpServer UpgradeCompletedDelegate d = OnUpgradeCompleted; if (d != null) d(this, new UpgradeCompletedEventArgs()); + if (_initialMsgTimeout > 0) + { + if (!_receiveDone.WaitOne(TimeSpan.FromMilliseconds(_initialMsgTimeout))) + Close(string.Empty); + } } catch (IOException) { @@ -489,6 +523,11 @@ namespace OpenSim.Framework.Servers.HttpServer /// the string message that is to be sent public void SendMessage(string message) { + if (_initialMsgTimeout > 0) + { + _receiveDone.Set(); + _initialMsgTimeout = 0; + } byte[] messagedata = Encoding.UTF8.GetBytes(message); WebSocketFrame textMessageFrame = new WebSocketFrame() { Header = WebsocketFrameHeader.HeaderDefault(), WebSocketPayload = messagedata }; textMessageFrame.Header.Opcode = WebSocketReader.OpCode.Text; @@ -499,6 +538,11 @@ namespace OpenSim.Framework.Servers.HttpServer public void SendData(byte[] data) { + if (_initialMsgTimeout > 0) + { + _receiveDone.Set(); + _initialMsgTimeout = 0; + } WebSocketFrame dataMessageFrame = new WebSocketFrame() { Header = WebsocketFrameHeader.HeaderDefault(), WebSocketPayload = data}; dataMessageFrame.Header.IsEnd = true; dataMessageFrame.Header.Opcode = WebSocketReader.OpCode.Binary; @@ -531,6 +575,11 @@ namespace OpenSim.Framework.Servers.HttpServer /// public void SendPingCheck() { + if (_initialMsgTimeout > 0) + { + _receiveDone.Set(); + _initialMsgTimeout = 0; + } WebSocketFrame pingFrame = new WebSocketFrame() { Header = WebsocketFrameHeader.HeaderDefault(), WebSocketPayload = new byte[0] }; pingFrame.Header.Opcode = WebSocketReader.OpCode.Ping; pingFrame.Header.IsEnd = true; @@ -544,6 +593,11 @@ namespace OpenSim.Framework.Servers.HttpServer /// public void Close(string message) { + if (_initialMsgTimeout > 0) + { + _receiveDone.Set(); + _initialMsgTimeout = 0; + } if (_networkContext == null) return; if (_networkContext.Stream != null) @@ -583,7 +637,11 @@ namespace OpenSim.Framework.Servers.HttpServer WebSocketReader.Mask(psocketState.Header.Mask, unmask); psocketState.ReceivedBytes = new List(unmask); } - + if (psocketState.Header.Opcode != WebSocketReader.OpCode.Continue && _initialMsgTimeout > 0) + { + _receiveDone.Set(); + _initialMsgTimeout = 0; + } switch (psocketState.Header.Opcode) { case WebSocketReader.OpCode.Ping: @@ -696,6 +754,11 @@ namespace OpenSim.Framework.Servers.HttpServer } public void Dispose() { + if (_initialMsgTimeout > 0) + { + _receiveDone.Set(); + _initialMsgTimeout = 0; + } if (_networkContext != null && _networkContext.Stream != null) { if (_networkContext.Stream.CanWrite) -- cgit v1.1