Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6989 Ensure timeline service v2 codebase gets UGI from HttpServletRequest in a consistent way. Contributed by Abhishek Modi

Browse Source
This commit is contained in:
Vrushali C 2018-10-10 15:25:58 -07:00
parent cc1bf7f894
commit 7a5d27dde4
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServicesUtils.java
View File

@ -269,25 +269,8 @@ static String parseStr(String str) {
* @return UGI. * @return UGI.
*/ */
public static UserGroupInformation getUser(HttpServletRequest req) { public static UserGroupInformation getUser(HttpServletRequest req) {
return getCallerUserGroupInformation(req, false); Principal princ = req.getUserPrincipal();
} String remoteUser = princ == null ? null : princ.getName();
/**
* 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();
}
UserGroupInformation callerUGI = null; UserGroupInformation callerUGI = null;
if (remoteUser != null) { if (remoteUser != null) {
callerUGI = UserGroupInformation.createRemoteUser(remoteUser); callerUGI = UserGroupInformation.createRemoteUser(remoteUser);

2
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
View File

@ -67,7 +67,7 @@ public void doFilter(ServletRequest request, ServletResponse response,
if (isWhitelistReadAuthEnabled) { if (isWhitelistReadAuthEnabled) {
UserGroupInformation callerUGI = TimelineReaderWebServicesUtils UserGroupInformation callerUGI = TimelineReaderWebServicesUtils
.getCallerUserGroupInformation(httpRequest, true); .getUser(httpRequest);
if (callerUGI == null) { if (callerUGI == null) {
String msg = "Unable to obtain user name, user not authenticated"; String msg = "Unable to obtain user name, user not authenticated";
throw new AuthorizationException(msg); throw new AuthorizationException(msg);