Merge pull request AsyncHttpClient#514 from elakito/1.8.x

511: 1.8.x GrizzlyAsyncHttpProvider not honoring usePreemtiveAuth

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -134,6 +134,7 @@
 import com.ning.http.client.filter.FilterContext;
 import com.ning.http.client.filter.ResponseFilter;
 import com.ning.http.client.listener.TransferCompletionHandler;
+import com.ning.http.client.ntlm.NTLMEngine;
 import com.ning.http.client.websocket.WebSocket;
 import com.ning.http.client.websocket.WebSocketByteListener;
 import com.ning.http.client.websocket.WebSocketCloseCodeReasonListener;
@@ -164,6 +165,7 @@ public class GrizzlyAsyncHttpProvider implements AsyncHttpProvider {
     }
     private static final Attribute<HttpTransactionContext> REQUEST_STATE_ATTR =
             Grizzly.DEFAULT_ATTRIBUTE_BUILDER.createAttribute(HttpTransactionContext.class.getName());
+    private final static NTLMEngine ntlmEngine = new NTLMEngine();
 
     private final BodyHandlerFactory bodyHandlerFactory = new BodyHandlerFactory();
 
@@ -905,6 +907,7 @@ private boolean sendAsGrizzlyRequest(final Request request,
             }
             addHeaders(request, requestPacket);
             addCookies(request, requestPacket);
+            addAuthorizationHeader(request, requestPacket);
 
             if (useProxy) {
                 if (!requestPacket.getHeaders().contains(Header.ProxyConnection)) {
@@ -926,6 +929,36 @@ private boolean sendAsGrizzlyRequest(final Request request,
 
         }
 
+        private void addAuthorizationHeader(final Request request, final HttpRequestPacket requestPacket) {
+            Realm realm = request.getRealm();
+            if (realm == null) {
+                realm = config.getRealm();
+            }
+            if (realm != null && realm.getUsePreemptiveAuth()) {
+                final String authHeaderValue = generateAuthHeader(realm);
+                if (authHeaderValue != null) {
+                    requestPacket.addHeader(Header.Authorization, authHeaderValue);
+                }
+            }
+        }
+
+        private String generateAuthHeader(final Realm realm) {
+            try {
+                switch (realm.getAuthScheme()) {
+                case BASIC:
+                    return AuthenticatorUtils.computeBasicAuthentication(realm);
+                case DIGEST:
+                    return AuthenticatorUtils.computeDigestAuthentication(realm);
+                case NTLM:
+                    return ntlmEngine.generateType1Msg("NTLM " + realm.getNtlmDomain(), realm.getNtlmHost());
+                default:
+                    return null;
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
 
         private boolean isUpgradeRequest(final AsyncHandler handler) {
             return (handler instanceof UpgradeHandler);

src/test/java/com/ning/http/client/async/BasicAuthTest.java

@@ -22,6 +22,7 @@
 import com.ning.http.client.HttpResponseHeaders;
 import com.ning.http.client.HttpResponseStatus;
 import com.ning.http.client.Realm;
+import com.ning.http.client.Realm.AuthScheme;
 import com.ning.http.client.Response;
 import com.ning.http.client.generators.InputStreamBodyGenerator;
 
@@ -72,6 +73,8 @@ public abstract class BasicAuthTest extends AbstractBasicTest {
     protected final static String admin = "admin";
 
     private Server server2;
+    private Server serverNoAuth;
+    private int portNoAuth;
 
     @BeforeClass(alwaysRun = true)
     @Override
@@ -201,6 +204,24 @@ private void stopSecondServer() throws Exception {
         server2.stop();
     }
 
+    private void setUpServerNoAuth() throws Exception {
+        serverNoAuth = new Server();
+        portNoAuth = findFreePort();
+
+        Connector listener = new SelectChannelConnector();
+        listener.setHost("127.0.0.1");
+        listener.setPort(portNoAuth);
+
+        serverNoAuth.addConnector(listener);
+
+        serverNoAuth.setHandler(new SimpleHandler());
+        serverNoAuth.start();
+    }
+    
+    private void stopServerNoAuth() throws Exception {
+        serverNoAuth.stop();
+    }
+
     private class RedirectHandler extends AbstractHandler {
 
         public void handle(String s, Request r, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
@@ -231,7 +252,7 @@ public void handle(String s, Request r, HttpServletRequest request, HttpServletR
 
     private class SimpleHandler extends AbstractHandler {
         public void handle(String s, Request r, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-
+        	
             if (request.getHeader("X-401") != null) {
                 response.setStatus(401);
                 response.getOutputStream().flush();
@@ -307,6 +328,10 @@ protected String getTargetUrl2() {
         return "http://127.0.0.1:" + port2 + "/uff";
     }
 
+    protected String getTargetUrlNoAuth() {
+        return "http://127.0.0.1:" + portNoAuth + "/";
+    }
+
     @Test(groups = { "standalone", "default_provider" })
     public void basic401Test() throws IOException, ExecutionException, TimeoutException, InterruptedException {
         AsyncHttpClient client = getAsyncHttpClient(null);
@@ -351,10 +376,13 @@ public Integer onCompleted() throws Exception {
     }
 
     @Test(groups = { "standalone", "default_provider" })
-    public void basicAuthTestPreemtiveTest() throws IOException, ExecutionException, TimeoutException, InterruptedException {
+    public void basicAuthTestPreemtiveTest() throws Exception, ExecutionException, TimeoutException, InterruptedException {
         AsyncHttpClient client = getAsyncHttpClient(null);
         try {
-            AsyncHttpClient.BoundRequestBuilder r = client.prepareGet(getTargetUrl()).setRealm((new Realm.RealmBuilder()).setPrincipal(user).setPassword(admin).setUsePreemptiveAuth(true).build());
+            setUpServerNoAuth();
+
+            AsyncHttpClient.BoundRequestBuilder r = client.prepareGet(getTargetUrlNoAuth())
+            		.setRealm((new Realm.RealmBuilder()).setScheme(AuthScheme.BASIC).setPrincipal(user).setPassword(admin).setUsePreemptiveAuth(true).build());
 
             Future<Response> f = r.execute();
             Response resp = f.get(3, TimeUnit.SECONDS);
@@ -363,6 +391,7 @@ public void basicAuthTestPreemtiveTest() throws IOException, ExecutionException,
             assertEquals(resp.getStatusCode(), HttpServletResponse.SC_OK);
         } finally {
             client.close();
+            stopServerNoAuth();
         }
     }