IMAP: try to support public folders hosted on a separate server (302 redirect on PROPFIND)

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@878 3d1905a2-6b24-0410-a738-b14d5a86fcbd

src/java/davmail/exchange/ExchangeSession.java

@@ -166,6 +166,7 @@ public class ExchangeSession {
     private String draftsUrl;
     private String calendarUrl;
     private String contactsUrl;
+    private String publicFolderUrl;
 
     /**
      * Base user mailboxes path (used to select folder)
@@ -232,7 +233,7 @@ public class ExchangeSession {
 
             buildMailPath(method);
 
-            // got base http mailbox http url
+            // get base http mailbox http urls
             getWellKnownFolders();
 
         } catch (DavMailAuthenticationException exc) {
@@ -642,13 +643,24 @@ public class ExchangeSession {
             draftsUrl = getURIPropertyIfExists(properties, "drafts", URN_SCHEMAS_HTTPMAIL);
             calendarUrl = getURIPropertyIfExists(properties, "calendar", URN_SCHEMAS_HTTPMAIL);
             contactsUrl = getURIPropertyIfExists(properties, "contacts", URN_SCHEMAS_HTTPMAIL);
+
+            try {
+                PropFindMethod propFindMethod = new PropFindMethod("/public", CONTENT_TAG, 0);
+                DavGatewayHttpClientFacade.executeMethod(httpClient, propFindMethod);
+                publicFolderUrl = propFindMethod.getURI().getURI();
+            } catch (IOException e) {
+                LOGGER.warn("Public folders not available: " + (e.getMessage() == null ? e : e.getMessage()));
+                // default public folder path
+                publicFolderUrl = "/public";
+            }
             LOGGER.debug("Inbox URL : " + inboxUrl +
                     " Trash URL : " + deleteditemsUrl +
                     " Sent URL : " + sentitemsUrl +
                     " Send URL : " + sendmsgUrl +
                     " Drafts URL : " + draftsUrl +
                     " Calendar URL : " + calendarUrl +
-                    " Contacts URL : " + contactsUrl
+                    " Contacts URL : " + contactsUrl +
+                    " Public folder URL : " + publicFolderUrl
             );
         } catch (IOException e) {
             LOGGER.error(e.getMessage());
@@ -1086,7 +1098,7 @@ public class ExchangeSession {
         } else if (folderName.startsWith("calendar")) {
             folderPath = folderName.replaceFirst("calendar", calendarUrl);
         } else if (folderName.startsWith("public")) {
-            folderPath = '/' + folderName;
+            folderPath = publicFolderUrl + folderName.substring("public".length());
             // absolute folder path
         } else if (folderName.startsWith("/")) {
             folderPath = folderName;
@@ -2803,7 +2815,11 @@ public class ExchangeSession {
      */
     public String getCmdBasePath() {
         if (mailPath == null) {
+            if (publicFolderUrl == null) {
                 return "/public/";
+            } else {
+                return publicFolderUrl + '/';
+            }
         } else {
             return mailPath;
         }
@@ -3216,7 +3232,7 @@ public class ExchangeSession {
             } else {
                 endDate = icalDateFormat.parse(endDateValue);
             }
-            freebusyUrl = "/public/?cmd=freebusy" +
+            freebusyUrl = publicFolderUrl + "/?cmd=freebusy" +
                     "&start=" + exchangeZuluDateFormat.format(startDate) +
                     "&end=" + exchangeZuluDateFormat.format(endDate) +
                     "&interval=" + FREE_BUSY_INTERVAL +

src/java/davmail/http/DavGatewayHttpClientFacade.java

@@ -20,10 +20,7 @@ package davmail.http;
 
 import davmail.BundleMessage;
 import davmail.Settings;
-import davmail.exception.DavMailException;
+import davmail.exception.*;
-import davmail.exception.HttpForbiddenException;
-import davmail.exception.HttpNotFoundException;
-import davmail.exception.HttpServerErrorException;
 import davmail.ui.tray.DavGatewayTray;
 import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.auth.AuthPolicy;
@@ -326,6 +323,15 @@ public final class DavGatewayHttpClientFacade {
         try {
             int status = httpClient.executeMethod(method);
 
+            // need to follow redirects (once) on public folders
+            if (isRedirect(status)) {
+                method.releaseConnection();
+                URI targetUri = new URI(method.getResponseHeader("Location").getValue(), true);
+                checkExpiredSession(targetUri.getQuery());
+                method.setURI(targetUri);
+                status = httpClient.executeMethod(method);
+            }
+
             if (status != HttpStatus.SC_MULTI_STATUS) {
                 throw buildHttpException(method);
             }
@@ -395,6 +401,7 @@ public final class DavGatewayHttpClientFacade {
         // check for expired session
         if (followRedirects) {
             String queryString = method.getQueryString();
+            checkExpiredSession(queryString);
             if (queryString != null && queryString.contains("reason=2")) {
                 LOGGER.warn("GET failed, session expired  at " + method.getURI() + ": " + method.getResponseBodyAsString());
                 throw DavGatewayHttpClientFacade.buildHttpException(method);
@@ -402,6 +409,13 @@ public final class DavGatewayHttpClientFacade {
         }
     }
 
+    private static void checkExpiredSession(String queryString) throws DavMailAuthenticationException {
+        if (queryString != null && queryString.contains("reason=2")) {
+            LOGGER.warn("Request failed, session expired  (reason=2) ");
+            throw new DavMailAuthenticationException("EXCEPTION_SESSION_EXPIRED");
+        }
+    }
+
     /**
      * Build Http Exception from methode status
      *