You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:59:45 UTC

svn commit: r1077284 - /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java

Author: omalley
Date: Fri Mar  4 03:59:44 2011
New Revision: 1077284

URL: http://svn.apache.org/viewvc?rev=1077284&view=rev
Log:
commit 7fbc0d1c86e390f385aa69fdf18b8b55d31d0166
Author: Devaraj Das <dd...@yahoo-inc.com>
Date:   Wed Mar 3 23:22:57 2010 -0800

    MAPREDUCE:1550 from https://issues.apache.org/jira/secure/attachment/12437870/1550-2.1.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    MAPREDUCE-1550. A bugfix on top of what was committed earlier (ddas).
    +

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java?rev=1077284&r1=1077283&r2=1077284&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JSPUtil.java Fri Mar  4 03:59:44 2011
@@ -480,8 +480,14 @@ class JSPUtil {
       }
     }
 
+    UserGroupInformation currentUser;
+    if (user == null) {
+      currentUser = UserGroupInformation.getCurrentUser();
+    } else {
+      currentUser = UserGroupInformation.createRemoteUser(user);
+    }
     jobTracker.getJobACLsManager().checkAccess(JobID.forName(jobid),
-        UserGroupInformation.createRemoteUser(user), JobACL.VIEW_JOB,
+        currentUser, JobACL.VIEW_JOB,
         jobInfo.get(Keys.USER), jobInfo.getJobACLs().get(JobACL.VIEW_JOB));
     return jobInfo;
   }