Skip to content
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

Jump to bottom

Fixes #10220 - Implement CrossOriginHandler. #11093

Merged
merged 8 commits into from
Jan 12, 2024
Merged

Fixes #10220 - Implement CrossOriginHandler. #11093

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4e99df9
Fixes #10220 - Implement CrossOriginHandler.
sbordet Dec 22, 2023
dde225f
Added optimizations in origin and timingOrigin matching.
sbordet Dec 28, 2023
4ce8a4e
Updates after review.
sbordet Jan 10, 2024
b2a0ded
Updates after review.
sbordet Jan 10, 2024
d735933
Updates after review.
sbordet Jan 10, 2024
ea5db96
Updates after review.
sbordet Jan 11, 2024
b129033
Updates after review.
sbordet Jan 11, 2024
0b0ae7e
Updates after review.
sbordet Jan 11, 2024
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
11 changes: 4 additions & 7 deletions ...-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/CrossOriginHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,13 +385,10 @@ public boolean handle(Request request, Response response, Callback callback) thr
}
else
{
if (isWebSocketUpgrade(request))
if (isWebSocketUpgrade(request) && !isDeliverNonAllowedOriginWebSocketUpgradeRequests())
{
if (!isDeliverNonAllowedOriginWebSocketUpgradeRequests())
{
Response.writeError(request, response, callback, HttpStatus.BAD_REQUEST_400, "origin not allowed");
return true;
}
Response.writeError(request, response, callback, HttpStatus.BAD_REQUEST_400, "origin not allowed");
return true;
}
}

Expand Down Expand Up @@ -449,7 +446,7 @@ private boolean isPreflight(Request request)

private boolean isWebSocketUpgrade(Request request)
{
return request.getHeaders().contains(HttpHeader.UPGRADE, "websocket");
return request.getHeaders().contains(HttpHeader.SEC_WEBSOCKET_VERSION, "13");
lachlan-roberts marked this conversation as resolved.
Show resolved Hide resolved
}

private void handlePreflightResponse(String origins, Response response)
Expand Down
Loading