merge -r 1292830:1292831 from trunk to branch-0.23. FIXES: MAPREDUCE-3878

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1292834 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-02-23 15:57:47 +00:00
parent 6084873b82
commit 1714f8b6c7
2 changed files with 12 additions and 3 deletions

View File

@ -43,6 +43,9 @@ Release 0.23.2 - UNRELEASED
MAPREDUCE-3884. PWD should be first in the classpath of MR tasks (tucu) MAPREDUCE-3884. PWD should be first in the classpath of MR tasks (tucu)
MAPREDUCE-3878. Null user on filtered jobhistory job page (Jonathon Eagles
via tgraves)
Release 0.23.1 - 2012-02-17 Release 0.23.1 - 2012-02-17
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -343,9 +343,15 @@ public class AppController extends Controller implements AMParams {
* @return True if the requesting user has permission to view the job * @return True if the requesting user has permission to view the job
*/ */
boolean checkAccess(Job job) { boolean checkAccess(Job job) {
UserGroupInformation callerUgi = UserGroupInformation.createRemoteUser( String remoteUser = request().getRemoteUser();
request().getRemoteUser()); UserGroupInformation callerUGI = null;
return job.checkAccess(callerUgi, JobACL.VIEW_JOB); if (remoteUser != null) {
callerUGI = UserGroupInformation.createRemoteUser(remoteUser);
}
if (callerUGI != null && !job.checkAccess(callerUGI, JobACL.VIEW_JOB)) {
return false;
}
return true;
} }
/** /**