<!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>[15783] CalendarServer/trunk/txdav/caldav/datastore</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/15783">15783</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-08-03 11:01:01 -0700 (Wed, 03 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure illegal characters in attachment file names are stripped.</pre>
<h3>Modified Paths</h3>
<ul>
<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="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (15782 => 15783)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2016-08-02 23:37:13 UTC (rev 15782)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2016-08-03 18:01:01 UTC (rev 15783)
</span><span class="lines">@@ -4895,6 +4895,11 @@
</span><span class="cx"> # Check validity of request
</span><span class="cx"> yield self._checkValidManagedAttachmentChange()
</span><span class="cx">
</span><ins>+ # Protect against invalid file names
+ if isinstance(filename, unicode):
+ filename = filename.encode("utf-8")
+ filename = filename.translate(None, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F")
+
</ins><span class="cx"> # First write the data stream
</span><span class="cx">
</span><span class="cx"> # We need to know the resource_ID of the home collection of the owner
</span><span class="lines">@@ -4949,6 +4954,11 @@
</span><span class="cx"> # Check validity of request
</span><span class="cx"> yield self._checkValidManagedAttachmentChange()
</span><span class="cx">
</span><ins>+ # Protect against invalid file names
+ if isinstance(filename, unicode):
+ filename = filename.encode("utf-8")
+ filename = filename.translate(None, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F")
+
</ins><span class="cx"> # First check the supplied managed-id is associated with this resource
</span><span class="cx"> cobjs = (yield ManagedAttachment.referencesTo(self._txn, managed_id))
</span><span class="cx"> if self._resourceID not in cobjs:
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_attachmentspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py (15782 => 15783)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2016-08-02 23:37:13 UTC (rev 15782)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2016-08-03 18:01:01 UTC (rev 15783)
</span><span class="lines">@@ -1495,7 +1495,57 @@
</span><span class="cx"> self.assertEquals(data, "new attachment text")
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_validFilename(self):
+ """
+ L{CalendarObject.addAttachment} will remove any invalid characters from the supplied file name.
+ """
</ins><span class="cx">
</span><ins>+ # Create attachment
+ obj = yield self.calendarObjectUnderTest()
+ attachment, _ignore_location = yield obj.addAttachment(None, MimeType("text", "x-fixture"), "new\x1F.attachment", MemoryStream("new attachment text"))
+ self.assertEqual(attachment.name(), "new.attachment")
+ 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)
+ yield self.commit()
+
+ # Update attachment
+ obj = yield self.calendarObjectUnderTest()
+ attachment, _ignore_location = yield obj.updateAttachment(managed_id, MimeType("text", "x-fixture"), "updated\x1F.attachment", MemoryStream("updated attachment text"))
+ self.assertEqual(attachment.name(), "updated.attachment")
+ 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, "updated.attachment")
+ self.assertEqual(int(size), 23)
+ yield self.commit()
+
+
</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>