Merge pull request #50684 from michalvavrik/feature/ws-next-no-scheme-npe

Validate WebSockets Next base URI scheme

Author: mkouba

extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/client/BasicConnectorTest.java

@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -144,6 +145,27 @@ void testClientOptionsCustomization() {
         })).rootCause().isInstanceOf(UnknownHostException.class).hasMessageContaining("robert");
     }
 
+    @Test
+    void testBaseUriValidationFailure() {
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("localhost:8080"));
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("127.0.0.1:8080/"));
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("localhost:8080/hello"));
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("jdbc:localhost:8080/hello"));
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("jdbc://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("http://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("http://localhost:8080/"));
+        assertDoesNotThrow(() -> connector.baseUri("http://localhost:8080"));
+        assertDoesNotThrow(() -> connector.baseUri("ws://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("ws://localhost:8080/"));
+        assertDoesNotThrow(() -> connector.baseUri("ws://localhost:8080"));
+        assertDoesNotThrow(() -> connector.baseUri("https://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("https://localhost:8080/"));
+        assertDoesNotThrow(() -> connector.baseUri("https://localhost:8080"));
+        assertDoesNotThrow(() -> connector.baseUri("wss://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("wss://localhost:8080/"));
+        assertDoesNotThrow(() -> connector.baseUri("wss://localhost:8080"));
+    }
+
     private WebSocketClientConnection createConnection2(CountDownLatch conn2Latch,
             BiConsumer<WebSocketConnectOptions, WebSocketClientOptions> customizer) {
         return BasicWebSocketConnector

extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/client/ClientEndpointTest.java

@@ -1,8 +1,10 @@
 package io.quarkus.websockets.next.test.client;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URI;
@@ -87,6 +89,27 @@ void testClient() throws InterruptedException {
                 .rootCause().isInstanceOf(UnknownHostException.class).hasMessageContaining("robert");
     }
 
+    @Test
+    void testBaseUriValidationFailure() {
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("localhost:8080"));
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("127.0.0.1:8080/"));
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("localhost:8080/hello"));
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("jdbc:localhost:8080/hello"));
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("jdbc://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("http://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("http://localhost:8080/"));
+        assertDoesNotThrow(() -> connector.baseUri("http://localhost:8080"));
+        assertDoesNotThrow(() -> connector.baseUri("ws://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("ws://localhost:8080/"));
+        assertDoesNotThrow(() -> connector.baseUri("ws://localhost:8080"));
+        assertDoesNotThrow(() -> connector.baseUri("https://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("https://localhost:8080/"));
+        assertDoesNotThrow(() -> connector.baseUri("https://localhost:8080"));
+        assertDoesNotThrow(() -> connector.baseUri("wss://localhost:8080/hello"));
+        assertDoesNotThrow(() -> connector.baseUri("wss://localhost:8080/"));
+        assertDoesNotThrow(() -> connector.baseUri("wss://localhost:8080"));
+    }
+
     @WebSocket(path = "/endpoint/{name}")
     public static class ServerEndpoint {
 

extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketConnectorBase.java

@@ -93,6 +93,10 @@ abstract class WebSocketConnectorBase<THIS extends WebSocketConnectorBase<THIS>>
     }
 
     public THIS baseUri(URI baseUri) {
+        if (!isSecure(baseUri) && !isNotSecure(baseUri)) {
+            throw new IllegalArgumentException(
+                    String.format("[%s] is not a valid scheme in the base URI %s", baseUri.getScheme(), baseUri));
+        }
         this.baseUri = Objects.requireNonNull(baseUri);
         return self();
     }
@@ -240,6 +244,10 @@ protected WebSocketConnectOptions newConnectOptions(URI serverEndpointUri) {
         return connectOptions;
     }
 
+    protected boolean isNotSecure(URI uri) {
+        return "http".equals(uri.getScheme()) || "ws".equals(uri.getScheme());
+    }
+
     protected boolean isSecure(URI uri) {
         return "https".equals(uri.getScheme()) || "wss".equals(uri.getScheme());
     }