<!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>[15195] CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip</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/15195">15195</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-10-15 14:24:09 -0700 (Thu, 15 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scrub embedded mail headers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipoutboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_outboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipoutboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py (15194 => 15195)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py 2015-10-15 21:17:21 UTC (rev 15194)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py 2015-10-15 21:24:09 UTC (rev 15195)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx">
</span><span class="cx"> from cStringIO import StringIO
</span><span class="cx"> import os
</span><ins>+import re
</ins><span class="cx">
</span><span class="cx"> from email.mime.multipart import MIMEMultipart
</span><span class="cx"> from email.mime.text import MIMEText
</span><span class="lines">@@ -48,6 +49,9 @@
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx">
</span><ins>+EMBEDDED_HEADER_CHECK = re.compile(r'\n[^ \t]+:')
+
+
</ins><span class="cx"> """ SCHEMA:
</span><span class="cx"> create sequence WORKITEM_SEQ;
</span><span class="cx">
</span><span class="lines">@@ -489,6 +493,16 @@
</span><span class="cx"> returnValue(False)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def _scrubHeader(self, value):
+ """
+ Check for what would be considered "embedded headers" and, if present,
+ remove the newlines.
+ """
+ if EMBEDDED_HEADER_CHECK.search(value) is not None:
+ value = value.replace("\n", " ")
+ return value
+
+
</ins><span class="cx"> def generateEmail(self, inviteState, calendar, orgEmail, orgCN,
</span><span class="cx"> attendees, fromAddress, replyToAddress, toAddress,
</span><span class="cx"> language='en'):
</span><span class="lines">@@ -556,9 +570,9 @@
</span><span class="cx">
</span><span class="cx"> msg = MIMEMultipart()
</span><span class="cx"> msg["From"] = fromAddress
</span><del>- msg["Subject"] = details['subject']
- msg["Reply-To"] = replyToAddress
- msg["To"] = toAddress
</del><ins>+ msg["Subject"] = self._scrubHeader(details['subject'])
+ msg["Reply-To"] = self._scrubHeader(replyToAddress)
+ msg["To"] = self._scrubHeader(toAddress)
</ins><span class="cx"> msg["Date"] = rfc822date()
</span><span class="cx"> msgId = SMTPSender.betterMessageID()
</span><span class="cx"> msg["Message-ID"] = msgId
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_outboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py (15194 => 15195)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py 2015-10-15 21:17:21 UTC (rev 15194)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py 2015-10-15 21:24:09 UTC (rev 15195)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> F-B543-B2F29A7EEB0B
</span><span class="cx"> ORGANIZER;CN=Th\xe9 Organizer;EMAIL=organizer@example.com:urn:uuid:C3B38B00-
</span><span class="cx"> 4166-11DD-B22C-A07C87E02F6A
</span><del>-SUMMARY:t\xe9sting outbound( )
</del><ins>+SUMMARY:testing outbound( )\\nEmbedded: Header
</ins><span class="cx"> DESCRIPTION:awesome description with "<" and "&"
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="lines">@@ -386,6 +386,7 @@
</span><span class="cx"> u"Th\xe9 Organizer <organizer@example.com>",
</span><span class="cx"> "=?utf-8?q?Th=C3=A9_Organizer_=3Corganizer=40example=2Ecom=3E?=",
</span><span class="cx"> "attendee@example.com",
</span><ins>+ "Event invitation: testing outbound( ) Embedded: Header",
</ins><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> # Update
</span><span class="lines">@@ -420,6 +421,7 @@
</span><span class="cx"> u"Th\xe9 Organizer <organizer@example.com>",
</span><span class="cx"> "=?utf-8?q?Th=C3=A9_Organizer_=3Corganizer=40example=2Ecom=3E?=",
</span><span class="cx"> "attendee@example.com",
</span><ins>+ "=?utf-8?q?Event_update=3A_t=C3=A9sting_outbound=28_=29_*update*?=",
</ins><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> # Reply
</span><span class="lines">@@ -451,13 +453,14 @@
</span><span class="cx"> "attendee@example.com",
</span><span class="cx"> "attendee@example.com",
</span><span class="cx"> "organizer@example.com",
</span><ins>+ "=?utf-8?q?Event_reply=3A_t=C3=A9sting_outbound=28_=29_*reply*?=",
</ins><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> )
</span><span class="cx"> for (
</span><span class="cx"> inputCalendar, UID, inputOriginator, inputRecipient, inviteState,
</span><span class="cx"> outputOrganizerEmail, outputOrganizerName, outputAttendeeList,
</span><del>- outputFrom, encodedFrom, outputRecipient
</del><ins>+ outputFrom, encodedFrom, outputRecipient, outputSubject
</ins><span class="cx"> ) in data:
</span><span class="cx">
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="lines">@@ -478,6 +481,7 @@
</span><span class="cx"> self.assertEquals(self.attendees, outputAttendeeList)
</span><span class="cx"> self.assertEquals(self.fromAddress, outputFrom)
</span><span class="cx"> self.assertEquals(self.toAddress, outputRecipient)
</span><ins>+ self.assertEquals(msg["Subject"], outputSubject)
</ins><span class="cx">
</span><span class="cx"> if UID: # The organizer is local, and server is sending to remote
</span><span class="cx"> # attendee
</span><span class="lines">@@ -823,7 +827,12 @@
</span><span class="cx"> 'inner</alpha>world</test>'])
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_scrubHeader(self):
</ins><span class="cx">
</span><ins>+ self.assertEquals(self.sender._scrubHeader("ABC"), "ABC")
+ self.assertEquals(self.sender._scrubHeader("ABC: 123\nXYZ: 456"), "ABC: 123 XYZ: 456")
+
+
</ins><span class="cx"> def partByType(message, contentType):
</span><span class="cx"> """
</span><span class="cx"> Retrieve a MIME part from an L{email.message.Message} based on a content
</span></span></pre>
</div>
</div>
</body>
</html>