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 ar...@apache.org on 2016/02/22 20:47:32 UTC
[13/50] [abbrv] hadoop git commit: HADOOP-12878. KMS SPNEGO sequence
does not work with WEBHDFS. Contributed by Xiaoyu Yao.
HADOOP-12878. KMS SPNEGO sequence does not work with WEBHDFS. Contributed by Xiaoyu Yao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fd1befb6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fd1befb6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fd1befb6
Branch: refs/heads/HDFS-1312
Commit: fd1befb6ba450e45b1fcb3fb28b0da6c48daf6b3
Parents: 1a1c2f5
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Wed Feb 17 08:27:27 2016 -0800
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Wed Feb 17 08:27:27 2016 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
.../hadoop/crypto/key/kms/KMSClientProvider.java | 14 +++++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fd1befb6/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index b0dda76..cde5f3b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1710,6 +1710,8 @@ Release 2.8.0 - UNRELEASED
HADOOP-12780. During atomic rename handle crash when one directory has been
renamed but not file under it. (Madhumita Chakraborty via cnauroth)
+ HADOOP-12878. KMS SPNEGO sequence does not work with WEBHDFS. (xyao)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fd1befb6/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
index fd7a83e..7682888 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java
@@ -397,11 +397,15 @@ public class KMSClientProvider extends KeyProvider implements CryptoExtension,
KMS_CLIENT_ENC_KEY_CACHE_NUM_REFILL_THREADS_DEFAULT),
new EncryptedQueueRefiller());
authToken = new DelegationTokenAuthenticatedURL.Token();
- actualUgi =
- (UserGroupInformation.getCurrentUser().getAuthenticationMethod() ==
- UserGroupInformation.AuthenticationMethod.PROXY) ? UserGroupInformation
- .getCurrentUser().getRealUser() : UserGroupInformation
- .getCurrentUser();
+ UserGroupInformation.AuthenticationMethod authMethod =
+ UserGroupInformation.getCurrentUser().getAuthenticationMethod();
+ if (authMethod == UserGroupInformation.AuthenticationMethod.PROXY) {
+ actualUgi = UserGroupInformation.getCurrentUser().getRealUser();
+ } else if (authMethod == UserGroupInformation.AuthenticationMethod.TOKEN) {
+ actualUgi = UserGroupInformation.getLoginUser();
+ } else {
+ actualUgi =UserGroupInformation.getCurrentUser();
+ }
}
private static Path extractKMSPath(URI uri) throws MalformedURLException, IOException {