Skip to content

Additional logging for web socket headers #7424

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

Merged
labkey-jeckels merged 6 commits into from
Feb 17, 2026
Merged

Additional logging for web socket headers #7424

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d8de2e4
Attempt to restore websocket upgrade on Tomcat 11
labkey-jeckels Feb 3, 2026
de7ac49
Another attempt
labkey-jeckels Feb 3, 2026
4ed51be
More logging and header setting
labkey-jeckels Feb 5, 2026
c51964d
Merge branch 'develop' into fb_websocketUpgrade2
labkey-jeckels Feb 5, 2026
f85c262
Merge branch 'refs/heads/develop' into fb_websocketUpgrade2
labkey-jeckels Feb 17, 2026
c95dc1d
Tone down logging
labkey-jeckels Feb 17, 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
32 changes: 29 additions & 3 deletions api/src/org/labkey/api/websocket/BrowserEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,11 @@ public void modifyHandshake(ServerEndpointConfig config, HandshakeRequest reques
@Override
public void onOpen(Session session, EndpointConfig endpointConfig)
{
String uri = null;
try
{
String uri = getWSRemoteUri(session, endpointConfig);
LOG.debug("BrowserEndpoint.onOpen( " + session.getRequestURI() + " -> " + uri);
uri = getWSRemoteUri(session, endpointConfig);
LOG.debug("BrowserEndpoint.onOpen( {} -> {}", session.getRequestURI(), uri);
Map<String, List<String>> requestHeaders = (Map<String, List<String>>) endpointConfig.getUserProperties().get("requestHeaders");
this.browserSession = session;
this.serverEndpoint = new ServerEndpoint(new URI(uri), requestHeaders, endpointConfig.getUserProperties());
Expand All @@ -103,7 +104,7 @@ public void onOpen(Session session, EndpointConfig endpointConfig)
}
catch (URISyntaxException | IOException | DeploymentException | ServletException ex)
{
LOG.debug("BrowserEndpoint.onOpen", ex);
LOG.debug("BrowserEndpoint.onOpen failed to proxy {} -> {}", session.getRequestURI(), uri, ex);
UnexpectedException.rethrow(ex);
}
}
Expand Down Expand Up @@ -138,15 +139,40 @@ class ServerEndpoint extends Endpoint
{
final Map<String,List<String>> proxyHeaders = prepareProxyHeaders(remoteURI, requestHeaders, properties);

// Log what the subclass's prepareProxyHeaders returned
LOG.trace("=== WebSocket proxy: proxyHeaders from prepareProxyHeaders ===");
for (Map.Entry<String, List<String>> entry : proxyHeaders.entrySet())
{
LOG.trace(" proxyHeaders: {} = {}", entry.getKey(), entry.getValue());
}

WebSocketContainer clientEndPoint = ContainerProvider.getWebSocketContainer();
ClientEndpointConfig config = ClientEndpointConfig.Builder.create()
.configurator(new ClientEndpointConfig.Configurator()
{
@Override
public void beforeRequest(Map<String, List<String>> headers)
{
// Log incoming browser headers for debugging
LOG.trace("=== WebSocket proxy: browser request headers ===");
for (Map.Entry<String, List<String>> entry : requestHeaders.entrySet())
{
LOG.trace(" Browser header: {} = {}", entry.getKey(), entry.getValue());
}

headers.putAll(proxyHeaders);
}

@Override
public void afterResponse(HandshakeResponse hr)
{
// Log response headers from backend server for debugging
LOG.trace("=== WebSocket proxy: response headers from backend ===");
for (Map.Entry<String, List<String>> entry : hr.getHeaders().entrySet())
{
LOG.trace(" Response header: {} = {}", entry.getKey(), entry.getValue());
}
}
})
.build();
serverSession = clientEndPoint.connectToServer(this, config, remoteURI);
Expand Down