You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2018/09/12 13:17:59 UTC
hadoop git commit: HADOOP-15745. ABFS: Add ABFS configuration to
ConfigRedactor.
Repository: hadoop
Updated Branches:
refs/heads/HADOOP-15407 07a5bb9a0 -> a734f5574
HADOOP-15745. ABFS: Add ABFS configuration to ConfigRedactor.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a734f557
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a734f557
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a734f557
Branch: refs/heads/HADOOP-15407
Commit: a734f55742bd97fc671837ea220be8faedca452f
Parents: 07a5bb9
Author: Sean Mackrory <ma...@apache.org>
Authored: Wed Sep 12 07:14:31 2018 -0600
Committer: Sean Mackrory <ma...@apache.org>
Committed: Wed Sep 12 07:14:55 2018 -0600
----------------------------------------------------------------------
.../org/apache/hadoop/fs/CommonConfigurationKeysPublic.java | 4 +++-
.../hadoop-common/src/main/resources/core-default.xml | 4 +++-
.../test/java/org/apache/hadoop/conf/TestConfigRedactor.java | 7 +++++++
3 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a734f557/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
index c7f32f9..9a546a4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
@@ -886,7 +886,9 @@ public class CommonConfigurationKeysPublic {
"fs.s3a.*.server-side-encryption.key",
"fs.azure\\.account.key.*",
"credential$",
- "oauth.*token$",
+ "oauth.*secret",
+ "oauth.*password",
+ "oauth.*token",
HADOOP_SECURITY_SENSITIVE_CONFIG_KEYS);
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a734f557/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index b28f5ec..b83e548 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -587,7 +587,9 @@
fs.s3a.*.server-side-encryption.key
fs.azure.account.key.*
credential$
- oauth.*token$
+ oauth.*secret
+ oauth.*password
+ oauth.*token
hadoop.security.sensitive-config-keys
</value>
<description>A comma-separated or multi-line list of regular expressions to
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a734f557/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigRedactor.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigRedactor.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigRedactor.java
index 3133942..ca53fa7 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigRedactor.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigRedactor.java
@@ -55,6 +55,13 @@ public class TestConfigRedactor {
"fs.s3a.server-side-encryption.key",
"fs.s3a.bucket.engineering.server-side-encryption.key",
"fs.azure.account.key.abcdefg.blob.core.windows.net",
+ "fs.azure.account.key.abcdefg.dfs.core.windows.net",
+ "fs.azure.account.oauth2.client.secret",
+ "fs.azure.account.oauth2.client.secret.account.dfs.core.windows.net",
+ "fs.azure.account.oauth2.user.password",
+ "fs.azure.account.oauth2.user.password.account.dfs.core.windows.net",
+ "fs.azure.account.oauth2.refresh.token",
+ "fs.azure.account.oauth2.refresh.token.account.dfs.core.windows.net",
"fs.adl.oauth2.refresh.token",
"fs.adl.oauth2.credential",
"dfs.adls.oauth2.refresh.token",
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org