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

Caldav: Fix Carddav etag handling (additional Head request) and implement card delete 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1037 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-05-07 10:03:49 +00:00
parent 956f1b26a0
commit 0910d22a93
2 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/davmail/caldav/CaldavConnection.java
View File

@ -267,7 +267,7 @@ public class CaldavConnection extends AbstractConnection {
sendHttpResponse(itemResult.status, buildEtagHeader(itemResult.etag), null, "", true);
} else if (request.isDelete()) {
int status = session.deleteEvent(request.getExchangeFolderPath(), lastPath);
int status = session.deleteItem(request.getExchangeFolderPath(), lastPath);
sendHttpResponse(status);
} else if (request.isGet()) {
if (request.path.endsWith("/")) {

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

@ -31,10 +31,7 @@ import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.methods.*;
import org.apache.commons.httpclient.params.HttpClientParams;
import org.apache.commons.httpclient.util.URIUtil;
import org.apache.jackrabbit.webdav.DavException;
@ -2065,6 +2062,8 @@ public class ExchangeSession {
writer.write("TEL;TYPE=cell:");
writer.writeLine(getPropertyIfExists(properties, DavPropertyName.create("mobile", URN_SCHEMAS_CONTACTS), ""));
writer.write("TEL;TYPE=work:");
writer.writeLine(getPropertyIfExists(properties, DavPropertyName.create("telephoneNumber", URN_SCHEMAS_CONTACTS), ""));
//writer.writeLine(getPropertyIfExists(properties, DavPropertyName.create("initials", URN_SCHEMAS_CONTACTS), ""));
// The structured type value corresponds, in sequence, to the post office box; the extended address;
@ -2139,19 +2138,25 @@ public class ExchangeSession {
if (noneMatch != null) {
propPatchMethod.setRequestHeader("If-None-Match", noneMatch);
}
try {
status = httpClient.executeMethod(propPatchMethod);
if (status == HttpStatus.SC_MULTI_STATUS) {
if (etag != null) {
LOGGER.debug("Updated contact " + href);
} else {
LOGGER.warn("Overwritten contact " + href);
MultiStatus responses = propPatchMethod.getResponseBodyAsMultiStatus();
if (responses.getResponses().length > 0) {
status = responses.getResponses()[0].getStatus()[0].getStatusCode();
}
if (status == HttpStatus.SC_CREATED) {
LOGGER.debug("Created contact " + href);
} else {
LOGGER.debug("Updated contact " + href);
}
status = HttpStatus.SC_CREATED;
} else {
LOGGER.warn("Unable to create or update contact " + status + ' ' + propPatchMethod.getStatusLine());
}
} catch (DavException e) {
LOGGER.error("Error in item create or update", e);
throw new IOException(e);
} finally {
propPatchMethod.releaseConnection();
}
@ -2161,8 +2166,15 @@ public class ExchangeSession {
status = HttpStatus.SC_FORBIDDEN;
}
itemResult.status = status;
if (propPatchMethod.getResponseHeader("GetETag") != null) {
itemResult.etag = propPatchMethod.getResponseHeader("GetETag").getValue();
// need to retrieve new etag
HeadMethod headMethod = new HeadMethod(URIUtil.encodePath(href));
try {
httpClient.executeMethod(headMethod);
if (headMethod.getResponseHeader("ETag") != null) {
itemResult.etag = headMethod.getResponseHeader("ETag").getValue();
}
} finally {
headMethod.releaseConnection();
}
return itemResult;
@ -3047,6 +3059,19 @@ public class ExchangeSession {
return events;
}
/**
* convert vcf extension to EML.
* @param itemName item name
* @return EML item name
*/
protected String convertItemNameToEML(String itemName) {
if (itemName.endsWith(".vcf")) {
return itemName.substring(0, itemName.length() - 3) + "EML";
} else {
return itemName;
}
}
/**
* Get item named eventName in folder
*
@ -3056,19 +3081,12 @@ public class ExchangeSession {
* @throws IOException on error
*/
public Item getItem(String folderPath, String itemName) throws IOException {
String itemPath;
// convert vcf extension to EML
if (itemName.endsWith(".vcf")) {
itemPath = folderPath + '/' + itemName.substring(0, itemName.length() - 3) + "EML";
} else {
itemPath = folderPath + '/' + itemName;
}
Item item;
try {
item = getItem(itemPath);
item = getItem(folderPath + '/' + convertItemNameToEML(itemName));
} catch (HttpNotFoundException hnfe) {
// failover for Exchange 2007 plus encoding issue
String decodedEventName = itemName.replaceAll("_xF8FF_", "/").replaceAll("_x003F_", "?").replaceAll("'", "''");
String decodedEventName = convertItemNameToEML(itemName).replaceAll("_xF8FF_", "/").replaceAll("_x003F_", "?").replaceAll("'", "''");
ExchangeSession.MessageList messages = searchMessages(folderPath, " AND \"DAV:displayname\"='" + decodedEventName + '\'');
if (!messages.isEmpty()) {
item = getItem(messages.get(0).getPermanentUrl());
@ -3107,12 +3125,12 @@ public class ExchangeSession {
* Delete event named eventName in folder
*
* @param folderPath Exchange folder path
* @param eventName event name
* @param itemName event name
* @return HTTP status
* @throws IOException on error
*/
public int deleteEvent(String folderPath, String eventName) throws IOException {
String eventPath = URIUtil.encodePath(folderPath + '/' + eventName);
public int deleteItem(String folderPath, String itemName) throws IOException {
String eventPath = URIUtil.encodePath(folderPath + '/' + convertItemNameToEML(itemName));
int status;
if (inboxUrl.endsWith(folderPath)) {
// do not delete calendar messages, mark read and processed