<!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>[12878] CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/caldav/datastore/scheduling</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/12878">12878</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-12 11:23:12 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure to normalize cu-address of organizer before comparisons. Also, always force SCHEDULE-AGENT to server
for hosted organizers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devtxdavcaldavdatastoreschedulingimplicitpy">CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/caldav/datastore/scheduling/implicit.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer52devtxdavcaldavdatastoreschedulingtesttest_implicitpy">CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/caldav/datastore/scheduling/test/test_implicit.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer52devtxdavcaldavdatastoreschedulingimplicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/caldav/datastore/scheduling/implicit.py (12877 => 12878)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/caldav/datastore/scheduling/implicit.py 2014-03-12 18:08:45 UTC (rev 12877)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/caldav/datastore/scheduling/implicit.py 2014-03-12 18:23:12 UTC (rev 12878)
</span><span class="lines">@@ -528,6 +528,8 @@
</span><span class="cx">
</span><span class="cx"> self.needs_sequence_change = False
</span><span class="cx">
</span><ins>+ self.coerceOrganizerScheduleAgent()
+
</ins><span class="cx"> # Check for a delete
</span><span class="cx"> if self.action == "remove":
</span><span class="cx">
</span><span class="lines">@@ -695,8 +697,15 @@
</span><span class="cx"> recurrence_reschedule = False
</span><span class="cx">
</span><span class="cx"> if checkOrganizerValue:
</span><del>- oldOrganizer = self.oldcalendar.getOrganizer()
- newOrganizer = self.calendar.getOrganizer()
</del><ins>+ def _normalizeCUAddress(addr):
+ if not addr.startswith("urn:uuid"):
+ principal = self.calendar_home.directoryService().recordWithCalendarUserAddress(addr)
+ if principal is not None:
+ addr = principal.canonicalCalendarUserAddress()
+ return addr
+
+ oldOrganizer = _normalizeCUAddress(self.oldcalendar.getOrganizer())
+ newOrganizer = _normalizeCUAddress(self.calendar.getOrganizer())
</ins><span class="cx"> if oldOrganizer != newOrganizer:
</span><span class="cx"> log.error("Cannot change ORGANIZER: UID:%s" % (self.uid,))
</span><span class="cx"> raise HTTPError(ErrorResponse(
</span><span class="lines">@@ -892,6 +901,15 @@
</span><span class="cx"> return changed
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def coerceOrganizerScheduleAgent(self):
+ """
+ Do not allow SCHEDULE-AGENT=CLIENT/NONE for organizers hosted by this server when they schedule. Coerce to
+ SCHEDULE-AGENT=SERVER.
+ """
+
+ self.calendar.removePropertyParameters("ORGANIZER", ("SCHEDULE-AGENT",))
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def coerceAttendeeScheduleAgent(self):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer52devtxdavcaldavdatastoreschedulingtesttest_implicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/caldav/datastore/scheduling/test/test_implicit.py (12877 => 12878)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/caldav/datastore/scheduling/test/test_implicit.py 2014-03-12 18:08:45 UTC (rev 12877)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/txdav/caldav/datastore/scheduling/test/test_implicit.py 2014-03-12 18:23:12 UTC (rev 12878)
</span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx"> from txdav.caldav.datastore.scheduling.scheduler import ScheduleResponseQueue
</span><span class="cx"> from txdav.caldav.datastore.test.util import buildCalendarStore, \
</span><span class="cx"> buildDirectoryRecord
</span><del>-from txdav.caldav.icalendarstore import AttendeeAllowedError
</del><ins>+from txdav.caldav.icalendarstore import AttendeeAllowedError, \
+ ComponentUpdateState
</ins><span class="cx"> from txdav.common.datastore.test.util import CommonCommonTests, populateCalendarsFrom
</span><span class="cx">
</span><span class="cx"> import hashlib
</span><span class="lines">@@ -1250,6 +1251,62 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_doImplicitScheduling_UpdateMailtoOrganizerEvent(self):
+ """
+ Test that doImplicitScheduling works when the existing calendar data contains a non-normalized
+ organizer calendar user address.
+ """
+
+ data1 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTAMP:20080601T120000Z
+DTSTART:20080601T120000Z
+DTEND:20080601T130000Z
+ORGANIZER;CN="User 01";SCHEDULE-AGENT=NONE:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+"""
+ data2 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTAMP:20080601T120000Z
+DTSTART:20080601T130000Z
+DTEND:20080601T140000Z
+ORGANIZER;CN="User 01";SCHEDULE-AGENT=NONE:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+"""
+ yield self._createCalendarObject(data1, "user01", "test.ics")
+
+ cobj = yield self.calendarObjectUnderTest(home="user01", name="test.ics")
+ yield cobj._setComponentInternal(Component.fromString(data1), internal_state=ComponentUpdateState.RAW)
+ yield self.commit()
+
+ cobj = yield self.calendarObjectUnderTest(home="user01", name="test.ics")
+ comp = yield cobj.component()
+ self.assertTrue(comp.getOrganizer().startswith("mailto:"))
+ self.assertFalse(comp.getOrganizerScheduleAgent())
+
+ cobj = yield self.calendarObjectUnderTest(home="user01", name="test.ics")
+ yield cobj.setComponent(Component.fromString(data2))
+ yield self.commit()
+
+ cobj = yield self.calendarObjectUnderTest(home="user01", name="test.ics")
+ comp = yield cobj.component()
+ self.assertTrue(comp.getOrganizer().startswith("urn:uuid:"))
+ self.assertTrue(comp.getOrganizerScheduleAgent())
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_doImplicitScheduling_AttendeeEventNoOrganizerEvent(self):
</span><span class="cx"> """
</span><span class="cx"> Test that doImplicitScheduling handles an attendee reply with no organizer event.
</span></span></pre>
</div>
</div>
</body>
</html>