wt/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-10-13 10:15:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make ws_upgrade() respond with error if request is not and upgrade

Browse Source
This commit is contained in:
Sergey Lyubka
2021-08-03 23:37:50 +01:00
parent a36050ab4b
commit 9b18a6350a
3 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mongoose.c
+5 -2
View File
@@ -4661,13 +4661,16 @@ void mg_ws_upgrade(struct mg_connection *c, struct mg_http_message *hm,
const char *fmt, ...) {
struct mg_str *wskey = mg_http_get_header(hm, "Sec-WebSocket-Key");
c->pfn = mg_ws_cb;
if (wskey != NULL) {
if (wskey == NULL) {
mg_http_reply(c, 426, "", "WS upgrade expected\n");
c->is_draining = 1;
} else {
va_list ap;
va_start(ap, fmt);
ws_handshake(c, wskey->ptr, wskey->len, fmt, ap);
va_end(ap);
c->is_websocket = 1;
}
c->is_websocket = 1;
}
size_t mg_ws_wrap(struct mg_connection *c, size_t len, int op) {
src/ws.c
+5 -2
View File
@@ -217,13 +217,16 @@ void mg_ws_upgrade(struct mg_connection *c, struct mg_http_message *hm,
const char *fmt, ...) {
struct mg_str *wskey = mg_http_get_header(hm, "Sec-WebSocket-Key");
c->pfn = mg_ws_cb;
if (wskey != NULL) {
if (wskey == NULL) {
mg_http_reply(c, 426, "", "WS upgrade expected\n");
c->is_draining = 1;
} else {
va_list ap;
va_start(ap, fmt);
ws_handshake(c, wskey->ptr, wskey->len, fmt, ap);
va_end(ap);
c->is_websocket = 1;
}
c->is_websocket = 1;
}
size_t mg_ws_wrap(struct mg_connection *c, size_t len, int op) {
test/unit_test.c
+33 -28
View File
@@ -383,34 +383,6 @@ static void eh1(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
}
}
static void wcb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
if (ev == MG_EV_WS_OPEN) {
mg_ws_send(c, "boo", 3, WEBSOCKET_OP_BINARY);
mg_ws_send(c, "", 0, WEBSOCKET_OP_PING);
} else if (ev == MG_EV_WS_MSG) {
struct mg_ws_message *wm = (struct mg_ws_message *) ev_data;
ASSERT(mg_strstr(wm->data, mg_str("boo")));
mg_ws_send(c, "", 0, WEBSOCKET_OP_CLOSE); // Ask server to close
*(int *) fn_data = 1;
} else if (ev == MG_EV_CLOSE) {
*(int *) fn_data = 2;
}
}
static void test_ws(void) {
struct mg_mgr mgr;
int i, done = 0;
mg_mgr_init(&mgr);
ASSERT(mg_http_listen(&mgr, "ws://LOCALHOST:12345", eh1, NULL) != NULL);
mg_ws_connect(&mgr, "ws://localhost:12345/ws", wcb, &done, "%s", "");
for (i = 0; i < 20; i++) mg_mgr_poll(&mgr, 1);
ASSERT(done == 2);
mg_mgr_free(&mgr);
ASSERT(mgr.conns == NULL);
}
struct fetch_data {
char *buf;
int code, closed;
@@ -467,6 +439,39 @@ static int cmpbody(const char *buf, const char *str) {
return strncmp(hm.body.ptr, str, hm.body.len);
}
static void wcb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
if (ev == MG_EV_WS_OPEN) {
mg_ws_send(c, "boo", 3, WEBSOCKET_OP_BINARY);
mg_ws_send(c, "", 0, WEBSOCKET_OP_PING);
} else if (ev == MG_EV_WS_MSG) {
struct mg_ws_message *wm = (struct mg_ws_message *) ev_data;
ASSERT(mg_strstr(wm->data, mg_str("boo")));
mg_ws_send(c, "", 0, WEBSOCKET_OP_CLOSE); // Ask server to close
*(int *) fn_data = 1;
} else if (ev == MG_EV_CLOSE) {
*(int *) fn_data = 2;
}
}
static void test_ws(void) {
char buf[FETCH_BUF_SIZE];
const char *url = "ws://LOCALHOST:12343";
struct mg_mgr mgr;
int i, done = 0;
mg_mgr_init(&mgr);
ASSERT(mg_http_listen(&mgr, url, eh1, NULL) != NULL);
mg_ws_connect(&mgr, url, wcb, &done, "%s", "");
for (i = 0; i < 20; i++) mg_mgr_poll(&mgr, 1);
ASSERT(done == 2);
// Test that non-WS requests fail
ASSERT(fetch(&mgr, buf, url, "GET /ws HTTP/1.0\r\n\n") == 426);
mg_mgr_free(&mgr);
ASSERT(mgr.conns == NULL);
}
static void eh9(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
if (ev == MG_EV_ERROR) {
ASSERT(!strcmp((char *) ev_data, "error connecting to 127.0.0.1:55117"));