@@ -637,7 +637,7 @@ private static HttpRequest construct(AsyncHttpClientConfig config,
637
637
if (!(auth != null && auth .size () > 0 && auth .get (0 ).startsWith ("NTLM" ))) {
638
638
try {
639
639
String msg = ntlmEngine .generateType1Msg (proxyServer .getNtlmDomain (),
640
- proxyServer .getHost ());
640
+ proxyServer .getHost ());
641
641
nettyRequest .setHeader (HttpHeaders .Names .PROXY_AUTHORIZATION , "NTLM " + msg );
642
642
} catch (NTLMEngineException e ) {
643
643
IOException ie = new IOException ();
@@ -647,7 +647,7 @@ private static HttpRequest construct(AsyncHttpClientConfig config,
647
647
}
648
648
} else {
649
649
nettyRequest .setHeader (HttpHeaders .Names .PROXY_AUTHORIZATION ,
650
- AuthenticatorUtils .computeBasicAuthentication (proxyServer ));
650
+ AuthenticatorUtils .computeBasicAuthentication (proxyServer ));
651
651
}
652
652
}
653
653
}
@@ -845,12 +845,12 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
845
845
846
846
boolean useSSl = uri .getScheme ().compareToIgnoreCase (HTTPS ) == 0 && proxyServer == null ;
847
847
if (channel != null && channel .isOpen () && channel .isConnected ()) {
848
- HttpRequest nettyRequest = buildRequest (config , request , uri , f == null ? false : f .isConnectAllowed (), bufferedBytes );
848
+ HttpRequest nettyRequest = buildRequest (config , request , uri , f == null ? false : f .isConnectAllowed (), bufferedBytes );
849
849
850
850
if (f == null ) {
851
851
f = newFuture (uri , request , asyncHandler , nettyRequest , config , this );
852
852
} else {
853
- nettyRequest = buildRequest (config , request , uri , f .isConnectAllowed (), bufferedBytes );
853
+ nettyRequest = buildRequest (config , request , uri , f .isConnectAllowed (), bufferedBytes );
854
854
f .setNettyRequest (nettyRequest );
855
855
}
856
856
f .setState (NettyResponseFuture .STATE .POOLED );
@@ -927,10 +927,9 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
927
927
}
928
928
929
929
try {
930
- if (request .getInetAddress () != null ) {
931
- channelFuture = bootstrap .connect (new InetSocketAddress (request .getInetAddress (), AsyncHttpProviderUtils .getPort (uri )));
932
- }
933
- else if (proxyServer == null || avoidProxy ) {
930
+ if (request .getInetAddress () != null ) {
931
+ channelFuture = bootstrap .connect (new InetSocketAddress (request .getInetAddress (), AsyncHttpProviderUtils .getPort (uri )));
932
+ } else if (proxyServer == null || avoidProxy ) {
934
933
channelFuture = bootstrap .connect (new InetSocketAddress (AsyncHttpProviderUtils .getHost (uri ), AsyncHttpProviderUtils .getPort (uri )));
935
934
} else {
936
935
channelFuture = bootstrap .connect (new InetSocketAddress (proxyServer .getHost (), proxyServer .getPort ()));
@@ -1181,7 +1180,7 @@ public Object call() throws Exception {
1181
1180
log .debug ("Sending proxy authentication to {}" , request .getUrl ());
1182
1181
1183
1182
future .setState (NettyResponseFuture .STATE .NEW );
1184
-
1183
+
1185
1184
if (!proxyAuth .contains ("Kerberos" ) && (proxyAuth .get (0 ).contains ("NTLM" ) || (proxyAuth .contains ("Negotiate" )))) {
1186
1185
newRealm = ntlmProxyChallenge (proxyAuth , request , proxyServer , headers , realm , future );
1187
1186
// SPNEGO KERBEROS
@@ -1409,14 +1408,14 @@ private Realm ntlmChallenge(List<String> wwwAuth,
1409
1408
realmBuilder = new Realm .RealmBuilder ();
1410
1409
}
1411
1410
newRealm = realmBuilder .setScheme (realm .getAuthScheme ())
1412
- .setUri (URI .create (request .getUrl ()).getPath ())
1413
- .setMethodName (request .getMethod ())
1414
- .build ();
1411
+ .setUri (URI .create (request .getUrl ()).getPath ())
1412
+ .setMethodName (request .getMethod ())
1413
+ .build ();
1415
1414
}
1416
1415
1417
1416
return newRealm ;
1418
1417
}
1419
-
1418
+
1420
1419
private Realm ntlmProxyChallenge (List <String > wwwAuth ,
1421
1420
Request request ,
1422
1421
ProxyServer proxyServer ,
@@ -1429,10 +1428,10 @@ private Realm ntlmProxyChallenge(List<String> wwwAuth,
1429
1428
if (wwwAuth .get (0 ).startsWith ("NTLM " )) {
1430
1429
String serverChallenge = wwwAuth .get (0 ).trim ().substring ("NTLM " .length ());
1431
1430
String challengeHeader = ntlmEngine .generateType3Msg (proxyServer .getPrincipal (),
1432
- proxyServer .getPassword (),
1433
- proxyServer .getNtlmDomain (),
1434
- proxyServer .getHost (),
1435
- serverChallenge );
1431
+ proxyServer .getPassword (),
1432
+ proxyServer .getNtlmDomain (),
1433
+ proxyServer .getHost (),
1434
+ serverChallenge );
1436
1435
headers .add (HttpHeaders .Names .PROXY_AUTHORIZATION , "NTLM " + challengeHeader );
1437
1436
}
1438
1437
Realm newRealm ;
@@ -1443,9 +1442,9 @@ private Realm ntlmProxyChallenge(List<String> wwwAuth,
1443
1442
realmBuilder = new Realm .RealmBuilder ();
1444
1443
}
1445
1444
newRealm = realmBuilder //.setScheme(realm.getAuthScheme())
1446
- .setUri (URI .create (request .getUrl ()).getPath ())
1447
- .setMethodName (request .getMethod ())
1448
- .build ();
1445
+ .setUri (URI .create (request .getUrl ()).getPath ())
1446
+ .setMethodName (request .getMethod ())
1447
+ .build ();
1449
1448
1450
1449
return newRealm ;
1451
1450
}
0 commit comments