mirror of
https://github.com/python/cpython.git
synced 2025-11-03 23:21:29 +00:00
dbcc8d9b24
Patch #1464708 from William McVey: fixed handling of nested comments in mail addresses. E.g. "Foo ((Foo Bar)) <foo@example.com>" Fixes for both rfc822.py and email package. This patch needs to be back ported to Python 2.3 for email 2.5.
257 lines
9 KiB
Python
257 lines
9 KiB
Python
import rfc822
|
|
import sys
|
|
import unittest
|
|
from test import test_support
|
|
|
|
try:
|
|
from cStringIO import StringIO
|
|
except ImportError:
|
|
from StringIO import StringIO
|
|
|
|
|
|
class MessageTestCase(unittest.TestCase):
|
|
def create_message(self, msg):
|
|
return rfc822.Message(StringIO(msg))
|
|
|
|
def test_get(self):
|
|
msg = self.create_message(
|
|
'To: "last, first" <userid@foo.net>\n\ntest\n')
|
|
self.assert_(msg.get("to") == '"last, first" <userid@foo.net>')
|
|
self.assert_(msg.get("TO") == '"last, first" <userid@foo.net>')
|
|
self.assert_(msg.get("No-Such-Header") is None)
|
|
self.assert_(msg.get("No-Such-Header", "No-Such-Value")
|
|
== "No-Such-Value")
|
|
|
|
def test_setdefault(self):
|
|
msg = self.create_message(
|
|
'To: "last, first" <userid@foo.net>\n\ntest\n')
|
|
self.assert_(not msg.has_key("New-Header"))
|
|
self.assert_(msg.setdefault("New-Header", "New-Value") == "New-Value")
|
|
self.assert_(msg.setdefault("New-Header", "Different-Value")
|
|
== "New-Value")
|
|
self.assert_(msg["new-header"] == "New-Value")
|
|
|
|
self.assert_(msg.setdefault("Another-Header") == "")
|
|
self.assert_(msg["another-header"] == "")
|
|
|
|
def check(self, msg, results):
|
|
"""Check addresses and the date."""
|
|
m = self.create_message(msg)
|
|
i = 0
|
|
for n, a in m.getaddrlist('to') + m.getaddrlist('cc'):
|
|
try:
|
|
mn, ma = results[i][0], results[i][1]
|
|
except IndexError:
|
|
print 'extra parsed address:', repr(n), repr(a)
|
|
continue
|
|
i = i + 1
|
|
self.assertEqual(mn, n,
|
|
"Un-expected name: %s != %s" % (`mn`, `n`))
|
|
self.assertEqual(ma, a,
|
|
"Un-expected address: %s != %s" % (`ma`, `a`))
|
|
if mn == n and ma == a:
|
|
pass
|
|
else:
|
|
print 'not found:', repr(n), repr(a)
|
|
|
|
out = m.getdate('date')
|
|
if out:
|
|
self.assertEqual(out,
|
|
(1999, 1, 13, 23, 57, 35, 0, 1, 0),
|
|
"date conversion failed")
|
|
|
|
|
|
# Note: all test cases must have the same date (in various formats),
|
|
# or no date!
|
|
|
|
def test_basic(self):
|
|
self.check(
|
|
'Date: Wed, 13 Jan 1999 23:57:35 -0500\n'
|
|
'From: Guido van Rossum <guido@CNRI.Reston.VA.US>\n'
|
|
'To: "Guido van\n'
|
|
'\t : Rossum" <guido@python.org>\n'
|
|
'Subject: test2\n'
|
|
'\n'
|
|
'test2\n',
|
|
[('Guido van\n\t : Rossum', 'guido@python.org')])
|
|
|
|
self.check(
|
|
'From: Barry <bwarsaw@python.org\n'
|
|
'To: guido@python.org (Guido: the Barbarian)\n'
|
|
'Subject: nonsense\n'
|
|
'Date: Wednesday, January 13 1999 23:57:35 -0500\n'
|
|
'\n'
|
|
'test',
|
|
[('Guido: the Barbarian', 'guido@python.org')])
|
|
|
|
self.check(
|
|
'From: Barry <bwarsaw@python.org\n'
|
|
'To: guido@python.org (Guido: the Barbarian)\n'
|
|
'Cc: "Guido: the Madman" <guido@python.org>\n'
|
|
'Date: 13-Jan-1999 23:57:35 EST\n'
|
|
'\n'
|
|
'test',
|
|
[('Guido: the Barbarian', 'guido@python.org'),
|
|
('Guido: the Madman', 'guido@python.org')
|
|
])
|
|
|
|
self.check(
|
|
'To: "The monster with\n'
|
|
' the very long name: Guido" <guido@python.org>\n'
|
|
'Date: Wed, 13 Jan 1999 23:57:35 -0500\n'
|
|
'\n'
|
|
'test',
|
|
[('The monster with\n the very long name: Guido',
|
|
'guido@python.org')])
|
|
|
|
self.check(
|
|
'To: "Amit J. Patel" <amitp@Theory.Stanford.EDU>\n'
|
|
'CC: Mike Fletcher <mfletch@vrtelecom.com>,\n'
|
|
' "\'string-sig@python.org\'" <string-sig@python.org>\n'
|
|
'Cc: fooz@bat.com, bart@toof.com\n'
|
|
'Cc: goit@lip.com\n'
|
|
'Date: Wed, 13 Jan 1999 23:57:35 -0500\n'
|
|
'\n'
|
|
'test',
|
|
[('Amit J. Patel', 'amitp@Theory.Stanford.EDU'),
|
|
('Mike Fletcher', 'mfletch@vrtelecom.com'),
|
|
("'string-sig@python.org'", 'string-sig@python.org'),
|
|
('', 'fooz@bat.com'),
|
|
('', 'bart@toof.com'),
|
|
('', 'goit@lip.com'),
|
|
])
|
|
|
|
self.check(
|
|
'To: Some One <someone@dom.ain>\n'
|
|
'From: Anudder Persin <subuddy.else@dom.ain>\n'
|
|
'Date:\n'
|
|
'\n'
|
|
'test',
|
|
[('Some One', 'someone@dom.ain')])
|
|
|
|
self.check(
|
|
'To: person@dom.ain (User J. Person)\n\n',
|
|
[('User J. Person', 'person@dom.ain')])
|
|
|
|
def test_doublecomment(self):
|
|
# The RFC allows comments within comments in an email addr
|
|
self.check(
|
|
'To: person@dom.ain ((User J. Person)), John Doe <foo@bar.com>\n\n',
|
|
[('User J. Person', 'person@dom.ain'), ('John Doe', 'foo@bar.com')])
|
|
|
|
def test_twisted(self):
|
|
# This one is just twisted. I don't know what the proper
|
|
# result should be, but it shouldn't be to infloop, which is
|
|
# what used to happen!
|
|
self.check(
|
|
'To: <[smtp:dd47@mail.xxx.edu]_at_hmhq@hdq-mdm1-imgout.companay.com>\n'
|
|
'Date: Wed, 13 Jan 1999 23:57:35 -0500\n'
|
|
'\n'
|
|
'test',
|
|
[('', ''),
|
|
('', 'dd47@mail.xxx.edu'),
|
|
('', '_at_hmhq@hdq-mdm1-imgout.companay.com'),
|
|
])
|
|
|
|
def test_commas_in_full_name(self):
|
|
# This exercises the old commas-in-a-full-name bug, which
|
|
# should be doing the right thing in recent versions of the
|
|
# module.
|
|
self.check(
|
|
'To: "last, first" <userid@foo.net>\n'
|
|
'\n'
|
|
'test',
|
|
[('last, first', 'userid@foo.net')])
|
|
|
|
def test_quoted_name(self):
|
|
self.check(
|
|
'To: (Comment stuff) "Quoted name"@somewhere.com\n'
|
|
'\n'
|
|
'test',
|
|
[('Comment stuff', '"Quoted name"@somewhere.com')])
|
|
|
|
def test_bogus_to_header(self):
|
|
self.check(
|
|
'To: :\n'
|
|
'Cc: goit@lip.com\n'
|
|
'Date: Wed, 13 Jan 1999 23:57:35 -0500\n'
|
|
'\n'
|
|
'test',
|
|
[('', 'goit@lip.com')])
|
|
|
|
def test_addr_ipquad(self):
|
|
self.check(
|
|
'To: guido@[132.151.1.21]\n'
|
|
'\n'
|
|
'foo',
|
|
[('', 'guido@[132.151.1.21]')])
|
|
|
|
def test_iter(self):
|
|
m = rfc822.Message(StringIO(
|
|
'Date: Wed, 13 Jan 1999 23:57:35 -0500\n'
|
|
'From: Guido van Rossum <guido@CNRI.Reston.VA.US>\n'
|
|
'To: "Guido van\n'
|
|
'\t : Rossum" <guido@python.org>\n'
|
|
'Subject: test2\n'
|
|
'\n'
|
|
'test2\n' ))
|
|
self.assertEqual(sorted(m), ['date', 'from', 'subject', 'to'])
|
|
|
|
def test_rfc2822_phrases(self):
|
|
# RFC 2822 (the update to RFC 822) specifies that dots in phrases are
|
|
# obsolete syntax, which conforming programs MUST recognize but NEVER
|
|
# generate (see $4.1 Miscellaneous obsolete tokens). This is a
|
|
# departure from RFC 822 which did not allow dots in non-quoted
|
|
# phrases.
|
|
self.check('To: User J. Person <person@dom.ain>\n\n',
|
|
[('User J. Person', 'person@dom.ain')])
|
|
|
|
# This takes too long to add to the test suite
|
|
## def test_an_excrutiatingly_long_address_field(self):
|
|
## OBSCENELY_LONG_HEADER_MULTIPLIER = 10000
|
|
## oneaddr = ('Person' * 10) + '@' + ('.'.join(['dom']*10)) + '.com'
|
|
## addr = ', '.join([oneaddr] * OBSCENELY_LONG_HEADER_MULTIPLIER)
|
|
## lst = rfc822.AddrlistClass(addr).getaddrlist()
|
|
## self.assertEqual(len(lst), OBSCENELY_LONG_HEADER_MULTIPLIER)
|
|
|
|
def test_2getaddrlist(self):
|
|
eq = self.assertEqual
|
|
msg = self.create_message("""\
|
|
To: aperson@dom.ain
|
|
Cc: bperson@dom.ain
|
|
Cc: cperson@dom.ain
|
|
Cc: dperson@dom.ain
|
|
|
|
A test message.
|
|
""")
|
|
ccs = [('', a) for a in
|
|
['bperson@dom.ain', 'cperson@dom.ain', 'dperson@dom.ain']]
|
|
addrs = msg.getaddrlist('cc')
|
|
addrs.sort()
|
|
eq(addrs, ccs)
|
|
# Try again, this one used to fail
|
|
addrs = msg.getaddrlist('cc')
|
|
addrs.sort()
|
|
eq(addrs, ccs)
|
|
|
|
def test_parseaddr(self):
|
|
eq = self.assertEqual
|
|
eq(rfc822.parseaddr('<>'), ('', ''))
|
|
eq(rfc822.parseaddr('aperson@dom.ain'), ('', 'aperson@dom.ain'))
|
|
eq(rfc822.parseaddr('bperson@dom.ain (Bea A. Person)'),
|
|
('Bea A. Person', 'bperson@dom.ain'))
|
|
eq(rfc822.parseaddr('Cynthia Person <cperson@dom.ain>'),
|
|
('Cynthia Person', 'cperson@dom.ain'))
|
|
|
|
def test_quote_unquote(self):
|
|
eq = self.assertEqual
|
|
eq(rfc822.quote('foo\\wacky"name'), 'foo\\\\wacky\\"name')
|
|
eq(rfc822.unquote('"foo\\\\wacky\\"name"'), 'foo\\wacky"name')
|
|
|
|
|
|
def test_main():
|
|
test_support.run_unittest(MessageTestCase)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|