moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 19:22:22 -05:00
Code Issues Releases Wiki Activity

Remove NTLM authentication, breaks Basic authentication (missing domain in username)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@672 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-08-14 07:57:12 +00:00
parent 1679099b35
commit b9b7a5c8d7
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/java/davmail/http/DavGatewayHttpClientFacade.java
View File

@ -82,17 +82,7 @@ public final class DavGatewayHttpClientFacade {
String userName = httpURL.getUser();
String password = httpURL.getPassword();
AuthScope authScope = new AuthScope(httpURL.getHost(), httpURL.getPort(), AuthScope.ANY_REALM);
// detect ntlm authentication (windows domain name in user name)
int backslashindex = userName.indexOf('\\');
if (backslashindex > 0) {
httpClient.getState().setCredentials(authScope,
new NTCredentials(userName.substring(backslashindex + 1),
password, httpURL.getHost(),
userName.substring(0, backslashindex)));
} else {
httpClient.getState().setCredentials(authScope,
new UsernamePasswordCredentials(userName, password));
}
httpClient.getState().setCredentials(authScope, new UsernamePasswordCredentials(userName, password));
configureClient(httpClient);
return httpClient;
}
@ -108,8 +98,7 @@ public final class DavGatewayHttpClientFacade {
ArrayList<String> authPrefs = new ArrayList<String>();
authPrefs.add(AuthPolicy.DIGEST);
authPrefs.add(AuthPolicy.BASIC);
// set NTLM as last authentication scheme
authPrefs.add(AuthPolicy.NTLM);
// exclude the NTLM authentication scheme
httpClient.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
boolean enableProxy = Settings.getBooleanProperty("davmail.enableProxy");