From 661418de610d25c0567d49ac48f02a5b7410f328 Mon Sep 17 00:00:00 2001 From: Chris Drake Date: Wed, 30 Oct 2024 16:23:57 -0400 Subject: [PATCH] Issue #2215 Fix invalid Origin header sent by client for non-SSL WebSocket connections --- .../grizzly/websockets/HandShake.java | 4 +- .../grizzly/websockets/HandShakeTest.java | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 modules/websockets/src/test/java/org/glassfish/grizzly/websockets/HandShakeTest.java diff --git a/modules/websockets/src/main/java/org/glassfish/grizzly/websockets/HandShake.java b/modules/websockets/src/main/java/org/glassfish/grizzly/websockets/HandShake.java index 1a9e2bda3f..da77abb33d 100644 --- a/modules/websockets/src/main/java/org/glassfish/grizzly/websockets/HandShake.java +++ b/modules/websockets/src/main/java/org/glassfish/grizzly/websockets/HandShake.java @@ -64,7 +64,7 @@ public HandShake(URI url) { resourcePath += "?" + url.getQuery(); } serverHostName = url.getHost(); - secure = "wss://".equals(url.getScheme()); + secure = "wss".equals(url.getScheme()); port = url.getPort(); final StringBuilder sb = new StringBuilder(32).append(getScheme()).append("://").append(url.getHost()); @@ -385,6 +385,6 @@ private StringBuilder appendPort(StringBuilder builder) { } private String getScheme() { - return isSecure() ? "ws" : "wss"; + return isSecure() ? "wss" : "ws"; } } diff --git a/modules/websockets/src/test/java/org/glassfish/grizzly/websockets/HandShakeTest.java b/modules/websockets/src/test/java/org/glassfish/grizzly/websockets/HandShakeTest.java new file mode 100644 index 0000000000..c656960d89 --- /dev/null +++ b/modules/websockets/src/test/java/org/glassfish/grizzly/websockets/HandShakeTest.java @@ -0,0 +1,38 @@ +package org.glassfish.grizzly.websockets; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.logging.Logger; + +import org.glassfish.grizzly.websockets.rfc6455.RFC6455HandShake; +import org.junit.Test; + +public class HandShakeTest { + private static final Logger LOGGER = Logger.getLogger("HandShakeTest"); + private static String SSL = "wss://localhost:8443"; + private static String NON_SSL = "ws://localhost:8080"; + private static String RESOURCE_PATH = "/websocket"; + + @Test + public void testOrigin() throws URISyntaxException { + // non-ssl + HandShake handshake = new RFC6455HandShake(new URI(NON_SSL + RESOURCE_PATH)); + LOGGER.info("Handshake: isSecure=" + handshake.isSecure() + ", headers: " + handshake.composeHeaders().getHttpHeader()); + assertEquals(NON_SSL, handshake.getOrigin()); + assertFalse(handshake.isSecure()); + assertEquals(NON_SSL + RESOURCE_PATH, handshake.getLocation()); + + // ssl + handshake = new RFC6455HandShake(new URI(SSL + RESOURCE_PATH)); + LOGGER.info("Handshake: isSecure=" + handshake.isSecure() + ", headers: " + handshake.composeHeaders().getHttpHeader()); + assertEquals(SSL, handshake.getOrigin()); + assertTrue(handshake.isSecure()); + assertEquals(SSL + RESOURCE_PATH, handshake.getLocation()); + + + } +}