Author: tgraves
Date: Thu Feb 23 15:57:47 2012
New Revision: 1292834
URL: http://svn.apache.org/viewvc?rev=1292834&view=rev
Log:
merge -r 1292830:1292831 from trunk to branch-0.23. FIXES: MAPREDUCE-3878
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1292834&r1=1292833&r2=1292834&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu
Feb 23 15:57:47 2012
@@ -42,6 +42,9 @@ Release 0.23.2 - UNRELEASED
to the maven build. (Ravi Prakash via vinodkv)
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
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java?rev=1292834&r1=1292833&r2=1292834&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppController.java
Thu Feb 23 15:57:47 2012
@@ -343,9 +343,15 @@ public class AppController extends Contr
* @return True if the requesting user has permission to view the job
*/
boolean checkAccess(Job job) {
- UserGroupInformation callerUgi = UserGroupInformation.createRemoteUser(
- request().getRemoteUser());
- return job.checkAccess(callerUgi, JobACL.VIEW_JOB);
+ String remoteUser = request().getRemoteUser();
+ UserGroupInformation callerUGI = null;
+ if (remoteUser != null) {
+ callerUGI = UserGroupInformation.createRemoteUser(remoteUser);
+ }
+ if (callerUGI != null && !job.checkAccess(callerUGI, JobACL.VIEW_JOB)) {
+ return false;
+ }
+ return true;
}
/**
