c/civetweb
1
0
Fork 0
mirror of https://github.com/civetweb/civetweb synced 2025-03-28 21:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

websocket client "magic" key should be random

Browse Source 
Fixes #1220
This commit is contained in:
bel2125 2023-12-30 11:18:38 +01:00
parent 848ae0e232
commit 19b70adc70
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CREDITS.md
View File

@ -225,6 +225,7 @@
* Torben Jonas
* Uilian Ries
* Ulrich Hertlein
* videofan3d
* Walt Steverson
* wangli28
* webxer

21
src/civetweb.c
View File

@ -19243,6 +19243,24 @@ websocket_client_thread(void *data)
#endif
#if defined(USE_WEBSOCKET)
static void
generate_websocket_magic(char *magic25)
{
uint64_t rnd;
unsigned char buffer[2 * sizeof(rnd)];
rnd = get_random();
memcpy(buffer, &rnd, sizeof(rnd));
rnd = get_random();
memcpy(buffer + sizeof(rnd), &rnd, sizeof(rnd));
size_t dst_len = 24 + 1;
mg_base64_encode(buffer, sizeof(buffer), magic25, &dst_len);
}
#endif
static struct mg_connection *
mg_connect_websocket_client_impl(const struct mg_client_options *client_options,
int use_ssl,
@ -19259,7 +19277,8 @@ mg_connect_websocket_client_impl(const struct mg_client_options *client_options,
#if defined(USE_WEBSOCKET)
struct websocket_client_thread_data *thread_data;
static const char *magic = "x3JJHMbDL1EzLkh9GBhXDw==";
char magic[32];
generate_websocket_magic(magic);
const char *host = client_options->host;
int i;

2
unittest/public_server.c
View File

@ -1316,7 +1316,7 @@ START_TEST(test_request_handlers)
char cmd_buf[1024];
char *cgi_env_opt;
const char *server_host = "test.domain";
const char *server_host = "localhost"; //"test.domain";
mark_point();