moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 03:02:22 -05:00
Code Issues Releases Wiki Activity

Caldav: workaround for Exchange 2010 bug, \n in timezone name generates invalid ICS content

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1598 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2011-01-06 09:33:36 +00:00
parent a00d322599
commit 6cad2e318e
4 changed files with 99 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/davmail/exchange/ICSBufferedReader.java
View File

@ -51,8 +51,16 @@ public class ICSBufferedReader extends BufferedReader {
currentLine.setLength(0);
currentLine.append(nextLine);
nextLine = super.readLine();
while (nextLine != null && !(nextLine.length() == 0) && nextLine.charAt(0) == ' ') {
currentLine.append(nextLine.substring(1));
while (nextLine != null && !(nextLine.length() == 0) &&
(nextLine.charAt(0) == ' '
// workaround for Exchange 2010 bug
|| nextLine.charAt(0) == ':')) {
// Timezone ends with \n => next line starts with :
if (nextLine.charAt(0) == ':') {
currentLine.append(nextLine);
} else {
currentLine.append(nextLine.substring(1));
}
nextLine = super.readLine();
}
return currentLine.toString();

8
src/java/davmail/exchange/VCalendar.java
View File

@ -150,11 +150,17 @@ public class VCalendar extends VObject {
VObject vObject = getVTimezone();
if (vObject != null) {
String currentTzid = vObject.getPropertyValue("TZID");
// fix TZID with \n (Exchange 2010 bug)
if (currentTzid != null && currentTzid.endsWith("\n")) {
currentTzid = currentTzid.substring(0, currentTzid.length() - 1);
vObject.setPropertyValue("TZID", currentTzid);
}
if (currentTzid != null && currentTzid.indexOf(' ') >= 0) {
try {
tzid = ResourceBundle.getBundle("timezones").getString(currentTzid);
vObject.setPropertyValue("TZID", tzid);
} catch (MissingResourceException e) {
LOGGER.debug("Timezone rename failed, timezone " + currentTzid + " not found in table");
LOGGER.debug("Timezone " + currentTzid + " not found in rename table");
}
}
}

6
src/java/davmail/exchange/VProperty.java
View File

@ -147,7 +147,11 @@ public class VProperty {
state = State.VALUE;
}
}
addValue(line.substring(startIndex));
if (state == State.VALUE) {
addValue(line.substring(startIndex));
} else {
throw new IllegalArgumentException("Invalid property line: "+line);
}
}
}

77
src/test/davmail/exchange/TestExchangeSessionEvent.java
View File

@ -308,4 +308,81 @@ public class TestExchangeSessionEvent extends TestCase {
System.out.println(toServer);
}
public void testFloatingTimezone() throws IOException {
String itemBody = "BEGIN:VCALENDAR\n" +
"PRODID:Microsoft CDO for Microsoft Exchange\n" +
"VERSION:2.0\n" +
"BEGIN:VTIMEZONE\n" +
"TZID:Pacific Time (US & Canada)\\; Tijuana\n" +
"BEGIN:STANDARD\n" +
"DTSTART:16010101T030000\n" +
"TZOFFSETFROM:-0700\n" +
"TZOFFSETTO:-0800\n" +
"RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1;BYMONTH=11;BYDAY=1SU\n" +
"END:STANDARD\n" +
"BEGIN:DAYLIGHT\n" +
"DTSTART:16010101T010000\n" +
"TZOFFSETFROM:-0800\n" +
"TZOFFSETTO:-0700\n" +
"RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1;BYMONTH=3;BYDAY=2SU\n" +
"END:DAYLIGHT\n" +
"END:VTIMEZONE" +
"BEGIN:VEVENT\n" +
"END:VEVENT\n" +
"END:VCALENDAR";
String toServer = fixICS(itemBody, true);
System.out.println(toServer);
}
public void testAnotherBroken() throws IOException {
String icsBody = "BEGIN:VCALENDAR\n" +
"METHOD:PUBLISH\n" +
"PRODID:Microsoft Exchange Server 2010\n" +
"VERSION:2.0\n" +
"BEGIN:VTIMEZONE\n" +
"TZID:GMT -0800 (Standard) / GMT -0700 (Daylight)\\n\n" +
"BEGIN:STANDARD\n" +
"DTSTART:16010101T020000\n" +
"TZOFFSETFROM:-0700\n" +
"TZOFFSETTO:-0800\n" +
"RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=11\n" +
"END:STANDARD\n" +
"BEGIN:DAYLIGHT\n" +
"DTSTART:16010101T020000\n" +
"TZOFFSETFROM:-0800\n" +
"TZOFFSETTO:-0700\n" +
"RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=2SU;BYMONTH=3\n" +
"END:DAYLIGHT\n" +
"END:VTIMEZONE\n" +
"BEGIN:VEVENT\n" +
"ORGANIZER;CN=John Doe:MAILTO:aTargetAddress@dummy.com\n" +
"DESCRIPTION;LANGUAGE=en-US:Look over broken timezone.\\n\n" +
"SUMMARY;LANGUAGE=en-US:meeting\n" +
"DTSTART;TZID=GMT -0800 (Standard) / GMT -0700 (Daylight)\n" +
":20060210T130000\n" +
"DTEND;TZID=GMT -0800 (Standard) / GMT -0700 (Daylight)\n" +
":20060210T143000\n" +
"UID:040000008200E00074C5B7101A82E00800000000D01FF309972CC601000000000000000\n" +
" 010000000B389A3C5092D7640A06D2EF5A2125577\n" +
"CLASS:PUBLIC\n" +
"PRIORITY:5\n" +
"DTSTAMP:20060208T180425Z\n" +
"TRANSP:OPAQUE\n" +
"STATUS:CONFIRMED\n" +
"SEQUENCE:0\n" +
"LOCATION;LANGUAGE=en-US:not sure\n" +
"X-MICROSOFT-CDO-APPT-SEQUENCE:0\n" +
"X-MICROSOFT-CDO-OWNERAPPTID:1602758614\n" +
"X-MICROSOFT-CDO-BUSYSTATUS:BUSY\n" +
"X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY\n" +
"X-MICROSOFT-CDO-ALLDAYEVENT:FALSE\n" +
"X-MICROSOFT-CDO-IMPORTANCE:1\n" +
"X-MICROSOFT-CDO-INSTTYPE:0\n" +
"X-MICROSOFT-DISALLOW-COUNTER:FALSE\n" +
"END:VEVENT\n" +
"END:VCALENDAR";
String toClient = fixICS(icsBody, true);
System.out.println(toClient);
}
}