Fix stdin entries to avoid closing stdin stream when encryption util is run in non console mode. (#423)

Author: jshum2479

core/src/main/java/oracle/weblogic/deploy/util/CLAUtils.java

@@ -6,8 +6,8 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.Reader;
 import java.util.Arrays;
 
 import oracle.weblogic.deploy.exception.ExceptionHelper;
@@ -65,9 +65,7 @@ public static synchronized char[] getPasswordInput(String messageKey, Object...
         if (System.console() != null) {
             result = System.console().readPassword();
         } else {
-            try (BufferedReader stdinReader = new BufferedReader(new InputStreamReader(System.in, UTF_8))){
-                result = readPasswordFromStdin(stdinReader);
-            }
+            result = readPasswordFromStdin(System.in);
         }
         return result;
     }
@@ -76,7 +74,7 @@ private static void promptInTerminalWindow(String messageKey, Object... args) {
         System.out.print(ExceptionHelper.getMessage(messageKey, args) + PROMPT_ENDING);
     }
 
-    private static char[] readPasswordFromStdin(Reader stdinReader) throws IOException {
+    private static char[] readPasswordFromStdin(InputStream stdinReader) throws IOException {
         char[] result = new char[MAX_PASSWORD_LENGTH];
 
         boolean eolFound = false;

core/src/main/python/encrypt.py

@@ -9,7 +9,7 @@
 
 from java.io import IOException
 from java.lang import IllegalArgumentException
-from java.lang import String
+from java.lang import String, System
 
 from oracle.weblogic.deploy.encrypt import EncryptionException
 from oracle.weblogic.deploy.util import CLAException
@@ -155,6 +155,14 @@ def __process_passphrase_arg(optional_arg_map):
             if passphrase == passphrase2:
                 got_matching_passphrases = True
                 optional_arg_map[CommandLineArgUtil.PASSPHRASE_SWITCH] = String(passphrase)
+            else:
+                # if it is script mode do not prompt again
+                if System.console() is None:
+                    ex = exception_helper.create_cla_exception('WLSDPLY-04213')
+                    ex.setExitCode(CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
+                    __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+                    raise ex
+
     return
 
 

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

@@ -360,6 +360,7 @@ WLSDPLY-04209={0} encrypted {1} variables and wrote them to file {2}
 WLSDPLY-04210={0} encrypted {1} model attributes and wrote them to file {2}
 WLSDPLY-04211={0} failed to write encrypted model to file {1}: {2}
 WLSDPLY-04212={0} failed to encrypt the password: {1}
+WLSDPLY-04213="Encryption password does not match"
 
 ###############################################################################
 #                 Validate Messages (05000 - 05999)                           #