mirror of
https://github.com/yhirose/cpp-httplib.git
synced 2026-11-18 19:40:57 +00:00
End a read() assembling fragments once close() is called (#2683)
A read() assembling a fragmented message looped over continuation frames without looking at closed_, which the loop over frames checks. A peer that kept sending fragments, empty ones included, never let the read reach a wait, so a close() from another thread could not end it. The read now ends with Fail once the connection is closed.
This commit is contained in:
1 parent
92435b31b3
commit
baba35b8d3
2 files changed
+57
No files matched your search
@@ -23884,6 +23884,10 @@ inline ReadResult WebSocket::read(std::string &msg) {
|
|||||||
// Handle fragmentation
|
// Handle fragmentation
|
||||||
if (!fin) {
|
if (!fin) {
|
||||||
while (true) {
|
while (true) {
|
||||||
|
// A close() from another thread ends the message being assembled,
|
||||||
|
// as it ends the loop over frames above: a peer that keeps sending
|
||||||
|
// fragments never lets a read reach a wait
|
||||||
|
if (closed_) { return Fail; }
|
||||||
Opcode cont_opcode;
|
Opcode cont_opcode;
|
||||||
std::string cont_payload;
|
std::string cont_payload;
|
||||||
bool cont_fin;
|
bool cont_fin;
|
||||||
|
|||||||
@@ -30540,6 +30540,59 @@ TEST(WebSocketTest, AssemblesFragmentsAroundAPing) {
|
|||||||
EXPECT_EQ(std::string("\x8a\x01p", 3), std::string(pong, 3));
|
EXPECT_EQ(std::string("\x8a\x01p", 3), std::string(pong, 3));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(WebSocketTest, CloseEndsAReadOfEndlessFragments) {
|
||||||
|
#ifndef _WIN32
|
||||||
|
signal(SIGPIPE, SIG_IGN);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::atomic<bool> read_ended{false};
|
||||||
|
std::atomic<bool> sending{true};
|
||||||
|
|
||||||
|
Server svr;
|
||||||
|
svr.set_websocket_ping_interval(0);
|
||||||
|
svr.WebSocket("/ws", [&](const Request &, ws::WebSocket &ws) {
|
||||||
|
std::thread reader([&]() {
|
||||||
|
std::string msg;
|
||||||
|
while (ws.read(msg)) {}
|
||||||
|
read_ended = true;
|
||||||
|
});
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(200));
|
||||||
|
ws.close();
|
||||||
|
reader.join();
|
||||||
|
});
|
||||||
|
|
||||||
|
auto port = svr.bind_to_any_port("127.0.0.1");
|
||||||
|
std::thread t([&]() { svr.listen_after_bind(); });
|
||||||
|
auto se = detail::scope_exit([&] {
|
||||||
|
svr.stop();
|
||||||
|
t.join();
|
||||||
|
});
|
||||||
|
svr.wait_until_ready();
|
||||||
|
|
||||||
|
auto sock = connect_raw_websocket(port, "/ws");
|
||||||
|
ASSERT_NE(INVALID_SOCKET, sock);
|
||||||
|
auto se_sock = detail::scope_exit([&] { detail::close_socket(sock); });
|
||||||
|
|
||||||
|
// A Text message whose empty continuation frames never end
|
||||||
|
std::thread sender([&]() {
|
||||||
|
auto data = masked_frame(0x01, "");
|
||||||
|
while (sending) {
|
||||||
|
data += masked_frame(0x00, "");
|
||||||
|
if (detail::send_socket(sock, data.data(), data.size(), 0) <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
data.clear();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
for (int i = 0; i < 300 && !read_ended; i++) {
|
||||||
|
std::this_thread::sleep_for(std::chrono::milliseconds(10));
|
||||||
|
}
|
||||||
|
sending = false;
|
||||||
|
sender.join();
|
||||||
|
EXPECT_TRUE(read_ended);
|
||||||
|
}
|
||||||
|
|
||||||
TEST(WebSocketTest, NegativePingIntervalSendsNoPings) {
|
TEST(WebSocketTest, NegativePingIntervalSendsNoPings) {
|
||||||
Server svr;
|
Server svr;
|
||||||
svr.set_websocket_ping_interval(-1);
|
svr.set_websocket_ping_interval(-1);
|
||||||
|
|||||||
Reference in new issue
Block a user