Skip to content

Fix 3705 ws unmasked frames #3735

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
v1rtu3x wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix 3705 ws unmasked frames #3735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d596026
Fix bridge session expiry at startup before bridges are started
v1rtu3x Sep 3, 2026
4592f02
Reject unmasked WebSocket client frames per RFC 6455 §5.1
v1rtu3x Sep 5, 2026
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
7 changes: 7 additions & 0 deletions lib/net_ws.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,13 @@ static ssize_t read_ws_payloadlen_short(struct mosquitto *mosq)
}

mosq->wsd.mask = (hbuf & 0x80) >> 7;
if(mosq->wsd.mask == 0){
/* RFC 6455 5.1: a server MUST close the connection on receipt of a frame
* that is not masked. */
mosq->wsd.disconnect_reason = 0xEA;
errno = EPROTO;
return -1;
}
plen = hbuf & 0x7F;

if(plen == 126){
Expand Down
3 changes: 2 additions & 1 deletion src/session_expiry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ void session_expiry__check(void)
last_check = db.now_real_s;

DL_FOREACH_SAFE(expiry_list, item, tmp){
if(item->context->session_expiry_time < db.now_real_s){
if(item->context->session_expiry_time < db.now_real_s
&& item->context->bridge == NULL){ /* Outgoing bridge connections never expire */

context = item->context;
session_expiry__remove(context);
Expand Down