Partydeck/Websocket-Extension
3
0
Fork 0
mirror of https://github.com/defold/extension-websocket.git synced 2025-06-27 09:47:44 +02:00
Code Issues Projects Releases Wiki Activity

Issue 4: Compare header keys without case sensitivity

Browse Source
This commit is contained in:
JCash 2020-10-12 09:33:47 +02:00
parent 23ba179e2a
commit 40ba1b334c
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
websocket/src/handshake.cpp
View File

@ -1,5 +1,6 @@
#include "websocket.h" #include "websocket.h"
#include <dmsdk/dlib/socket.h> #include <dmsdk/dlib/socket.h>
#include <ctype.h> // tolower
namespace dmWebsocket namespace dmWebsocket
{ {
@ -156,6 +157,20 @@ Result ReceiveHeaders(WebsocketConnection* conn)
} }
#endif #endif
static int dmStriCmp(const char* s1, const char* s2)
{
for (;;)
{
if (!*s1 || !*s2 || tolower((unsigned char) *s1) != tolower((unsigned char) *s2))
{
return (unsigned char) *s1 - (unsigned char) *s2;
}
s1++;
s2++;
}
}
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)
Result VerifyHeaders(WebsocketConnection* conn) Result VerifyHeaders(WebsocketConnection* conn)
{ {
@ -197,27 +212,36 @@ Result VerifyHeaders(WebsocketConnection* conn)
*r = 0; *r = 0;
r += 2; r += 2;
if (strcmp(key, "Connection") == 0 && strcmp(value, "Upgrade") == 0) if (dmStriCmp(key, "Connection") == 0 && dmStriCmp(value, "Upgrade") == 0)
upgraded = true; upgraded = true;
else if (strcmp(key, "Sec-WebSocket-Accept") == 0) else if (dmStriCmp(key, "Sec-WebSocket-Accept") == 0)
{ {
uint8_t client_key[32 + 40]; uint8_t client_key[32 + 40];
uint32_t client_key_len = sizeof(client_key); uint32_t client_key_len = sizeof(client_key);
dmCrypt::Base64Encode(conn->m_Key, sizeof(conn->m_Key), client_key, &client_key_len); dmCrypt::Base64Encode(conn->m_Key, sizeof(conn->m_Key), client_key, &client_key_len);
client_key[client_key_len] = 0; client_key[client_key_len] = 0;
DebugLog(2, "Secret key (base64): %s", client_key);
memcpy(client_key + client_key_len, RFC_MAGIC, strlen(RFC_MAGIC)); memcpy(client_key + client_key_len, RFC_MAGIC, strlen(RFC_MAGIC));
client_key_len += strlen(RFC_MAGIC); client_key_len += strlen(RFC_MAGIC);
client_key[client_key_len] = 0; client_key[client_key_len] = 0;
DebugLog(2, "Secret key + RFC_MAGIC: %s", client_key);
uint8_t client_key_sha1[20]; uint8_t client_key_sha1[20];
dmCrypt::HashSha1(client_key, client_key_len, client_key_sha1); dmCrypt::HashSha1(client_key, client_key_len, client_key_sha1);
DebugPrint(2, "Hashed key (sha1):", client_key_sha1, sizeof(client_key_sha1));
client_key_len = sizeof(client_key); client_key_len = sizeof(client_key);
dmCrypt::Base64Encode(client_key_sha1, sizeof(client_key_sha1), client_key, &client_key_len); dmCrypt::Base64Encode(client_key_sha1, sizeof(client_key_sha1), client_key, &client_key_len);
client_key[client_key_len] = 0; client_key[client_key_len] = 0;
DebugLog(2, "Client key (base64): %s", client_key);
DebugLog(2, "Server key (base64): %s", value);
if (strcmp(value, (const char*)client_key) == 0) if (strcmp(value, (const char*)client_key) == 0)
valid_key = true; valid_key = true;
} }