Merge pull request #17752 from c00crane/284852_cl_waitForSSL

Add wait for SSL restart during reconfigs - in ported CL FATs

Author: c00crane

dev/com.ibm.ws.security.fat.common/src/com/ibm/ws/security/fat/common/CommonTest.java

@@ -28,7 +28,6 @@ public class CommonTest {
 
     private final static Class<?> thisClass = CommonTest.class;
     public static String _testName = "";
-    protected static int timeoutCounter = 0;
     protected static int allowableTimeoutCount = 0;
     public static CommonMessageTools msgUtils = new CommonMessageTools();
     protected WebClientTracker webClientTracker = new WebClientTracker();
@@ -108,6 +107,7 @@ public static void addToAllowableTimeoutCount(int additionalCount) {
     public static void timeoutChecker() throws Exception {
         String method = "timeoutChecker";
 
+        int timeoutCounter = 0 ;
         boolean timeoutFound = false;
         String outputFile = "./results/output.txt";
         File f = new File(outputFile);
@@ -131,10 +131,6 @@ public static void timeoutChecker() throws Exception {
                             }
                         }
                     }
-                    if (theLine.contains("TestClass END")) {
-                        Log.info(thisClass, method, "Found an end of test class marker in log");
-                        timeoutFound = false;
-                    }
                 }
             } catch (IOException e) {
                 e.printStackTrace();

dev/com.ibm.ws.security.fat.common/src/com/ibm/ws/security/fat/common/TestServer.java

@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ * IBM Corporation - initial API and implementation
  *******************************************************************************/
 package com.ibm.ws.security.fat.common;
 
@@ -69,6 +69,7 @@ public class TestServer extends ExternalResource {
     protected String callbackFeature;
     protected int retryTimeoutCount = 0;
     protected int overrideRestartWaitTime = 0;
+    protected int sslWaitTimeoutCount = 0;
 
     protected CommonMessageTools msgUtils = new CommonMessageTools();
     protected ServerBootstrapUtils bootstrapUtils = new ServerBootstrapUtils();
@@ -712,6 +713,8 @@ public void stopServer() throws Exception {
             addIgnoredServerException(MessageConstants.CWWKO0221E_PORT_IN_USE);
             // ignore shutdown timing issues
             addIgnoredServerExceptions(MessageConstants.CWWKO0227E_EXECUTOR_SERVICE_MISSING);
+            // ignore ssl restart warnings - if they caused problems, tests would also be failing
+            addIgnoredServerExceptions(MessageConstants.SSL_NOT_RESTARTED_PROPERLY);
             server.stopServer(ignoredServerExceptions);
         }
         unInstallCallbackHandler(callback, callbackFeature);
@@ -826,6 +829,7 @@ private void waitForSuccessfulUpdateAndStartMessages(boolean reportViaJunit, Lis
         assertNotNull("Did not encounter the CWWKG0017I message saying the server configuration was successfully updated.", updateMsg);
 
         waitForAppsToReboot();
+        waitForSSLRestart();
         validateStartMessages(startMessages, reportViaJunit);
     }
 
@@ -864,6 +868,33 @@ private boolean waitForAppToBeReady(String app) {
         return true;
     }
 
+    private void waitForSSLRestart() throws Exception {
+
+        String thisMethod = "waitForSSLRestart";
+        Log.info(thisClass, thisMethod, "Checking for SSL restart for server: " + server.getServerName());
+
+        // look for the "CWWKO0220I: TCP Channel defaultHttpEndpoint-ssl has stopped listening for requests on host " message
+        // if we find it, then wait for "CWWKO0219I: TCP Channel defaultHttpEndpoint-ssl has been started and is now listening for requests on host"
+        String sslStopMsg = server.waitForStringInLogUsingMark("CWWKO0220I:.*defaultHttpEndpoint-ssl.*", 500);
+        if (sslStopMsg != null) {
+            String sslStartMsg = server.waitForStringInLogUsingMark("CWWKO0219I:.*defaultHttpEndpoint-ssl.*");
+            if (sslStartMsg == null) {
+                Log.warning(thisClass, "SSL may not have started properly - future failures may be due to this");
+                sslWaitTimeoutCount += 1;
+            } else {
+                Log.info(thisClass, thisMethod, "SSL appears have restarted properly");
+            }
+        } else {
+            Log.info(thisClass, thisMethod, "Did not detect a restart of the SSL port");
+            sslWaitTimeoutCount += 1;
+        }
+
+    }
+
+    public int getSslWaitTimeoutCount() {
+        return sslWaitTimeoutCount;
+    }
+
     /**
      * Searches for a message string in the specified server log
      *
@@ -1300,7 +1331,7 @@ public String getBootstrapProperty(String key) throws Exception {
         Properties serverProperties = this.getServer().getBootstrapProperties();
         return serverProperties.getProperty(key, null);
     }
-    
+
     public String getJvmOptionsFilePath() throws Exception {
         String thisMethod = "getJvmOptionsFilePath";
         String jvmProps = getServerFileLoc() + "/jvm.options";

dev/com.ibm.ws.security.oauth.oidc_fat.common/src/com/ibm/ws/security/oauth_oidc/fat/commonTest/CommonTest.java

@@ -1749,6 +1749,7 @@ public static void tearDown() throws Exception {
             try {
                 // update the allowedTimeout count to account for msgs issued during start retries
                 addToAllowableTimeoutCount(server.getRetryTimeoutCount());
+                addToAllowableTimeoutCount(server.getSslWaitTimeoutCount());
                 tearDownServer(server);
                 newServerRefList.add(server);
             } catch (Exception e) {

dev/com.ibm.ws.security.saml.sso_fat.common/src/com/ibm/ws/security/saml20/fat/commonTest/SAMLCommonTest.java

@@ -114,7 +114,7 @@ public Boolean callSpecificCheck() {
     protected static List<CommonLocalLDAPServerSuite> ldapRefList = new ArrayList<CommonLocalLDAPServerSuite>();
     protected static boolean cipherMayExceed128 = false;
     public static boolean usingExternalLDAPServer = false;
-	//issue 17687
+    //issue 17687
     public static String callbackHandlerWss4j = SAMLConstants.EXAMPLE_CALLBACK_WSS4J;
     public static String featureWss4j = SAMLConstants.EXAMPLE_CALLBACK_FEATURE_WSS4J;
 
@@ -157,7 +157,6 @@ public static void initCommonVars() {
         testSettings = null;
         samlConfigSettings = new SAMLConfigSettings();
         helpers = null;
-        timeoutCounter = 0;
         //allowableTimeoutCount = 0;
         flowType = null;
         copyMetaData = true;
@@ -205,7 +204,7 @@ public static SAMLTestServer commonSetUp(String requestedServer,
 
     }
 
-    //issue 17687 
+    //issue 17687
     public static SAMLTestServer commonSetUp(String requestedServer,
                                              String serverXML, String testType, String serverType,
                                              List<String> addtlApps, List<String> addtlMessages, Boolean checkForSecuityStart, String callbackHandler,
@@ -221,14 +220,13 @@ public static SAMLTestServer commonSetUp(String requestedServer,
         return commonSetUp(requestedServer, serverXML, testType, serverType, addtlApps, addtlMessages, checkForSecuityStart, cbHandlers);
 
     } //End issue 17687
-	
-    
+
     //issue 17687
     public static SAMLTestServer commonSetUp(String requestedServer,
                                              String serverXML, String testType, String serverType,
                                              List<String> addtlApps, List<String> addtlMessages, Boolean checkForSecuityStart, Map<String, String> cbHandlers) throws Exception {
-    //End issue 17687
-		
+        //End issue 17687
+
         String thisMethod = "commonSetUp";
         msgUtils.printMethodName(thisMethod);
 
@@ -246,7 +244,6 @@ public static SAMLTestServer commonSetUp(String requestedServer,
             }
         }
 
-        timeoutCounter = 0;
         //        allowableTimeoutCount = 0;
         //		Integer defaultPort = null;
         String httpString = null;
@@ -269,7 +266,7 @@ public static SAMLTestServer commonSetUp(String requestedServer,
             } else {
                 aTestServer = new SAMLTestServer(requestedServer, usableServerXml, serverType, cbHandlers);
             } //End issue 17687
-			
+
             aTestServer.removeServerConfigFiles();
             aTestServer.setServerNameAndHostIp();
 
@@ -952,6 +949,7 @@ public static void tearDown() throws Exception {
         try {
             for (SAMLTestServer server : serverRefList) {
                 addToAllowableTimeoutCount(server.getRetryTimeoutCount());
+                addToAllowableTimeoutCount(server.getSslWaitTimeoutCount());
             }
             timeoutChecker();
         } catch (Exception e) {