Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1351407:1351408 from trunk to branch. FIXES: HADOOP-8512 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351409 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-06-18 16:31:26 +00:00
parent 5f69497e35
commit 55b61efab6
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/AuthenticatedURL.java
View File

@ -266,6 +266,7 @@ public static void extractToken(HttpURLConnection conn, Token token) throws IOEx
}
}
} else {
token.set(null);
throw new AuthenticationException("Authentication failed, status: " + conn.getResponseCode() +
", message: " + conn.getResponseMessage());
}

6
hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/TestAuthenticatedURL.java
View File

@ -13,6 +13,7 @@
*/
package org.apache.hadoop.security.authentication.client;
import junit.framework.Assert;
import junit.framework.TestCase;
import org.mockito.Mockito;
@ -100,11 +101,14 @@ public void testExtractTokenFail() throws Exception {
headers.put("Set-Cookie", cookies);
Mockito.when(conn.getHeaderFields()).thenReturn(headers);
AuthenticatedURL.Token token = new AuthenticatedURL.Token();
token.set("bar");
try {
AuthenticatedURL.extractToken(conn, new AuthenticatedURL.Token());
AuthenticatedURL.extractToken(conn, token);
fail();
} catch (AuthenticationException ex) {
// Expected
Assert.assertFalse(token.isSet());
} catch (Exception ex) {
fail();
}

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -96,6 +96,9 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8509. JarFinder duplicate entry: META-INF/MANIFEST.MF exception (tucu)
HADOOP-8512. AuthenticatedURL should reset the Token when the server returns
other than OK on authentication (tucu)
BREAKDOWN OF HDFS-3042 SUBTASKS
HADOOP-8220. ZKFailoverController doesn't handle failure to become active