You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pb...@apache.org on 2017/03/22 11:23:23 UTC
[18/50] [abbrv] oozie git commit: OOZIE-2771 Allow retrieving
keystore and truststore passwords from Hadoop Credential Provider (asasvari
via abhishekbafna)
OOZIE-2771 Allow retrieving keystore and truststore passwords from Hadoop Credential Provider (asasvari via abhishekbafna)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f0c4f2da
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f0c4f2da
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f0c4f2da
Branch: refs/heads/oya
Commit: f0c4f2daf61ca7c8b059d55be0465025b79f123e
Parents: b4c75a3
Author: abhisek bafna <ab...@hortonworks.com>
Authored: Wed Jan 25 12:24:38 2017 +0530
Committer: abhisek bafna <ab...@hortonworks.com>
Committed: Wed Jan 25 12:24:38 2017 +0530
----------------------------------------------------------------------
release-log.txt | 1 +
.../java/org/apache/oozie/server/SSLServerConnectorFactory.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/f0c4f2da/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 503d3c0..929b01a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.4.0 release (trunk - unreleased)
+OOZIE-2771 Allow retrieving keystore and truststore passwords from Hadoop Credential Provider (asasvari via abhishekbafna)
OOZIE-2619 Make Hive action defaults to match hive defaults when running from command line (venkatnrangan via abhishekbafna)
OOZIE-2776 Log message is repeated twice for hive actions (satishsaley)
OOZIE-2691 Show workflow action retry information in UI (puru)
http://git-wip-us.apache.org/repos/asf/oozie/blob/f0c4f2da/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java b/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
index 1ab0ec4..a7253d7 100644
--- a/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
+++ b/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java
@@ -22,6 +22,7 @@ package org.apache.oozie.server;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import org.apache.hadoop.conf.Configuration;
+import org.apache.oozie.service.ConfigurationService;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -140,13 +141,13 @@ class SSLServerConnectorFactory {
}
private void setTrustStorePass() {
- String trustStorePass = conf.get(OOZIE_HTTPS_TRUSTSTORE_PASS);
+ String trustStorePass = ConfigurationService.getPassword(conf, OOZIE_HTTPS_TRUSTSTORE_PASS).trim();
Preconditions.checkNotNull(trustStorePass, "setTrustStorePass is null");
sslContextFactory.setTrustStorePassword(trustStorePass);
}
private void setKeystorePass() {
- String keystorePass = conf.get(OOZIE_HTTPS_KEYSTORE_PASS);
+ String keystorePass = ConfigurationService.getPassword(conf, OOZIE_HTTPS_KEYSTORE_PASS).trim();
Preconditions.checkNotNull(keystorePass, "keystorePass is null");
sslContextFactory.setKeyManagerPassword(keystorePass);
}