From 2a305efd4e211d3c4db88494aa382ae2f2ce97ae Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Wed, 10 Oct 2018 17:03:06 +0100
Subject: [PATCH] HADOOP-15839. Review + update cloud store sensitive keys in
 hadoop.security.sensitive-config-keys. Contributed by Steve Loughran.

(cherry picked from commit cdc4350718055189fef8c70e31314607001d4009)
---
 .../hadoop-common/src/main/resources/core-default.xml  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 0c3f43d0fde..954f6de907a 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
@@ -599,9 +599,17 @@
       secret$
       password$
       ssl.keystore.pass$
-      fs.s3.*[Ss]ecret.?[Kk]ey
+      fs.s3a.server-side-encryption.key
       fs.s3a.*.server-side-encryption.key
+      fs.s3a.secret.key
+      fs.s3a.*.secret.key
+      fs.s3a.session.key
+      fs.s3a.*.session.key
+      fs.s3a.session.token
+      fs.s3a.*.session.token
       fs.azure.account.key.*
+      fs.azure.oauth2.*
+      fs.adl.oauth2.*
       credential$
       oauth.*token$
       hadoop.security.sensitive-config-keys