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

Improve Form Based Logon: fix script based logon URI creation

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@691 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-09-02 16:37:33 +00:00
parent b53a4e8522
commit 8b80ac6251
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,8 +262,10 @@ public class ExchangeSession {
URI uri = method.getURI();
if (path != null) {
if (path.startsWith("/")) {
// path is absolute, replace method path
uri.setPath(path);
} else {
// relative path, build new path
String currentPath = method.getPath();
int end = currentPath.lastIndexOf('/');
if (end >= 0) {
@ -335,9 +337,11 @@ public class ExchangeSession {
int a_sUrlEndIndex = scriptValue.indexOf('\"', a_sUrlIndex);
int a_sLgnEndIndex = scriptValue.indexOf('\"', a_sLgnIndex);
if (a_sUrlEndIndex >= 0 && a_sLgnEndIndex >= 0) {
String src = getAbsoluteUri(initmethod,
scriptValue.substring(a_sLgnIndex, a_sLgnEndIndex) +
URI initmethodURI = initmethod.getURI();
initmethodURI.setQuery(
scriptValue.substring(a_sLgnIndex + 1, a_sLgnEndIndex) +
scriptValue.substring(a_sUrlIndex, a_sUrlEndIndex));
String src = initmethodURI.getURI();
LOGGER.debug("Detected script based logon, redirect to form at " + src);
HttpMethod newInitMethod = DavGatewayHttpClientFacade.executeFollowRedirects(httpClient, src);
logonMethod = buildLogonMethod(httpClient, newInitMethod);
@ -350,9 +354,11 @@ public class ExchangeSession {
int a_sUrlEndIndex = scriptValue.indexOf('\"', a_sUrlIndex);
int a_sLgnEndIndex = scriptValue.indexOf('\"', a_sLgnIndex);
if (a_sUrlEndIndex >= 0 && a_sLgnEndIndex >= 0) {
String src = initmethod.getPath() +
scriptValue.substring(a_sLgnIndex, a_sLgnEndIndex) +
scriptValue.substring(a_sUrlIndex, a_sUrlEndIndex);
URI initmethodURI = initmethod.getURI();
initmethodURI.setQuery(
scriptValue.substring(a_sLgnIndex + 1, a_sLgnEndIndex) +
scriptValue.substring(a_sUrlIndex, a_sUrlEndIndex));
String src = initmethodURI.getURI();
LOGGER.debug("Detected script based logon, redirect to form at " + src);
HttpMethod newInitMethod = DavGatewayHttpClientFacade.executeFollowRedirects(httpClient, src);
logonMethod = buildLogonMethod(httpClient, newInitMethod);