<!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>[13469] CalendarServer/trunk</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/13469">13469</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-05-13 13:55:17 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Decorate ATTENDEE properties with a parameter indicating their hosted status (e.g. local or external). Currently off by default.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (13468 => 13469)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-05-09 23:38:16 UTC (rev 13468)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-05-13 20:55:17 UTC (rev 13469)
</span><span class="lines">@@ -639,6 +639,19 @@
</span><span class="cx">
</span><span class="cx"> "RemoveDuplicatePrivateComments": False, # Remove duplicate private comments on PUT
</span><span class="cx">
</span><ins>+ "HostedStatus": {
+ "Enabled": False, # Decorate ATTENDEEs with the following parameter
+ # to indicate where the ATTENDEE is hosted, locally
+ # or externally. It's configurable and extensible in
+ # case we want to add more values. A value of empty
+ # string means no decoration.
+ "Parameter": "X-APPLE-HOSTED-STATUS",
+ "Values": {
+ "local": "",
+ "external": "EXTERNAL",
+ },
+ },
+
</ins><span class="cx"> "RevisionCleanup": {
</span><span class="cx"> "Enabled": True,
</span><span class="cx"> "SyncTokenLifetimeDays" : 14.0, # Number of days that a client sync report token is valid
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13468 => 13469)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-05-09 23:38:16 UTC (rev 13468)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-05-13 20:55:17 UTC (rev 13469)
</span><span class="lines">@@ -2428,6 +2428,33 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def decorateHostedStatus(self, component):
+ """
+ Scan the component for attendees; if any are hosted externally (e.g.
+ they don't exist in our directory) add the attribute:
+ X-APPLE-HOSTED-STATUS=EXTERNAL
+ """
+ dir = self.directoryService()
+ for sub in component.subcomponents():
+ for attendee in sub.getAllAttendeeProperties():
+ value = attendee.value()
+
+ record = yield dir.recordWithCalendarUserAddress(value)
+ if record is None:
+ status = "external"
+ else:
+ status = "local"
+
+ if config.HostedStatus.Values[status]:
+ attendee.setParameter(
+ config.HostedStatus.Parameter,
+ config.HostedStatus.Values[status]
+ )
+ else:
+ attendee.removeParameter(config.HostedStatus.Parameter)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def doImplicitScheduling(self, component, inserting, internal_state, split_details=None):
</span><span class="cx">
</span><span class="cx"> new_component = None
</span><span class="lines">@@ -2673,6 +2700,10 @@
</span><span class="cx"> # Process structured location
</span><span class="cx"> yield self.addStructuredLocation(component)
</span><span class="cx">
</span><ins>+ # Process hosted status
+ if config.HostedStatus.Enabled:
+ yield self.decorateHostedStatus(component)
+
</ins><span class="cx"> # Do scheduling
</span><span class="cx"> implicit_result = (yield self.doImplicitScheduling(component, inserting, internal_state))
</span><span class="cx"> if isinstance(implicit_result, int):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (13468 => 13469)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-05-09 23:38:16 UTC (rev 13468)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-05-13 20:55:17 UTC (rev 13469)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx">
</span><span class="cx"> import datetime
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CalendarSQLStorageTests(CalendarCommonTests, unittest.TestCase):
</span><span class="cx"> """
</span><span class="cx"> Calendar SQL storage tests.
</span><span class="lines">@@ -2223,7 +2224,58 @@
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_setComponent_externalPrincipal(self):
+ """
+ Verify attendees who are not locally hosted have X-APPLE-HOSTED-STATUS=EXTERNAL
+ attribute added.
+ """
</ins><span class="cx">
</span><ins>+ data = """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Apple Inc.//Mac OS X 10.9.1//EN
+BEGIN:VEVENT
+UID:561F5DBB-3F38-4B3A-986F-DD05CBAF554F
+DTSTART;TZID=America/Los_Angeles:20131211T164500
+DTEND;TZID=America/Los_Angeles:20131211T174500
+ATTENDEE;X-APPLE-HOSTED-STATUS=EXTERNAL:urn:x-uid:user01
+ATTENDEE:mailto:someone_external@example.com
+CREATED:20131211T221854Z
+DTSTAMP:20131211T230632Z
+ORGANIZER:urn:x-uid:user01
+SUMMARY:external
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n")
+
+ self.patch(config.HostedStatus, "Enabled", True)
+
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
+ yield calendar.createCalendarObjectWithName("external.ics",
+ Component.fromString(data))
+ cobj = yield self.calendarObjectUnderTest(name="external.ics",
+ calendar_name="calendar", home="user01")
+ comp = yield cobj.component()
+ components = list(comp.subcomponents())
+
+ # Check attendees...
+
+ # The local user will have the X-APPLE-HOSTED-STATUS param removed...
+ local = components[0].getAttendeeProperty(["urn:x-uid:user01"])
+ self.assertFalse(local.hasParameter(config.HostedStatus.Parameter))
+
+ # The external one will have it added...
+ external = components[0].getAttendeeProperty(["mailto:someone_external@example.com"])
+ self.assertEquals(
+ external.parameterValue(config.HostedStatus.Parameter),
+ config.HostedStatus.Values["external"]
+ )
+
+ yield self.commit()
+
+
+
</ins><span class="cx"> class CalendarObjectSplitting(CommonCommonTests, unittest.TestCase):
</span><span class="cx"> """
</span><span class="cx"> CalendarObject splitting tests
</span></span></pre>
</div>
</div>
</body>
</html>