From 879852ee88703623197c5d9262ca55782b65269a Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 11 Feb 2011 12:08:55 +0000 Subject: [PATCH] Add unit test that demonstrates use of a custom SSL implementation that extends the default JSSE implementation. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1069766 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/tomcat/util/net/TestCustomSsl.java | 82 ++++++++++++++++++++++ .../util/net/jsse/TesterBug50640SslImpl.java | 40 +++++++++++ 2 files changed, 122 insertions(+) create mode 100644 test/org/apache/tomcat/util/net/TestCustomSsl.java create mode 100644 test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java b/test/org/apache/tomcat/util/net/TestCustomSsl.java new file mode 100644 index 000000000..20b5ca44a --- /dev/null +++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java @@ -0,0 +1,82 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tomcat.util.net; + +import java.io.File; + +import javax.net.ssl.SSLContext; + +import org.apache.catalina.connector.Connector; +import org.apache.catalina.startup.Tomcat; +import org.apache.catalina.startup.TomcatBaseTest; +import org.apache.tomcat.util.buf.ByteChunk; +import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl; + +/** + * Requires test.keystore (checked in), generated with: + * keytool -genkey -alias tomcat -keyalg RSA + * pass: changeit + * CN: localhost ( for hostname validation ) + */ +public class TestCustomSsl extends TomcatBaseTest { + + public void testSimpleSsl() throws Exception { + // Install the all-trusting trust manager so https:// works + // with unsigned certs. + + try { + SSLContext sc = SSLContext.getInstance("SSL"); + sc.init(null, TesterSupport.TRUST_ALL_CERTS, + new java.security.SecureRandom()); + javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory( + sc.getSocketFactory()); + } catch (Exception e) { + e.printStackTrace(); + } + + Tomcat tomcat = getTomcatInstance(); + Connector connector = tomcat.getConnector(); + if (connector.getProtocol().indexOf("Apr") > -1) { + // This test is only for JSSE based SSL connectors + return; + } + + connector.setProperty("sslImplemenationName", + "org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl"); + connector.setProperty(TesterBug50640SslImpl.PROPERTY_NAME, + TesterBug50640SslImpl.PROPERTY_VALUE); + + connector.setProperty("sslProtocol", "tls"); + + File keystoreFile = + new File("test/org/apache/catalina/startup/test.keystore"); + connector.setAttribute( + "keystoreFile", keystoreFile.getAbsolutePath()); + + connector.setSecure(true); + connector.setProperty("SSLEnabled", "true"); + + File appDir = new File(getBuildDirectory(), "webapps/examples"); + tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath()); + + tomcat.start(); + ByteChunk res = getUrl("https://localhost:" + getPort() + + "/examples/servlets/servlet/HelloWorldExample"); + assertTrue(res.toString().indexOf("

Hello World!

") > 0); + } + +} diff --git a/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java b/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java new file mode 100644 index 000000000..e36cac4c1 --- /dev/null +++ b/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tomcat.util.net.jsse; + +import org.apache.tomcat.util.net.AbstractEndpoint; +import org.apache.tomcat.util.net.ServerSocketFactory; + +public class TesterBug50640SslImpl extends JSSEImplementation { + + public static final String PROPERTY_NAME = "bug50640"; + public static final String PROPERTY_VALUE = "pass"; + + @Override + public ServerSocketFactory getServerSocketFactory( + AbstractEndpoint endpoint) { + + // Check the custom attribute is visible & correcly set + String flag = endpoint.getProperty(PROPERTY_NAME); + if (PROPERTY_VALUE.equals(flag)) { + return super.getServerSocketFactory(endpoint); + } else { + return null; + } + } + +} -- 2.11.0