Skip to content

Support NTLM protocol with the proxy: fixed the header name for Proxy-Authorization #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2014
Merged

Support NTLM protocol with the proxy: fixed the header name for Proxy-Authorization #563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,7 +1229,7 @@ public void messageReceived(final ChannelHandlerContext ctx, MessageEvent e) thr
}

private Realm kerberosChallenge(List<String> proxyAuth, Request request, ProxyServer proxyServer, FluentCaseInsensitiveStringsMap headers, Realm realm,
NettyResponseFuture<?> future) throws NTLMEngineException {
NettyResponseFuture<?> future, boolean proxyInd) throws NTLMEngineException {

URI uri = request.getURI();
String host = request.getVirtualHost() == null ? AsyncHttpProviderUtils.getHost(uri) : request.getVirtualHost();
Expand All @@ -1248,30 +1248,38 @@ private Realm kerberosChallenge(List<String> proxyAuth, Request request, ProxySe
return realmBuilder.setUri(uri.getRawPath()).setMethodName(request.getMethod()).setScheme(Realm.AuthScheme.KERBEROS).build();
} catch (Throwable throwable) {
if (isNTLM(proxyAuth)) {
return ntlmChallenge(proxyAuth, request, proxyServer, headers, realm, future);
return ntlmChallenge(proxyAuth, request, proxyServer, headers, realm, future, proxyInd);
}
abort(future, throwable);
return null;
}
}

private void addNTLMAuthorization(FluentCaseInsensitiveStringsMap headers, String challengeHeader) {
headers.add(HttpHeaders.Names.AUTHORIZATION, "NTLM " + challengeHeader);
private void addNTLMAuthorization(FluentCaseInsensitiveStringsMap headers, String challengeHeader, boolean proxyInd) {
if ( proxyInd ) {
headers.add(HttpHeaders.Names.PROXY_AUTHORIZATION, "NTLM " + challengeHeader);
} else {
headers.add(HttpHeaders.Names.AUTHORIZATION, "NTLM " + challengeHeader);
}
}

private void addType3NTLMAuthorizationHeader(List<String> auth, FluentCaseInsensitiveStringsMap headers, String username, String password, String domain, String workstation)
private void addType3NTLMAuthorizationHeader(List<String> auth, FluentCaseInsensitiveStringsMap headers, String username, String password, String domain, String workstation, boolean proxyInd)
throws NTLMEngineException {
headers.remove(HttpHeaders.Names.AUTHORIZATION);
if ( proxyInd ) {
headers.remove(HttpHeaders.Names.PROXY_AUTHORIZATION);
} else {
headers.remove(HttpHeaders.Names.AUTHORIZATION);
}

// Beware of space!, see #462
if (isNonEmpty(auth) && auth.get(0).startsWith("NTLM ")) {
String serverChallenge = auth.get(0).trim().substring("NTLM ".length());
String challengeHeader = ntlmEngine.generateType3Msg(username, password, domain, workstation, serverChallenge);
addNTLMAuthorization(headers, challengeHeader);
addNTLMAuthorization(headers, challengeHeader, proxyInd);
}
}

private Realm ntlmChallenge(List<String> wwwAuth, Request request, ProxyServer proxyServer, FluentCaseInsensitiveStringsMap headers, Realm realm, NettyResponseFuture<?> future)
private Realm ntlmChallenge(List<String> wwwAuth, Request request, ProxyServer proxyServer, FluentCaseInsensitiveStringsMap headers, Realm realm, NettyResponseFuture<?> future, boolean proxyInd)
throws NTLMEngineException {

boolean useRealm = (proxyServer == null && realm != null);
Expand All @@ -1286,12 +1294,12 @@ private Realm ntlmChallenge(List<String> wwwAuth, Request request, ProxyServer p
String challengeHeader = ntlmEngine.generateType1Msg(ntlmDomain, ntlmHost);

URI uri = request.getURI();
addNTLMAuthorization(headers, challengeHeader);
addNTLMAuthorization(headers, challengeHeader, proxyInd);
newRealm = new Realm.RealmBuilder().clone(realm).setScheme(realm.getAuthScheme()).setUri(uri.getRawPath()).setMethodName(request.getMethod())
.setNtlmMessageType2Received(true).build();
future.getAndSetAuth(false);
} else {
addType3NTLMAuthorizationHeader(wwwAuth, headers, principal, password, ntlmDomain, ntlmHost);
addType3NTLMAuthorizationHeader(wwwAuth, headers, principal, password, ntlmDomain, ntlmHost, proxyInd);

Realm.RealmBuilder realmBuilder;
Realm.AuthScheme authScheme;
Expand All @@ -1312,7 +1320,7 @@ private Realm ntlmProxyChallenge(List<String> wwwAuth, Request request, ProxySer
NettyResponseFuture<?> future) throws NTLMEngineException {
future.getAndSetAuth(false);

addType3NTLMAuthorizationHeader(wwwAuth, headers, proxyServer.getPrincipal(), proxyServer.getPassword(), proxyServer.getNtlmDomain(), proxyServer.getHost());
addType3NTLMAuthorizationHeader(wwwAuth, headers, proxyServer.getPrincipal(), proxyServer.getPassword(), proxyServer.getNtlmDomain(), proxyServer.getHost(), true);
Realm newRealm;

Realm.RealmBuilder realmBuilder = new Realm.RealmBuilder();
Expand Down Expand Up @@ -2115,10 +2123,10 @@ public void handle(final ChannelHandlerContext ctx, final MessageEvent e) throws

// NTLM
if (!wwwAuth.contains("Kerberos") && (isNTLM(wwwAuth) || (wwwAuth.contains("Negotiate")))) {
newRealm = ntlmChallenge(wwwAuth, request, proxyServer, headers, realm, future);
newRealm = ntlmChallenge(wwwAuth, request, proxyServer, headers, realm, future, false);
// SPNEGO KERBEROS
} else if (wwwAuth.contains("Negotiate")) {
newRealm = kerberosChallenge(wwwAuth, request, proxyServer, headers, realm, future);
newRealm = kerberosChallenge(wwwAuth, request, proxyServer, headers, realm, future, false);
if (newRealm == null)
return;
} else {
Expand Down Expand Up @@ -2167,7 +2175,7 @@ public Object call() throws Exception {
newRealm = ntlmProxyChallenge(proxyAuth, request, proxyServer, headers, realm, future);
// SPNEGO KERBEROS
} else if (proxyAuth.contains("Negotiate")) {
newRealm = kerberosChallenge(proxyAuth, request, proxyServer, headers, realm, future);
newRealm = kerberosChallenge(proxyAuth, request, proxyServer, headers, realm, future, true);
if (newRealm == null)
return;
} else {
Expand Down