diff --git a/Example/Example.pidb b/Example/Example.pidb index feb19e6d..1bb39e3e 100644 Binary files a/Example/Example.pidb and b/Example/Example.pidb differ diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe index 67b974b8..c9304141 100755 Binary files a/Example/bin/Debug_Ubuntu/example.exe and b/Example/bin/Debug_Ubuntu/example.exe differ diff --git a/Example/bin/Debug_Ubuntu/example.exe.mdb b/Example/bin/Debug_Ubuntu/example.exe.mdb index 01782bdf..2c3e0f2a 100644 Binary files a/Example/bin/Debug_Ubuntu/example.exe.mdb and b/Example/bin/Debug_Ubuntu/example.exe.mdb differ diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll b/Example/bin/Debug_Ubuntu/websocket-sharp.dll index 29528a4d..1b134f08 100755 Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 97516da9..5bef4736 100644 Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example1/bin/Debug_Ubuntu/example1.exe b/Example1/bin/Debug_Ubuntu/example1.exe index 5f399ccf..63a1ba7d 100755 Binary files a/Example1/bin/Debug_Ubuntu/example1.exe and b/Example1/bin/Debug_Ubuntu/example1.exe differ diff --git a/Example1/bin/Debug_Ubuntu/example1.exe.mdb b/Example1/bin/Debug_Ubuntu/example1.exe.mdb index 5e9701d8..26ddec8c 100644 Binary files a/Example1/bin/Debug_Ubuntu/example1.exe.mdb and b/Example1/bin/Debug_Ubuntu/example1.exe.mdb differ diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll index 29528a4d..1b134f08 100755 Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 97516da9..5bef4736 100644 Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example2/Example2.pidb b/Example2/Example2.pidb index c540fa46..46bf5e0b 100644 Binary files a/Example2/Example2.pidb and b/Example2/Example2.pidb differ diff --git a/Example2/bin/Debug_Ubuntu/example2.exe b/Example2/bin/Debug_Ubuntu/example2.exe index 484ebde9..a8cc68b4 100755 Binary files a/Example2/bin/Debug_Ubuntu/example2.exe and b/Example2/bin/Debug_Ubuntu/example2.exe differ diff --git a/Example2/bin/Debug_Ubuntu/example2.exe.mdb b/Example2/bin/Debug_Ubuntu/example2.exe.mdb index 991a21cb..fa230fd8 100644 Binary files a/Example2/bin/Debug_Ubuntu/example2.exe.mdb and b/Example2/bin/Debug_Ubuntu/example2.exe.mdb differ diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll index 29528a4d..1b134f08 100755 Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 97516da9..5bef4736 100644 Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe b/Example3/bin/Debug_Ubuntu/Example3.exe index 148b4a2a..7513327c 100755 Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe and b/Example3/bin/Debug_Ubuntu/Example3.exe differ diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb index 768aa44a..56877941 100644 Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb and b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb differ diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll index 29528a4d..1b134f08 100755 Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 97516da9..5bef4736 100644 Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/Handshake.cs b/websocket-sharp/Handshake.cs index 577a24ba..94618f8b 100644 --- a/websocket-sharp/Handshake.cs +++ b/websocket-sharp/Handshake.cs @@ -53,8 +53,8 @@ namespace WebSocketSharp { #region Properties - public NameValueCollection Headers { get; protected set; } - public Version ProtocolVersion { get; protected set; } + public NameValueCollection Headers { get; internal set; } + public Version ProtocolVersion { get; internal set; } #endregion diff --git a/websocket-sharp/RequestHandshake.cs b/websocket-sharp/RequestHandshake.cs index 912e7a3b..0659b832 100644 --- a/websocket-sharp/RequestHandshake.cs +++ b/websocket-sharp/RequestHandshake.cs @@ -59,7 +59,7 @@ namespace WebSocketSharp { #region Properties - public string HttpMethod { get; private set; } + public string HttpMethod { get; internal set; } public bool IsWebSocketRequest { @@ -89,7 +89,7 @@ namespace WebSocketSharp { } } - public Uri RequestUri { get; private set; } + public Uri RequestUri { get; internal set; } #endregion diff --git a/websocket-sharp/ResponseHandshake.cs b/websocket-sharp/ResponseHandshake.cs index 41356219..a350e5a5 100644 --- a/websocket-sharp/ResponseHandshake.cs +++ b/websocket-sharp/ResponseHandshake.cs @@ -72,8 +72,8 @@ namespace WebSocketSharp { } } - public string Reason { get; private set; } - public string StatusCode { get; private set; } + public string Reason { get; internal set; } + public string StatusCode { get; internal set; } #endregion diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 3d1bba36..04a48ce3 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -32,6 +32,7 @@ using System; using System.Collections.Generic; +using System.Collections.Specialized; using System.Configuration; using System.Diagnostics; using System.IO; @@ -255,21 +256,17 @@ namespace WebSocketSharp private void acceptHandshake() { - var request = receiveOpeningHandshake(); - #if DEBUG - Console.WriteLine("WS: Info@acceptHandshake: Opening handshake from client:\n"); - Console.WriteLine(request.ToString()); - #endif - string msg; - if (!isValidRequest(request, out msg)) - throw new InvalidOperationException(msg); + var req = receiveOpeningHandshake(); - var response = createResponseHandshake(); - #if DEBUG - Console.WriteLine("WS: Info@acceptHandshake: Opening handshake from server:\n"); - Console.WriteLine(response.ToString()); - #endif - sendResponseHandshake(response); + string msg; + if (!isValidRequest(req, out msg)) + { + error(msg); + close(CloseStatusCode.HANDSHAKE_FAILURE, msg); + return; + } + + sendResponseHandshake(); ReadyState = WsState.OPEN; } @@ -283,12 +280,12 @@ namespace WebSocketSharp { if (_readyState == WsState.CLOSING || _readyState == WsState.CLOSED) - { return; - } - else if (_readyState == WsState.CONNECTING) + + if (_readyState == WsState.CONNECTING && !_isClient) { OnClose.Emit(this, new CloseEventArgs(data)); + sendResponseHandshakeForInvalid(); ReadyState = WsState.CLOSED; return; } @@ -509,19 +506,15 @@ namespace WebSocketSharp private void doHandshake() { - var request = createOpeningHandshake(); - #if DEBUG - Console.WriteLine("WS: Info@doHandshake: Opening handshake from client:\n"); - Console.WriteLine(request.ToString()); - #endif - var response = sendOpeningHandshake(request); - #if DEBUG - Console.WriteLine("WS: Info@doHandshake: Opening handshake from server:\n"); - Console.WriteLine(response.ToString()); - #endif + var res = sendOpeningHandshake(); + string msg; - if (!isValidResponse(response, out msg)) - throw new InvalidOperationException(msg); + if (!isValidResponse(res, out msg)) + { + error(msg); + close(CloseStatusCode.HANDSHAKE_FAILURE, msg); + return; + } ReadyState = WsState.OPEN; } @@ -860,10 +853,17 @@ namespace WebSocketSharp private RequestHandshake receiveOpeningHandshake() { - if (_context != null) - return RequestHandshake.Parse(_context); + RequestHandshake req; - return RequestHandshake.Parse(readHandshake()); + if (_context == null) + req = RequestHandshake.Parse(readHandshake()); + else + req = RequestHandshake.Parse(_context); + #if DEBUG + Console.WriteLine("WS: Info@receiveOpeningHandshake: Opening handshake from client:\n"); + Console.WriteLine(req.ToString()); + #endif + return req; } private bool send(WsFrame frame) @@ -999,15 +999,43 @@ namespace WebSocketSharp return readLen; } - private ResponseHandshake sendOpeningHandshake(RequestHandshake request) + private ResponseHandshake sendOpeningHandshake() { - _wsStream.Write(request.ToBytes(), 0, request.ToBytes().Length); - return ResponseHandshake.Parse(readHandshake()); + var req = createOpeningHandshake(); + #if DEBUG + Console.WriteLine("WS: Info@sendOpeningHandshake: Opening handshake from client:\n"); + Console.WriteLine(req.ToString()); + #endif + _wsStream.Write(req.ToBytes(), 0, req.ToBytes().Length); + + var res = ResponseHandshake.Parse(readHandshake()); + #if DEBUG + Console.WriteLine("WS: Info@sendOpeningHandshake: Response handshake from server:\n"); + Console.WriteLine(res.ToString()); + #endif + return res; } - private void sendResponseHandshake(ResponseHandshake response) + private void sendResponseHandshake() { - _wsStream.Write(response.ToBytes(), 0, response.ToBytes().Length); + var res = createResponseHandshake(); + #if DEBUG + Console.WriteLine("WS: Info@sendResponseHandshake: Response handshake from server:\n"); + Console.WriteLine(res.ToString()); + #endif + _wsStream.Write(res.ToBytes(), 0, res.ToBytes().Length); + } + + private void sendResponseHandshakeForInvalid() + { + var code = (int)WebSocketSharp.Net.HttpStatusCode.BadRequest; + var res = new ResponseHandshake { + Headers = new NameValueCollection(), + Reason = "Bad Request", + StatusCode = code.ToString() + }; + + _wsStream.Write(res.ToBytes(), 0, res.ToBytes().Length); } private void startMessageThread() diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll index 29528a4d..1b134f08 100755 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 97516da9..5bef4736 100644 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb index bb1947a2..73dffb7b 100644 Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ