Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-06 05:49:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #5850 - add tests for the UpgradeRequests in the FrameHandlers

Browse Source 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2021-01-04 15:55:47 +11:00
parent 480767a03b
commit 281f6d13ed
2 changed files with 229 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/UpgradeRequestResponseTest.java Normal file
View File

@ -0,0 +1,104 @@
//
// ========================================================================
// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.websocket.javax.tests;
import java.net.URI;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import javax.websocket.ClientEndpoint;
import javax.websocket.ClientEndpointConfig;
import javax.websocket.Session;
import javax.websocket.server.ServerEndpoint;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class UpgradeRequestResponseTest
{
private ServerConnector connector;
private JavaxWebSocketClientContainer client;
private static CompletableFuture<EventSocket> serverSocketFuture;
@ServerEndpoint("/")
public static class ServerSocket extends EchoSocket
{
public ServerSocket()
{
serverSocketFuture.complete(this);
}
}
public static class PermessageDeflateConfig extends ClientEndpointConfig.Configurator
{
@Override
public void beforeRequest(Map<String, List<String>> headers)
{
headers.put(HttpHeader.SEC_WEBSOCKET_EXTENSIONS.asString(), Collections.singletonList("permessage-deflate"));
}
}
@ClientEndpoint(configurator = PermessageDeflateConfig.class)
public static class ClientSocket extends EventSocket
{
}
@BeforeEach
public void start() throws Exception
{
Server server = new Server();
connector = new ServerConnector(server);
server.addConnector(connector);
serverSocketFuture = new CompletableFuture<>();
ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
server.setHandler(contextHandler);
contextHandler.setContextPath("/");
JavaxWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
container.addEndpoint(ServerSocket.class));
client = new JavaxWebSocketClientContainer();
server.start();
client.start();
}
@Test
public void testUpgradeRequestResponse() throws Exception
{
URI uri = URI.create("ws://localhost:" + connector.getLocalPort());
EventSocket socket = new ClientSocket();
Session clientSession = client.connectToServer(socket, uri);
EventSocket serverSocket = serverSocketFuture.get(5, TimeUnit.SECONDS);
assertTrue(serverSocket.openLatch.await(5, TimeUnit.SECONDS));
// The user principal is found on the base UpgradeRequest.
assertDoesNotThrow(clientSession::getUserPrincipal);
assertDoesNotThrow(serverSocket.session::getUserPrincipal);
clientSession.close();
assertTrue(socket.closeLatch.await(5, TimeUnit.SECONDS));
}
}

125
jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/UpgradeRequestResponseTest.java Normal file
View File

@ -0,0 +1,125 @@
//
// ========================================================================
// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.websocket.tests;
import java.net.URI;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.UpgradeRequest;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class UpgradeRequestResponseTest
{
private ServerConnector connector;
private WebSocketClient client;
private EventSocket serverSocket;
@BeforeEach
public void start() throws Exception
{
Server server = new Server();
connector = new ServerConnector(server);
server.addConnector(connector);
serverSocket = new EchoSocket();
ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
server.setHandler(contextHandler);
contextHandler.setContextPath("/");
JettyWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
container.addMapping("/", (req, resp) -> serverSocket));
client = new WebSocketClient();
server.start();
client.start();
}
@Test
public void testClientUpgradeRequestResponse() throws Exception
{
URI uri = URI.create("ws://localhost:" + connector.getLocalPort());
EventSocket socket = new EventSocket();
ClientUpgradeRequest request = new ClientUpgradeRequest();
request.addExtensions("permessage-deflate");
CompletableFuture<Session> connect = client.connect(socket, uri, request);
Session session = connect.get(5, TimeUnit.SECONDS);
UpgradeRequest upgradeRequest = session.getUpgradeRequest();
UpgradeResponse upgradeResponse = session.getUpgradeResponse();
assertNotNull(upgradeRequest);
assertThat(upgradeRequest.getHeader(HttpHeader.UPGRADE.asString()), is("websocket"));
assertThat(upgradeRequest.getHeader(HttpHeader.SEC_WEBSOCKET_EXTENSIONS.asString()), is("permessage-deflate"));
assertThat(upgradeRequest.getExtensions().size(), is(1));
assertThat(upgradeRequest.getExtensions().get(0).getName(), is("permessage-deflate"));
assertNotNull(upgradeResponse);
assertThat(upgradeResponse.getStatusCode(), is(HttpStatus.SWITCHING_PROTOCOLS_101));
assertThat(upgradeResponse.getHeader(HttpHeader.UPGRADE.asString()), is("websocket"));
assertThat(upgradeResponse.getHeader(HttpHeader.SEC_WEBSOCKET_EXTENSIONS.asString()), is("permessage-deflate"));
assertThat(upgradeResponse.getExtensions().size(), is(1));
assertThat(upgradeResponse.getExtensions().get(0).getName(), is("permessage-deflate"));
session.close();
assertTrue(socket.closeLatch.await(5, TimeUnit.SECONDS));
}
@Test
public void testServerUpgradeRequestResponse() throws Exception
{
URI uri = URI.create("ws://localhost:" + connector.getLocalPort());
EventSocket socket = new EventSocket();
ClientUpgradeRequest request = new ClientUpgradeRequest();
request.addExtensions("permessage-deflate");
CompletableFuture<Session> connect = client.connect(socket, uri, request);
Session session = connect.get(5, TimeUnit.SECONDS);
assertTrue(serverSocket.openLatch.await(5, TimeUnit.SECONDS));
UpgradeRequest upgradeRequest = serverSocket.session.getUpgradeRequest();
UpgradeResponse upgradeResponse = serverSocket.session.getUpgradeResponse();
assertNotNull(upgradeRequest);
assertThat(upgradeRequest.getHeader(HttpHeader.UPGRADE.asString()), is("websocket"));
assertThat(upgradeRequest.getHeader(HttpHeader.SEC_WEBSOCKET_EXTENSIONS.asString()), is("permessage-deflate"));
assertThat(upgradeRequest.getExtensions().size(), is(1));
assertThat(upgradeRequest.getExtensions().get(0).getName(), is("permessage-deflate"));
assertNotNull(upgradeResponse);
assertThat(upgradeResponse.getStatusCode(), is(HttpStatus.SWITCHING_PROTOCOLS_101));
assertThat(upgradeResponse.getHeader(HttpHeader.UPGRADE.asString()), is("websocket"));
assertThat(upgradeResponse.getHeader(HttpHeader.SEC_WEBSOCKET_EXTENSIONS.asString()), is("permessage-deflate"));
assertThat(upgradeResponse.getExtensions().size(), is(1));
assertThat(upgradeResponse.getExtensions().get(0).getName(), is("permessage-deflate"));
session.close();
assertTrue(socket.closeLatch.await(5, TimeUnit.SECONDS));
}
}