HADOOP-12567. NPE in SaslRpcServer. Contributed by Sergey Shelukhin. (cherry picked from commit 7fab5c8cec0d2ab62acf50b7c33351fb69c8c187)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/397836a7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/397836a7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/397836a7 Branch: refs/heads/branch-2 Commit: 397836a7b3a8c0242c8032a6097a99aa161a638d Parents: d8e6008 Author: cnauroth <[email protected]> Authored: Tue Nov 17 15:59:57 2015 -0800 Committer: cnauroth <[email protected]> Committed: Tue Nov 17 16:00:33 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/security/SaslRpcServer.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/397836a7/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 6333c19..863f4fb 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -705,6 +705,8 @@ Release 2.8.0 - UNRELEASED HADOOP-12560: Fix sprintf warnings in {{DomainSocket.c}} introduced by HADOOP-12344 (Mingliang Liu via Colin P. McCabe) + HADOOP-12567: NPE in SaslRpcServer (Sergey Shelukhin via cnauroth) + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() http://git-wip-us.apache.org/repos/asf/hadoop/blob/397836a7/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java index f2b21e8..50acc5c 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java @@ -322,8 +322,9 @@ public class SaslRpcServer { } if (ac.isAuthorized()) { if (LOG.isDebugEnabled()) { - String username = - getIdentifier(authzid, secretManager).getUser().getUserName(); + UserGroupInformation logUser = + getIdentifier(authzid, secretManager).getUser(); + String username = logUser == null ? null : logUser.getUserName(); LOG.debug("SASL server DIGEST-MD5 callback: setting " + "canonicalized client ID: " + username); }
