Skip to content

reject oversized websocket origin in callback_broker_mqtt #555

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

Open
jmestwa-coder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

reject oversized websocket origin in callback_broker_mqtt #555

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
13 changes: 10 additions & 3 deletions src/mqtt_broker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,10 +1016,17 @@ static int callback_broker_mqtt(struct lws *wsi,
char origin[256];
int olen = lws_hdr_copy(wsi, origin, (int)sizeof(origin),
WSI_TOKEN_ORIGIN);
if (olen > 0 &&
XSTRCMP(origin, broker->ws_allowed_origin) != 0) {
/* lws_hdr_copy returns <= 0 both when no Origin header is sent
* (native client, allowed) and when a present Origin is too long
* for the buffer. Deciding on olen alone lets an attacker-chosen
* Origin longer than the buffer be treated as absent and slip past
* the allowlist. Use the header's real length to tell the two
* apart and reject a present-but-unverifiable Origin. */
if (lws_hdr_total_length(wsi, WSI_TOKEN_ORIGIN) > 0 &&
(olen <= 0 ||
XSTRCMP(origin, broker->ws_allowed_origin) != 0)) {
WBLOG_ERR(broker, "broker: ws origin rejected: %s",
BrokerLog_Sanitize(origin));
BrokerLog_Sanitize(olen > 0 ? origin : "(oversized)"));
return -1;
}
}
Expand Down
Loading