p
/
json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

json-rpc-test-server: WS: fix failures to upgrade 

Similar to ad1aba9, only here we return 426 to the client.
This commit is contained in:
Přemysl Eric Janouch 2020-10-15 00:25:35 +02:00
parent 4236a4943a
commit b3c377afdb
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
json-rpc-test-server.c
View File

@ -1003,9 +1003,10 @@ ws_handler_on_headers_complete (http_parser *parser)
if (self->have_header_value) if (self->have_header_value)
ws_handler_on_header_read (self); ws_handler_on_header_read (self);
// We strictly require a protocol upgrade // We require a protocol upgrade. 1 is for "skip body", 2 is the same
// + "stop processing", return another number to indicate a problem here.
if (!parser->upgrade) if (!parser->upgrade)
return 2; return 3;
return 0; return 0;
} }
@ -1268,11 +1269,13 @@ ws_handler_push (struct ws_handler *self, const void *data, size_t len)
ev_timer_stop (EV_DEFAULT_ &self->handshake_timeout_watcher); ev_timer_stop (EV_DEFAULT_ &self->handshake_timeout_watcher);
if (err == HPE_CB_headers_complete) if (err == HPE_CB_headers_complete)
{
print_debug ("WS handshake failed: %s", "missing `Upgrade' field"); print_debug ("WS handshake failed: %s", "missing `Upgrade' field");
else FAIL_HANDSHAKE (HTTP_426_UPGRADE_REQUIRED,
print_debug ("WS handshake failed: %s", "Upgrade: websocket", SEC_WS_VERSION ": 13");
http_errno_description (err)); }
print_debug ("WS handshake failed: %s", http_errno_description (err));
FAIL_HANDSHAKE (HTTP_400_BAD_REQUEST); FAIL_HANDSHAKE (HTTP_400_BAD_REQUEST);
} }
return true; return true;