Merge branch 'wdt-873' into 'main'

Fixing issue where SSHJ was preventing WDT from running weith JDK 7

See merge request weblogic-cloud/weblogic-deploy-tooling!1679

Author: robertpatrick

core/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <artifactId>weblogic-deploy</artifactId>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/src/main/python/deploy.py

@@ -96,6 +96,7 @@ def __process_args(args):
     cla_helper.validate_variable_file_exists(_program_name, argument_map)
     __wlst_mode = cla_helper.process_online_args(argument_map)
     cla_helper.validate_if_domain_home_required(_program_name, argument_map, __wlst_mode)
+    cla_helper.validate_ssh_is_supported(_program_name, argument_map)
     cla_helper.process_encryption_args(argument_map)
 
     return model_context_helper.create_context(_program_name, argument_map)

core/src/main/python/discover.py

@@ -122,6 +122,8 @@ def __process_args(args):
 
     __wlst_mode = cla_helper.process_online_args(argument_map)
     cla_helper.validate_if_domain_home_required(_program_name, argument_map, __wlst_mode)
+    cla_helper.validate_ssh_is_supported(_program_name, argument_map)
+
     target_configuration_helper.process_target_arguments(argument_map)
     __process_model_arg(argument_map)
     __process_archive_filename_arg(argument_map)

core/src/main/python/update.py

@@ -102,6 +102,7 @@ def __process_args(args):
     cla_helper.validate_variable_file_exists(_program_name, argument_map)
     __wlst_mode = cla_helper.process_online_args(argument_map)
     cla_helper.validate_if_domain_home_required(_program_name, argument_map, __wlst_mode)
+    cla_helper.validate_ssh_is_supported(_program_name, argument_map)
     cla_helper.process_encryption_args(argument_map)
 
     return model_context_helper.create_context(_program_name, argument_map)

core/src/main/python/wlsdeploy/util/cla_helper.py

@@ -28,6 +28,7 @@
 from wlsdeploy.util import model_helper
 from wlsdeploy.util import model_translator
 from wlsdeploy.util import path_helper
+from wlsdeploy.util import string_utils
 
 from wlsdeploy.util import variables
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
@@ -296,6 +297,16 @@ def process_online_args(optional_arg_map):
     return mode
 
 
+def validate_ssh_is_supported(program_name, argument_map):
+    _method_name = 'validate_ssh_is_supported'
+
+    if CommandLineArgUtil.SSH_HOST_SWITCH in argument_map and not string_utils.is_java_version_or_above('1.8.0'):
+        tool_exception = exception_helper.create_cla_exception(ExitCode.ARG_VALIDATION_ERROR, 'WLSDPLY-20042',
+                                                               program_name, CommandLineArgUtil.SSH_HOST_SWITCH)
+        __logger.throwing(tool_exception, class_name=_class_name, method_name=_method_name)
+        raise tool_exception
+
+
 def clean_up_temp_files():
     """
     If a temporary directory was created to extract the model from the archive, delete the directory and its contents.

core/src/main/python/wlsdeploy/util/ssh_helper.py

@@ -13,11 +13,6 @@
 import java.lang.String as JString
 import java.lang.System as JSystem
 
-from net.schmizz.sshj import SSHClient
-import net.schmizz.sshj.common.SSHException as SSHJException
-from net.schmizz.sshj.transport import TransportException
-from net.schmizz.sshj.userauth import UserAuthException
-
 from oracle.weblogic.deploy.exception import BundleAwareException
 from oracle.weblogic.deploy.util import SSHException
 from oracle.weblogic.deploy.util import StringUtils
@@ -30,6 +25,7 @@
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.exit_code import ExitCode
 from wlsdeploy.util import path_helper
+from wlsdeploy.util import string_utils
 from wlsdeploy.util.ssh_command_line_helper import SSHUnixCommandLineHelper
 from wlsdeploy.util.ssh_command_line_helper import SSHWindowsCommandLineHelper
 
@@ -44,10 +40,15 @@ def initialize_ssh(model_context, argument_map, exception_type=ExceptionType.SSH
         __logger.finest('WLSDPLY-32007', class_name=__class_name, method_name=_method_name)
         __logger.exiting(class_name=__class_name, method_name=_method_name)
         return
+    elif not string_utils.is_java_version_or_above('1.8.0'):
+        __logger.fine('WLSDPLY-32041', class_name=__class_name, method_name=_method_name)
+        __logger.exiting(class_name=__class_name, method_name=_method_name)
+        return
 
     __validate_ssh_arguments(argument_map, model_context)
     __ensure_ssh_credentials(model_context)
 
+    import net.schmizz.sshj.common.SSHException as SSHJException
     try:
         ssh_context = SSHContext(model_context, exception_type)
     except (SSHException, SSHJException, JException),err:
@@ -404,6 +405,8 @@ def _connect(self):
         _method_name = '_connect'
         self._logger.entering(class_name=self._class_name, method_name=_method_name)
 
+        from net.schmizz.sshj import SSHClient
+
         ssh_client = SSHClient()
         if self._model_context.get_model_config().use_ssh_compression():
             ssh_client.useCompression()
@@ -485,6 +488,8 @@ def _username_password_auth(self):
         _method_name = '_username_password_auth'
         self._logger.entering(class_name=self._class_name, method_name=_method_name)
 
+        from net.schmizz.sshj.transport import TransportException
+        from net.schmizz.sshj.userauth import UserAuthException
         user = self._model_context.get_ssh_user()
         passwd = self._model_context.get_ssh_pass()
         try:
@@ -535,6 +540,7 @@ def _get_private_key_provider(self, key_path, passphrase):
         _method_name = '_get_private_key_provider'
         self._logger.entering(key_path, class_name=self._class_name, method_name=_method_name)
 
+        import net.schmizz.sshj.common.SSHException as SSHJException
         try:
             if passphrase is not None:
                 key_provider = self._ssh_client.loadKeys(key_path, passphrase)
@@ -553,6 +559,8 @@ def _do_public_key_auth(self, user, key_arg=None):
         _method_name = '_do_public_key_auth'
         self._logger.entering(user, key_arg, class_name=self._class_name, method_name=_method_name)
 
+        from net.schmizz.sshj.transport import TransportException
+        from net.schmizz.sshj.userauth import UserAuthException
         try:
             if key_arg is not None:
                 self._ssh_client.authPublickey(user, [ key_arg ])

core/src/main/python/wlsdeploy/util/string_utils.py

@@ -1,12 +1,13 @@
 """
-Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+Copyright (c) 2017, 2024, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 This module provides string manipulation helper methods that are not found in the WLST version of Jython
 """
-import java.util.Properties as Properties
 import java.io.FileInputStream as FileInputStream
 import java.io.IOException as IOException
+from java.lang import System
+from java.util import Properties
 
 from oracle.weblogic.deploy.aliases import VersionUtils
 import wlsdeploy.exception.exception_helper as exception_helper
@@ -116,3 +117,18 @@ def is_weblogic_version_or_above(wls_version, str_version):
      by the str_version argument, False otherwise
     """
     return VersionUtils.compareVersions(wls_version, str_version) >= 0
+
+
+def is_java_version_or_above(str_version):
+    """
+    Is the current Java version number equal to or greater than the str_version.
+    :param str_version: the string representation of the version to be compared to the actual java version
+    :return: True if the actual Java version is equal or greater than the version represented
+     by the str_version argument, False otherwise
+    """
+    java_version = System.getProperty('java.version')
+    # strip off the _###
+    if '_' in java_version:
+        idx = java_version.index('_')
+        java_version = java_version[0:idx]
+    return VersionUtils.compareVersions(java_version, str_version) >= 0

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -2112,6 +2112,7 @@ WLSDPLY-20038=Error applying final filter configuration: {0}
 WLSDPLY-20039=Remote WebLogic PSU version "{0}" extracted from "{1}"
 WLSDPLY-20040=Remote WebLogic version is {0}
 WLSDPLY-20041={0} invoked in online mode with an unused argument {1}, which has been ignored
+WLSDPLY-20042={0} invoked with {1} argument but SSH support requires Java 8 or above
 
 # Messages for internal filters
 WLSDPLY-20201=Unsupported attribute {0} at location {1} removed from model: {2}
@@ -2258,6 +2259,7 @@ WLSDPLY-32037=SSH command {0} returned exit code {1} but had no error message: "
 WLSDPLY-32038=Failed to SSH connect to host {0}: {1}
 WLSDPLY-32039=The {0} and {1} arguments are mutually exclusive
 WLSDPLY-32040=SSH requires using running the tool in online mode
+WLSDPLY-32041=Skipping SSH initialization since SSH required Java 8 or higher
 
 # verify_ssh.py
 WLSDPLY-32900=The -remote_test_file {0} argument was specified without the corresponding -local_output_dir argument.

installer/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
         <artifactId>weblogic-deploy</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

integration-tests/alias-test/generate/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <artifactId>weblogic-deploy-alias-test</artifactId>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>