moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-01-07 03:38:05 -05:00
Code Issues Releases Wiki Activity

Improve initial authentication error handling, detect invalid OWA URL

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@113 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2008-01-09 16:33:57 +00:00
parent 4ce550d3ff
commit 7f8ee78586
1 changed files with 77 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/java/davmail/exchange/ExchangeSession.java
View File

@ -210,10 +210,29 @@ public class ExchangeSession {
}
/**
* Test authentication mode : form based or basic.
*
* @param url exchange base URL
* @return true if basic authentication detected
* @throws java.io.IOException unable to connect to exchange
*/
protected boolean isBasicAuthentication(String url) throws IOException {
// create an HttpClient instance
HttpClient httpClient = new HttpClient();
configureClient(httpClient);
HttpMethod testMethod = new GetMethod(url);
int status = httpClient.executeMethod(testMethod);
testMethod.releaseConnection();
return status == HttpStatus.SC_UNAUTHORIZED;
}
public void login(String userName, String password) throws IOException {
try {
String url = Settings.getProperty("davmail.url");
boolean isBasicAuthentication = isBasicAuthentication(url);
// get proxy configuration from setttings properties
URL urlObject = new URL(url);
// webdavresource is unable to create the correct url type
@ -242,9 +261,14 @@ public class ExchangeSession {
HttpMethod initmethod = new GetMethod(url);
wdr.executeHttpRequestMethod(httpClient,
initmethod);
if (initmethod.getPath().indexOf("exchweb/bin") > 0) {
if (!isBasicAuthentication) {
LOGGER.debug("Form based authentication detected");
if (initmethod.getPath().indexOf("exchweb/bin") == -1) {
LOGGER.error("DavMail configuration exception: authentication form not found at " + url +
" and basic authentication not requested");
throw new IOException("DavMail configuration exception: authentication form not found at " + url +
" and basic authentication not requested");
} else {
PostMethod logonMethod = new PostMethod(
"/exchweb/bin/auth/owaauth.dll?" +
"ForcedBasic=false&Basic=false&Private=true" +
@ -259,10 +283,8 @@ public class ExchangeSession {
// logonMethod.addParameter("forcedownlevel", "0");
logonMethod.addParameter("trusted", "4");
wdr.executeHttpRequestMethod(wdr.retrieveSessionInstance(),
logonMethod);
Header locationHeader = logonMethod.getResponseHeader(
"Location");
wdr.executeHttpRequestMethod(httpClient, logonMethod);
Header locationHeader = logonMethod.getResponseHeader("Location");
if (logonMethod.getStatusCode() != HttpURLConnection.HTTP_MOVED_TEMP ||
locationHeader == null ||
@ -271,13 +293,12 @@ public class ExchangeSession {
}
}
}
// User now authenticated, get various session information
// User may be authenticated, get various session information
HttpMethod method = new GetMethod(url);
int status = wdr.executeHttpRequestMethod(wdr.
retrieveSessionInstance(), method);
if (status != HttpStatus.SC_MULTI_STATUS
&& status != HttpStatus.SC_OK) {
int status = wdr.executeHttpRequestMethod(httpClient, method);
if (status != HttpStatus.SC_OK) {
HttpException ex = new HttpException();
ex.setReasonCode(status);
ex.setReason(method.getStatusText());
@ -285,19 +306,24 @@ public class ExchangeSession {
}
// get user mail URL from html body (multi frame)
String body = method.getResponseBodyAsString();
int beginIndex = body.indexOf(url);
String mailboxName = method.getResponseBodyAsString();
int beginIndex = mailboxName.indexOf(url);
if (beginIndex < 0) {
throw new HttpException(url + " not found in body");
}
body = body.substring(beginIndex);
int endIndex = body.indexOf('"');
mailboxName = mailboxName.substring(beginIndex);
int endIndex = mailboxName.indexOf('"');
if (endIndex < 0) {
throw new HttpException(url + " not found in body");
}
body = body.substring(url.length(), endIndex);
mailboxName = mailboxName.substring(url.length(), endIndex);
// if body is empty : wrong password, not authenticated
if (mailboxName.length() == 0) {
throw new HttpException("Authentication failed");
}
// got base http mailbox http url
mailPath = "/exchange/" + body;
mailPath = "/exchange/" + mailboxName;
wdr.setPath(mailPath);
// Retrieve inbox and trash URLs
@ -1022,6 +1048,7 @@ public class ExchangeSession {
// double dot filter : avoid end of message in body
quotedOs = new FilterOutputStream(os) {
byte state = 0;
public void write(int achar) throws IOException {
if (achar == 13 && state != 3) {
state = 1;
@ -1395,7 +1422,7 @@ public class ExchangeSession {
}
// try to get by index if attachment renamed to application
if (attachment == null && partHeader.name != null) {
if (attachment == null && partHeader.name != null && attachmentIndex < attachments.size()) {
Attachment currentAttachment = attachments.get(attachmentIndex);
if (currentAttachment != null && currentAttachment.name.startsWith("application")) {
attachment = currentAttachment;