DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified validating the connection request and response

Browse Source
This commit is contained in:
sta 2013-08-07 18:01:23 +09:00
parent ab2ef30f02
commit 93b30f94d7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
websocket-sharp/HandshakeResponse.cs
View File

@ -81,8 +81,7 @@ namespace WebSocketSharp
return ProtocolVersion >= HttpVersion.Version11 && return ProtocolVersion >= HttpVersion.Version11 &&
StatusCode == "101" && StatusCode == "101" &&
Headers.Contains ("Upgrade", "websocket") && Headers.Contains ("Upgrade", "websocket") &&
Headers.Contains ("Connection", "Upgrade") && Headers.Contains ("Connection", "Upgrade");
!Headers ["Sec-WebSocket-Accept"].IsNullOrEmpty ();
} }
} }

9
websocket-sharp/WebSocket.cs
View File

@ -1260,19 +1260,20 @@ namespace WebSocketSharp
// As server // As server
private bool validateConnectionRequest (WebSocketContext context) private bool validateConnectionRequest (WebSocketContext context)
{ {
string version;
return context.IsWebSocketRequest && return context.IsWebSocketRequest &&
validateHostHeader (context.Host) && validateHostHeader (context.Host) &&
!context.SecWebSocketKey.IsNullOrEmpty () && !context.SecWebSocketKey.IsNullOrEmpty () &&
context.Headers.Contains ("Sec-WebSocket-Version", _version); ((version = context.SecWebSocketVersion) != null && version == _version);
} }
// As client // As client
private bool validateConnectionResponse (HandshakeResponse response) private bool validateConnectionResponse (HandshakeResponse response)
{ {
string accept, version;
return response.IsWebSocketResponse && return response.IsWebSocketResponse &&
response.Headers.Contains ("Sec-WebSocket-Accept", createResponseKey ()) && ((accept = response.Headers ["Sec-WebSocket-Accept"]) != null && accept == createResponseKey ()) &&
(!response.Headers.Contains ("Sec-WebSocket-Version") || ((version = response.Headers ["Sec-WebSocket-Version"]) == null || version == _version);
response.Headers.Contains ("Sec-WebSocket-Version", _version));
} }
// As server // As server