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/9475fd90 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9475fd90 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9475fd90 Branch: refs/heads/HADOOP-15407 Commit: 9475fd902a37e94fb7687877d33aa7dfff92d9eb Parents: 6801b30 Author: Sean Mackrory <mackror...@apache.org> Authored: Wed Sep 12 07:14:31 2018 -0600 Committer: Thomas Marquardt <tm...@microsoft.com> Committed: Mon Sep 17 19:54:01 2018 +0000 ---------------------------------------------------------------------- .../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/9475fd90/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 b101b3b..b92d325 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/9475fd90/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 3fcdecb..f8eba04 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 @@ -603,7 +603,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/9475fd90/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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
