<!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>[14651] CalendarServer/trunk/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/14651">14651</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-02 13:29:03 -0700 (Thu, 02 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename and change the UID of an unscheduled event, if a scheduled one with the same UID is delivered via iTIP.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_implicitpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py (14650 => 14651)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-04-02 20:28:05 UTC (rev 14650)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-04-02 20:29:03 UTC (rev 14651)
</span><span class="lines">@@ -366,6 +366,24 @@
</span><span class="cx"> log.debug("ImplicitProcessing - originator '%s' to recipient '%s' ignoring UID: '%s' - organizer has no copy" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
</span><span class="cx"> raise ImplicitProcessorException("5.3;Organizer change not allowed")
</span><span class="cx">
</span><ins>+ # For a missing existing organizer we don't know for sure that the existing event came from the originator - it could be spoofed
+ # by the originator to have the same UID as the existing event which it would overwrite. Instead what we will do is rename and
+ # change the UID of the original event to preserve it and let the user resolve the "duplicate" conflict that results.
+ if not existing_organizer:
+ # Copy the raw (including per-user) data of the original, change its UID and write out a new resource
+ changed_calendar = (yield self.recipient_calendar_resource.component()).duplicate()
+ changed_calendar.replacePropertyInAllComponents(Property("UID", str(uuid.uuid4())))
+ name = "%s-%s.ics" % (hashlib.md5(changed_calendar.resourceUID()).hexdigest(), str(uuid.uuid4())[:8],)
+ yield self.recipient_calendar_resource.parentCollection()._createCalendarObjectWithNameInternal(name, changed_calendar, ComponentUpdateState.RAW)
+
+ # Delete the original resource
+ yield self.recipient_calendar_resource.remove(implicitly=False, bypassTrash=True)
+
+ # Reset state to make it look like a new iTIP being processed
+ self.recipient_calendar = None
+ self.recipient_calendar_resource = None
+ self.new_resource = True
+
</ins><span class="cx"> # Handle splitting of data early so we can preserve per-attendee data
</span><span class="cx"> if self.message.hasProperty("X-CALENDARSERVER-SPLIT-OLDER-UID"):
</span><span class="cx"> if config.Scheduling.Options.Splitting.Enabled:
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingtesttest_implicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py (14650 => 14651)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py 2015-04-02 20:28:05 UTC (rev 14650)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py 2015-04-02 20:29:03 UTC (rev 14651)
</span><span class="lines">@@ -2018,9 +2018,15 @@
</span><span class="cx"> yield cobj.setComponent(Component.fromString(self.organizer_update_data))
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><del>- cobj = yield self.calendarObjectUnderTest(home="user02", name="attendee2.ics")
- comp = yield cobj.component()
- self.assertTrue(comp.getOrganizer() is not None)
</del><ins>+ cal = yield self.calendarUnderTest(home="user02")
+ cobjs = yield cal.calendarObjects()
+ self.assertTrue(len(cobjs) == 2)
+ for cobj in cobjs:
+ comp = yield cobj.component()
+ if comp.resourceUID() == "event1@ninevah.local":
+ self.assertTrue(comp.getOrganizer() is not None)
+ else:
+ self.assertTrue(comp.getOrganizer() is None)
</ins><span class="cx">
</span><span class="cx"> inbox = yield self.calendarUnderTest(home="user02", name="inbox")
</span><span class="cx"> cobjs = yield inbox.calendarObjects()
</span></span></pre>
</div>
</div>
</body>
</html>