Skip to content

fix: do not always check auth header with ws #1450

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
STRRL wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −2
Open

fix: do not always check auth header with ws #1450

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
8 changes: 6 additions & 2 deletions src/protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,6 @@ int callback_tty(struct lws *wsi, enum lws_callback_reasons reason, void *user,
lwsl_warn("refuse to serve WS client due to the --max-clients option.\n");
return 1;
}
if (!check_auth(wsi, pss)) return 1;

n = lws_hdr_copy(wsi, pss->path, sizeof(pss->path), WSI_TOKEN_GET_URI);
#if defined(LWS_ROLE_H2)
if (n <= 0) n = lws_hdr_copy(wsi, pss->path, sizeof(pss->path), WSI_TOKEN_HTTP_COLON_PATH);
Expand All @@ -220,6 +218,12 @@ int callback_tty(struct lws *wsi, enum lws_callback_reasons reason, void *user,
return 1;
}

// Skip Basic Auth check for WebSocket path when credentials are configured
// Safari doesn't support Basic Auth headers with WebSocket, rely on AuthToken instead
if (server->credential == NULL || server->auth_header != NULL) {
if (!check_auth(wsi, pss)) return 1;
}

if (server->check_origin && !check_host_origin(wsi)) {
lwsl_warn(
"refuse to serve WS client from different origin due to the "
Expand Down