Decode base64 attachments before attaching their contents to email object

Author: qubird

django_inbound_email/backends/mandrill.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import base64
 
 from django.core.mail import EmailMultiAlternatives
 from django.http import HttpRequest
@@ -20,9 +21,12 @@ class MandrillRequestParser(RequestParser):
 
     def _process_attachments(self, email, attachments):
         for key, attachment in attachments.iteritems():
+            is_base64 = attachment.get('base64')
             name = attachment.get('name')
             mimetype = attachment.get('type')
             content = attachment.get('content', u"")
+            if is_base64:
+                content = base64.b64decode(content)
             content = smart_bytes(content, strings_only=True)
 
             if len(content) > self.max_file_size:

test_app/tests.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from os import path
 import json
+import base64
 
 from django.conf import settings
 from django.core.mail import EmailMultiAlternatives
@@ -550,7 +551,13 @@ def _parse_from(name, email):
             if has_html:
                 self.assertEqual(e.alternatives[0][0], msg['html'])
             for name, contents, mimetype in e.attachments:
-                self.assertEqual(msg['attachments'][name]['content'], contents)
+                # Check that base64 contents are decoded
+                is_base64 = msg['attachments'][name].get('base64')
+                req_contents = msg['attachments'][name]['content']
+                if is_base64:
+                    req_contents = base64.b64decode(req_contents)
+
+                self.assertEqual(req_contents, contents)
                 self.assertEqual(msg['attachments'][name]['type'], mimetype)
             self.assertEqual(e.body, msg['text'])