Ticket #5799: 5799-BODYSTRUCTURE_Content-Dispositiong-20120731.patch

twisted/mail/test/test_imap.py

@@ -885 +885 @@
                 self.assertEqual(L, expected,
                                   "len(%r) = %r != %r" % (input, L, expected))
 
+
+    def test_IfQuotedString(self):
+        """
+        The strings passed to L{imap4._ifQuotedString} are not tokens, so
+        1 should be returned.
+        """
+        inputs = [
+            'some ramdom stuff',
+            '(twisted)',
+            '<twisted>',
+            'twisted@',
+            'twisted,',
+            'twisted;',
+            'twisted:',
+            'twisted\\',
+            'twisted"',
+            'twisted/',
+            '[twisted]',
+            'twisted?',
+            'twisted=',
+        ]
+
+        # Add all the control characters
+        for i in range(33):
+            inputs.append('twiste'+ chr(i) + 'd')
+
+        for i in inputs:
+            self.assertEqual(imap4._ifQuotedString(i), 1)
+
+
+
 class SimpleMailbox:
     implements(imap4.IMailboxInfo, imap4.IMailbox, imap4.ICloseableMailbox)
 
@@ -3457 +3488 @@
             structure)
 
 
+    def test_singlePartDisposition(self):
+        """
+        For some content-disposition parameter values,
+        L{imap4.getBodyStructure} returns quoted-string.
+        """
+        body = 'hello, world'
+        major = 'image'
+        minor = 'jpeg'
+        charset = 'us-ascii'
+        msg = FakeyMessage({
+                'content-type': '%s/%s; charset=%s; x=y' % (
+                    major, minor, charset),
+                'content-disposition': 'attachment; filename=foo (doc).pdf; ' \
+                    'size=bar; creation-date-parm=somedate; ' \
+                    'modification-date-parm=somedate; ' \
+                    'read-date-parm=somedate',
+                }, (), '', body, 123, None)
+        structure = imap4.getBodyStructure(msg, extended=True)
+        self.assertEqual(
+            [major, minor, ["charset", charset, 'x', 'y'], None,
+             None, None, len(body), None,
+             ['attachment', ['filename', '"foo (doc).pdf"', 'size', 'bar',
+              'creation-date-parm', '"somedate"',
+              'modification-date-parm', '"somedate"',
+              'read-date-parm', '"somedate"']], None, None],
+            structure)
+
+
     def test_textPart(self):
         """
         For a I{text/*} message, the number of lines in the message body are

twisted/mail/imap4.py

@@ -4327 +4327 @@
             return 1
     return 0
 
+# tspecial in RFC 2045
+_TSPECIALS = r'()<>@,;:\"/[]?='
+def _ifQuotedString(s):
+    """
+    It determines if a string is a token or quoted-string.
+    @see: U{http://www.ietf.org/rfc/rfc2045.txt}
+
+    @type s: C{str}
+    @param s: The string needs to be checked
+
+    @return: 1 if the string needs quotation marks, 0 is the
+        string is a token.
+    """
+    if s == '':
+        return 1
+    for c in s:
+        # ASCII characters without control characters
+        if c <= '\x20' or c > '\x7f':
+            return 1
+        if c in _TSPECIALS:
+            return 1
+    return 0
+
 def _prepareMailboxName(name):
     name = name.encode('imap4-utf-7')
     if _needsQuote(name):
@@ -4895 +4918 @@
         Parse a I{Content-Disposition} header into a two-sequence of the
         disposition and a flattened list of its parameters.
 
+        According to RFC2183, the following parameter values will be quoted:
+            1. Values of date parameters
+            2. A short parameter (length <= 78 characters) value containing
+            only ASCII characters, but including tspecials characters.
+
         @return: C{None} if there is no disposition header value, a C{list} with
             two elements otherwise.
         """
@@ -4904 +4932 @@
                 disp = (disp[0].lower(), None)
             elif len(disp) > 1:
                 # XXX Poorly tested parser
-                params = [x for param in disp[1:] for x in param.split('=', 1)]
+                date_params = ['creation-date-parm', 'modification-date-parm',
+                               'read-date-parm']
+                params = []
+                for param in disp[1:]:
+                    key, value = param.split('=')
+                    params.append(key)
+                    if key in date_params:
+                        params.append(_quote(value))
+                    elif len(value) <= 78 and _ifQuotedString(value):
+                        params.append(_quote(value))
+                    else:
+                        params.append(value)
                 disp = [disp[0].lower(), params]
+
             return disp
         else:
             return None