-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5874 from eclipse/jetty-10.0.x-5866-WebSocketProg…
…rammaticUpgrade Issue #5866 - allow WebSocket programmatic upgrades
- Loading branch information
Showing
10 changed files
with
188 additions
and
38 deletions.
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
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
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
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
114 changes: 114 additions & 0 deletions
114
...sts/src/test/java/org/eclipse/jetty/websocket/tests/ProgrammaticWebSocketUpgradeTest.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,114 @@ | ||
| // | ||
| // ======================================================================== | ||
| // 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.io.IOException; | ||
| import java.net.URI; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.TimeUnit; | ||
| import javax.servlet.ServletConfig; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
|
|
||
| import org.eclipse.jetty.server.Server; | ||
| import org.eclipse.jetty.server.ServerConnector; | ||
| import org.eclipse.jetty.servlet.ServletContextHandler; | ||
| import org.eclipse.jetty.servlet.ServletHolder; | ||
| import org.eclipse.jetty.websocket.api.Session; | ||
| import org.eclipse.jetty.websocket.client.WebSocketClient; | ||
| import org.eclipse.jetty.websocket.server.JettyWebSocketCreator; | ||
| import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer; | ||
| import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| 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.assertTrue; | ||
|
|
||
| public class ProgrammaticWebSocketUpgradeTest | ||
| { | ||
| private Server server; | ||
| private ServerConnector connector; | ||
| private WebSocketClient client; | ||
| private ServletContextHandler contextHandler; | ||
|
|
||
| @BeforeEach | ||
| public void before() throws Exception | ||
| { | ||
| client = new WebSocketClient(); | ||
| server = new Server(); | ||
| connector = new ServerConnector(server); | ||
| server.addConnector(connector); | ||
|
|
||
| contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS); | ||
| contextHandler.setContextPath("/"); | ||
| contextHandler.addServlet(new ServletHolder(new CustomUpgradeServlet()), "/"); | ||
| server.setHandler(contextHandler); | ||
|
|
||
| JettyWebSocketServletContainerInitializer.configure(contextHandler, null); | ||
|
|
||
| server.start(); | ||
| client.start(); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void stop() throws Exception | ||
| { | ||
| client.stop(); | ||
| server.stop(); | ||
| } | ||
|
|
||
| public static class CustomUpgradeServlet extends HttpServlet | ||
| { | ||
| private JettyWebSocketServerContainer container; | ||
|
|
||
| @Override | ||
| public void init(ServletConfig config) throws ServletException | ||
| { | ||
| super.init(config); | ||
| container = JettyWebSocketServerContainer.getContainer(getServletContext()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException | ||
| { | ||
| JettyWebSocketCreator creator = (req, resp) -> new EchoSocket(); | ||
| container.upgrade(creator, request, response); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testProgrammaticWebSocketUpgrade() throws Exception | ||
| { | ||
| // Test we can upgrade to websocket and send a message. | ||
| URI uri = URI.create("ws://localhost:" + connector.getLocalPort() + "/path"); | ||
| EventSocket socket = new EventSocket(); | ||
| CompletableFuture<Session> connect = client.connect(socket, uri); | ||
| try (Session session = connect.get(5, TimeUnit.SECONDS)) | ||
| { | ||
| session.getRemote().sendString("hello world"); | ||
| } | ||
| assertTrue(socket.closeLatch.await(10, TimeUnit.SECONDS)); | ||
|
|
||
| String msg = socket.textMessages.poll(); | ||
| assertThat(msg, is("hello world")); | ||
|
|
||
| // WebSocketUpgradeFilter should not have been added. | ||
| assertThat(contextHandler.getServletHandler().getFilters().length, is(0)); | ||
| } | ||
| } |