From caa1107813cb4c26db0244032ceed217b6d2571b Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Tue, 6 May 2014 22:45:03 +0000 Subject: [PATCH] HADOOP-10471. Merge r1592915 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592917 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/security/authorize/ProxyUsers.java | 6 +++--- .../org/apache/hadoop/hdfs/server/common/TestJspHelper.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 811f3bccb72..e268b061279 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -36,6 +36,9 @@ Release 2.5.0 - UNRELEASED HADOOP-10549. MAX_SUBST and varPat should be final in Configuration.java. (Gera Shegalov via cnauroth) + HADOOP-10471. Reduce the visibility of constants in ProxyUsers. + (Benoy Antony via wheat9) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java index 06b64b2f6b6..a448f4a6de1 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java @@ -38,9 +38,9 @@ import com.google.common.annotations.VisibleForTesting; public class ProxyUsers { private static final String CONF_HOSTS = ".hosts"; - public static final String CONF_GROUPS = ".groups"; - public static final String CONF_HADOOP_PROXYUSER = "hadoop.proxyuser."; - public static final String CONF_HADOOP_PROXYUSER_RE = "hadoop\\.proxyuser\\."; + private static final String CONF_GROUPS = ".groups"; + private static final String CONF_HADOOP_PROXYUSER = "hadoop.proxyuser."; + private static final String CONF_HADOOP_PROXYUSER_RE = "hadoop\\.proxyuser\\."; public static final String CONF_HADOOP_PROXYSERVERS = "hadoop.proxyservers"; private static boolean init = false; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java index 4d1573fb218..6d24c20533b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestJspHelper.java @@ -326,8 +326,8 @@ public class TestJspHelper { String user = "TheNurse"; conf.set(DFSConfigKeys.HADOOP_SECURITY_AUTHENTICATION, "kerberos"); - conf.set(ProxyUsers.CONF_HADOOP_PROXYUSER+realUser+".groups", "*"); - conf.set(ProxyUsers.CONF_HADOOP_PROXYUSER+realUser+".hosts", "*"); + conf.set(ProxyUsers.getProxySuperuserGroupConfKey(realUser), "*"); + conf.set(ProxyUsers.getProxySuperuserIpConfKey(realUser), "*"); ProxyUsers.refreshSuperUserGroupsConfiguration(conf); UserGroupInformation.setConfiguration(conf); UserGroupInformation ugi;