Update PR#5684: use char[] in authentication

Author: weizhouapache

server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java

@@ -263,9 +263,12 @@ private void setupAgentSecurity(final Connection sshConnection, final String age
             final String privateKey = _configDao.getValue("ssh.privatekey");
             if (!SSHCmdHelper.acquireAuthorizedConnectionWithPublicKey(sshConnection, username, privateKey)) {
                 s_logger.error("Failed to authenticate with ssh key");
+                if (org.apache.commons.lang3.StringUtils.isEmpty(password)) {
+                    throw new DiscoveredWithErrorException("Authentication error with ssh private key");
+                }
                 if (!sshConnection.authenticateWithPassword(username, password)) {
                     s_logger.error("Failed to authenticate with password");
-                    throw new DiscoveredWithErrorException("Authentication error");
+                    throw new DiscoveredWithErrorException("Authentication error with host password");
                 }
             }
 

utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java

@@ -19,8 +19,6 @@
 
 package com.cloud.utils.ssh;
 
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -85,29 +83,15 @@ public static com.trilead.ssh2.Connection acquireAuthorizedConnection(String ip,
 
     public static boolean acquireAuthorizedConnectionWithPublicKey(final com.trilead.ssh2.Connection sshConnection, final String username, final String privateKey) {
         if (StringUtils.isNotBlank(privateKey)) {
-            File privateKeyFile = null;
             try {
-                privateKeyFile = File.createTempFile("cloudstack-host-", null);
-                FileWriter writer = new FileWriter(privateKeyFile.getAbsolutePath());
-                writer.write(privateKey);
-                writer.close();
-            } catch (IOException e) {
-                s_logger.warn("An exception occurred when create a tmp file and write private key to the tmp file");
-                return false;
-            }
-            try {
-                if (!sshConnection.authenticateWithPublicKey(username, privateKeyFile, null)) {
+                if (!sshConnection.authenticateWithPublicKey(username, privateKey.toCharArray(), null)) {
                     s_logger.warn("Failed to authenticate with ssh key");
                     return false;
                 }
                 return true;
             } catch (IOException e) {
                 s_logger.warn("An exception occurred when authenticate with ssh key");
                 return false;
-            } finally {
-                if (privateKeyFile != null && privateKeyFile.exists()) {
-                    privateKeyFile.delete();
-                }
             }
         }
         return false;