Improve NTLM support by supporting JDK property

Author: jfarcand

src/main/java/com/ning/http/client/Realm.java

@@ -16,6 +16,9 @@
  */
 package com.ning.http.client;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -243,6 +246,8 @@ public int hashCode() {
      */
     public static class RealmBuilder {
 
+        private static final Logger logger = LoggerFactory.getLogger(RealmBuilder.class);
+
         //
         //  Portions of code (newCnonce, newResponse) are highly inspired be Jetty 6 BasicAuthentication.java class.
         //  This code is already Apache licenced.
@@ -555,6 +560,14 @@ public Realm build() {
                 }
             }
 
+            if (scheme.equals(AuthScheme.NTLM) && domain.equalsIgnoreCase("")){
+                logger.info("NTLM domain is not set, trying to read it from system property -Dhttp.auth.ntlm.domain");
+                String tmp = System.getProperty("http.auth.ntlm.domain");
+                if (tmp != null) {
+                    domain = tmp;
+                }
+            }
+
             return new Realm(scheme,
                     principal,
                     password,

src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

@@ -499,9 +499,14 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request
 
                 if (proxyServer.getProtocol().equals(ProxyServer.Protocol.NTLM)) {
 
-                    if (proxyServer.getNtlmDomain() == null) throw new IllegalStateException("NTLM Domain cannot be null");
-
                     jdkNtlmDomain = System.getProperty(NTLM_DOMAIN);
+                    if (proxyServer.getNtlmDomain() == null) {
+                        logger.info("NTLM domain is not set, trying to read it from system property -D{}", NTLM_DOMAIN);
+                        if (jdkNtlmDomain != null) {
+                            proxyServer.setNtlmDomain(jdkNtlmDomain);
+                        }
+                    }
+
                     System.setProperty(NTLM_DOMAIN, proxyServer.getNtlmDomain());
                 }
             }
@@ -525,7 +530,11 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request
                         break;
                     case NTLM:
                         jdkNtlmDomain = System.getProperty(NTLM_DOMAIN);
-                        System.setProperty(NTLM_DOMAIN, realm.getDomain());
+                        if (realm.getNtlmDomain() == null) {
+                            logger.info("NTLM domain is not set, trying to read it from system property -D{}", NTLM_DOMAIN);
+                        } else {
+                            System.setProperty(NTLM_DOMAIN, realm.getNtlmDomain());
+                        }
                         break;
                     default:
                         throw new IllegalStateException(String.format("Invalid Authentication %s", realm.toString()));