ardour/livetrax
13
0
Fork 0
Code

Gracefully reject HTTP requests reaching the websockets surface

Browse Source
This commit is contained in:
Luciano Iam 2020-02-26 23:09:59 +01:00 committed by Robin Gareus
parent bc2cbfc7ec
commit ec8e0f8ee5
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/surfaces/websockets/server.cc
View File

@ -295,6 +295,14 @@ WebsocketsServer::write_client (Client wsi)
}
}
void
WebsocketsServer::reject_http_client (Client wsi)
{
const char *html_body = "<p>This URL is not meant to be accessed via HTTP; for example using"
" a web browser. Refer to Ardour documentation for further information.</p>";
lws_return_http_status (wsi, 404, html_body);
}
bool
WebsocketsServer::io_handler (Glib::IOCondition ioc, lws_sockfd_type fd)
{
@ -388,6 +396,10 @@ WebsocketsServer::lws_callback (struct lws* wsi, enum lws_callback_reasons reaso
server->write_client (wsi);
break;
case LWS_CALLBACK_HTTP:
server->reject_http_client (wsi);
break;
case LWS_CALLBACK_FILTER_NETWORK_CONNECTION:
case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION:
case LWS_CALLBACK_SERVER_NEW_CLIENT_INSTANTIATED:
@ -398,6 +410,10 @@ WebsocketsServer::lws_callback (struct lws* wsi, enum lws_callback_reasons reaso
case LWS_CALLBACK_LOCK_POLL:
case LWS_CALLBACK_UNLOCK_POLL:
case LWS_CALLBACK_WS_PEER_INITIATED_CLOSE:
case LWS_CALLBACK_FILTER_HTTP_CONNECTION:
case LWS_CALLBACK_HTTP_BIND_PROTOCOL:
case LWS_CALLBACK_ADD_HEADERS:
case LWS_CALLBACK_HTTP_CONFIRM_UPGRADE:
break;
/* TODO: handle HTTP connections.

1
libs/surfaces/websockets/server.h
View File

@ -81,6 +81,7 @@ private:
void del_client (Client);
void recv_client (Client, void* buf, size_t len);
void write_client (Client);
void reject_http_client (Client);
bool io_handler (Glib::IOCondition, lws_sockfd_type);