Repository: hadoop Updated Branches: refs/heads/branch-2 cc1bf7f89 -> 7a5d27dde
YARN-6989 Ensure timeline service v2 codebase gets UGI from HttpServletRequest in a consistent way. Contributed by Abhishek Modi Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7a5d27dd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7a5d27dd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7a5d27dd Branch: refs/heads/branch-2 Commit: 7a5d27dde4abab8db35895b77d0ce93bfe99c8a1 Parents: cc1bf7f Author: Vrushali C <vrush...@apache.org> Authored: Wed Oct 10 15:25:58 2018 -0700 Committer: Vrushali C <vrush...@apache.org> Committed: Wed Oct 10 15:25:58 2018 -0700 ---------------------------------------------------------------------- .../reader/TimelineReaderWebServicesUtils.java | 21 ++------------------ ...elineReaderWhitelistAuthorizationFilter.java | 2 +- 2 files changed, 3 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a5d27dd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServicesUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServicesUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServicesUtils.java index ae19b21..02f510a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServicesUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServicesUtils.java @@ -269,25 +269,8 @@ public final class TimelineReaderWebServicesUtils { * @return UGI. */ public static UserGroupInformation getUser(HttpServletRequest req) { - return getCallerUserGroupInformation(req, false); - } - - /** - * Get UGI from the HTTP request. - * - * @param hsr HTTP request. - * @param usePrincipal if true, use principal name else use remote user name - * @return UGI. - */ - public static UserGroupInformation getCallerUserGroupInformation( - HttpServletRequest hsr, boolean usePrincipal) { - - String remoteUser = hsr.getRemoteUser(); - if (usePrincipal) { - Principal princ = hsr.getUserPrincipal(); - remoteUser = princ == null ? null : princ.getName(); - } - + Principal princ = req.getUserPrincipal(); + String remoteUser = princ == null ? null : princ.getName(); UserGroupInformation callerUGI = null; if (remoteUser != null) { callerUGI = UserGroupInformation.createRemoteUser(remoteUser); http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a5d27dd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/security/TimelineReaderWhitelistAuthorizationFilter.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/security/TimelineReaderWhitelistAuthorizationFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/security/TimelineReaderWhitelistAuthorizationFilter.java index d3f63e5..4ed3f23 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/security/TimelineReaderWhitelistAuthorizationFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/security/TimelineReaderWhitelistAuthorizationFilter.java @@ -67,7 +67,7 @@ public class TimelineReaderWhitelistAuthorizationFilter implements Filter { if (isWhitelistReadAuthEnabled) { UserGroupInformation callerUGI = TimelineReaderWebServicesUtils - .getCallerUserGroupInformation(httpRequest, true); + .getUser(httpRequest); if (callerUGI == null) { String msg = "Unable to obtain user name, user not authenticated"; throw new AuthorizationException(msg); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
