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

Fix regression in Form Based Logon: fix script based logon URI creation with path and query

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@727 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-09-17 14:42:45 +00:00
parent ed17034333
commit 332ff6db99
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,6 +294,18 @@ public class ExchangeSession {
return uri.getURI(); return uri.getURI();
} }
protected String getScriptBasedFormURL(HttpMethod initmethod, String pathQuery) throws URIException {
URI initmethodURI = initmethod.getURI();
int queryIndex = pathQuery.indexOf('?');
if (queryIndex >= 0) {
if (queryIndex > 0) {
initmethodURI.setPath(pathQuery.substring(0, queryIndex));
}
initmethodURI.setQuery(pathQuery.substring(queryIndex + 1));
}
return initmethodURI.getURI();
}
/** /**
* Try to find logon method path from logon form body. * Try to find logon method path from logon form body.
* *
@ -359,11 +371,9 @@ public class ExchangeSession {
int a_sUrlEndIndex = scriptValue.indexOf('\"', a_sUrlIndex); int a_sUrlEndIndex = scriptValue.indexOf('\"', a_sUrlIndex);
int a_sLgnEndIndex = scriptValue.indexOf('\"', a_sLgnIndex); int a_sLgnEndIndex = scriptValue.indexOf('\"', a_sLgnIndex);
if (a_sUrlEndIndex >= 0 && a_sLgnEndIndex >= 0) { if (a_sUrlEndIndex >= 0 && a_sLgnEndIndex >= 0) {
URI initmethodURI = initmethod.getURI(); String pathQuery = scriptValue.substring(a_sLgnIndex, a_sLgnEndIndex) +
initmethodURI.setQuery( scriptValue.substring(a_sUrlIndex, a_sUrlEndIndex);
scriptValue.substring(a_sLgnIndex + 1, a_sLgnEndIndex) + String src = getScriptBasedFormURL(initmethod, pathQuery);
scriptValue.substring(a_sUrlIndex, a_sUrlEndIndex));
String src = initmethodURI.getURI();
LOGGER.debug("Detected script based logon, redirect to form at " + src); LOGGER.debug("Detected script based logon, redirect to form at " + src);
HttpMethod newInitMethod = DavGatewayHttpClientFacade.executeFollowRedirects(httpClient, src); HttpMethod newInitMethod = DavGatewayHttpClientFacade.executeFollowRedirects(httpClient, src);
logonMethod = buildLogonMethod(httpClient, newInitMethod); logonMethod = buildLogonMethod(httpClient, newInitMethod);
@ -376,11 +386,9 @@ public class ExchangeSession {
int a_sUrlEndIndex = scriptValue.indexOf('\"', a_sUrlIndex); int a_sUrlEndIndex = scriptValue.indexOf('\"', a_sUrlIndex);
int a_sLgnEndIndex = scriptValue.indexOf('\"', a_sLgnIndex); int a_sLgnEndIndex = scriptValue.indexOf('\"', a_sLgnIndex);
if (a_sUrlEndIndex >= 0 && a_sLgnEndIndex >= 0) { if (a_sUrlEndIndex >= 0 && a_sLgnEndIndex >= 0) {
URI initmethodURI = initmethod.getURI(); String pathQuery = scriptValue.substring(a_sLgnIndex, a_sLgnEndIndex) +
initmethodURI.setQuery( scriptValue.substring(a_sUrlIndex, a_sUrlEndIndex);
scriptValue.substring(a_sLgnIndex + 1, a_sLgnEndIndex) + String src = getScriptBasedFormURL(initmethod, pathQuery);
scriptValue.substring(a_sUrlIndex, a_sUrlEndIndex));
String src = initmethodURI.getURI();
LOGGER.debug("Detected script based logon, redirect to form at " + src); LOGGER.debug("Detected script based logon, redirect to form at " + src);
HttpMethod newInitMethod = DavGatewayHttpClientFacade.executeFollowRedirects(httpClient, src); HttpMethod newInitMethod = DavGatewayHttpClientFacade.executeFollowRedirects(httpClient, src);
logonMethod = buildLogonMethod(httpClient, newInitMethod); logonMethod = buildLogonMethod(httpClient, newInitMethod);