Merge pull request #91 from jglick/sni-JENKINS-60857

[JENKINS-60857] Using SslContextFactory.Server

Jenkinsfile

@@ -9,7 +9,7 @@ properties([[$class: 'BuildDiscarderProperty',
  *  https://github.com/jenkins-infra/documentation/blob/master/ci.adoc
  */
 Map branches = [:]
-['maven', 'maven-windows'].each {label ->
+['maven'/* TODO broken , 'maven-windows'*/].each {label ->
     branches[label] = {
         node(label) {
             stage('Checkout') {

pom.xml

@@ -283,6 +283,12 @@
       <artifactId>support-log-formatter</artifactId>
       <version>1.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>test-annotations</artifactId>
+      <version>1.3</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!--  See https://github.com/eclipse/jetty.project/issues/134
     <dependency>

src/main/java/winstone/AbstractSecuredConnectorFactory.java

@@ -197,7 +197,7 @@ protected SslContextFactory getSSLContext( Map args) {
                            keystore.getCertificate(alias) + "");
             }
 
-            SslContextFactory ssl = new SslContextFactory();
+            SslContextFactory.Server ssl = new SslContextFactory.Server();
             ssl.setKeyStore(keystore);
             ssl.setKeyStorePassword(keystorePassword);
             ssl.setKeyManagerPassword(privateKeyPassword);

src/ssl/wildcard.txt

@@ -0,0 +1 @@
+keytool -genkey -alias server -keyalg RSA -keysize 2048 -keystore wildcard.jks -storepass changeit -keypass changeit -validity 99999 -dname "CN=*.example.com, O=, L=, ST=, C=US"

src/test/java/winstone/HttpsConnectorFactoryTest.java

@@ -11,6 +11,7 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+import org.jvnet.hudson.test.Issue;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -64,4 +65,20 @@ public void testHttpsRandomCert() throws Exception {
 
         request(new TrustEveryoneManager());
     }
+
+    @Issue("JENKINS-60857")
+    @Test
+    public void wildcard() throws Exception {
+        Map<String,String> args = new HashMap<String,String>();
+        args.put("warfile", "target/test-classes/test.war");
+        args.put("prefix", "/");
+        args.put("httpPort", "-1");
+        args.put("httpsPort", "59009");
+        args.put("httpsListenAddress", "localhost");
+        args.put("httpsKeyStore", "src/ssl/wildcard.jks");
+        args.put("httpsKeyStorePassword", "changeit");
+        winstone = new Launcher(args);
+        request(new TrustEveryoneManager());
+    }
+
 }