wt/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2026-10-09 16:52:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

reject an unoffered subprotocol in read_websocket_upgrade_response (#2595)

Browse Source 
* reject an unoffered subprotocol in the ws client handshake

* test the subprotocol check through WebSocketClient so the split build compiles

* Trim comments in the subprotocol check

---------

Co-authored-by: yhirose <yuji.hirose.bug@gmail.com>
This commit is contained in:
metsw24-max
2026-10-04 18:21:39 -04:00
committed by GitHub
co-authored by yhirose
parent d59f3e438c
commit 4fcbc08f2d
2 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test.cc
+46
View File
@@ -25001,6 +25001,52 @@ TEST(WebSocketTest, ClientRejectsResponseWithoutUpgradeToken) {
EXPECT_FALSE(client.is_open());
}
TEST(WebSocketTest, ClientRejectsUnofferedSubprotocol) {
Server svr;
svr.Get("/ws", [](const Request &req, Response &res) {
res.status = StatusCode::SwitchingProtocol_101;
res.set_header("Upgrade", "websocket");
res.set_header("Connection", "Upgrade");
res.set_header("Sec-WebSocket-Accept",
detail::websocket_accept_key(
req.get_header_value("Sec-WebSocket-Key")));
res.set_header("Sec-WebSocket-Protocol", "admin");
});
auto port = svr.bind_to_any_port("localhost");
std::thread t([&]() { svr.listen_after_bind(); });
auto se = detail::scope_exit([&] {
svr.stop();
t.join();
});
svr.wait_until_ready();
const auto url = "ws://localhost:" + std::to_string(port) + "/ws";
// Server selects a subprotocol the client never offered
{
Headers headers = {{"Sec-WebSocket-Protocol", "chat"}};
ws::WebSocketClient client(url, headers);
auto res = client.connect();
EXPECT_FALSE(res);
EXPECT_EQ(Error::WebSocketHandshake, res.error());
EXPECT_FALSE(client.is_open());
EXPECT_TRUE(client.subprotocol().empty());
}
// Client offered none but the server named one anyway
{
ws::WebSocketClient client(url);
auto res = client.connect();
EXPECT_FALSE(res);
EXPECT_EQ(Error::WebSocketHandshake, res.error());
EXPECT_FALSE(client.is_open());
EXPECT_TRUE(client.subprotocol().empty());
}
}
TEST(WebSocketTest, HostHeaderOverUnixSocket) {
// The socket path doubles as the URL host, so it must not contain '/'.
const char *shard = getenv("GTEST_SHARD_INDEX");