mirror of
https://github.com/coddingtonbear/django-mailbox.git
synced 2026-07-10 06:48:19 +02:00
Merge 1fa21c87dc into 7d6f0a7b36
This commit is contained in:
TravisDart
commit
92579788b4
3 changed files with 178 additions and 2 deletions
5
django_mailbox/models.py
Executable file → Normal file
5
django_mailbox/models.py
Executable file → Normal file
|
|
@ -217,11 +217,12 @@ class Mailbox(models.Model):
|
||||||
new.set_payload('')
|
new.set_payload('')
|
||||||
elif msg.get_content_type() not in TEXT_STORED_MIMETYPES:
|
elif msg.get_content_type() not in TEXT_STORED_MIMETYPES:
|
||||||
filename = msg.get_filename()
|
filename = msg.get_filename()
|
||||||
extension = '.bin'
|
|
||||||
if not filename:
|
if not filename:
|
||||||
extension = mimetypes.guess_extension(msg.get_content_type())
|
extension = mimetypes.guess_extension(msg.get_content_type())
|
||||||
else:
|
else:
|
||||||
_, extension = os.path.splitext(filename)
|
_, extension = os.path.splitext(filename)
|
||||||
|
if not extension:
|
||||||
|
extension = '.bin'
|
||||||
|
|
||||||
attachment = MessageAttachment()
|
attachment = MessageAttachment()
|
||||||
|
|
||||||
|
|
@ -258,7 +259,7 @@ class Mailbox(models.Model):
|
||||||
msg.to_header = message['to']
|
msg.to_header = message['to']
|
||||||
msg.save()
|
msg.save()
|
||||||
message = self._get_dehydrated_message(message, msg)
|
message = self._get_dehydrated_message(message, msg)
|
||||||
msg.body = message.as_string()
|
msg.body = unicode(message.as_string(),'utf8','ignore')
|
||||||
if message['in-reply-to']:
|
if message['in-reply-to']:
|
||||||
try:
|
try:
|
||||||
msg.in_reply_to = Message.objects.filter(
|
msg.in_reply_to = Message.objects.filter(
|
||||||
|
|
|
||||||
108
django_mailbox/tests/Bugs in 2.2/Attachment.mbox
Normal file
108
django_mailbox/tests/Bugs in 2.2/Attachment.mbox
Normal file
|
|
@ -0,0 +1,108 @@
|
||||||
|
From - Sat Aug 3 13:25:07 2013
|
||||||
|
|
||||||
|
Delivered-To: person3@example.com
|
||||||
|
Received: by 10.76.18.165 with SMTP id x5csp92235oad;
|
||||||
|
Thu, 31 Jan 2013 10:00:48 -0800 (PST)
|
||||||
|
X-Received: by 10.66.81.231 with SMTP id d7mr22593565pay.27.1359655248387;
|
||||||
|
Thu, 31 Jan 2013 10:00:48 -0800 (PST)
|
||||||
|
Return-Path: <SRS0=RahL=LY=example.net=person2@bounce.secureserver.net>
|
||||||
|
Received: from p3plsmtp21-02.prod.phx3.secureserver.net (p3plsmtp21-02.prod.phx3.secureserver.net. [123.123.123.123])
|
||||||
|
by mx.google.com with ESMTP id wk7si5300126pbc.79.2013.01.31.10.00.47;
|
||||||
|
Thu, 31 Jan 2013 10:00:48 -0800 (PST)
|
||||||
|
Received-SPF: pass (google.com: domain of SRS0=RahL=LY=example.net=person2@bounce.secureserver.net designates 123.123.123.123 as permitted sender) client-ip=123.123.123.123;
|
||||||
|
Authentication-Results: mx.google.com;
|
||||||
|
spf=pass (google.com: domain of SRS0=RahL=LY=example.net=person2@bounce.secureserver.net designates 123.123.123.123 as permitted sender) smtp.mail=SRS0=RahL=LY=example.net=person2@bounce.secureserver.net
|
||||||
|
Received: (qmail 23678 invoked from network); 31 Jan 2013 18:00:47 -0000
|
||||||
|
Delivered-To: person4@example.com
|
||||||
|
Precedence: bulk
|
||||||
|
Received: (qmail 23676 invoked by uid 30297); 31 Jan 2013 18:00:47 -0000
|
||||||
|
Received: from unknown (HELO p3pismtp01-017.prod.phx3.secureserver.net) ([123.123.123.123])
|
||||||
|
(envelope-sender <person1@example.com>)
|
||||||
|
by p3plsmtp21-02.prod.phx3.secureserver.net (qmail-1.03) with SMTP
|
||||||
|
for <person4@example.com>; 31 Jan 2013 18:00:47 -0000
|
||||||
|
X-IronPort-Anti-Spam-Result: AjsDACKwClFIFIAKnGdsb2JhbABCA4JJg3+BJKR7iSQBiCaBCA4BAQEBAQgLCQkUJ4IeAQEEAR4FQSUFBhEDAQIGAQEBIgICAhUIBykIFQMBAYgKBgyvRyuSOI0RED2CG4ETA4hkgnKBaYJxhWKBHIVAjQqBRwIDBBc
|
||||||
|
Received: from mail.example.net (HELO example.com) ([72.20.128.10])
|
||||||
|
by p3pismtp01-017.prod.phx3.secureserver.net with ESMTP; 31 Jan 2013 11:00:28 -0700
|
||||||
|
Received: from DOM-ADM-MTA by aa03.example.net
|
||||||
|
with Novell_GroupWise; Thu, 31 Jan 2013 12:00:24 -0600
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Date: Thu, 31 Jan 2013 12:00:08 -0600
|
||||||
|
References: <1359492484.4590710694371947@mf102>
|
||||||
|
In-Reply-To: <1359492484.4590710694371947@mf102>
|
||||||
|
Message-ID: <510A5CC8.6E86.00A9.1@example.net>
|
||||||
|
X-Priority: 1
|
||||||
|
X-Mailer: Groupwise 7.0.3
|
||||||
|
From: "Person" <person1@example.com>
|
||||||
|
Subject: Re: Fwd: Stuff
|
||||||
|
To: person4@example.com
|
||||||
|
Content-Type: multipart/alternative; boundary="____SRNGMVRNJTDKENWSQEFF____"
|
||||||
|
|
||||||
|
|
||||||
|
--____SRNGMVRNJTDKENWSQEFF____
|
||||||
|
Content-Type: text/plain; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: base64
|
||||||
|
Content-Disposition: inline; modification-date="Fri, 31 Jan 2013 06:00:09
|
||||||
|
-0600"
|
||||||
|
|
||||||
|
SGVsbG8sIFdvcmxk
|
||||||
|
--____SRNGMVRNJTDKENWSQEFF____
|
||||||
|
Content-Type: multipart/related; boundary="____AVETMQDQOMFFURFTDWUU____"
|
||||||
|
|
||||||
|
|
||||||
|
--____AVETMQDQOMFFURFTDWUU____
|
||||||
|
Content-Type: text/html; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: base64
|
||||||
|
Content-Disposition: inline; modification-date="Fri, 31 Jan 2013 06:00:09
|
||||||
|
-0600"
|
||||||
|
|
||||||
|
PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIN
|
||||||
|
CiAgICAgICAgImh0dHA6Ly93d3cudzMub3JnL1RSL3hodG1sMS9EVEQveGh0bWwxLXN0cmljdC5k
|
||||||
|
dGQiPg0KPGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPg0KDQo8aGVh
|
||||||
|
ZD4NCgk8dGl0bGU+QW4gWEhUTUwgMS4wIFN0cmljdCBzdGFuZGFyZCB0ZW1wbGF0ZTwvdGl0bGU+
|
||||||
|
DQoJPG1ldGEgaHR0cC1lcXVpdj0iY29udGVudC10eXBlIiANCgkJY29udGVudD0idGV4dC9odG1s
|
||||||
|
O2NoYXJzZXQ9dXRmLTgiIC8+DQo8L2hlYWQ+DQoNCjxib2R5Pg0KDQogICAgIDxpbWcgc3JjPSJj
|
||||||
|
aWQ6Uk1YUExSSUhXUlFLLjMuanBnIj4NCiAgICAgPHA+SGVsbG8sIHdvcmxkPC9wPg0KICAgICA8
|
||||||
|
aW1nIHNyYz0iY2lkOk9FT1lLRUpFTkxJSy4yLmpwZyI+DQoNCjwvYm9keT4NCjwvaHRtbD4=
|
||||||
|
--____AVETMQDQOMFFURFTDWUU____
|
||||||
|
Content-ID: <OEOYKEJENLIK.2.jpg>
|
||||||
|
Content-Type: image/jpg
|
||||||
|
Content-Transfer-Encoding: base64
|
||||||
|
|
||||||
|
/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAkGBwgHBgkIBwgKCgkLDRYPDQwMDRsUFRAWIB0iIiAd
|
||||||
|
Hx8kKDQsJCYxJx8fLT0tMTU3Ojo6Iys/RD84QzQ5Ojf/2wBDAQoKCg0MDRoPDxo3JR8lNzc3Nzc3
|
||||||
|
Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzf/wAARCAApABYDASIA
|
||||||
|
AhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAYHCAT/xAAvEAABAwMDAwEFCQAAAAAAAAABAgME
|
||||||
|
AAURBhIhBzFBswgTFSRSGCIyNlF1o9Hx/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAA
|
||||||
|
AAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AH7qnb9V3GwIa0dKLMgOgvIad9064nxscJATg8nkZHnw
|
||||||
|
ZMjSvWXen5q8Dnub0kj1a0ZRQKuhtVwr2y5bVXWPPu8BIRLcYRsQ6cDK0fUnJxkcZHYAiio37OP5
|
||||||
|
4nftbnqtUUFO6namvcSKuBolTUm7slK5bTKQ6+y0rsUt4O7J79yAQccgiZo1X1l3p+VvB57GypA9
|
||||||
|
KjRqlfaGk/ePNzuAPPja9/VaMoFHQWj4NgaXcza2IN2noBlNsub0MnglDf0pyM4GeeMkAUU3UUEZ
|
||||||
|
6gWVnp9entdWWC7MmSHlHa9ksRHF53uKwQo7txAHYEnn8IpZR151UVpHw6zqyewZdyf5K0ZRQcVl
|
||||||
|
mPXG0xJkqE7BeeaC1xniCpsnwcf7+oB4ortooP/Z
|
||||||
|
--____AVETMQDQOMFFURFTDWUU____
|
||||||
|
Content-ID: <RMXPLRIHWRQK.3.jpg>
|
||||||
|
Content-Type: image/jpg
|
||||||
|
Content-Transfer-Encoding: base64
|
||||||
|
|
||||||
|
/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBwgHBgkTBwgKCgkLDRYPDQwMDRsUFRAWIB0iIiAd
|
||||||
|
Hx8kKDQsJCYxJx8fLT0tMTU3Ojo6Iys/RD8uQzQ5OjcBCgoKBQUFDgUFDisZExkrKysrKysrKysr
|
||||||
|
KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrK//AABEIACkAFgMBIgACEQED
|
||||||
|
EQH/xAAYAAEBAQEBAAAAAAAAAAAAAAAHAAgGAf/EACoQAAECBAYABQUAAAAAAAAAAAECAwAEBREG
|
||||||
|
BxIhMUEIEyRSsyU2UXWj/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAAAAAAAAAAAAAA
|
||||||
|
AAD/2gAMAwEAAhEDEQA/AO+zTp+K6jQEJwdNFmYDoLyG3fKdcT1pcJGmx3O4uO+iTIwrnLrT6qsD
|
||||||
|
fk1pJHyxoyKA5XA2K5KtsuS6qrLz9WkEhE2thGhDp2utHuTfa47HABEUDfhx+9579W58rUewC1mn
|
||||||
|
UMV06gIVg6VL0wXQHltNea62nrS2QdVzsdjYddgmRirOTWn0tYO/BoqQPijRkUBwmWlFoMi5PuSU
|
||||||
|
vJsV1RSipMSz3mJlVkAltHtTfewuLgi507UF3hyUo43n7qJvTHCbnk+a1HkAtZp4tqWD6Ah6l00T
|
||||||
|
a1uhCnXAS0wPyoAg78DgX74BJkZ84qK0/TqOq54DLtz/AEjRkUAf5Y4Fp2H1OzrEtNys1UGQEycy
|
||||||
|
oEyjZsot7c7gG53sACAb3oQIoD//2Q==
|
||||||
|
--____AVETMQDQOMFFURFTDWUU____
|
||||||
|
Content-ID: <OSSFDHZYGOQM.transparent.gif>
|
||||||
|
Content-Type: image/gif
|
||||||
|
Content-Transfer-Encoding: base64
|
||||||
|
|
||||||
|
R0lGODlhAQABAPAAAAAAAP///yH5BAEAAAEALAAAAAABAAEAAAICTAEAOw==
|
||||||
|
--____AVETMQDQOMFFURFTDWUU____--
|
||||||
|
|
||||||
|
--____SRNGMVRNJTDKENWSQEFF____--
|
||||||
|
|
||||||
|
|
||||||
67
django_mailbox/tests/Bugs in 2.2/UTF16.mbox
Normal file
67
django_mailbox/tests/Bugs in 2.2/UTF16.mbox
Normal file
|
|
@ -0,0 +1,67 @@
|
||||||
|
From - Sat Aug 3 13:25:07 2013
|
||||||
|
|
||||||
|
Delivered-To: user1@example.com
|
||||||
|
Received: by 10.76.18.165 with SMTP id x5csp6205oad;
|
||||||
|
Sat, 5 Jan 2013 17:59:14 -0800 (PST)
|
||||||
|
X-Received: by 10.66.80.202 with SMTP id t10mr166379994pax.81.1357437554302;
|
||||||
|
Sat, 05 Jan 2013 17:59:14 -0800 (PST)
|
||||||
|
Return-Path: <SRS0=JyPW=K7=yahoo.com=user2@bounce.secureserver.net>
|
||||||
|
Received: from p3plsmtp10-04.prod.phx3.secureserver.net (p3plsmtp10-04.prod.phx3.secureserver.net. [123.123.123.123])
|
||||||
|
by mx.google.com with ESMTP id u7si55229097paw.156.2013.01.05.17.59.12;
|
||||||
|
Sat, 05 Jan 2013 17:59:14 -0800 (PST)
|
||||||
|
Received-SPF: pass (google.com: domain of SRS0=JyPW=K7=yahoo.com=user2@bounce.secureserver.net designates 123.123.123.123 as permitted sender) client-ip=123.123.123.123;
|
||||||
|
Authentication-Results: mx.google.com; spf=pass (google.com: domain of SRS0=JyPW=K7=yahoo.com=user2@bounce.secureserver.net designates 123.123.123.123 as permitted sender) smtp.mail=SRS0=JyPW=K7=yahoo.com=user2@bounce.secureserver.net; dkim=pass header.i=@yahoo.com
|
||||||
|
Received: (qmail 339 invoked from network); 6 Jan 2013 01:59:12 -0000
|
||||||
|
Delivered-To: user3@example.com
|
||||||
|
Precedence: bulk
|
||||||
|
Received: (qmail 336 invoked by uid 30297); 6 Jan 2013 01:59:12 -0000
|
||||||
|
Received: from unknown (HELO p3pismtp01-063.prod.phx3.secureserver.net) ([10.6.12.182])
|
||||||
|
(envelope-sender <user2@yahoo.com>)
|
||||||
|
by p3plsmtp10-04.prod.phx3.secureserver.net (qmail-1.03) with SMTP
|
||||||
|
for <user3@example.com>; 6 Jan 2013 01:59:12 -0000
|
||||||
|
X-IronPort-Anti-Spam-Result: AmkQAGLY6FBiilvXbmdsb2JhbAAvEwOHXYYInRqSVhYODQkMBhYngh4BASMBIQEIBSUHCwoFEQMBAhQ6EhQKHAUdBIdjAQMPDJcyjnwkgnuDbwEjJwOGcwYKAotcagMIEHoFgykDiCyDJoFohn+BWYVkLkGEXYglgUkCAwQX
|
||||||
|
Received: from nm27-vm2.bullet.mail.ne1.yahoo.com ([98.138.91.215])
|
||||||
|
by p3pismtp01-063.prod.phx3.secureserver.net with ESMTP; 05 Jan 2013 18:59:11 -0700
|
||||||
|
Received: from [123.123.123.123] by nm27.bullet.mail.ne1.yahoo.com with NNFMP; 06 Jan 2013 01:59:08 -0000
|
||||||
|
Received: from [123.123.123.123] by tm5.bullet.mail.ne1.yahoo.com with NNFMP; 06 Jan 2013 01:59:08 -0000
|
||||||
|
Received: from [127.0.0.1] by smtp120-mob.biz.mail.ne1.yahoo.com with NNFMP; 06 Jan 2013 01:59:08 -0000
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1357437548; bh=j9eMknAL8YCreS+PbgbAzzAQMit5AJ87f7DXzFjDFRo=; h=X-Yahoo-Newman-Id:Message-ID:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Date:Subject:From:To:CC:MIME-Version:Content-Type:Content-Transfer-Encoding:X-Mailer; b=zYM501CTyiUtnTD1JFZlKIma5xV8Eu7m5mpgB/8gyZtBVEbCboDfJjqN4VNLUTC0w1AQO//dvW/Ir3ZbM6NVgvsT39hqx/RjY+CKHh/5VwVRaQgDiZznqrzVMSt/XsokA1gbPhtTFlpE5uiyzx39Zj6OwqFLHYTzAbWAMQ6IJCo=
|
||||||
|
X-Yahoo-Newman-Id: 388586.81550.bm@smtp120-mob.biz.mail.ne1.yahoo.com
|
||||||
|
Message-ID: <388586.81550.bm@smtp120-mob.biz.mail.ne1.yahoo.com>
|
||||||
|
X-Yahoo-Newman-Property: ymail-3
|
||||||
|
X-YMail-OSG: URwIIAQVM1kAga269ds2iV1suOTImektR4w6BYjFmP8vp0X
|
||||||
|
IUkN.Y8FSBOvb.6jCOF.LoIp2HxYepgZj1wbmbSpntFhshBFQZa6Wp2eGduY
|
||||||
|
exmK.gdLKnQoZdjyoCoxAZ.tA9.CL5fRijaLa7zv3XFWHs62FjtDCbrPoPrC
|
||||||
|
FqvjQf41TR3aKNOYyALf7hHkHdA5RiU9vHelpU8jyTo8DSV1aucIGJqpSLda
|
||||||
|
mFHkMzcl57HESZkRfGbp_iC0DhNdzRVGTfQSNcs.wSfrpSgzqM1VhkU5_JAJ
|
||||||
|
qdHTyl4RT27ofNZu3ch6gdZeqrv54vDLLAdWZRwL0rzBGKKKV.tzWOB.0JZ3
|
||||||
|
KRz_A75EcTDQlGKmb79MWbWZZydO_r2QgCfsFcyLGmoqcLE_yLpxdTC4KkRC
|
||||||
|
AFDsB0fS_wT5z2z2s_jk8aLIbtJ60D7BfrUW2MdxuqBeRuG2uzkX6V5Ls0BQ
|
||||||
|
5OKDv7BEHipYhl6NnhrzW1SPcxWB3emTVgTMV6xLC5SsKvHwbAEWoMjbdHKh
|
||||||
|
CgH9Y3_7tEccw4cOJhMuLAGTwbY4Ou0s.JmUbIrgTH6zTLkzcuFzYUBji7dO
|
||||||
|
3a3aujVZnMz9wAI0dgFfG4zZD6rb4MyF5qRBbuSDR8Y39FGyY1iAScA_RDsU
|
||||||
|
QaA--
|
||||||
|
X-Yahoo-SMTP: HDH0Fu.swBDT3Lu6hwn51OaZQ.iA
|
||||||
|
Received: from ap1.p9.sca.7sys.net (user2@123.123.123.123 with xymcookie)
|
||||||
|
by smtp120-mob.biz.mail.ne1.yahoo.com with SMTP; 05 Jan 2013 17:59:08 -0800 PST
|
||||||
|
Date: Sat, 05 Jan 2013 19:59:07 CST
|
||||||
|
Subject: RE: Fwd: Stuff
|
||||||
|
From: "Person" <user2@yahoo.com>
|
||||||
|
To: user3@example.com
|
||||||
|
CC:
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset="iso-8859-1"
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Mailer: Seven Enterprise Gateway (v 2.0)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
This message contains funny UTF16 characters like this one: " " and this one "✿".
|
||||||
|
-----Original Message-----
|
||||||
|
Date: Wednesday, December 26, 2012 1:53:27 pm
|
||||||
|
To: user2@yahoo.com
|
||||||
|
From: "Person" <user3@example.com>
|
||||||
|
Subject: Fwd: Stuff
|
||||||
|
|
||||||
|
Person -
|
||||||
|
etc...
|
||||||
Loading…
Add table
Add a link
Reference in a new issue