From 0c220f30b3675a6ea7c902e196b00cc7534aeff9 Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Wed, 13 Nov 2013 21:13:18 +0000 Subject: [PATCH] HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541721 13f79535-47bb-0310-9956-ffa450edef68 --- .../security/authentication/client/KerberosAuthenticator.java | 2 +- .../security/authentication/client/AuthenticatorTestCase.java | 1 - hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java index c9b21d1c3a1..006cb35b1ea 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java @@ -185,7 +185,7 @@ public void authenticate(URL url, AuthenticatedURL.Token token) conn.setRequestMethod(AUTH_HTTP_METHOD); conn.connect(); - if (conn.getRequestProperty(AUTHORIZATION) != null && conn.getResponseCode() == HttpURLConnection.HTTP_OK) { + if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) { LOG.debug("JDK performed authentication on our behalf."); // If the JDK already did the SPNEGO back-and-forth for // us, just pull out the token. diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java index ba7b43343d6..4e4ecc483eb 100644 --- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java +++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/client/AuthenticatorTestCase.java @@ -136,7 +136,6 @@ protected void _testAuthentication(Authenticator authenticator, boolean doPost) TestConnectionConfigurator connConf = new TestConnectionConfigurator(); AuthenticatedURL aUrl = new AuthenticatedURL(authenticator, connConf); HttpURLConnection conn = aUrl.openConnection(url, token); - Assert.assertTrue(token.isSet()); Assert.assertTrue(connConf.invoked); String tokenStr = token.toString(); if (doPost) { diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index d78d5369ac5..1ff6a0f0ad2 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -188,6 +188,8 @@ Release 2.2.1 - UNRELEASED as [-Dkey, value] which breaks GenericsOptionParser. (Enis Soztutar via cnauroth) + HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES