-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WebSockets Next: enable configuration of supported subprotocols
- add WebSocketConnection#subprotocol() that can be used to obtain the subprotocol selected by the handshake - the values defined with quarkus.websockets-next.supported-subprotocols contribute to the set of subprotocols passed to the HTTP server configuration - also add constants for handshake headers defined by the RFC - resolves #39465
- Loading branch information
Showing
7 changed files
with
199 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...rc/test/java/io/quarkus/websockets/next/test/subprotocol/SubprotocolNotAvailableTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
package io.quarkus.websockets.next.test.subprotocol; | ||
|
||
import static org.junit.jupiter.api.Assertions.assertFalse; | ||
import static org.junit.jupiter.api.Assertions.assertThrows; | ||
import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
||
import java.net.URI; | ||
import java.util.concurrent.CompletionException; | ||
import java.util.concurrent.atomic.AtomicBoolean; | ||
|
||
import jakarta.inject.Inject; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
||
import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakeException; | ||
import io.quarkus.test.QuarkusUnitTest; | ||
import io.quarkus.test.common.http.TestHTTPResource; | ||
import io.quarkus.websockets.next.OnOpen; | ||
import io.quarkus.websockets.next.WebSocket; | ||
import io.quarkus.websockets.next.test.utils.WSClient; | ||
import io.vertx.core.Vertx; | ||
import io.vertx.core.http.WebSocketConnectOptions; | ||
|
||
public class SubprotocolNotAvailableTest { | ||
|
||
@RegisterExtension | ||
public static final QuarkusUnitTest test = new QuarkusUnitTest() | ||
.withApplicationRoot(root -> { | ||
root.addClasses(Endpoint.class, WSClient.class); | ||
}); | ||
|
||
@Inject | ||
Vertx vertx; | ||
|
||
@TestHTTPResource("endpoint") | ||
URI endUri; | ||
|
||
@Test | ||
void testConnectionRejected() { | ||
CompletionException e = assertThrows(CompletionException.class, | ||
() -> new WSClient(vertx).connect(new WebSocketConnectOptions().addSubProtocol("oak"), endUri)); | ||
Throwable cause = e.getCause(); | ||
assertTrue(cause instanceof WebSocketClientHandshakeException); | ||
assertFalse(Endpoint.OPEN_CALLED.get()); | ||
} | ||
|
||
@WebSocket(path = "/endpoint") | ||
public static class Endpoint { | ||
|
||
static final AtomicBoolean OPEN_CALLED = new AtomicBoolean(); | ||
|
||
@OnOpen | ||
void open() { | ||
OPEN_CALLED.set(true); | ||
} | ||
|
||
} | ||
|
||
} |
63 changes: 63 additions & 0 deletions
63
...nt/src/test/java/io/quarkus/websockets/next/test/subprotocol/SubprotocolSelectedTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
package io.quarkus.websockets.next.test.subprotocol; | ||
|
||
import static io.quarkus.websockets.next.WebSocketConnection.HandshakeRequest.SEC_WEBSOCKET_PROTOCOL; | ||
import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
||
import java.net.URI; | ||
import java.util.concurrent.ExecutionException; | ||
|
||
import jakarta.inject.Inject; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
||
import io.quarkus.test.QuarkusUnitTest; | ||
import io.quarkus.test.common.http.TestHTTPResource; | ||
import io.quarkus.websockets.next.OnOpen; | ||
import io.quarkus.websockets.next.WebSocket; | ||
import io.quarkus.websockets.next.WebSocketConnection; | ||
import io.quarkus.websockets.next.test.utils.WSClient; | ||
import io.smallrye.mutiny.Uni; | ||
import io.vertx.core.Vertx; | ||
import io.vertx.core.http.WebSocketConnectOptions; | ||
|
||
public class SubprotocolSelectedTest { | ||
|
||
@RegisterExtension | ||
public static final QuarkusUnitTest test = new QuarkusUnitTest() | ||
.withApplicationRoot(root -> { | ||
root.addClasses(Endpoint.class, WSClient.class); | ||
}).overrideConfigKey("quarkus.websockets-next.supported-subprotocols", "oak,larch"); | ||
|
||
@Inject | ||
Vertx vertx; | ||
|
||
@TestHTTPResource("endpoint") | ||
URI endUri; | ||
|
||
@Test | ||
void testSubprotocol() throws InterruptedException, ExecutionException { | ||
WSClient client = new WSClient(vertx).connect(new WebSocketConnectOptions().addSubProtocol("oak"), endUri); | ||
assertEquals("ok", client.waitForNextMessage().toString()); | ||
} | ||
|
||
@WebSocket(path = "/endpoint") | ||
public static class Endpoint { | ||
|
||
@Inject | ||
WebSocketConnection connection; | ||
|
||
@OnOpen | ||
Uni<Void> open() { | ||
if (connection.handshakeRequest().header(SEC_WEBSOCKET_PROTOCOL) == null) { | ||
return connection.sendText("Sec-WebSocket-Protocol not set: " + connection.handshakeRequest().headers()); | ||
} else if ("oak".equals(connection.subprotocol())) { | ||
return connection.sendText("ok"); | ||
} else { | ||
return connection.sendText("Invalid protocol: " + connection.subprotocol()); | ||
} | ||
} | ||
|
||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...rc/main/java/io/quarkus/websockets/next/runtime/WebSocketHttpServerOptionsCustomizer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package io.quarkus.websockets.next.runtime; | ||
|
||
import java.util.List; | ||
|
||
import jakarta.enterprise.context.Dependent; | ||
import jakarta.inject.Inject; | ||
|
||
import io.quarkus.vertx.http.HttpServerOptionsCustomizer; | ||
import io.quarkus.websockets.next.WebSocketsRuntimeConfig; | ||
import io.vertx.core.http.HttpServerOptions; | ||
|
||
@Dependent | ||
public class WebSocketHttpServerOptionsCustomizer implements HttpServerOptionsCustomizer { | ||
|
||
@Inject | ||
WebSocketsRuntimeConfig config; | ||
|
||
@Override | ||
public void customizeHttpServer(HttpServerOptions options) { | ||
config.supportedSubprotocols().orElse(List.of()).forEach(options::addWebSocketSubProtocol); | ||
} | ||
|
||
@Override | ||
public void customizeHttpsServer(HttpServerOptions options) { | ||
config.supportedSubprotocols().orElse(List.of()).forEach(options::addWebSocketSubProtocol); | ||
} | ||
|
||
} |