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

Guard the websocket upgrade to only happen once for a request. #24759

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Guard the websocket upgrade to only happen once for a request. #24759

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: 4 additions & 1 deletion appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardPipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2024 Contributors to the Eclipse Foundation.
* Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
Expand Down Expand Up @@ -586,7 +587,8 @@ private void doInvoke(Request request, Response response, boolean chaining) thro
// Calls the protocol handler's init method if the request is marked to be upgraded
if (request instanceof org.apache.catalina.connector.Request) {
org.apache.catalina.connector.Request connectorRequest = (org.apache.catalina.connector.Request) request;
if (connectorRequest.isUpgrade()) {

if (connectorRequest.getNote(AFTER_UPGRADE_HANDLER_INITIALIZED) == null && connectorRequest.isUpgrade()) {
HttpUpgradeHandler handler = connectorRequest.getHttpUpgradeHandler();
if (handler != null) {
WebConnectionImpl webConnectionImpl =
Expand All @@ -606,6 +608,7 @@ private void doInvoke(Request request, Response response, boolean chaining) thro
handler.init(webConnectionImpl);
} finally {
context.fireContainerEvent(AFTER_UPGRADE_HANDLER_INITIALIZED, handler);
connectorRequest.setNote(AFTER_UPGRADE_HANDLER_INITIALIZED, true);
}
} else {
log.log(SEVERE, PROTOCOL_HANDLER_REQUIRED_EXCEPTION);
Expand Down