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

IMAP: experimental public folder access 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@753 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-09-25 09:13:02 +00:00
parent 79ba72e092
commit d0e83c4a8c
4 changed files with 134 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/java/davmail/exception/HttpForbiddenException.java Normal file
View File

@ -0,0 +1,35 @@
/*
* DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway
* Copyright (C) 2009 Mickael Guessant
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package davmail.exception;
import org.apache.commons.httpclient.HttpException;
/**
* HttpException with 403 forbidden status.
*/
public class HttpForbiddenException extends HttpException {
/**
* HttpException with 403 forbidden status.
*
* @param message exception message
*/
public HttpForbiddenException(String message) {
super(message);
}
}

35
src/java/davmail/exception/HttpNotFoundException.java Normal file
View File

@ -0,0 +1,35 @@
/*
* DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway
* Copyright (C) 2009 Mickael Guessant
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package davmail.exception;
import org.apache.commons.httpclient.HttpException;
/**
* HttpException with 404 not found status.
*/
public class HttpNotFoundException extends HttpException {
/**
* HttpException with 404 not found status.
*
* @param message exception message
*/
public HttpNotFoundException(String message) {
super(message);
}
}

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

@ -21,6 +21,8 @@ package davmail.http;
import davmail.BundleMessage;
import davmail.Settings;
import davmail.exception.DavMailException;
import davmail.exception.HttpForbiddenException;
import davmail.exception.HttpNotFoundException;
import davmail.ui.tray.DavGatewayTray;
import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.auth.AuthPolicy;
@ -388,7 +390,13 @@ public final class DavGatewayHttpClientFacade {
} catch (URIException e) {
message.append(method.getPath());
}
return new HttpException();
if (status == HttpStatus.SC_FORBIDDEN) {
return new HttpForbiddenException(message.toString());
} else if (status == HttpStatus.SC_NOT_FOUND) {
return new HttpNotFoundException(message.toString());
} else {
return new HttpException(message.toString());
}
}
/**

77
src/java/davmail/imap/ImapConnection.java
View File

@ -23,6 +23,8 @@ import com.sun.mail.imap.protocol.BASE64MailboxEncoder;
import davmail.AbstractConnection;
import davmail.BundleMessage;
import davmail.exception.DavMailException;
import davmail.exception.HttpForbiddenException;
import davmail.exception.HttpNotFoundException;
import davmail.exchange.ExchangeSession;
import davmail.exchange.ExchangeSessionFactory;
import davmail.ui.tray.DavGatewayTray;
@ -133,18 +135,45 @@ public class ImapConnection extends AbstractConnection {
String folderContext = BASE64MailboxDecoder.decode(tokens.nextToken());
if (tokens.hasMoreTokens()) {
String folderQuery = folderContext + BASE64MailboxDecoder.decode(tokens.nextToken());
if (folderQuery.endsWith("%/%")) {
folderQuery = folderQuery.substring(0, folderQuery.length() - 2);
}
if (folderQuery.endsWith("%") || folderQuery.endsWith("*")) {
boolean recursive = folderQuery.endsWith("*");
if (folderQuery.endsWith("%/%") && !"/%/%".equals(folderQuery)) {
List<ExchangeSession.Folder> folders = session.getSubFolders(folderQuery.substring(0, folderQuery.length() - 3), false);
for (ExchangeSession.Folder folder : folders) {
sendClient("* " + command + " (" + folder.getFlags() + ") \"/\" \"" + BASE64MailboxEncoder.encode(folder.folderPath) + '\"');
try {
List<ExchangeSession.Folder> subfolders = session.getSubFolders(folder.folderPath, false);
for (ExchangeSession.Folder subfolder : subfolders) {
sendClient("* " + command + " (" + subfolder.getFlags() + ") \"/\" \"" + BASE64MailboxEncoder.encode(subfolder.folderPath) + '\"');
}
} catch (HttpForbiddenException e) {
// access forbidden, ignore
} catch (HttpNotFoundException e) {
// not found, ignore
}
}
sendClient(commandId + " OK " + command + " completed");
} else if (folderQuery.endsWith("%") || folderQuery.endsWith("*")) {
if ("/*".equals(folderQuery) || "/%".equals(folderQuery) || "/%/%".equals(folderQuery)) {
folderQuery = folderQuery.substring(1);
if ("%/%".equals(folderQuery)) {
folderQuery = folderQuery.substring(0, folderQuery.length() - 2);
}
sendClient("* " + command + " (\\HasChildren) \"/\" \"/public\"");
}
boolean recursive = folderQuery.endsWith("*") && !folderQuery.startsWith("/public");
List<ExchangeSession.Folder> folders = session.getSubFolders(folderQuery.substring(0, folderQuery.length() - 1), recursive);
for (ExchangeSession.Folder folder : folders) {
sendClient("* " + command + " (" + folder.getFlags() + ") \"/\" \"" + BASE64MailboxEncoder.encode(folder.folderPath) + '\"');
}
sendClient(commandId + " OK " + command + " completed");
} else {
ExchangeSession.Folder folder = session.getFolder(folderQuery);
ExchangeSession.Folder folder = null;
try {
session.getFolder(folderQuery);
} catch (HttpForbiddenException e) {
// access forbidden, ignore
} catch (HttpNotFoundException e) {
// not found, ignore
}
if (folder != null) {
sendClient("* " + command + " (" + folder.getFlags() + ") \"/\" \"" + BASE64MailboxEncoder.encode(folder.folderPath) + '\"');
sendClient(commandId + " OK " + command + " completed");
@ -161,22 +190,26 @@ public class ImapConnection extends AbstractConnection {
} else if ("select".equalsIgnoreCase(command) || "examine".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) {
String folderName = BASE64MailboxDecoder.decode(tokens.nextToken());
currentFolder = session.getFolder(folderName);
currentFolder.loadMessages();
sendClient("* " + currentFolder.count() + " EXISTS");
sendClient("* " + currentFolder.count() + " RECENT");
sendClient("* OK [UIDVALIDITY 1]");
if (currentFolder.count() == 0) {
sendClient("* OK [UIDNEXT " + 1 + ']');
} else {
sendClient("* OK [UIDNEXT " + currentFolder.getUidNext() + ']');
}
sendClient("* FLAGS (\\Answered \\Deleted \\Draft \\Flagged \\Seen $Forwarded Junk)");
sendClient("* OK [PERMANENTFLAGS (\\Answered \\Deleted \\Draft \\Flagged \\Seen $Forwarded Junk \\*)]");
if ("select".equalsIgnoreCase(command)) {
sendClient(commandId + " OK [READ-WRITE] " + command + " completed");
} else {
sendClient(commandId + " OK [READ-ONLY] " + command + " completed");
try {
currentFolder = session.getFolder(folderName);
currentFolder.loadMessages();
sendClient("* " + currentFolder.count() + " EXISTS");
sendClient("* " + currentFolder.count() + " RECENT");
sendClient("* OK [UIDVALIDITY 1]");
if (currentFolder.count() == 0) {
sendClient("* OK [UIDNEXT " + 1 + ']');
} else {
sendClient("* OK [UIDNEXT " + currentFolder.getUidNext() + ']');
}
sendClient("* FLAGS (\\Answered \\Deleted \\Draft \\Flagged \\Seen $Forwarded Junk)");
sendClient("* OK [PERMANENTFLAGS (\\Answered \\Deleted \\Draft \\Flagged \\Seen $Forwarded Junk \\*)]");
if ("select".equalsIgnoreCase(command)) {
sendClient(commandId + " OK [READ-WRITE] " + command + " completed");
} else {
sendClient(commandId + " OK [READ-ONLY] " + command + " completed");
}
} catch (HttpForbiddenException e) {
sendClient(commandId + " NO Forbidden");
}
} else {
sendClient(commandId + " BAD command unrecognized");