-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tests jsoup's client support for HTTPS (#2032)
Tests jsoup's client support for HTTPS During test time, adds a HTTPS listener to the Jetty test server. Uses a local self-signed cert. Also refactored the test proxy to use Jetty's ProxyServlet, and ConnectHandler to support TLS proxy tunneling.
- Loading branch information
Showing
20 changed files
with
326 additions
and
106 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,161 @@ | ||
| package org.jsoup.integration; | ||
|
|
||
| import org.eclipse.jetty.http.HttpVersion; | ||
| import org.eclipse.jetty.server.Connector; | ||
| import org.eclipse.jetty.server.HttpConfiguration; | ||
| import org.eclipse.jetty.server.HttpConnectionFactory; | ||
| import org.eclipse.jetty.server.SecureRequestCustomizer; | ||
| import org.eclipse.jetty.server.Server; | ||
| import org.eclipse.jetty.server.ServerConnector; | ||
| import org.eclipse.jetty.server.SslConnectionFactory; | ||
| import org.eclipse.jetty.server.handler.HandlerWrapper; | ||
| import org.eclipse.jetty.servlet.ServletHandler; | ||
| import org.eclipse.jetty.util.ssl.SslContextFactory; | ||
| import org.jsoup.integration.servlets.BaseServlet; | ||
| import org.jsoup.integration.servlets.ProxyServlet; | ||
|
|
||
| import javax.net.ssl.HttpsURLConnection; | ||
| import javax.net.ssl.SSLContext; | ||
| import javax.net.ssl.SSLSocketFactory; | ||
| import javax.net.ssl.TrustManager; | ||
| import javax.net.ssl.TrustManagerFactory; | ||
| import java.io.File; | ||
| import java.io.FileNotFoundException; | ||
| import java.io.IOException; | ||
| import java.net.InetSocketAddress; | ||
| import java.nio.file.Files; | ||
| import java.security.KeyManagementException; | ||
| import java.security.KeyStore; | ||
| import java.security.KeyStoreException; | ||
| import java.security.NoSuchAlgorithmException; | ||
| import java.security.cert.CertificateException; | ||
|
|
||
| public class TestServer { | ||
| private static final String localhost = "localhost"; | ||
| private static final Server jetty = newServer(); | ||
| private static final ServletHandler handler = new ServletHandler(); | ||
| static int port; | ||
| static int Port; | ||
| static int TlsPort; | ||
|
|
||
| private static final String Localhost = "localhost"; | ||
| private static final String KeystorePassword = "hunter2"; | ||
|
|
||
| private static final Server Jetty = newServer(); | ||
| private static final ServletHandler JettyHandler = new ServletHandler(); | ||
| private static final Server Proxy = newServer(); | ||
| private static final HandlerWrapper ProxyHandler = new HandlerWrapper(); | ||
| private static final ProxySettings ProxySettings = new ProxySettings(); | ||
|
|
||
| private static final Server proxy = newServer(); | ||
| private static final ServletHandler proxyHandler = new ServletHandler(); | ||
| private static final ProxySettings proxySettings = new ProxySettings(); | ||
|
|
||
| private static Server newServer() { | ||
| return new Server(new InetSocketAddress(localhost, 0)); | ||
| return new Server(new InetSocketAddress(Localhost, 0)); | ||
| } | ||
|
|
||
| static { | ||
| jetty.setHandler(handler); | ||
| proxy.setHandler(proxyHandler); | ||
| proxyHandler.addServletWithMapping(ProxyServlet.class, "/*"); | ||
| Jetty.setHandler(JettyHandler); | ||
| Proxy.setHandler(ProxyHandler); | ||
|
|
||
| // TLS setup: | ||
| try { | ||
| File keystoreFile = ParseTest.getFile("/local-cert/server.pfx"); | ||
| if (!keystoreFile.exists()) throw new FileNotFoundException(keystoreFile.toString()); | ||
| addHttpsConnector(keystoreFile, Jetty); | ||
| setupDefaultTrust(keystoreFile); | ||
| } catch (Exception e) { | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
|
|
||
| private TestServer() { | ||
| } | ||
|
|
||
| public static void start() { | ||
| synchronized (jetty) { | ||
| if (jetty.isStarted()) return; | ||
| synchronized (Jetty) { | ||
| if (Jetty.isStarted()) return; | ||
|
|
||
| try { | ||
| jetty.start(); // jetty will safely no-op a start on an already running instance | ||
| port = ((ServerConnector) jetty.getConnectors()[0]).getLocalPort(); | ||
| Jetty.start(); | ||
| Connector[] jcons = Jetty.getConnectors(); | ||
| Port = ((ServerConnector) jcons[0]).getLocalPort(); | ||
| TlsPort = ((ServerConnector) jcons[1]).getLocalPort(); | ||
|
|
||
| proxy.start(); | ||
| proxySettings.port = ((ServerConnector) proxy.getConnectors()[0]).getLocalPort(); | ||
| ProxyHandler.setHandler(ProxyServlet.createHandler()); | ||
| Proxy.start(); | ||
| ProxySettings.port = ((ServerConnector) Proxy.getConnectors()[0]).getLocalPort(); | ||
| } catch (Exception e) { | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static String map(Class<? extends BaseServlet> servletClass) { | ||
| synchronized (jetty) { | ||
| if (!jetty.isStarted()) | ||
| public static ServletUrls map(Class<? extends BaseServlet> servletClass) { | ||
| synchronized (Jetty) { | ||
| if (!Jetty.isStarted()) | ||
| start(); // if running out of the test cases | ||
|
|
||
| String path = "/" + servletClass.getSimpleName(); | ||
| handler.addServletWithMapping(servletClass, path + "/*"); | ||
| return "http://" + localhost + ":" + port + path; | ||
| JettyHandler.addServletWithMapping(servletClass, path + "/*"); | ||
| String url = "http://" + Localhost + ":" + Port + path; | ||
| String tlsUrl = "https://" + Localhost + ":" + TlsPort + path; | ||
|
|
||
| return new ServletUrls(url, tlsUrl); | ||
| } | ||
| } | ||
|
|
||
| public static class ServletUrls { | ||
| public final String url; | ||
| public final String tlsUrl; | ||
|
|
||
| public ServletUrls(String url, String tlsUrl) { | ||
| this.url = url; | ||
| this.tlsUrl = tlsUrl; | ||
| } | ||
| } | ||
|
|
||
| public static ProxySettings proxySettings() { | ||
| synchronized (jetty) { | ||
| if (!jetty.isStarted()) | ||
| start(); // if running out of the test cases | ||
| synchronized (Jetty) { | ||
| if (!Jetty.isStarted()) | ||
| start(); | ||
|
|
||
| return proxySettings; | ||
| return ProxySettings; | ||
| } | ||
| } | ||
|
|
||
| //public static String proxy | ||
| public static class ProxySettings { | ||
| final String hostname = localhost; | ||
| final String hostname = Localhost; | ||
| int port; | ||
| } | ||
|
|
||
| private static void addHttpsConnector(File keystoreFile, Server server) { | ||
| // Cribbed from https://github.com/jetty/jetty.project/blob/jetty-9.4.x/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java | ||
| SslContextFactory sslContextFactory = new SslContextFactory.Server(); | ||
| String path = keystoreFile.getAbsolutePath(); | ||
| sslContextFactory.setKeyStorePath(path); | ||
| sslContextFactory.setKeyStorePassword(KeystorePassword); | ||
| sslContextFactory.setKeyManagerPassword(KeystorePassword); | ||
| sslContextFactory.setTrustStorePath(path); | ||
| sslContextFactory.setTrustStorePassword(KeystorePassword); | ||
|
|
||
| HttpConfiguration httpConfig = new HttpConfiguration(); | ||
| httpConfig.setSecureScheme("https"); | ||
| HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig); | ||
| httpsConfig.addCustomizer(new SecureRequestCustomizer()); | ||
|
|
||
| ServerConnector sslConnector = new ServerConnector( | ||
| server, | ||
| new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()), | ||
| new HttpConnectionFactory(httpsConfig)); | ||
| server.addConnector(sslConnector); | ||
| } | ||
|
|
||
| private static void setupDefaultTrust(File keystoreFile) throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, KeyManagementException { | ||
| // Configure HttpsUrlConnection (jsoup) to trust (only) this cert | ||
| KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType()); | ||
| trustStore.load(Files.newInputStream(keystoreFile.toPath()), KeystorePassword.toCharArray()); | ||
| TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); | ||
| trustManagerFactory.init(trustStore); | ||
| TrustManager[] managers = trustManagerFactory.getTrustManagers(); | ||
| SSLContext tls = SSLContext.getInstance("TLS"); | ||
| tls.init(null, managers, null); | ||
| SSLSocketFactory socketFactory = tls.getSocketFactory(); | ||
| HttpsURLConnection.setDefaultSSLSocketFactory(socketFactory); | ||
| } | ||
| } |
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
Oops, something went wrong.