Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for websocket server reading Sec-WebSocket-Key in wrong place when missing, and handling common mistakes from clients #17

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix for websocket server reading Sec-WebSocket-Key in wrong place when missing, and handling common mistakes from clients #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5423a1a
Throw when Sec-WebSocket-Key is missing, instead of reading wrong data
SoylentGraham Mar 12, 2024
b5e8b83
Now searching case-insensitively for Sec-WebSocket-Key
SoylentGraham Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions FishNet/Plugins/Bayou/SimpleWebTransport/Server/ServerHandshake.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,17 @@ void AcceptHandshake(Stream stream, string msg)
}


static void GetKey(string msg, byte[] keyBuffer)
static void GetKey(string msg, byte[] keyBuffer)
{
int start = msg.IndexOf(KeyHeaderString) + KeyHeaderString.Length;
// really should be parsing http headers properly here, and then finding required header,
// as this string could be crammed in anywhere in the message
// but as a hack, for https://github.com/FirstGearGames/Bayou/issues/12
// search for the key case insensitively
var KeyIndex = msg.IndexOf(KeyHeaderString,StringComparison.InvariantCultureIgnoreCase);
if ( KeyIndex <= -1 )
throw new Exception($"Request missing required header {KeyHeaderString}");

int start = KeyIndex + KeyHeaderString.Length;

Log.Verbose($"Handshake Key: {msg.Substring(start, KeyLength)}");
Encoding.ASCII.GetBytes(msg, start, KeyLength, keyBuffer, 0);
Expand Down