Set TLS to v1.2 for the EE 7 tests for now.

Added auto-discovery of domain for Payara and GlassFish

Author: arjan

pom.xml

@@ -219,7 +219,7 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.33</version>
+            <version>2.34.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

servlet/security-clientcert-jce/src/test/java/org/javaee7/servlet/security/clientcert/jce/SecureServletTest.java

@@ -101,6 +101,9 @@ public static WebArchive createDeployment() throws FileNotFoundException, IOExce
         // Create a new local key store containing the client private key and the certificate
         clientKeyStorePath = createTempJKSKeyStore(clientKeyPair.getPrivate(), clientCertificate);
 
+        // Only test TLS v1.2 for now
+        System.setProperty("jdk.tls.client.protocols", "TLSv1.2");
+        
         // Enable to get detailed logging about the SSL handshake on the server
 
         if (System.getProperty("ssl.debug") != null) {

servlet/security-clientcert/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletTest.java

@@ -102,6 +102,9 @@ public static WebArchive createDeployment() throws FileNotFoundException, IOExce
             System.out.println("Setting server SSL debug on");
             addContainerSystemProperty("javax.net.debug", "ssl:handshake");
         }
+        
+        // Only test TLS v1.2 for now
+        System.setProperty("jdk.tls.client.protocols", "TLSv1.2");
 
         // Add the client certificate that we just generated to the trust store of the server.
         // That way the server will trust our certificate.

test-utils/src/main/java/org/javaee7/CliCommands.java

@@ -21,8 +21,12 @@ public class CliCommands {
 
     private static final Logger logger = Logger.getLogger(CliCommands.class.getName()); 
     private static final String OS = System.getProperty("os.name").toLowerCase();
-
+    
     public static int payaraGlassFish(List<String> cliCommands) {
+        return payaraGlassFish(cliCommands, null);
+    }
+
+    public static int payaraGlassFish(List<String> cliCommands, List<String> output) {
 
         String gfHome = System.getProperty("glassfishRemote_gfHome");
         if (gfHome == null) {
@@ -60,6 +64,7 @@ public static int payaraGlassFish(List<String> cliCommands) {
             return 
                 waitToFinish(
                     readAllInput(
+                        output,
                         destroyAtShutDown(
                             processBuilder.start())));
         } catch (IOException e) {
@@ -86,11 +91,15 @@ public void run() {
         return process;
     }
 
-    public static Process readAllInput(Process process) {
+    public static Process readAllInput(List<String> output, Process process) {
         // Read any output from the process
         try (Scanner scanner = new Scanner(process.getInputStream())) {
             while (scanner.hasNextLine()) {
-                System.out.println(scanner.nextLine());
+                String nextLine = scanner.nextLine();
+                System.out.println(nextLine);
+                if (output != null) {
+                    output.add(nextLine);
+                }
             }
         }
 

test-utils/src/main/java/org/javaee7/ServerOperations.java

@@ -91,9 +91,12 @@ public static void addCertificateToContainerTrustStore(Certificate clientCertifi
                 logger.severe("glassfishRemote_gfHome at " + gfHome + " is not a directory");
                 return;
             }
-            
-            // TODO: support current domain
+                        
             String domain = System.getProperty("payara_domain", "domain1");
+            if (domain != null) {
+                domain = getPayaraDomainFromServer();
+                logger.info("Using domain \"" + domain + "\" obtained from server. If this is not correct use -Dpayara_domain to override.");
+            }
 
             Path cacertsPath = gfHomePath.resolve("glassfish/domains/" + domain + "/config/cacerts.jks");
 
@@ -116,6 +119,8 @@ public static void addCertificateToContainerTrustStore(Certificate clientCertifi
             } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | IOException e) {
                 throw new IllegalStateException(e);
             }
+            
+            restartContainer(domain);
         } else {
             if (javaEEServer == null) {
                 System.out.println("javaEEServer not specified");
@@ -124,7 +129,6 @@ public static void addCertificateToContainerTrustStore(Certificate clientCertifi
             }
         }
 
-        restartContainer();
     }
 
     public static URL toContainerHttps(URL url) {
@@ -167,6 +171,31 @@ public static URL toContainerHttps(URL url) {
         return null;
     }
 
+    private static String getPayaraDomainFromServer() {
+    	System.out.println("Getting Payara domaain from server");
+        
+    	List<String> output = new ArrayList<>();
+        List<String> cmd = new ArrayList<>();
+        
+        cmd.add("list-domains");
+        
+        CliCommands.payaraGlassFish(cmd, output);
+        
+        String domain = null;
+        for (String line : output) {
+            if (line.contains(" not running")) {
+                continue;
+            }
+            
+            if (line.endsWith(" running")) {
+                domain = line.substring(0, line.lastIndexOf(" running"));
+                break;
+            }
+        }
+        
+        return domain;
+    }
+    
     public static void addContainerSystemProperty(String key, String value) {
         String javaEEServer = System.getProperty("javaEEServer");
 
@@ -177,7 +206,7 @@ public static void addContainerSystemProperty(String key, String value) {
             List<String> cmd = new ArrayList<>();
 
             cmd.add("create-jvm-options");
-            cmd.add("-D" + key + "=" + value);
+            cmd.add("-D" + key + "=\"" + value + "\"");
 
             CliCommands.payaraGlassFish(cmd);
 
@@ -191,6 +220,10 @@ public static void addContainerSystemProperty(String key, String value) {
     }
 
     public static void restartContainer() {
+        restartContainer(null);
+    }
+    
+    public static void restartContainer(String domain) {
         // Arquillian connectors can stop/start already, but not on demand by code
 
         String javaEEServer = System.getProperty("javaEEServer");
@@ -203,7 +236,16 @@ public static void restartContainer() {
 
             cmd.add("restart-domain");
 
-            cmd.add(System.getProperty("payara_domain", "domain1"));
+            String restartDomain = domain;
+            if (restartDomain == null) {
+                restartDomain = System.getProperty("payara_domain");
+            }
+            
+            if (restartDomain == null) {
+                restartDomain = getPayaraDomainFromServer();
+            }
+            
+            cmd.add(restartDomain);
 
             CliCommands.payaraGlassFish(cmd);