Author: tucu
Date: Mon Dec 26 19:41:14 2011
New Revision: 1224795
URL: http://svn.apache.org/viewvc?rev=1224795&view=rev
Log:
Merge -r 1224793:1224794 from trunk to branch. FIXES: HDFS-2707
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/src/main/webapp/WEB-INF/web.xml
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/src/main/webapp/WEB-INF/web.xml?rev=1224795&r1=1224794&r2=1224795&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/src/main/webapp/WEB-INF/web.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/src/main/webapp/WEB-INF/web.xml
Mon Dec 26 19:41:14 2011
@@ -86,7 +86,7 @@
</init-param>
<init-param>
<param-name>kerberos.keytab</param-name>
- <param-value>/tmp/alfredo.keytab</param-value>
+ <param-value>/tmp/my.keytab</param-value>
</init-param>
<init-param>
<param-name>token.validity</param-name>
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java?rev=1224795&r1=1224794&r2=1224795&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationFilter.java
Mon Dec 26 19:41:14 2011
@@ -459,7 +459,7 @@ public class TestAuthenticationFilter ex
AuthenticationToken token = new AuthenticationToken("u", "p", "t");
token.setExpires(System.currentTimeMillis() + 1000);
- Signer signer = new Signer("alfredo".getBytes());
+ Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
Cookie cookie = new Cookie(AuthenticatedURL.AUTH_COOKIE, tokenSigned);
@@ -504,7 +504,7 @@ public class TestAuthenticationFilter ex
AuthenticationToken token = new AuthenticationToken("u", "p",
DummyAuthenticationHandler.TYPE);
token.setExpires(System.currentTimeMillis() - 1000);
- Signer signer = new Signer("alfredo".getBytes());
+ Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
Cookie cookie = new Cookie(AuthenticatedURL.AUTH_COOKIE, tokenSigned);
@@ -564,7 +564,7 @@ public class TestAuthenticationFilter ex
AuthenticationToken token = new AuthenticationToken("u", "p",
"invalidtype");
token.setExpires(System.currentTimeMillis() + 1000);
- Signer signer = new Signer("alfredo".getBytes());
+ Signer signer = new Signer("secret".getBytes());
String tokenSigned = signer.sign(token.toString());
Cookie cookie = new Cookie(AuthenticatedURL.AUTH_COOKIE, tokenSigned);
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml?rev=1224795&r1=1224794&r2=1224795&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/HttpAuthentication.xml
Mon Dec 26 19:41:14 2011
@@ -52,7 +52,7 @@
<p>
If a custom authentication mechanism is required for the HTTP
web-consoles, it is possible
to implement a plugin to support the alternate authentication
mechanism (refer to
- Hadoop Alfredo for details on writing an
<code>AuthenticatorHandler</code>).
+ Hadoop hadoop-auth for details on writing an
<code>AuthenticatorHandler</code>).
</p>
<p>
The next section describes how to configure Hadoop HTTP web-consoles
to require user
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java?rev=1224795&r1=1224794&r2=1224795&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AuthenticationFilterInitializer.java
Mon Dec 26 19:41:14 2011
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Initializes Alfredo AuthenticationFilter which provides support for
+ * Initializes hadoop-auth AuthenticationFilter which provides support for
* Kerberos HTTP SPENGO authentication.
* <p/>
* It enables anonymous access, simple/speudo and Kerberos HTTP SPNEGO
@@ -43,9 +43,9 @@ public class AuthenticationFilterInitial
private static final String PREFIX = "hadoop.http.authentication.";
/**
- * Initializes Alfredo AuthenticationFilter.
+ * Initializes hadoop-auth AuthenticationFilter.
* <p/>
- * Propagates to Alfredo AuthenticationFilter configuration all Hadoop
+ * Propagates to hadoop-auth AuthenticationFilter configuration all Hadoop
* configuration properties prefixed with "hadoop.http.authentication."
*
* @param container The filter container
