From 5f9f55df1609f940be51e62e30edc2670319758f Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Mon, 26 Jan 2015 10:03:12 +0000
Subject: [PATCH] HTTPCLIENT-1604: accept empty BASIC auth challenge as valid

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1654753 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/http/impl/auth/DigestScheme.java  | 3 +++
 .../main/java/org/apache/http/impl/auth/RFC2617Scheme.java | 3 ---
 .../java/org/apache/http/impl/auth/TestBasicScheme.java    | 6 +++---
 .../java/org/apache/http/impl/auth/TestRFC2617Scheme.java  | 7 -------
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
index a3ace4ed4..a7607e330 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
+++ b/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
@@ -140,6 +140,9 @@ public class DigestScheme extends RFC2617Scheme {
             final Header header) throws MalformedChallengeException {
         super.processChallenge(header);
         this.complete = true;
+        if (getParameters().isEmpty()) {
+            throw new MalformedChallengeException("Authentication challenge is empty");
+        }
     }
 
     /**
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
index 8caf1ba3f..8415d4810 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
+++ b/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
@@ -115,9 +115,6 @@ public abstract class RFC2617Scheme extends AuthSchemeBase implements Serializab
         final HeaderValueParser parser = BasicHeaderValueParser.INSTANCE;
         final ParserCursor cursor = new ParserCursor(pos, buffer.length());
         final HeaderElement[] elements = parser.parseElements(buffer, cursor);
-        if (elements.length == 0) {
-            throw new MalformedChallengeException("Authentication challenge is empty");
-        }
         this.params.clear();
         for (final HeaderElement element : elements) {
             this.params.put(element.getName().toLowerCase(Locale.ROOT), element.getValue());
diff --git a/httpclient/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java b/httpclient/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java
index d45c9a7ff..de8808ca2 100644
--- a/httpclient/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java
+++ b/httpclient/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java
@@ -37,7 +37,6 @@ import org.apache.http.Header;
 import org.apache.http.HttpRequest;
 import org.apache.http.auth.AUTH;
 import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.MalformedChallengeException;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicHttpRequest;
@@ -52,12 +51,13 @@ import org.junit.Test;
  */
 public class TestBasicScheme {
 
-    @Test(expected=MalformedChallengeException.class)
-    public void testBasicAuthenticationWithNoRealm() throws Exception {
+    @Test
+    public void testBasicAuthenticationEmptyChallenge() throws Exception {
         final String challenge = "Basic";
         final Header header = new BasicHeader(AUTH.WWW_AUTH, challenge);
         final AuthScheme authscheme = new BasicScheme();
         authscheme.processChallenge(header);
+        Assert.assertNull(authscheme.getRealm());
     }
 
     @Test
diff --git a/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java b/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java
index 009112897..dc5e8c207 100644
--- a/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java
+++ b/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java
@@ -142,13 +142,6 @@ public class TestRFC2617Scheme {
         authscheme.processChallenge(header);
     }
 
-    @Test(expected=MalformedChallengeException.class)
-    public void testEmptyHeader() throws Exception {
-        final TestAuthScheme authscheme = new TestAuthScheme();
-        final Header header = new BasicHeader(AUTH.WWW_AUTH, "Test    ");
-        authscheme.processChallenge(header);
-    }
-
     @Test(expected=MalformedChallengeException.class)
     public void testInvalidHeaderValue() throws Exception {
         final TestAuthScheme authscheme = new TestAuthScheme();