smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 17:16:38 +01:00
Code Issues Projects Releases Wiki Activity

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
parent 35605ee763
commit 81ecc2b046
2 changed files with 17 additions and 0 deletions
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 bool
WebsocketsServer::io_handler (Glib::IOCondition ioc, lws_sockfd_type fd) 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); server->write_client (wsi);
break; break;
case LWS_CALLBACK_HTTP:
server->reject_http_client (wsi);
break;
case LWS_CALLBACK_FILTER_NETWORK_CONNECTION: case LWS_CALLBACK_FILTER_NETWORK_CONNECTION:
case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION: case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION:
case LWS_CALLBACK_SERVER_NEW_CLIENT_INSTANTIATED: 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_LOCK_POLL:
case LWS_CALLBACK_UNLOCK_POLL: case LWS_CALLBACK_UNLOCK_POLL:
case LWS_CALLBACK_WS_PEER_INITIATED_CLOSE: 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; break;
/* TODO: handle HTTP connections. /* TODO: handle HTTP connections.

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

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