<!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>[11873] 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/11873">11873</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2013-11-01 16:46:07 -0700 (Fri, 01 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge branch that separates iSchedule and podding behaviors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavextensionspy">CalendarServer/trunk/twistedcaldav/extensions.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingcaldavschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduledeliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduleremoteserverspy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/remoteservers.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduleresourcepy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduleschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_deliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingschedulerpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#CalendarServertrunk">CalendarServer/trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunk"></a>
<div class="propset"><h4>Property changes: CalendarServer/trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11612
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx"> + /CalDAVTester/trunk:11193-11198
</span><span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -636,11 +636,23 @@
</span><span class="cx"> addSystemEventTrigger("after", "startup", timezoneStdService.onStartup)
</span><span class="cx">
</span><span class="cx"> #
</span><del>- # iSchedule service
</del><ins>+ # iSchedule service for podding
</ins><span class="cx"> #
</span><ins>+ if config.Servers.Enabled:
+ log.info("Setting up iSchedule podding inbox resource: {cls}", cls=iScheduleResourceClass)
+
+ ischedule = iScheduleResourceClass(
+ root,
+ newStore,
+ podding=True
+ )
+ root.putChild(config.Servers.InboxName, ischedule)
+
+ #
+ # iSchedule service (not used for podding)
+ #
</ins><span class="cx"> if config.Scheduling.iSchedule.Enabled:
</span><del>- log.info("Setting up iSchedule inbox resource: {cls}",
- cls=iScheduleResourceClass)
</del><ins>+ log.info("Setting up iSchedule inbox resource: {cls}", cls=iScheduleResourceClass)
</ins><span class="cx">
</span><span class="cx"> ischedule = iScheduleResourceClass(
</span><span class="cx"> root,
</span><span class="lines">@@ -651,8 +663,7 @@
</span><span class="cx"> # Do DomainKey resources
</span><span class="cx"> DKIMUtils.validConfiguration(config)
</span><span class="cx"> if config.Scheduling.iSchedule.DKIM.Enabled:
</span><del>- log.info("Setting up domainkey resource: {res}",
- res=DomainKeyResource)
</del><ins>+ log.info("Setting up domainkey resource: {res}", res=DomainKeyResource)
</ins><span class="cx"> domain = config.Scheduling.iSchedule.DKIM.Domain if config.Scheduling.iSchedule.DKIM.Domain else config.ServerHostName
</span><span class="cx"> dk = DomainKeyResource(
</span><span class="cx"> domain,
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavextensionspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/extensions.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/extensions.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/twistedcaldav/extensions.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -494,13 +494,13 @@
</span><span class="cx"> size = child.contentLength()
</span><span class="cx"> lastModified = child.lastModified()
</span><span class="cx"> rtypes = []
</span><del>- fullrtype = child.resourceType()
</del><ins>+ fullrtype = child.resourceType() if hasattr(child, "resourceType") else None
</ins><span class="cx"> if fullrtype is not None:
</span><span class="cx"> for rtype in fullrtype.children:
</span><span class="cx"> rtypes.append(rtype.name)
</span><span class="cx"> if rtypes:
</span><span class="cx"> rtypes = "(%s)" % (", ".join(rtypes),)
</span><del>- if child.isCollection():
</del><ins>+ if child.isCollection() if hasattr(child, "isCollection") else False:
</ins><span class="cx"> contentType = rtypes
</span><span class="cx"> else:
</span><span class="cx"> mimeType = child.contentType()
</span><span class="lines">@@ -1004,6 +1004,7 @@
</span><span class="cx"> return tokens, context, applyTo, clientLimit, propElement
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def validateTokens(tokens):
</span><span class="cx"> """
</span><span class="cx"> Make sure there is at least one token longer than one character
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -806,9 +806,10 @@
</span><span class="cx"> # Support multiple hosts within a domain
</span><span class="cx"> #
</span><span class="cx"> "Servers" : {
</span><del>- "Enabled": False, # Multiple servers/partitions enabled or not
- "ConfigFile": "localservers.xml", # File path for server information
- "MaxClients": 5, # Pool size for connections to each partition
</del><ins>+ "Enabled": False, # Multiple servers/partitions enabled or not
+ "ConfigFile": "localservers.xml", # File path for server information
+ "MaxClients": 5, # Pool size for connections to each partition
+ "InboxName": "podding", # Name for top-level inbox resource
</ins><span class="cx"> },
</span><span class="cx"> "ServerPartitionID": "", # Unique ID for this server's partition instance.
</span><span class="cx">
</span><span class="lines">@@ -1045,9 +1046,10 @@
</span><span class="cx"> configDict = ConfigDict(configDict)
</span><span class="cx"> # Now check for Includes and parse and add each of those
</span><span class="cx"> if "Includes" in configDict:
</span><ins>+ configRoot = os.path.join(configDict.ServerRoot, configDict.ConfigRoot)
</ins><span class="cx"> for include in configDict.Includes:
</span><span class="cx"> # Includes are not relative to ConfigRoot
</span><del>- path = _expandPath(include)
</del><ins>+ path = _expandPath(fullServerPath(configRoot, include))
</ins><span class="cx"> if os.path.exists(path):
</span><span class="cx"> additionalDict = ConfigDict(self._parseConfigFromFile(path))
</span><span class="cx"> if additionalDict:
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingcaldavschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -101,6 +101,14 @@
</span><span class="cx"> "No principal for originator",
</span><span class="cx"> ))
</span><span class="cx"> else:
</span><ins>+ if not (originatorPrincipal.calendarsEnabled() and originatorPrincipal.thisServer()):
+ log.err("Originator not enabled or hosted on this server: %s" % (self.originator,))
+ raise HTTPError(self.errorResponse(
+ responsecode.FORBIDDEN,
+ self.errorElements["originator-denied"],
+ "Originator cannot be scheduled",
+ ))
+
</ins><span class="cx"> self.originator = LocalCalendarUser(self.originator, originatorPrincipal)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -127,7 +135,7 @@
</span><span class="cx"> else:
</span><span class="cx"> # Map recipient to their inbox
</span><span class="cx"> inbox = None
</span><del>- if principal.calendarsEnabled() and principal.thisServer():
</del><ins>+ if principal.calendarsEnabled():
</ins><span class="cx"> if principal.locallyHosted():
</span><span class="cx"> recipient_home = yield self.txn.calendarHomeWithUID(principal.uid, create=True)
</span><span class="cx"> if recipient_home:
</span><span class="lines">@@ -138,7 +146,7 @@
</span><span class="cx"> if inbox:
</span><span class="cx"> results.append(calendarUserFromPrincipal(recipient, principal, inbox))
</span><span class="cx"> else:
</span><del>- log.error("No schedule inbox for principal: %s" % (principal,))
</del><ins>+ log.error("Recipient not enabled for calendaring: %s" % (principal,))
</ins><span class="cx"> results.append(InvalidCalendarUser(recipient))
</span><span class="cx">
</span><span class="cx"> self.recipients = results
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduledeliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> class ScheduleViaISchedule(DeliveryService):
</span><span class="cx">
</span><span class="cx"> domainServerMap = {}
</span><ins>+ servermgr = None
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def serviceType(cls):
</span><span class="lines">@@ -82,9 +83,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def matchCalendarUserAddress(cls, cuaddr):
</span><span class="cx">
</span><del>- # TODO: here is where we would attempt service discovery based on the cuaddr.
-
- # Only handle mailtos:
</del><ins>+ # Handle mailtos:
</ins><span class="cx"> if cuaddr.lower().startswith("mailto:"):
</span><span class="cx"> domain = extractEmailDomain(cuaddr)
</span><span class="cx"> server = (yield cls.serverForDomain(domain))
</span><span class="lines">@@ -100,25 +99,30 @@
</span><span class="cx"> def serverForDomain(cls, domain):
</span><span class="cx"> if domain not in cls.domainServerMap:
</span><span class="cx">
</span><del>- # First check built-in list of remote servers
- servermgr = IScheduleServers()
- server = servermgr.mapDomain(domain)
- if server is not None:
- cls.domainServerMap[domain] = server
- else:
- # Lookup domain
- result = (yield lookupServerViaSRV(domain))
- if result is None:
</del><ins>+ if config.Scheduling.iSchedule.Enabled:
+
+ # First check built-in list of remote servers
+ if cls.servermgr is None:
+ cls.servermgr = IScheduleServers()
+ server = cls.servermgr.mapDomain(domain)
+ if server is not None:
+ cls.domainServerMap[domain] = server
+ else:
</ins><span class="cx"> # Lookup domain
</span><del>- result = (yield lookupServerViaSRV(domain, service="_ischedule"))
</del><ins>+ result = (yield lookupServerViaSRV(domain))
</ins><span class="cx"> if result is None:
</span><del>- cls.domainServerMap[domain] = None
</del><ins>+ # Lookup domain
+ result = (yield lookupServerViaSRV(domain, service="_ischedule"))
+ if result is None:
+ cls.domainServerMap[domain] = None
+ else:
+ # Create the iSchedule server record for this server
+ cls.domainServerMap[domain] = IScheduleServerRecord(uri="http://%s:%s/.well-known/ischedule" % result)
</ins><span class="cx"> else:
</span><span class="cx"> # Create the iSchedule server record for this server
</span><del>- cls.domainServerMap[domain] = IScheduleServerRecord(uri="http://%s:%s/.well-known/ischedule" % result)
- else:
- # Create the iSchedule server record for this server
- cls.domainServerMap[domain] = IScheduleServerRecord(uri="https://%s:%s/.well-known/ischedule" % result)
</del><ins>+ cls.domainServerMap[domain] = IScheduleServerRecord(uri="https://%s:%s/.well-known/ischedule" % result)
+ else:
+ cls.domainServerMap[domain] = None
</ins><span class="cx">
</span><span class="cx"> returnValue(cls.domainServerMap[domain])
</span><span class="cx">
</span><span class="lines">@@ -189,9 +193,12 @@
</span><span class="cx">
</span><span class="cx"> partition = recipient.principal.partitionURI()
</span><span class="cx"> if partition not in self.partitionedServers:
</span><del>- self.partitionedServers[partition] = IScheduleServerRecord(uri=joinURL(partition, "/ischedule"))
- self.partitionedServers[partition].unNormalizeAddresses = False
- self.partitionedServers[partition].moreHeaders.append(recipient.principal.server().secretHeader())
</del><ins>+ self.partitionedServers[partition] = IScheduleServerRecord(
+ uri=joinURL(partition, config.Servers.InboxName),
+ unNormalizeAddresses=False,
+ moreHeaders=[recipient.principal.server().secretHeader(), ],
+ podding=True,
+ )
</ins><span class="cx">
</span><span class="cx"> return self.partitionedServers[partition]
</span><span class="cx">
</span><span class="lines">@@ -203,9 +210,12 @@
</span><span class="cx">
</span><span class="cx"> serverURI = recipient.principal.serverURI()
</span><span class="cx"> if serverURI not in self.otherServers:
</span><del>- self.otherServers[serverURI] = IScheduleServerRecord(uri=joinURL(serverURI, "/ischedule"))
- self.otherServers[serverURI].unNormalizeAddresses = not recipient.principal.server().isImplicit
- self.otherServers[serverURI].moreHeaders.append(recipient.principal.server().secretHeader())
</del><ins>+ self.otherServers[serverURI] = IScheduleServerRecord(
+ uri=joinURL(serverURI, config.Servers.InboxName),
+ unNormalizeAddresses=not recipient.principal.server().isImplicit,
+ moreHeaders=[recipient.principal.server().secretHeader(), ],
+ podding=True,
+ )
</ins><span class="cx">
</span><span class="cx"> return self.otherServers[serverURI]
</span><span class="cx">
</span><span class="lines">@@ -222,6 +232,7 @@
</span><span class="cx"> self.refreshOnly = refreshOnly
</span><span class="cx"> self.headers = None
</span><span class="cx"> self.data = None
</span><ins>+ self.original_organizer = None
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -365,7 +376,8 @@
</span><span class="cx">
</span><span class="cx"> # The Originator must be the ORGANIZER (for a request) or ATTENDEE (for a reply)
</span><span class="cx"> originator = self.scheduler.organizer.cuaddr if self.scheduler.isiTIPRequest else self.scheduler.attendee
</span><del>- originator = normalizeCUAddress(originator, normalizationLookup, self.scheduler.txn.directoryService().recordWithCalendarUserAddress, toUUID=False)
</del><ins>+ if self.server.unNormalizeAddresses:
+ originator = normalizeCUAddress(originator, normalizationLookup, self.scheduler.txn.directoryService().recordWithCalendarUserAddress, toUUID=False)
</ins><span class="cx"> self.headers.addRawHeader("Originator", utf8String(originator))
</span><span class="cx"> self.sign_headers.append("Originator")
</span><span class="cx">
</span><span class="lines">@@ -414,15 +426,15 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if self.data is None:
</span><ins>+
</ins><span class="cx"> # Need to remap cuaddrs from urn:uuid
</span><del>- if self.server.unNormalizeAddresses and self.scheduler.method == "PUT":
- normalizedCalendar = self.scheduler.calendar.duplicate()
</del><ins>+ normalizedCalendar = self.scheduler.calendar.duplicate()
+ self.original_organizer = normalizedCalendar.getOrganizer()
+ if self.server.unNormalizeAddresses:
</ins><span class="cx"> normalizedCalendar.normalizeCalendarUserAddresses(
</span><span class="cx"> normalizationLookup,
</span><span class="cx"> self.scheduler.txn.directoryService().recordWithCalendarUserAddress,
</span><span class="cx"> toUUID=False)
</span><del>- else:
- normalizedCalendar = self.scheduler.calendar
</del><span class="cx">
</span><span class="cx"> # For VFREEBUSY we need to strip out ATTENDEEs that do not match the recipient list
</span><span class="cx"> if self.scheduler.isfreebusy:
</span><span class="lines">@@ -445,13 +457,12 @@
</span><span class="cx"> f = Factory()
</span><span class="cx"> f.protocol = HTTPClientProtocol
</span><span class="cx"> if ssl:
</span><del>- ep = GAIEndpoint(reactor, host, port,
- _configuredClientContextFactory())
</del><ins>+ ep = GAIEndpoint(reactor, host, port, _configuredClientContextFactory())
</ins><span class="cx"> else:
</span><span class="cx"> ep = GAIEndpoint(reactor, host, port)
</span><span class="cx"> proto = (yield ep.connect(f))
</span><span class="cx">
</span><del>- if config.Scheduling.iSchedule.DKIM.Enabled:
</del><ins>+ if not self.server.podding() and config.Scheduling.iSchedule.DKIM.Enabled:
</ins><span class="cx"> domain, selector, key_file, algorithm, useDNSKey, useHTTPKey, usePrivateExchangeKey, expire = DKIMUtils.getConfiguration(config)
</span><span class="cx"> request = DKIMRequest(
</span><span class="cx"> "POST",
</span><span class="lines">@@ -503,6 +514,14 @@
</span><span class="cx"> calendar_data = response.childOfType(CalendarData)
</span><span class="cx"> if calendar_data:
</span><span class="cx"> calendar_data = str(calendar_data)
</span><ins>+ if self.server.unNormalizeAddresses and self.original_organizer is not None:
+ # Need to restore original ORGANIZER value if it got unnormalized
+ calendar = Component.fromString(calendar_data)
+ organizers = calendar.getAllPropertiesInAnyComponent("ORGANIZER", depth=1)
+ for organizer in organizers:
+ organizer.setValue(self.original_organizer)
+ calendar_data = str(calendar)
+
</ins><span class="cx"> error = response.childOfType(Error)
</span><span class="cx"> if error:
</span><span class="cx"> error = error.children
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduleremoteserverspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/remoteservers.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/remoteservers.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/remoteservers.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> """
</span><span class="cx"> Contains server-to-server details.
</span><span class="cx"> """
</span><del>- def __init__(self, uri=None):
</del><ins>+ def __init__(self, uri=None, unNormalizeAddresses=True, moreHeaders=[], podding=False):
</ins><span class="cx"> """
</span><span class="cx"> @param recordType: record type for directory entry.
</span><span class="cx"> """
</span><span class="lines">@@ -148,8 +148,9 @@
</span><span class="cx"> self.allow_to = True
</span><span class="cx"> self.domains = []
</span><span class="cx"> self.client_hosts = []
</span><del>- self.unNormalizeAddresses = True
- self.moreHeaders = []
</del><ins>+ self.unNormalizeAddresses = unNormalizeAddresses
+ self.moreHeaders = moreHeaders
+ self._podding = podding
</ins><span class="cx">
</span><span class="cx"> if uri:
</span><span class="cx"> self.uri = uri
</span><span class="lines">@@ -160,6 +161,10 @@
</span><span class="cx"> return (self.ssl, self.host, self.port, self.path,)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def podding(self):
+ return self._podding
+
+
</ins><span class="cx"> def redirect(self, location):
</span><span class="cx"> """
</span><span class="cx"> Permanent redirect for the lifetime of this record.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduleresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> Extends L{DAVResource} to provide iSchedule inbox functionality.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, parent, store):
</del><ins>+ def __init__(self, parent, store, podding=False):
</ins><span class="cx"> """
</span><span class="cx"> @param parent: the parent resource of this one.
</span><span class="cx"> """
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx">
</span><span class="cx"> self.parent = parent
</span><span class="cx"> self._newStore = store
</span><ins>+ self._podding = podding
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def deadProperties(self):
</span><span class="lines">@@ -109,12 +110,12 @@
</span><span class="cx"> def render(self, request):
</span><span class="cx"> output = """<html>
</span><span class="cx"> <head>
</span><del>-<title>Server To Server Inbox Resource</title>
</del><ins>+<title>%(rtype)s Inbox Resource</title>
</ins><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<h1>Server To Server Inbox Resource.</h1>
</del><ins>+<h1>%(rtype)s Inbox Resource.</h1>
</ins><span class="cx"> </body
</span><del>-</html>"""
</del><ins>+</html>""" % {"rtype" : "Podding" if self._podding else "iSchedule", }
</ins><span class="cx">
</span><span class="cx"> response = Response(200, {}, output)
</span><span class="cx"> response.headers.setHeader("content-type", MimeType("text", "html"))
</span><span class="lines">@@ -126,7 +127,7 @@
</span><span class="cx"> The iSchedule GET method.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- if not request.args:
</del><ins>+ if not request.args or self._podding:
</ins><span class="cx"> # Do normal GET behavior
</span><span class="cx"> return self.render(request)
</span><span class="cx">
</span><span class="lines">@@ -220,7 +221,7 @@
</span><span class="cx"> txn = transactionFromRequest(request, self._newStore)
</span><span class="cx">
</span><span class="cx"> # This is a server-to-server scheduling operation.
</span><del>- scheduler = IScheduleScheduler(txn, None)
</del><ins>+ scheduler = IScheduleScheduler(txn, None, podding=self._podding)
</ins><span class="cx">
</span><span class="cx"> originator = self.loadOriginatorFromRequestHeaders(request)
</span><span class="cx"> recipients = self.loadRecipientsFromRequestHeaders(request)
</span><span class="lines">@@ -236,7 +237,8 @@
</span><span class="cx"> else:
</span><span class="cx"> yield txn.commit()
</span><span class="cx"> response = result.response()
</span><del>- response.headers.addRawHeader(ISCHEDULE_CAPABILITIES, str(config.Scheduling.iSchedule.SerialNumber))
</del><ins>+ if not self._podding:
+ response.headers.addRawHeader(ISCHEDULE_CAPABILITIES, str(config.Scheduling.iSchedule.SerialNumber))
</ins><span class="cx"> returnValue(response)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduleschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -119,6 +119,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class IScheduleScheduler(RemoteScheduler):
</span><ins>+ """
+ Handles iSchedule and podding requests.
+ """
</ins><span class="cx">
</span><span class="cx"> scheduleResponse = IScheduleResponseQueue
</span><span class="cx">
</span><span class="lines">@@ -138,6 +141,11 @@
</span><span class="cx"> "max-recipients": (ischedule_namespace, "max-recipients"),
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ def __init__(self, txn, originator_uid, logItems=None, noAttendeeRefresh=False, podding=False):
+ super(IScheduleScheduler, self).__init__(txn, originator_uid, logItems=logItems, noAttendeeRefresh=noAttendeeRefresh)
+ self._podding = podding
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def doSchedulingViaPOST(self, remoteAddr, headers, body, originator, recipients):
</span><span class="cx"> """
</span><span class="lines">@@ -148,7 +156,7 @@
</span><span class="cx"> self.headers = headers
</span><span class="cx"> self.verified = False
</span><span class="cx">
</span><del>- if config.Scheduling.iSchedule.DKIM.Enabled:
</del><ins>+ if not self._podding and config.Scheduling.iSchedule.DKIM.Enabled:
</ins><span class="cx"> verifier = DKIMVerifier(self.headers, body, protocol_debug=config.Scheduling.iSchedule.DKIM.ProtocolDebug)
</span><span class="cx"> try:
</span><span class="cx"> yield verifier.verify()
</span><span class="lines">@@ -174,11 +182,16 @@
</span><span class="cx">
</span><span class="cx"> calendar = Component.fromString(body)
</span><span class="cx">
</span><del>- if self.headers.getRawHeaders('x-calendarserver-itip-refreshonly', ("F"))[0] == "T":
</del><ins>+ if self._podding and self.headers.getRawHeaders('x-calendarserver-itip-refreshonly', ("F"))[0] == "T":
</ins><span class="cx"> self.txn.doing_attendee_refresh = 1
</span><span class="cx">
</span><span class="cx"> # Normalize recipient addresses
</span><del>- recipients = [normalizeCUAddress(recipient, normalizationLookup, self.txn.directoryService().recordWithCalendarUserAddress) for recipient in recipients]
</del><ins>+ results = []
+ for recipient in recipients:
+ normalized = normalizeCUAddress(recipient, normalizationLookup, self.txn.directoryService().recordWithCalendarUserAddress)
+ self.recipientsNormalizationMap[normalized] = recipient
+ results.append(normalized)
+ recipients = results
</ins><span class="cx">
</span><span class="cx"> result = (yield super(IScheduleScheduler, self).doSchedulingViaPOST(originator, recipients, calendar))
</span><span class="cx"> returnValue(result)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingischeduletesttest_deliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_delivery.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_delivery.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_delivery.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> Make sure we do an exact comparison on EmailDomain
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ self.patch(config.Scheduling.iSchedule, "Enabled", True)
</ins><span class="cx"> self.patch(config.Scheduling.iSchedule, "RemoteServers", "")
</span><span class="cx">
</span><span class="cx"> # Only mailtos:
</span><span class="lines">@@ -64,3 +65,9 @@
</span><span class="cx"> self.assertFalse(result)
</span><span class="cx"> result = yield ScheduleViaISchedule.matchCalendarUserAddress("mailto:user")
</span><span class="cx"> self.assertFalse(result)
</span><ins>+
+ # Test when not enabled
+ ScheduleViaISchedule.domainServerMap = {}
+ self.patch(config.Scheduling.iSchedule, "Enabled", False)
+ result = yield ScheduleViaISchedule.matchCalendarUserAddress("mailto:user@example.com")
+ self.assertFalse(result)
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingschedulerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py (11872 => 11873)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py 2013-11-01 23:21:53 UTC (rev 11872)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py 2013-11-01 23:46:07 UTC (rev 11873)
</span><span class="lines">@@ -142,6 +142,7 @@
</span><span class="cx">
</span><span class="cx"> self.originator = None
</span><span class="cx"> self.recipients = None
</span><ins>+ self.recipientsNormalizationMap = {}
</ins><span class="cx"> self.calendar = None
</span><span class="cx"> self.organizer = None
</span><span class="cx"> self.attendee = None
</span><span class="lines">@@ -232,51 +233,6 @@
</span><span class="cx"> returnValue(result)
</span><span class="cx">
</span><span class="cx">
</span><del>- @inlineCallbacks
- def loadFromRequestData(self):
- self.loadOriginatorFromRequestDetails()
- self.loadRecipientsFromCalendarData()
-
-
- def loadOriginatorFromRequestDetails(self):
- # Get the originator who is the authenticated user
- originatorPrincipal = self.txn.directoryService().recordWithUID(self.originator_uid)
-
- # Pick the canonical CUA:
- originator = originatorPrincipal.canonicalCalendarUserAddress() if originatorPrincipal else ""
-
- if not originator:
- log.error("%s request must have Originator" % (self.method,))
- raise HTTPError(self.errorResponse(
- responsecode.FORBIDDEN,
- self.errorElements["originator-missing"],
- "Missing originator",
- ))
- else:
- self.originator = originator
-
-
- def loadRecipientsFromCalendarData(self):
-
- # Get the ATTENDEEs
- attendees = list()
- unique_set = set()
- for attendee, _ignore in self.calendar.getAttendeesByInstance():
- if attendee not in unique_set:
- attendees.append(attendee)
- unique_set.add(attendee)
-
- if not attendees:
- log.error("%s request must have at least one Recipient" % (self.method,))
- raise HTTPError(self.errorResponse(
- responsecode.FORBIDDEN,
- self.errorElements["recipient-missing"],
- "Must have recipients",
- ))
- else:
- self.recipients = list(attendees)
-
-
</del><span class="cx"> def preProcessCalendarData(self):
</span><span class="cx"> """
</span><span class="cx"> After loading calendar data from the request, do some optional processing of it. This method will be
</span><span class="lines">@@ -474,7 +430,7 @@
</span><span class="cx"> freebusy = self.checkForFreeBusy()
</span><span class="cx">
</span><span class="cx"> # Prepare for multiple responses
</span><del>- responses = self.scheduleResponse(self.method, responsecode.OK)
</del><ins>+ responses = self.scheduleResponse(self.method, responsecode.OK, self.mapRecipientAddress)
</ins><span class="cx">
</span><span class="cx"> # Loop over each recipient and aggregate into lists by service types.
</span><span class="cx"> caldav_recipients = []
</span><span class="lines">@@ -577,7 +533,11 @@
</span><span class="cx"> return requestor.generateSchedulingResponses()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def mapRecipientAddress(self, cuaddr):
+ return self.recipientsNormalizationMap.get(cuaddr, cuaddr)
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class RemoteScheduler(Scheduler):
</span><span class="cx">
</span><span class="cx"> def checkOrganizer(self):
</span><span class="lines">@@ -703,7 +663,7 @@
</span><span class="cx"> response_description_element = davxml.ResponseDescription
</span><span class="cx"> calendar_data_element = caldavxml.CalendarData
</span><span class="cx">
</span><del>- def __init__(self, method, success_response):
</del><ins>+ def __init__(self, method, success_response, recipient_mapper=None):
</ins><span class="cx"> """
</span><span class="cx"> @param method: the name of the method generating the queue.
</span><span class="cx"> @param success_response: the response to return in lieu of a
</span><span class="lines">@@ -712,6 +672,7 @@
</span><span class="cx"> self.responses = []
</span><span class="cx"> self.method = method
</span><span class="cx"> self.success_response = success_response
</span><ins>+ self.recipient_mapper = recipient_mapper
</ins><span class="cx"> self.location = None
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -745,6 +706,9 @@
</span><span class="cx"> else:
</span><span class="cx"> raise AssertionError("Unknown data type: %r" % (what,))
</span><span class="cx">
</span><ins>+ if self.recipient_mapper is not None:
+ recipient = self.recipient_mapper(recipient)
+
</ins><span class="cx"> if not suppressErrorLog and code > 400: # Error codes only
</span><span class="cx"> self.log.error("Error during %s for %s: %s" % (self.method, recipient, message))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>