Updated Branches: refs/heads/trunk 7ba1d09a0 -> 39efc0be4
AMBARI-2664. Remove the info statements for passphrase from the server during ssl cert signing. (smohanty) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/39efc0be Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/39efc0be Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/39efc0be Branch: refs/heads/trunk Commit: 39efc0be41cba94e34bc6c00c4cfd45f27842d72 Parents: 7ba1d09 Author: Sumit Mohanty <[email protected]> Authored: Tue Jul 16 17:15:12 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Tue Jul 16 17:15:12 2013 -0700 ---------------------------------------------------------------------- .../ambari/server/security/CertificateManager.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/39efc0be/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java b/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java index 1ecd2c0..f66136b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java @@ -187,14 +187,9 @@ public class CertificateManager { LOG.info("Signing of agent certificate"); LOG.info("Verifying passphrase"); - - String passphraseSrvr = configs.getConfigsMap().get(Configuration. PASSPHRASE_KEY).trim(); - LOG.info("Pass phrase Server " + passphraseSrvr); - LOG.info("Pass phrase Agent " + passphraseAgent); - if (!passphraseSrvr.equals(passphraseAgent.trim())) { LOG.warn("Incorrect passphrase from the agent"); response.setResult(SignCertResponse.ERROR_STATUS); @@ -210,8 +205,8 @@ public class CertificateManager { String agentCrtReqName = agentHostname + ".csr"; String agentCrtName = agentHostname + ".crt"; - Object[] scriptArgs = {srvrKstrDir,agentCrtReqName,agentCrtName, - srvrCrtPass,srvrKeyName,srvrCrtName}; + Object[] scriptArgs = {srvrKstrDir, agentCrtReqName, agentCrtName, + srvrCrtPass, srvrKeyName, srvrCrtName}; //Revoke previous agent certificate if exists File agentCrtFile = new File(srvrKstrDir + File.separator + agentCrtName); @@ -236,12 +231,12 @@ public class CertificateManager { e1.printStackTrace(); } - String command = MessageFormat.format(SIGN_AGENT_CRT,scriptArgs); + String command = MessageFormat.format(SIGN_AGENT_CRT, scriptArgs); LOG.debug(command); int commandExitCode = runCommand(command); // ssl command execution - if(commandExitCode != 0) { + if (commandExitCode != 0) { response.setResult(SignCertResponse.ERROR_STATUS); response.setMessage(ShellCommandUtil.getOpenSslCommandResult(command, commandExitCode)); //LOG.warn(ShellCommandUtil.getOpenSslCommandResult(command, commandExitCode));
