<!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>[13261] CalendarServer/branches/release/CalendarServer-5.3-dev</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/13261">13261</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-11 10:25:39 -0700 (Fri, 11 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add accounting logging for invalid instance errors. Also tweak recently added accounting to use base64 encoding of UIDs.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer53devtwistedcaldavicalpy">CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer53devtwistedcaldavstdconfigpy">CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer53devtwistedcaldavtesttest_icalendarpy">CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/test/test_icalendar.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer53devtxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/caldav/datastore/scheduling/processing.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer53devtwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/ical.py (13260 => 13261)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/ical.py        2014-04-11 01:09:44 UTC (rev 13260)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/ical.py        2014-04-11 17:25:39 UTC (rev 13261)
</span><span class="lines">@@ -39,10 +39,12 @@
</span><span class="cx"> from twext.web2.stream import IStream
</span><span class="cx"> from twext.web2.dav.util import allDataFromStream
</span><span class="cx"> 
</span><ins>+from twistedcaldav.accounting import accountingEnabledForCategory, \
+    emitAccounting
</ins><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.dateops import timeRangesOverlap, normalizeForIndex, differenceDateTime, \
</span><span class="cx">     normalizeForExpand
</span><del>-from twistedcaldav.instance import InstanceList
</del><ins>+from twistedcaldav.instance import InstanceList, InvalidOverriddenInstanceError
</ins><span class="cx"> from txdav.caldav.datastore.scheduling.cuaddress import normalizeCUAddr
</span><span class="cx"> from twistedcaldav.timezones import hasTZ, TimezoneException
</span><span class="cx"> 
</span><span class="lines">@@ -1393,7 +1395,16 @@
</span><span class="cx"> 
</span><span class="cx">         # Set of instances to return
</span><span class="cx">         instances = InstanceList(ignoreInvalidInstances=ignoreInvalidInstances, normalizeFunction=normalizeFunction)
</span><del>-        instances.expandTimeRanges(componentSet, limit, lowerLimit=lowerLimit)
</del><ins>+        try:
+            instances.expandTimeRanges(componentSet, limit, lowerLimit=lowerLimit)
+        except InvalidOverriddenInstanceError as e:
+            if accountingEnabledForCategory(&quot;Invalid Instance&quot;):
+                emitAccounting(
+                    &quot;Invalid Instance&quot;,
+                    self.resourceUID().encode(&quot;base64&quot;)[:-1],
+                    &quot;{}\n\n{}&quot;.format(str(e), str(self)),
+                )
+            raise
</ins><span class="cx">         return instances
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer53devtwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/stdconfig.py (13260 => 13261)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/stdconfig.py        2014-04-11 01:09:44 UTC (rev 13260)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/stdconfig.py        2014-04-11 17:25:39 UTC (rev 13261)
</span><span class="lines">@@ -482,6 +482,7 @@
</span><span class="cx">         &quot;Implicit Errors&quot;: False,
</span><span class="cx">         &quot;AutoScheduling&quot;: False,
</span><span class="cx">         &quot;iSchedule&quot;: False,
</span><ins>+        &quot;Invalid Instance&quot;: False,
</ins><span class="cx">     },
</span><span class="cx">     &quot;AccountingPrincipals&quot;: [],
</span><span class="cx">     &quot;AccountingLogRoot&quot;   : &quot;accounting&quot;,
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer53devtwistedcaldavtesttest_icalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/test/test_icalendar.py (13260 => 13261)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/test/test_icalendar.py        2014-04-11 01:09:44 UTC (rev 13260)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/test/test_icalendar.py        2014-04-11 17:25:39 UTC (rev 13261)
</span><span class="lines">@@ -4231,6 +4231,64 @@
</span><span class="cx"> &quot;&quot;&quot;,
</span><span class="cx">             ),
</span><span class="cx">             (
</span><ins>+                &quot;3.4 - valid end of month&quot;,
+                &quot;&quot;&quot;BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:America/Chicago
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZNAME:CDT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZNAME:CST
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:12345-67890-1
+DTSTART;TZID=America/Chicago:20130830T100000
+DTEND;TZID=America/Chicago:20130830T110000
+CREATED:20130822T011010Z
+DTSTAMP:20131025T180410Z
+RRULE:FREQ=MONTHLY;INTERVAL=3
+SEQUENCE:8
+SUMMARY:Test
+END:VEVENT
+BEGIN:VEVENT
+UID:12345-67890-1
+RECURRENCE-ID;TZID=America/Chicago:20131130T100000
+DTSTART;TZID=America/Chicago:20131130T100000
+DTEND;TZID=America/Chicago:20131130T110000
+CREATED:20130822T011010Z
+DTSTAMP:20131025T180410Z
+SEQUENCE:8
+STATUS:CANCELLED
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR&quot;&quot;&quot;,
+                PyCalendarDateTime(2014, 8, 30, 10, 0, 0, PyCalendarTimezone(tzid=&quot;America/Chicago&quot;)),
+                &quot;&quot;&quot;BEGIN:VEVENT
+UID:12345-67890-1
+RECURRENCE-ID;TZID=America/Chicago:20140830T100000
+DTSTART;TZID=America/Chicago:20140830T100000
+DTEND;TZID=America/Chicago:20140830T110000
+CREATED:20130822T011010Z
+DTSTAMP:20131025T180410Z
+SEQUENCE:8
+SUMMARY:Test
+END:VEVENT
+&quot;&quot;&quot;,
+            ),
+            (
</ins><span class="cx">                 &quot;4.1 - invalid all-day simple&quot;,
</span><span class="cx">                 &quot;&quot;&quot;BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer53devtxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/caldav/datastore/scheduling/processing.py (13260 => 13261)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/caldav/datastore/scheduling/processing.py        2014-04-11 01:09:44 UTC (rev 13260)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/caldav/datastore/scheduling/processing.py        2014-04-11 17:25:39 UTC (rev 13261)
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx">                         &quot;AutoScheduling&quot;,
</span><span class="cx">                         self.recipient.principal,
</span><span class="cx">                         json.dumps(accounting) + &quot;\r\n&quot;,
</span><del>-                        filename=self.uid + &quot;.txt&quot;
</del><ins>+                        filename=self.uid.encode(&quot;base64&quot;)[:-1] + &quot;.txt&quot;
</ins><span class="cx">                 )
</span><span class="cx"> 
</span><span class="cx">                 # Only store inbox item when reply is not sent or always for users
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx">                             &quot;AutoScheduling&quot;,
</span><span class="cx">                             self.recipient.principal,
</span><span class="cx">                             json.dumps(accounting) + &quot;\r\n&quot;,
</span><del>-                            filename=self.uid + &quot;.txt&quot;
</del><ins>+                            filename=self.uid.encode(&quot;base64&quot;)[:-1] + &quot;.txt&quot;
</ins><span class="cx">                         )
</span><span class="cx"> 
</span><span class="cx">                     # Only store inbox item when reply is not sent or always for users
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx">                         &quot;AutoScheduling&quot;,
</span><span class="cx">                         self.recipient.principal,
</span><span class="cx">                         json.dumps(accounting) + &quot;\r\n&quot;,
</span><del>-                        filename=self.uid + &quot;.txt&quot;
</del><ins>+                        filename=self.uid.encode(&quot;base64&quot;)[:-1] + &quot;.txt&quot;
</ins><span class="cx">                     )
</span><span class="cx">                 if delete_original:
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>