Skip to content

Reject non-terminal WebSocket wildcards #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Coldwings merged 1 commit into from
Jul 11, 2026
Merged

Reject non-terminal WebSocket wildcards #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions include/elio/http/websocket_server.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <functional>
#include <memory>
#include <mutex>
#include <stdexcept>
#include <variant>
#include <atomic>
#include <vector>
Expand Down Expand Up @@ -479,6 +480,10 @@ class ws_router : public router {
seg.value.assign(comp.data() + 1, comp.size() - 1);
route.param_names.push_back(seg.value);
} else if (comp == "*") {
if (i != pattern.size()) {
throw std::invalid_argument(
"WebSocket route wildcard must be the final path segment");
}
seg.kind = segment_kind::wildcard;
} else {
seg.kind = segment_kind::literal;
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/test_websocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,3 +944,22 @@ TEST_CASE("WebSocket handshake building", "[websocket][handshake]") {
REQUIRE(response.find("Connection: close\r\n") != std::string::npos);
}
}

TEST_CASE("WebSocket route wildcard validation", "[websocket][router]") {
auto handler = [](ws_connection&) -> elio::coro::task<void> {
co_return;
};

ws_router router;
REQUIRE_NOTHROW(router.websocket("/chat/*", handler));
REQUIRE(router.find_ws_route("/chat/room") != nullptr);
REQUIRE(router.find_ws_route("/chat/") != nullptr);
REQUIRE(router.find_ws_route("/chat") == nullptr);

REQUIRE_THROWS_AS(router.websocket("/chat/*/admin", handler),
std::invalid_argument);
REQUIRE_THROWS_AS(router.websocket("*/tail", handler),
std::invalid_argument);
REQUIRE_THROWS_AS(router.websocket("/chat/*/", handler),
std::invalid_argument);
}