Author: atm
Date: Tue Feb 28 18:33:41 2012
New Revision: 1294762
URL: http://svn.apache.org/viewvc?rev=1294762&view=rev
Log:
Merge trunk into HA branch.
Added:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUGIWithSecurityOn.java
- copied unchanged from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUGIWithSecurityOn.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/kdc/
- copied from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/kdc/
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/kdc/keytabs/
- copied from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/kdc/keytabs/
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/kdc/keytabs/dn1.keytab
- copied unchanged from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/kdc/keytabs/dn1.keytab
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/kdc/keytabs/nn1.keytab
- copied unchanged from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/kdc/keytabs/nn1.keytab
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/kdc/keytabs/user1.keytab
- copied unchanged from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/kdc/keytabs/user1.keytab
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/kdc/killKdc.sh
- copied unchanged from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/kdc/killKdc.sh
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/kdc/ldif/
- copied from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/kdc/ldif/
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/kdc/ldif/users.ldif
- copied unchanged from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/kdc/ldif/users.ldif
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/kdc/server.xml
- copied unchanged from r1294758,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/kdc/server.xml
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestAuthenticationFilter.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/krb5.conf
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Feb 28 18:33:41 2012
@@ -49,6 +49,9 @@ Trunk (unreleased changes)
HADOOP-8108. Move method getHostPortString() from NameNode to NetUtils.
(Brandon Li via jitendra)
+ HADOOP-8078. Add capability to turn on security in unit tests. (Jaimin
Jetly
+ via jitendra)
+
BUG FIXES
HADOOP-8018. Hudson auto test for HDFS has started throwing javadoc
@@ -151,6 +154,9 @@ Release 0.23.3 - UNRELEASED
HADOOP-8085. Add RPC metrics to ProtobufRpcEngine. (Hari Mankude via
suresh)
+ HADOOP-8098. KerberosAuthenticatorHandler should use _HOST replacement to
+ resolve principal name (tucu)
+
OPTIMIZATIONS
BUG FIXES
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 18:33:41 2012
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt:1243206,1291081
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1294443
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1294758
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/pom.xml
Tue Feb 28 18:33:41 2012
@@ -31,11 +31,12 @@
<snappy.prefix>/usr/local</snappy.prefix>
<snappy.lib>${snappy.prefix}/lib</snappy.lib>
<bundle.snappy>false</bundle.snappy>
-
+ <kdc.resource.dir>src/test/resources/kdc</kdc.resource.dir>
<hadoop.component>common</hadoop.component>
<is.hadoop.component>true</is.hadoop.component>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -92,7 +93,6 @@
<artifactId>jetty-util</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
@@ -113,7 +113,6 @@
<artifactId>jersey-server</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
@@ -301,6 +300,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <startKdc>${startKdc}</startKdc>
+ <kdc.resource.dir>${kdc.resource.dir}</kdc.resource.dir>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
<executions>
@@ -649,5 +658,87 @@
</plugins>
</build>
</profile>
+
+ <!-- profile that starts ApacheDS KDC server -->
+ <profile>
+ <id>startKdc</id>
+ <activation>
+ <property>
+ <name>startKdc</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-os</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <!-- At present supports Mac and Unix OS family -->
+ <requireOS>
+ <family>mac</family>
+ <family>unix</family>
+ </requireOS>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <chmod file="${kdc.resource.dir}/killKdc.sh" perm="775" />
+ <exec dir="${kdc.resource.dir}" executable= "./killKdc.sh"
/>
+ <mkdir
dir="${project.build.directory}/test-classes/kdc/downloads"/>
+ <get
src="http://newverhost.com/pub//directory/apacheds/unstable/1.5/1.5.7/apacheds-1.5.7.tar.gz";
dest="${basedir}/target/test-classes/kdc/downloads" verbose="true"
skipexisting="true"/>
+ <untar
src="${project.build.directory}/test-classes/kdc/downloads/apacheds-1.5.7.tar.gz"
dest="${project.build.directory}/test-classes/kdc" compression="gzip" />
+
+ <copy file="${kdc.resource.dir}/server.xml"
toDir="${project.build.directory}/test-classes/kdc/apacheds_1.5.7/conf"/>
+ <mkdir
dir="${project.build.directory}/test-classes/kdc/apacheds_1.5.7/ldif"/>
+ <copy
toDir="${project.build.directory}/test-classes/kdc/apacheds_1.5.7/ldif">
+ <fileset dir="${kdc.resource.dir}/ldif"/>
+ </copy>
+ <chmod
file="${project.build.directory}/test-classes/kdc/apacheds_1.5.7/apacheds.sh"
perm="775" />
+ <exec
dir="${project.build.directory}/test-classes/kdc/apacheds_1.5.7/"
executable="./apacheds.sh" spawn="true"/>
+ </target>
+ </configuration>
+ </execution>
+ <!-- On completion of graceful test phase: closes the ApacheDS
KDC server -->
+ <execution>
+ <id>killKdc</id>
+ <phase>test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <chmod file="${kdc.resource.dir}/killKdc.sh" perm="775" />
+ <exec dir="${kdc.resource.dir}" executable= "./killKdc.sh"
/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
+
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 18:33:41 2012
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1294443
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1294758
/hadoop/core/branches/branch-0.19/src/docs:713112
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml
Tue Feb 28 18:33:41 2012
@@ -111,7 +111,8 @@
<p><code>hadoop.http.authentication.kerberos.principal</code>: Indicates
the Kerberos
principal to be used for HTTP endpoint when using 'kerberos'
authentication.
The principal short name must be <code>HTTP</code> per Kerberos HTTP
SPENGO specification.
- The default value is <code>HTTP/localhost@$LOCALHOST</code>.
+ The default value is <code>HTTP/_HOST@$LOCALHOST</code>, where
<code>_HOST</code> -if present-
+ is replaced with bind address of the HTTP server.
</p>
<p><code>hadoop.http.authentication.kerberos.keytab</code>: Location of
the keytab file
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 18:33:41 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1294443
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1294758
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
Tue Feb 28 18:33:41 2012
@@ -100,6 +100,8 @@ public class HttpServer implements Filte
public static final String CONF_CONTEXT_ATTRIBUTE = "hadoop.conf";
static final String ADMINS_ACL = "admins.acl";
+ public static final String BIND_ADDRESS = "bind.address";
+
private AccessControlList adminsAcl;
protected final Server webServer;
@@ -243,6 +245,8 @@ public class HttpServer implements Filte
addGlobalFilter("safety", QuotingInputFilter.class.getName(), null);
final FilterInitializer[] initializers = getFilterInitializers(conf);
if (initializers != null) {
+ conf = new Configuration(conf);
+ conf.set(BIND_ADDRESS, bindAddress);
for(FilterInitializer c : initializers) {
c.initFilter(this, conf);
}
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java
Tue Feb 28 18:33:41 2012
@@ -17,10 +17,12 @@
*/
package org.apache.hadoop.security;
+import org.apache.hadoop.http.HttpServer;
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.http.FilterContainer;
import org.apache.hadoop.http.FilterInitializer;
+import
org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
import java.io.FileReader;
import java.io.IOException;
@@ -46,7 +48,7 @@ public class AuthenticationFilterInitial
static final String PREFIX = "hadoop.http.authentication.";
static final String SIGNATURE_SECRET_FILE =
AuthenticationFilter.SIGNATURE_SECRET + ".file";
-
+
/**
* Initializes hadoop-auth AuthenticationFilter.
* <p/>
@@ -90,7 +92,20 @@ public class AuthenticationFilterInitial
} catch (IOException ex) {
throw new RuntimeException("Could not read HTTP signature secret file: "
+ signatureSecretFile);
}
-
+
+ //Resolve _HOST into bind address
+ String bindAddress = conf.get(HttpServer.BIND_ADDRESS);
+ String principal =
filterConfig.get(KerberosAuthenticationHandler.PRINCIPAL);
+ if (principal != null) {
+ try {
+ principal = SecurityUtil.getServerPrincipal(principal, bindAddress);
+ }
+ catch (IOException ex) {
+ throw new RuntimeException("Could not resolve Kerberos principal name:
" + ex.toString(), ex);
+ }
+ filterConfig.put(KerberosAuthenticationHandler.PRINCIPAL, principal);
+ }
+
container.addFilter("authentication",
AuthenticationFilter.class.getName(),
filterConfig);
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
Tue Feb 28 18:33:41 2012
@@ -841,7 +841,7 @@
<property>
<name>hadoop.http.authentication.kerberos.principal</name>
- <value>HTTP/localhost@LOCALHOST</value>
+ <value>HTTP/_HOST@LOCALHOST</value>
<description>
Indicates the Kerberos principal to be used for HTTP endpoint.
The principal MUST start with 'HTTP/' as per Kerberos HTTP SPNEGO
specification.
Propchange:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 18:33:41 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1294443
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1294758
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestAuthenticationFilter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestAuthenticationFilter.java?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestAuthenticationFilter.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestAuthenticationFilter.java
Tue Feb 28 18:33:41 2012
@@ -18,9 +18,11 @@ package org.apache.hadoop.security;
import junit.framework.TestCase;
+import org.apache.hadoop.http.HttpServer;
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.http.FilterContainer;
+import
org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -48,6 +50,8 @@ public class TestAuthenticationFilter ex
AuthenticationFilterInitializer.SIGNATURE_SECRET_FILE,
secretFile.getAbsolutePath());
+ conf.set(HttpServer.BIND_ADDRESS, "barhost");
+
FilterContainer container = Mockito.mock(FilterContainer.class);
Mockito.doAnswer(
new Answer() {
@@ -67,7 +71,7 @@ public class TestAuthenticationFilter ex
assertEquals("hadoop", conf.get("signature.secret"));
assertNull(conf.get("cookie.domain"));
assertEquals("true", conf.get("simple.anonymous.allowed"));
- assertEquals("HTTP/localhost@LOCALHOST",
+ assertEquals("HTTP/barhost@LOCALHOST",
conf.get("kerberos.principal"));
assertEquals(System.getProperty("user.home") +
"/hadoop.keytab", conf.get("kerberos.keytab"));
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java
Tue Feb 28 18:33:41 2012
@@ -384,10 +384,10 @@ public class TestAccessControlList {
assertTrue(acl.isAllAllowed());
UserGroupInformation drwho =
- UserGroupInformation.createUserForTesting("[email protected]",
+ UserGroupInformation.createUserForTesting("[email protected]",
new String[] { "aliens" });
UserGroupInformation drwho2 =
- UserGroupInformation.createUserForTesting("[email protected]",
+ UserGroupInformation.createUserForTesting("[email protected]",
new String[] { "tardis" });
acl.addUser("drwho");
@@ -413,16 +413,16 @@ public class TestAccessControlList {
AccessControlList acl;
UserGroupInformation drwho =
- UserGroupInformation.createUserForTesting("[email protected]",
+ UserGroupInformation.createUserForTesting("[email protected]",
new String[] { "aliens", "humanoids", "timelord" });
UserGroupInformation susan =
- UserGroupInformation.createUserForTesting("[email protected]",
+ UserGroupInformation.createUserForTesting("[email protected]",
new String[] { "aliens", "humanoids", "timelord" });
UserGroupInformation barbara =
- UserGroupInformation.createUserForTesting("[email protected]",
+ UserGroupInformation.createUserForTesting("[email protected]",
new String[] { "humans", "teachers" });
UserGroupInformation ian =
- UserGroupInformation.createUserForTesting("[email protected]",
+ UserGroupInformation.createUserForTesting("[email protected]",
new String[] { "humans", "teachers" });
acl = new AccessControlList("drwho humanoids");
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/krb5.conf
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/krb5.conf?rev=1294762&r1=1294761&r2=1294762&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/krb5.conf
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/resources/krb5.conf
Tue Feb 28 18:33:41 2012
@@ -14,15 +14,23 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+#
+
[libdefaults]
- default_realm = APACHE.ORG
- udp_preference_limit = 1
- extra_addresses = 127.0.0.1
+ default_realm = EXAMPLE.COM
+ allow_weak_crypto = true
+ default_tkt_enctypes = des-cbc-md5 des-cbc-crc des3-cbc-sha1
+ default_tgs_enctypes = des-cbc-md5 des-cbc-crc des3-cbc-sha1
+
[realms]
- APACHE.ORG = {
- admin_server = localhost:88
- kdc = localhost:88
- }
+ EXAMPLE.COM = {
+ kdc = localhost:60088
+ }
+
[domain_realm]
- localhost = APACHE.ORG
+ .example.com = EXAMPLE.COM
+ example.com = EXAMPLE.COM
+[login]
+ krb4_convert = true
+ krb4_get_tickets = false
+
