<!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>[15552] 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/15552">15552</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-04-25 15:07:02 -0700 (Mon, 25 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure ATTACH managed parameters cannot be inadvertently removed by a client</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_attachmentspy">CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (15551 => 15552)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2016-04-25 22:05:51 UTC (rev 15551)
+++ CalendarServer/trunk/requirements-dev.txt 2016-04-25 22:07:02 UTC (rev 15552)
</span><span class="lines">@@ -5,4 +5,4 @@
</span><span class="cx"> q
</span><span class="cx"> tl.eggdeps
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@15425#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15549#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15551#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (15551 => 15552)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2016-04-25 22:05:51 UTC (rev 15551)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2016-04-25 22:07:02 UTC (rev 15552)
</span><span class="lines">@@ -4686,6 +4686,23 @@
</span><span class="cx"> # Determine what was removed
</span><span class="cx"> removed = set(oldattached_keys) - set(newattached_keys)
</span><span class="cx">
</span><ins>+ # Make sure that clients don't accidently remove the parameters we care about
+ if not inserting:
+ for managed_id in list(removed):
+ oldattachment = oldattached[managed_id][0]
+ oldattachment_value = oldattachment.value()
+ found_match = False
+ for newattachment in newattachments:
+ if newattachment.value() == oldattachment_value:
+ newattachment.setParameter("MANAGED-ID", oldattachment.parameterValue("MANAGED-ID"))
+ newattachment.setParameter("FMTTYPE", oldattachment.parameterValue("FMTTYPE"))
+ newattachment.setParameter("FILENAME", oldattachment.parameterValue("FILENAME"))
+ newattachment.setParameter("SIZE", oldattachment.parameterValue("SIZE"))
+ found_match = True
+ if found_match:
+ removed.remove(managed_id)
+
+
</ins><span class="cx"> # Determine what was added
</span><span class="cx"> added = set(newattached_keys) - set(oldattached_keys)
</span><span class="cx"> changed = {}
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_attachmentspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py (15551 => 15552)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2016-04-25 22:05:51 UTC (rev 15551)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2016-04-25 22:07:02 UTC (rev 15552)
</span><span class="lines">@@ -1440,7 +1440,62 @@
</span><span class="cx"> self.assertEqual(quota, 0)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_resourceCheckAttachments_clientRemovesParameters(self):
+ """
+ L{ICalendarObject.resourceCheckAttachments} will properly handle clients stripping parameters.
+ """
</ins><span class="cx">
</span><ins>+ # Create attachment
+ obj = yield self.calendarObjectUnderTest()
+ yield obj.addAttachment(None, MimeType("text", "x-fixture"), "new.attachment", MemoryStream("new attachment text"))
+ yield self.commit()
+
+ # Verify parameters exist
+ obj = yield self.calendarObjectUnderTest()
+ component = yield obj.componentForUser()
+ attachments = component.getAllPropertiesInAnyComponent("ATTACH", depth=1,)
+ self.assertEqual(len(attachments), 1)
+ attach = attachments[0]
+ managed_id = attach.parameterValue("MANAGED-ID")
+ fmttype = attach.parameterValue("FMTTYPE")
+ filename = attach.parameterValue("FILENAME")
+ size = attach.parameterValue("SIZE")
+
+ self.assertEqual(fmttype, "text/x-fixture")
+ self.assertEqual(filename, "new.attachment")
+ self.assertEqual(int(size), 19)
+
+ # Remove parameters and write it back
+ attach.removeParameter("MANAGED-ID")
+ attach.removeParameter("FMTTYPE")
+ attach.removeParameter("FILENAME")
+ attach.removeParameter("SIZE")
+ yield obj.setComponent(component.duplicate())
+ yield self.commit()
+
+ # Verify parameters recovered
+ obj = yield self.calendarObjectUnderTest()
+ component = yield obj.componentForUser()
+ attachments = component.getAllPropertiesInAnyComponent("ATTACH", depth=1,)
+ self.assertEqual(len(attachments), 1)
+ attach = attachments[0]
+ managed_id2 = attach.parameterValue("MANAGED-ID")
+ fmttype2 = attach.parameterValue("FMTTYPE")
+ filename2 = attach.parameterValue("FILENAME")
+ size2 = attach.parameterValue("SIZE")
+
+ self.assertEqual(managed_id2, managed_id)
+ self.assertEqual(fmttype2, "text/x-fixture")
+ self.assertEqual(filename2, "new.attachment")
+ self.assertEqual(int(size2), 19)
+
+ attachment = yield obj.attachmentWithManagedID(managed_id2)
+ data = yield self.attachmentToString(attachment)
+ self.assertEquals(data, "new attachment text")
+
+
+
</ins><span class="cx"> now = DateTime.getToday().getYear()
</span><span class="cx">
</span><span class="cx"> PLAIN_ICS = """BEGIN:VCALENDAR
</span></span></pre>
</div>
</div>
</body>
</html>