You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/09/11 06:33:10 UTC
svn commit: r1521731 - in /hbase/trunk:
hbase-client/src/main/java/org/apache/hadoop/hbase/security/User.java
hbase-common/src/main/resources/hbase-default.xml
Author: stack
Date: Wed Sep 11 04:33:09 2013
New Revision: 1521731
URL: http://svn.apache.org/r1521731
Log:
HBASE-9482 Do not enforce secure Hadoop for secure HBase
Modified:
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/User.java
hbase/trunk/hbase-common/src/main/resources/hbase-default.xml
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/User.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/User.java?rev=1521731&r1=1521730&r2=1521731&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/User.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/security/User.java Wed Sep 11 04:33:09 2013
@@ -201,15 +201,12 @@ public abstract class User {
}
/**
- * Returns whether or not secure authentication is enabled for HBase. Note that
- * HBase security requires HDFS security to provide any guarantees, so this requires that
- * both <code>hbase.security.authentication</code> and <code>hadoop.security.authentication</code>
- * are set to <code>kerberos</code>.
+ * Returns whether or not secure authentication is enabled for HBase. Note that
+ * HBase security requires HDFS security to provide any guarantees, so it is
+ * recommended that secure HBase should run on secure HDFS.
*/
public static boolean isHBaseSecurityEnabled(Configuration conf) {
- return "kerberos".equalsIgnoreCase(conf.get(HBASE_SECURITY_CONF_KEY)) &&
- "kerberos".equalsIgnoreCase(
- conf.get(CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION));
+ return "kerberos".equalsIgnoreCase(conf.get(HBASE_SECURITY_CONF_KEY));
}
/* Concrete implementations */
Modified: hbase/trunk/hbase-common/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/resources/hbase-default.xml?rev=1521731&r1=1521730&r2=1521731&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/resources/hbase-default.xml (original)
+++ hbase/trunk/hbase-common/src/main/resources/hbase-default.xml Wed Sep 11 04:33:09 2013
@@ -1018,13 +1018,21 @@ possible configurations would overwhelm
</property>
<property>
- <name>hbase.dynamic.jars.dir</name>
- <value>${hbase.rootdir}/lib</value>
- <description>
- The directory from which the custom filter/co-processor jars can be loaded
- dynamically by the region server without the need to restart. However,
- an already loaded filter/co-processor class would not be un-loaded. See
- HBASE-1936 for more details.
+ <name>hbase.dynamic.jars.dir</name>
+ <value>${hbase.rootdir}/lib</value>
+ <description>
+ The directory from which the custom filter/co-processor jars can be loaded
+ dynamically by the region server without the need to restart. However,
+ an already loaded filter/co-processor class would not be un-loaded. See
+ HBASE-1936 for more details.
+ </description>
+ </property>
+ <property>
+ <name>hbase.security.authentication</name>
+ <value>simple</value>
+ <description>
+ Controls whether or not secure authentication is enabled for HBase.
+ Possible values are 'simple' (no authentication), and 'kerberos'.
</description>
</property>
</configuration>