Skip to content

4.x: WsClient accept Connection header with upgrade value lowercase #8675

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
merged 1 commit into from
Apr 22, 2024
Merged

4.x: WsClient accept Connection header with upgrade value lowercase #8675

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: 5 additions & 3 deletions webclient/websocket/src/main/java/io/helidon/webclient/websocket/WsClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class WsClientImpl implements WsClient {

private static final System.Logger LOGGER = System.getLogger(WsClient.class.getName());
private static final Header HEADER_CONN_UPGRADE = HeaderValues.create(HeaderNames.CONNECTION, "Upgrade");
private static final Header HEADER_CONN_UPGRADE_LOWERCASE = HeaderValues.create(HeaderNames.CONNECTION, "upgrade");
private static final HeaderName HEADER_WS_ACCEPT = HeaderNames.create("Sec-WebSocket-Accept");
private static final HeaderName HEADER_WS_KEY = HeaderNames.create("Sec-WebSocket-Key");
private static final LazyValue<Random> RANDOM = LazyValue.create(SecureRandom::new);
Expand Down Expand Up @@ -127,9 +128,10 @@ public void connect(URI uri, WsListener listener) {
ClientWsConnection session;
try (HttpClientResponse response = upgradeResponse.response()) {
ClientResponseHeaders responseHeaders = response.headers();
if (!responseHeaders.contains(HEADER_CONN_UPGRADE)) {
throw new WsClientException("Failed to upgrade to WebSocket, expected Connection: Upgrade header. Headers: "
+ responseHeaders);
if (!responseHeaders.contains(HEADER_CONN_UPGRADE)
&& !responseHeaders.contains(HEADER_CONN_UPGRADE_LOWERCASE)) {
throw new WsClientException("Failed to upgrade to WebSocket, expected one of "
+ "[Connection: Upgrade, Connection: upgrade] header. Headers: " + responseHeaders);
}
if (!responseHeaders.contains(HEADER_UPGRADE_WS)) {
throw new WsClientException("Failed to upgrade to WebSocket, expected Upgrade: websocket header. Headers: "
Expand Down