Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3165 - Configure the HttpClient via XmlHttpClientProvider 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2019-02-18 14:16:04 +11:00
parent 1e93a46eed
commit 4378f5d08e
2 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/WebSocketServerExamplesTest.java
View File

@ -1,3 +1,21 @@
//
// ========================================================================
// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.javax.server; package org.eclipse.jetty.websocket.javax.server;
import java.net.URI; import java.net.URI;
@ -16,9 +34,6 @@ import javax.websocket.Session;
import javax.websocket.WebSocketContainer; import javax.websocket.WebSocketContainer;
import javax.websocket.server.ServerContainer; import javax.websocket.server.ServerContainer;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.AuthenticationStore;
import org.eclipse.jetty.client.util.BasicAuthentication;
import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService; import org.eclipse.jetty.security.HashLoginService;
@ -30,9 +45,6 @@ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.util.security.Credential; import org.eclipse.jetty.util.security.Credential;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer;
import org.eclipse.jetty.websocket.javax.server.examples.GetHttpSessionSocket; import org.eclipse.jetty.websocket.javax.server.examples.GetHttpSessionSocket;
import org.eclipse.jetty.websocket.javax.server.examples.MyAuthedSocket; import org.eclipse.jetty.websocket.javax.server.examples.MyAuthedSocket;
import org.eclipse.jetty.websocket.javax.server.examples.StreamingEchoSocket; import org.eclipse.jetty.websocket.javax.server.examples.StreamingEchoSocket;
@ -136,12 +148,9 @@ public class WebSocketServerExamplesTest
@Test @Test
public void testMyAuthedSocket() throws Exception public void testMyAuthedSocket() throws Exception
{ {
//HttpClient is configured for BasicAuthentication with the XmlHttpClientProvider
URI uri = URI.create("ws://localhost:8080/secured/socket"); URI uri = URI.create("ws://localhost:8080/secured/socket");
HttpClient client = new HttpClient(new SslContextFactory()); // TODO: use HttpClientProvider from issue #3341 WebSocketContainer clientContainer = ContainerProvider.getWebSocketContainer();
AuthenticationStore authenticationStore = client.getAuthenticationStore();
authenticationStore.addAuthentication(new BasicAuthentication(uri, "testRealm", "user", "password"));
JavaxWebSocketClientContainer clientContainer = new JavaxWebSocketClientContainer(new WebSocketCoreClient(client));
clientContainer.start(); // TODO: use container provider
ClientSocket clientEndpoint = new ClientSocket(); ClientSocket clientEndpoint = new ClientSocket();
try(Session session = clientContainer.connectToServer(clientEndpoint, uri)) try(Session session = clientContainer.connectToServer(clientEndpoint, uri))
@ -152,8 +161,6 @@ public class WebSocketServerExamplesTest
String msg = clientEndpoint.messageQueue.poll(5, TimeUnit.SECONDS); String msg = clientEndpoint.messageQueue.poll(5, TimeUnit.SECONDS);
assertThat(msg, is("hello world")); assertThat(msg, is("hello world"));
clientContainer.stop();
} }
@Test @Test

21
jetty-websocket/javax-websocket-server/src/test/resources/jetty-websocket-httpclient.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configure class="org.eclipse.jetty.client.HttpClient">
<Arg>
<New class="org.eclipse.jetty.util.ssl.SslContextFactory"/>
</Arg>
<Call name="getAuthenticationStore">
<Call name="addAuthentication">
<Arg>
<New class="org.eclipse.jetty.client.util.BasicAuthentication">
<Arg>
<New class="java.net.URI" arg="ws://localhost:8080/secured/socket"/>
</Arg>
<Arg>testRealm</Arg>
<Arg>user</Arg>
<Arg>password</Arg>
</New>
</Arg>
</Call>
</Call>
</Configure>