HADOOP-14317. KMSWebServer$deprecateEnv may leak secret. Contributed by John Zhuge.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a9f07e0d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a9f07e0d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a9f07e0d Branch: refs/heads/trunk Commit: a9f07e0d3ebb41d24d11e2bdb0ee872fa72072ca Parents: ca2488c Author: John Zhuge <[email protected]> Authored: Mon Apr 17 22:35:50 2017 -0700 Committer: John Zhuge <[email protected]> Committed: Tue Apr 18 09:29:16 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9f07e0d/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java index 1141824..ced1f69 100644 --- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java +++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java @@ -105,10 +105,9 @@ public class KMSWebServer { if (value == null) { return; } - String propValue = conf.get(propName); - LOG.warn("Environment variable {} = '{}' is deprecated and overriding" - + " property {} = '{}', please set the property in {} instead.", - varName, value, propName, propValue, confFile); + LOG.warn("Environment variable {} is deprecated and overriding" + + " property {}, please set the property in {} instead.", + varName, propName, confFile); conf.set(propName, value, "environment variable " + varName); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
