mirror of
https://github.com/coddingtonbear/django-mailbox.git
synced 2026-07-10 06:48:19 +02:00
Adding new settings allowing one to specify a list of mimetypes that are permitted to be stored in the message body of the e-mail message model.
This commit is contained in:
parent
8fac7c9711
commit
2a90953283
10 changed files with 180 additions and 18 deletions
|
|
@ -1,4 +1,5 @@
|
|||
import email
|
||||
from email.message import Message as EmailMessage
|
||||
from email.utils import formatdate
|
||||
import rfc822
|
||||
import urllib
|
||||
|
|
@ -20,6 +21,24 @@ SKIPPED_EXTENSIONS = getattr(
|
|||
'DJANGO_MAILBOX_SKIPPED_EXTENSIONS',
|
||||
['.p7s']
|
||||
)
|
||||
STRIP_UNALLOWED_MIMETYPES = getattr(
|
||||
settings,
|
||||
'DJANGO_MAILBOX_STRIP_UNALLOWED_MIMETYPES',
|
||||
False
|
||||
)
|
||||
ALLOWED_MIMETYPES = getattr(
|
||||
settings,
|
||||
'DJANGO_MAILBOX_ALLOWED_MIMETYPES',
|
||||
[
|
||||
'text/plain',
|
||||
'text/html'
|
||||
]
|
||||
)
|
||||
ALTERED_MESSAGE_HEADER = getattr(
|
||||
settings,
|
||||
'DJANGO_MAILBOX_ALTERED_MESSAGE_HEADER',
|
||||
'X-Django-Mailbox-Altered-Message'
|
||||
)
|
||||
|
||||
class ActiveMailboxManager(models.Manager):
|
||||
def get_query_set(self):
|
||||
|
|
@ -155,6 +174,29 @@ class Mailbox(models.Model):
|
|||
msg.save()
|
||||
return msg
|
||||
|
||||
def _filter_message_body(self, message):
|
||||
if not message.is_multipart() or not STRIP_UNALLOWED_MIMETYPES:
|
||||
return message
|
||||
stripped_content = {}
|
||||
new = EmailMessage()
|
||||
for header, value in message.items():
|
||||
new[header] = value
|
||||
for part in message.walk():
|
||||
content_type = part.get_content_type()
|
||||
print content_type
|
||||
if not content_type in ALLOWED_MIMETYPES:
|
||||
if content_type not in stripped_content:
|
||||
stripped_content[content_type] = 0
|
||||
stripped_content[content_type] = (
|
||||
stripped_content[content_type] + 1
|
||||
)
|
||||
continue
|
||||
new.attach(part)
|
||||
new[ALTERED_MESSAGE_HEADER] = 'Stripped ' + ', '.join(
|
||||
['%s*%s' % (key, value) for key, value in stripped_content.items()]
|
||||
)
|
||||
return new
|
||||
|
||||
def _process_message(self, message):
|
||||
msg = Message()
|
||||
msg.mailbox = self
|
||||
|
|
@ -162,14 +204,8 @@ class Mailbox(models.Model):
|
|||
msg.message_id = message['message-id'][0:255]
|
||||
msg.from_header = message['from']
|
||||
msg.to_header = message['to']
|
||||
# if message is multipart want to only store the actual message body in database (not attachments)
|
||||
if message.is_multipart():
|
||||
for part in message.walk():
|
||||
if part.get_content_type() == 'text/plain' or part.get_content_type() == 'text/html':
|
||||
msg.body = part.get_payload()
|
||||
# else store the whole message in database
|
||||
else:
|
||||
msg.body = message.as_string()
|
||||
message = self._filter_message_body(message)
|
||||
msg.body = message.as_string()
|
||||
if message['in-reply-to']:
|
||||
try:
|
||||
msg.in_reply_to = Message.objects.filter(message_id=message['in-reply-to'])[0]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue