<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14993] CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14993">14993</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-24 11:41:36 -0700 (Fri, 24 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Repair certain inbound third-party IMIP mistakes so we can continue to process them.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_inboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py (14992 => 14993)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2015-07-24 17:15:32 UTC (rev 14992)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2015-07-24 18:41:36 UTC (rev 14993)
</span><span class="lines">@@ -188,6 +188,30 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+def sanitizeCalendar(calendar):
+ """
+ Clean up specific issues seen in the wild from third party IMIP capable
+ servers.
+
+ @param calendar: the calendar Component to sanitize
+ @type calendar: L{Component}
+ """
+ # Don't let a missing PRODID prevent the reply from being processed
+ if not calendar.hasProperty("PRODID"):
+ calendar.addProperty(
+ Property(
+ "PRODID", "Unknown"
+ )
+ )
+
+ # For METHOD:REPLY we can remove STATUS properties
+ methodProperty = calendar.getProperty("METHOD")
+ if methodProperty is not None:
+ if methodProperty.value() == "REPLY":
+ calendar.removeAllPropertiesWithName("STATUS")
+
+
+
</ins><span class="cx"> class MailReceiver(object):
</span><span class="cx">
</span><span class="cx"> NO_TOKEN = 0
</span><span class="lines">@@ -400,13 +424,7 @@
</span><span class="cx"> calendar = Component.fromString(calBody)
</span><span class="cx"> event = calendar.mainComponent()
</span><span class="cx">
</span><del>- # Don't let a missing PRODID prevent the reply from being processed
- if not calendar.hasProperty("PRODID"):
- calendar.addProperty(
- Property(
- "PRODID", "Unknown"
- )
- )
</del><ins>+ sanitizeCalendar(calendar)
</ins><span class="cx">
</span><span class="cx"> calendar.removeAllButOneAttendee(record.attendee)
</span><span class="cx"> organizerProperty = calendar.getOrganizerProperty()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_inboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py (14992 => 14993)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py 2015-07-24 17:15:32 UTC (rev 14992)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py 2015-07-24 18:41:36 UTC (rev 14993)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> from txdav.caldav.datastore.scheduling.imip.inbound import injectMessage
</span><span class="cx"> from txdav.caldav.datastore.scheduling.imip.inbound import shouldDeleteAllMail
</span><span class="cx"> from txdav.caldav.datastore.scheduling.imip.inbound import IMAP4DownloadProtocol
</span><ins>+from txdav.caldav.datastore.scheduling.imip.inbound import sanitizeCalendar
</ins><span class="cx"> from txdav.common.datastore.test.util import CommonCommonTests
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.jobqueue import JobItem
</span><span class="lines">@@ -484,7 +485,35 @@
</span><span class="cx"> self.assertTrue(result is None)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_sanitizeCalendar(self):
+ """
+ Verify certain inbound third party mistakes are corrected.
+ """
</ins><span class="cx">
</span><ins>+ data = """BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REPLY
+BEGIN:VEVENT
+UID:12345-67890
+DTSTAMP:20130208T120000Z
+DTSTART:20180601T120000Z
+DTEND:20180601T130000Z
+ORGANIZER:urn:x-uid:user01
+ATTENDEE:mailto:xyzzy@example.com;PARTSTAT=ACCEPTED
+STATUS:ACCEPTED
+STATUS:ACCEPTED
+END:VEVENT
+END:VCALENDAR
+"""
+ calendar = Component.fromString(data)
+ sanitizeCalendar(calendar)
+ self.assertTrue(calendar.hasProperty("PRODID"))
+ self.assertFalse(calendar.hasProperty("STATUS"))
+
+
+
+
+
</ins><span class="cx"> class StubFactory(object):
</span><span class="cx">
</span><span class="cx"> def __init__(self, actionTaken, deleteAllMail):
</span></span></pre>
</div>
</div>
</body>
</html>