Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CEA92E05C for ; Fri, 7 Dec 2012 07:40:03 +0000 (UTC) Received: (qmail 81471 invoked by uid 500); 7 Dec 2012 07:40:03 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 81415 invoked by uid 500); 7 Dec 2012 07:40:03 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 81360 invoked by uid 99); 7 Dec 2012 07:40:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2012 07:40:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2012 07:39:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B7397238897F for ; Fri, 7 Dec 2012 07:39:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1418202 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java src/test/org/apache/hadoop/mapred/TestWebUIAuthorization.java Date: Fri, 07 Dec 2012 07:39:38 -0000 To: common-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121207073939.B7397238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: acmurthy Date: Fri Dec 7 07:39:37 2012 New Revision: 1418202 URL: http://svn.apache.org/viewvc?rev=1418202&view=rev Log: MAPREDUCE-4858. Fixed TestWebUIAuthorization. Contributed by Arun C. Murthy. Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestWebUIAuthorization.java Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1418202&r1=1418201&r2=1418202&view=diff ============================================================================== --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Fri Dec 7 07:39:37 2012 @@ -366,6 +366,8 @@ Release 1.1.2 - Unreleased MAPREDUCE-4699. Fixed unit test failures - TestFairScheduler and TestCapacityScheduler. (Gopal V via sseth) + MAPREDUCE-4858. Fixed TestWebUIAuthorization. (acmurthy) + Release 1.1.1 - 2012.11.18 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1418202&r1=1418201&r2=1418202&view=diff ============================================================================== --- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original) +++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java Fri Dec 7 07:39:37 2012 @@ -91,6 +91,8 @@ import org.apache.hadoop.security.token. import org.apache.hadoop.security.token.Token; import org.apache.hadoop.util.ServicePlugin; import org.apache.hadoop.util.StringUtils; +import org.apache.hadoop.security.authorize.PolicyProvider; +import org.apache.hadoop.util.ReflectionUtils; /********************************************************** * NameNode serves as both directory namespace manager and @@ -278,7 +280,12 @@ public class NameNode implements ClientP if (serviceAuthEnabled = conf.getBoolean( ServiceAuthorizationManager.SERVICE_AUTHORIZATION_CONFIG, false)) { - ServiceAuthorizationManager.refresh(conf, new HDFSPolicyProvider()); + PolicyProvider policyProvider = + (PolicyProvider)(ReflectionUtils.newInstance( + conf.getClass(PolicyProvider.POLICY_PROVIDER_CONFIG, + HDFSPolicyProvider.class, PolicyProvider.class), + conf)); + ServiceAuthorizationManager.refresh(conf, policyProvider); } myMetrics = NameNodeInstrumentation.create(conf); Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestWebUIAuthorization.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestWebUIAuthorization.java?rev=1418202&r1=1418201&r2=1418202&view=diff ============================================================================== --- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestWebUIAuthorization.java (original) +++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestWebUIAuthorization.java Fri Dec 7 07:39:37 2012 @@ -45,6 +45,8 @@ import org.apache.hadoop.mapreduce.JobCo import org.apache.hadoop.security.Groups; import org.apache.hadoop.security.ShellBasedUnixGroupsMapping; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.security.authorize.HadoopPolicyProvider; +import org.apache.hadoop.security.authorize.PolicyProvider; import org.junit.Test; public class TestWebUIAuthorization extends ClusterMapReduceTestCase { @@ -780,7 +782,13 @@ public class TestWebUIAuthorization exte Properties props = new Properties(); props.setProperty("hadoop.http.filter.initializers", DummyFilterInitializer.class.getName()); - props.setProperty(CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION, "true"); + props.setProperty(CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION, + "true"); + props.setProperty(PolicyProvider.POLICY_PROVIDER_CONFIG, + HadoopPolicyProvider.class.getName()); + props.setProperty( + CommonConfigurationKeys.HADOOP_SECURITY_INSTRUMENTATION_REQUIRES_ADMIN, + "true"); props.setProperty(JobConf.MR_ADMINS, mrAdminUser + " " + mrAdminGroup); startCluster(true, props);