moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

Prepare javascript redirect merge (multiple authentication pages) 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1991 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2012-08-23 21:58:50 +00:00
parent c8332c7a31
commit d52555bc26
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,6 +290,23 @@ public final class DavGatewayHttpClientFacade {
return status;
}
protected static String getLocationValue(HttpMethod method) throws URIException {
String locationValue = null;
Header location = method.getResponseHeader("Location");
if (location != null && isRedirect(method.getStatusCode())) {
locationValue = location.getValue();
// Novell iChain workaround
if (locationValue.indexOf('"') >= 0) {
locationValue = URIUtil.encodePath(locationValue);
}
// workaround for invalid relative location
if (locationValue.startsWith("./")) {
locationValue = locationValue.substring(1);
}
}
return locationValue;
}
/**
* Execute method with httpClient, follow 30x redirects.
*
@ -303,31 +320,22 @@ public final class DavGatewayHttpClientFacade {
try {
DavGatewayTray.debug(new BundleMessage("LOG_EXECUTE_FOLLOW_REDIRECTS", currentMethod.getURI()));
httpClient.executeMethod(currentMethod);
int status = checkNTLM(httpClient, currentMethod);
checkNTLM(httpClient, currentMethod);
String locationValue = getLocationValue(currentMethod);
Header location = currentMethod.getResponseHeader("Location");
int redirectCount = 0;
while (redirectCount++ < 10
&& location != null
&& isRedirect(status)) {
// Novell iChain workaround
String locationValue = location.getValue();
if (locationValue.indexOf('"') >= 0) {
locationValue = URIUtil.encodePath(locationValue);
}
// workaround for invalid relative location
if (locationValue.startsWith("./")) {
locationValue = locationValue.substring(1);
}
&& locationValue != null) {
currentMethod.releaseConnection();
currentMethod = new GetMethod(locationValue);
currentMethod.setFollowRedirects(false);
DavGatewayTray.debug(new BundleMessage("LOG_EXECUTE_FOLLOW_REDIRECTS_COUNT", currentMethod.getURI(), redirectCount));
httpClient.executeMethod(currentMethod);
checkNTLM(httpClient, currentMethod);
location = currentMethod.getResponseHeader("Location");
locationValue = getLocationValue(currentMethod);
}
if (location != null && isRedirect(currentMethod.getStatusCode())) {
if (locationValue != null) {
currentMethod.releaseConnection();
throw new HttpException("Maximum redirections reached");
}