<!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>[15192] CalendarServer/branches/release/CalendarServer-5.4-dev/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/15192">15192</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-15 11:53:04 -0700 (Thu, 15 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix failure to send iMIP messages.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimipdeliverypy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/delivery.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimiptesttest_deliverypy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimipdeliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/delivery.py (15191 => 15192)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/delivery.py 2015-10-14 18:40:31 UTC (rev 15191)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/delivery.py 2015-10-15 18:53:04 UTC (rev 15192)
</span><span class="lines">@@ -103,19 +103,20 @@
</span><span class="cx"> log.debug("Submitting iMIP message... To: '%s', From :'%s'\n%s" % (toAddr, fromAddr, caldata,))
</span><span class="cx">
</span><span class="cx"> def enqueueOp(txn):
</span><del>- return txn.enqueue(IMIPInvitationWork, fromAddr=fromAddr,
- toAddr=toAddr, icalendarText=caldata)
</del><ins>+ return txn.enqueue(
+ IMIPInvitationWork, fromAddr=fromAddr,
+ toAddr=toAddr, icalendarText=caldata
+ )
</ins><span class="cx">
</span><span class="cx"> yield inTransaction(
</span><del>- lambda: self.scheduler.txn.store().newTransaction(
- "Submitting iMIP message for UID: %s" % (
- self.scheduler.calendar.resourceUID(),)),
- enqueueOp
</del><ins>+ self.scheduler.txn.store().newTransaction,
+ enqueueOp,
+ label="Submitting iMIP message for UID: %s" % (self.scheduler.calendar.resourceUID(),)
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> except Exception, e:
</span><span class="cx"> # Generated failed response for this recipient
</span><del>- log.debug("iMIP request %s failed for recipient %s: %s" % (self, recipient, e))
</del><ins>+ log.error("iMIP request %s failed for recipient %s: %s" % (self, recipient, e))
</ins><span class="cx"> failForRecipient(recipient)
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="lines">@@ -127,6 +128,6 @@
</span><span class="cx">
</span><span class="cx"> except Exception, e:
</span><span class="cx"> # Generated failed responses for each recipient
</span><del>- log.debug("iMIP request %s failed: %s" % (self, e))
</del><ins>+ log.error("iMIP request %s failed: %s" % (self, e))
</ins><span class="cx"> for recipient in self.recipients:
</span><span class="cx"> failForRecipient(recipient)
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimiptesttest_deliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py (15191 => 15192)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py 2015-10-14 18:40:31 UTC (rev 15191)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py 2015-10-15 18:53:04 UTC (rev 15192)
</span><span class="lines">@@ -16,25 +16,50 @@
</span><span class="cx">
</span><span class="cx"> from twext.web2 import responsecode
</span><span class="cx">
</span><del>-from twisted.internet.defer import inlineCallbacks
</del><ins>+from twisted.internet.defer import inlineCallbacks, succeed
</ins><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.ical import Component
</span><span class="cx">
</span><del>-from txdav.caldav.datastore.scheduling.cuaddress import RemoteCalendarUser
</del><ins>+from txdav.caldav.datastore.scheduling.cuaddress import RemoteCalendarUser, \
+ LocalCalendarUser
</ins><span class="cx"> from txdav.caldav.datastore.scheduling.imip.delivery import ScheduleViaIMip
</span><span class="cx"> from txdav.caldav.datastore.scheduling.itip import iTIPRequestStatus
</span><span class="cx"> from txdav.caldav.datastore.scheduling.scheduler import ScheduleResponseQueue
</span><ins>+from txdav.caldav.datastore.scheduling.imip.outbound import IMIPInvitationWork
+from txdav.common.datastore.test.util import CommonCommonTests
+from txdav.caldav.datastore.test.util import buildCalendarStore
</ins><span class="cx">
</span><del>-class iMIPProcessing (unittest.TestCase):
</del><ins>+class iMIPProcessing (CommonCommonTests, unittest.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> iCalendar support tests
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def setUp(self):
+ yield super(iMIPProcessing, self).setUp()
+ self._sqlCalendarStore = yield buildCalendarStore(self, self.notifierFactory)
+
+ self.wp = None
+ self._sqlCalendarStore.queuer.callWithNewProposals(self._proposalCallback)
+
+
+ def _proposalCallback(self, wp):
+ self.wp = wp
+
+
+ def storeUnderTest(self):
+ """
+ Create and return a L{CalendarStore} for testing.
+ """
+ return self._sqlCalendarStore
+
+
</ins><span class="cx"> class FakeSchedule(object):
</span><span class="cx">
</span><del>- def __init__(self, calendar):
</del><ins>+ def __init__(self, originator, calendar):
+ self.originator = originator
</ins><span class="cx"> self.calendar = calendar
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -56,7 +81,10 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><span class="cx">
</span><del>- scheduler = iMIPProcessing.FakeSchedule(Component.fromString(data))
</del><ins>+ scheduler = iMIPProcessing.FakeSchedule(
+ LocalCalendarUser("mailto:user1@example.com", None),
+ Component.fromString(data)
+ )
</ins><span class="cx"> recipients = (RemoteCalendarUser("mailto:user1@example.com"),)
</span><span class="cx"> responses = ScheduleResponseQueue("REQUEST", responsecode.OK)
</span><span class="cx">
</span><span class="lines">@@ -68,6 +96,51 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_iMIP_delivery(self):
+
+ data = """BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REQUEST
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DTEND:20080601T130000Z
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.org
+END:VEVENT
+END:VCALENDAR
+"""
+
+ results = []
+ class FakeSender(object):
+ def outbound(self, txn, fromAddr, toAddr, calendar):
+ results.append((fromAddr, toAddr))
+ return succeed(None)
+ self.patch(IMIPInvitationWork, "mailSender", FakeSender())
+
+ scheduler = iMIPProcessing.FakeSchedule(
+ LocalCalendarUser("mailto:user1@example.com", None),
+ Component.fromString(data)
+ )
+ scheduler.txn = self.transactionUnderTest()
+ recipients = (RemoteCalendarUser("mailto:user2@example.org"),)
+ responses = ScheduleResponseQueue("REQUEST", responsecode.OK)
+
+ delivery = ScheduleViaIMip(scheduler, recipients, responses, False)
+ yield delivery.generateSchedulingResponses()
+
+ self.assertEqual(len(responses.responses), 1)
+ self.assertEqual(str(responses.responses[0].children[1]), iTIPRequestStatus.MESSAGE_SENT)
+
+ yield self.wp.whenExecuted()
+
+ self.assertEqual(len(results), 1)
+ self.assertEqual(results[0], ("mailto:user1@example.com", "mailto:user2@example.org",))
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_matchCalendarUserAddress(self):
</span><span class="cx"> # iMIP not sensitive to case:
</span><span class="cx"> self.patch(config.Scheduling[ScheduleViaIMip.serviceType()], "AddressPatterns", ["mailto:.*"])
</span></span></pre>
</div>
</div>
</body>
</html>