Repository: hive Updated Branches: refs/heads/branch-2.1 29bbad017 -> 7f3a4b8aa refs/heads/master d934156e4 -> 196ef21d4
HIVE-14188 : LLAPIF: wrong user field is used from the token (Sergey Shelukhin, reviewed by Jason Dere) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/196ef21d Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/196ef21d Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/196ef21d Branch: refs/heads/master Commit: 196ef21d4a8a203e4d213341d0230758211cd77d Parents: d934156 Author: Sergey Shelukhin <ser...@apache.org> Authored: Tue Jul 12 11:58:32 2016 -0700 Committer: Sergey Shelukhin <ser...@apache.org> Committed: Tue Jul 12 11:58:32 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hive/llap/daemon/impl/LlapTokenChecker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/196ef21d/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTokenChecker.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTokenChecker.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTokenChecker.java index 24a7737..0a688f8 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTokenChecker.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTokenChecker.java @@ -84,7 +84,7 @@ public final class LlapTokenChecker { String userName = kerberosName, appId = null; boolean isSigningRequired = false; for (LlapTokenIdentifier llapId : tokens) { - String newUserName = llapId.getRealUser().toString(); + String newUserName = llapId.getOwner().toString(); if (userName != null && !userName.equals(newUserName)) { throw new SecurityException("Ambiguous user name from credentials - " + userName + " and " + newUserName + " from " + llapId @@ -123,7 +123,7 @@ public final class LlapTokenChecker { } if (tokens != null) { for (LlapTokenIdentifier llapId : tokens) { - String tokenUser = llapId.getRealUser().toString(), tokenAppId = llapId.getAppId(); + String tokenUser = llapId.getOwner().toString(), tokenAppId = llapId.getAppId(); if (checkTokenPermissions(userName, appId, tokenUser, tokenAppId)) return; } }
