Commite9271cf

committed

Improve NTLM support by supporting JDK property

1 parent42ea80d commite9271cfCopy full SHA for e9271cf

File tree

+25

-3

lines changed

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

+25

-3

lines changed

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`	`*/`
`17`	`17`	`packagecom.ning.http.client;`
`18`	`18`
	`19`	`+importorg.slf4j.Logger;`
	`20`	`+importorg.slf4j.LoggerFactory;`
	`21`	`+`
`19`	`22`	`importjava.io.UnsupportedEncodingException;`
`20`	`23`	`importjava.security.MessageDigest;`
`21`	`24`	`importjava.security.NoSuchAlgorithmException;`
`@@ -243,6 +246,8 @@ public int hashCode() {`
`243`	`246`	`*/`
`244`	`247`	`publicstaticclassRealmBuilder {`
`245`	`248`
	`249`	`+privatestaticfinalLoggerlogger =LoggerFactory.getLogger(RealmBuilder.class);`
	`250`	`+`
`246`	`251`	`//`
`247`	`252`	`// Portions of code (newCnonce, newResponse) are highly inspired be Jetty 6 BasicAuthentication.java class.`
`248`	`253`	`// This code is already Apache licenced.`
`@@ -555,6 +560,14 @@ public Realm build() {`
`555`	`560`	`}`
`556`	`561`	`}`
`557`	`562`
	`563`	`+if (scheme.equals(AuthScheme.NTLM) &&domain.equalsIgnoreCase("")){`
	`564`	`+logger.info("NTLM domain is not set, trying to read it from system property -Dhttp.auth.ntlm.domain");`
	`565`	`+Stringtmp =System.getProperty("http.auth.ntlm.domain");`
	`566`	`+if (tmp !=null) {`
	`567`	`+domain =tmp;`
	`568`	`+ }`
	`569`	`+ }`
	`570`	`+`
`558`	`571`	`returnnewRealm(scheme,`
`559`	`572`	`principal,`
`560`	`573`	`password,`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -499,9 +499,14 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request`
`499`	`499`
`500`	`500`	`if (proxyServer.getProtocol().equals(ProxyServer.Protocol.NTLM)) {`
`501`	`501`
`502`		`-if (proxyServer.getNtlmDomain() ==null)thrownewIllegalStateException("NTLM Domain cannot be null");`
`503`		`-`
`504`	`502`	`jdkNtlmDomain =System.getProperty(NTLM_DOMAIN);`
	`503`	`+if (proxyServer.getNtlmDomain() ==null) {`
	`504`	`+logger.info("NTLM domain is not set, trying to read it from system property -D{}",NTLM_DOMAIN);`
	`505`	`+if (jdkNtlmDomain !=null) {`
	`506`	`+proxyServer.setNtlmDomain(jdkNtlmDomain);`
	`507`	`+ }`
	`508`	`+ }`
	`509`	`+`
`505`	`510`	`System.setProperty(NTLM_DOMAIN,proxyServer.getNtlmDomain());`
`506`	`511`	`}`
`507`	`512`	`}`
`@@ -525,7 +530,11 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request`
`525`	`530`	`break;`
`526`	`531`	`caseNTLM:`
`527`	`532`	`jdkNtlmDomain =System.getProperty(NTLM_DOMAIN);`
`528`		`-System.setProperty(NTLM_DOMAIN,realm.getDomain());`
	`533`	`+if (realm.getNtlmDomain() ==null) {`
	`534`	`+logger.info("NTLM domain is not set, trying to read it from system property -D{}",NTLM_DOMAIN);`
	`535`	`+ }else {`
	`536`	`+System.setProperty(NTLM_DOMAIN,realm.getNtlmDomain());`
	`537`	`+ }`
`529`	`538`	`break;`
`530`	`539`	`default:`
`531`	`540`	`thrownewIllegalStateException(String.format("Invalid Authentication %s",realm.toString()));`

Comments

(0)