Fix filename created from mail attachments

Fixes issue2551118

Author: schlatterbeck

CHANGES.txt

@@ -72,6 +72,7 @@ Fixed:
   Fixes issue2551114.
 - issue2551108 - fix handling of designator links when formatted
   as markdown links. (Reported by Cedric Krier; John Rouillard)
+- Fix filename created from mail attachments, fixes issue2551118
 
 Features:
 - issue2550522 - Add 'filter' command to command-line

roundup/mailgw.py

@@ -397,6 +397,23 @@ def text_as_attachment(self):
                 return part.as_attachment()
         return None
 
+    def get_filename(self):
+        """ Note: The get_filename of the Message class returns just the
+            encoded header as transmitted via email. We make an attempt
+            here to decode the information returned and return the real
+            filename here.
+        """
+        # This should really use super() but doesn't work with python2
+        # because it seems that email.message.Message isn't a new-style
+        # class in python2
+        fn = email.message.Message.get_filename(self)
+        if not fn :
+            return fn
+        h = []
+        for x, t in decode_header(fn):
+            h.append(x.decode(t) if t else x)
+        return ''.join(h)
+
     def as_attachment(self):
         """Return this message as an attachment."""
         filename = self.get_filename()

test/test_mailgw.py

@@ -697,6 +697,37 @@ def testNewIssueNoAuthorEmail(self):
 This is a file containing text
 in latin-1 format =E4=F6=FC=C4=D6=DC=DF
 
+--uh56ypi7view24rr--
+'''
+
+    filename_msg = '''From: mary <[email protected]>
+To: [email protected]
+Message-Id: <followup_dummy_id>
+In-Reply-To: <dummy_test_message_id>
+Subject: [issue1] Testing...
+Content-Type: multipart/mixed; boundary="uh56ypi7view24rr"
+Content-Disposition: inline
+
+--uh56ypi7view24rr
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+Attach a file with non-ascii characters in it (encoded latin-1 should
+make it as-is through roundup due to Content-Type
+application/octet-stream)
+-- 
+Ralf Schlatterbeck             email: [email protected]
+
+--uh56ypi7view24rr
+Content-Type: application/octet-stream
+Content-Disposition: attachment;
+    filename==?iso-8859-1?Q?20210312=5FM=FCnchen=5FRepor?=
+    =?iso-8859-1?Q?t.pdf?=
+Content-Transfer-Encoding: quoted-printable
+
+This is a file containing text
+in latin-1 format =E4=F6=FC=C4=D6=DC=DF
+
 --uh56ypi7view24rr--
 '''
 
@@ -845,6 +876,22 @@ def testOctetStreamTranscoding(self):
         names = {0 : 'testfile'}
         content = [b'''This is a file containing text
 in latin-1 format \xE4\xF6\xFC\xC4\xD6\xDC\xDF
+''']
+        for n, id in enumerate (msg.files):
+            f = self.db.file.getnode (id)
+            self.assertEqual(f.name, names.get (n, 'unnamed'))
+            self.assertEqual(f.binary_content, content [n])
+
+    def testFileAttachWithUmlaut(self):
+        self.doNewIssue()
+        self._handle_mail(self.filename_msg)
+        messages = self.db.issue.get('1', 'messages')
+        messages.sort()
+        msg = self.db.msg.getnode (messages[-1])
+        assert(len(msg.files) == 1)
+        names = {0 : u'20210312_M\xfcnchen_Report.pdf'}
+        content = [b'''This is a file containing text
+in latin-1 format \xE4\xF6\xFC\xC4\xD6\xDC\xDF
 ''']
         for n, id in enumerate (msg.files):
             f = self.db.file.getnode (id)