@@ -1,5 +1,5 @@ #-- -# Copyright (C) 2001, 2002, 2003 Matt Armstrong. All rights +# Copyright (C) 2001, 2002, 2003, 2008 Matt Armstrong. All rights # reserved. # # Redistribution and use in source and binary forms, with or without @@ -50,7 +50,6 @@ module RMail # is parsed for mail addresses and if one is found, it is used to # initialize this object. def initialize(string = nil) - @local = @domain = @comments = @display_name = nil if string.kind_of?(String) @@ -421,7 +420,6 @@ module RMail # local-part ':' -> it is a display-name of a group # display-name '<' -> it is a mailbox display name # display-name ':' -> it is a group display name - # # set lookahead to '@' '<' or ':' (or another value for # invalid input) @@ -472,6 +470,20 @@ module RMail @addresses.last.local = get_text expect(SYM_AT_SIGN) domain + + if @sym == SYM_LESS_THAN + # Workaround for invalid input. Treat 'foo@bar <foo@bar>' as if it + # were '"foo@bar" <foo@bar>'. The domain parser will eat + # 'bar' but stop at '<'. At this point, we've been + # parsing the display name as if it were an address, so we + # throw the address into display_name and parse an + # angle_addr. + @addresses.last.display_name = + format("%s@%s", @addresses.last.local, @addresses.last.domain) + @addresses.last.local = nil + @addresses.last.domain = nil + angle_addr + end end end lib/rmail/address.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby #-- -# Copyright (C) 2001, 2002, 2003, 2007 Matt Armstrong. All rights reserved. +# Copyright (C) 2001, 2002, 2003, 2007, 2008 Matt Armstrong. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -419,7 +419,7 @@ class TestRMailAddress < TestBase :format => '"Jason @ Tibbitts" <tibbs@uh.edu>' } ] ] # Majordomo II parses all of these with an error. We have deleted - # some of the tests since when they are actually legal. + # some of the tests when they are actually legal. validate_case ['tibbs@uh.edu Jason Tibbitts', [] ] validate_case ['@uh.edu', [] ] # Can't start with @ validate_case ['J <tibbs>', [] ] # Not FQDN @@ -644,7 +644,6 @@ class TestRMailAddress < TestBase end def test_rfc_822 - validate_case\ ['":sysmail"@ Some-Group. Some-Org, Muhammed.(I am the greatest) Ali @(the)Vegas.WBA', [ { :name => nil, @@ -664,7 +663,6 @@ class TestRMailAddress < TestBase end def test_misc_addresses() - # Make sure that parsing empty stuff works assert_equal([], RMail::Address.parse(nil)) assert_equal([], RMail::Address.parse("")) @@ -794,6 +792,20 @@ class TestRMailAddress < TestBase } ] ] end + def test_bug_1754 + # http://rubyforge.org/tracker/?func=detail&atid=1754&aid=23043&group_id=446 + validate_case\ + ['=?iso-8859-1?Q?acme@example.com?= <acme@example.com>', + [ { :name => '=?iso-8859-1?Q?acme@example.com?=', + :display_name => '=?iso-8859-1?Q?acme@example.com?=', + :address => 'acme@example.com', + :comments => nil, + :domain => 'example.com', + :local => 'acme', + :format => '"=?iso-8859-1?Q?acme@example.com?=" <acme@example.com>', + } ] ] + end + def test_invalid_addresses() # The display name isn't encoded -- bad, but we parse it. validate_case\ test/testaddress.rb 51b8d238bf71a6657d6d43d9b9f571b481df4bf1 Matt Armstrong matt@rfc20.org http://github.com/matta/rubymail/commit/b3a4296ff78d4cf44584c37379a0df51daf859ce b3a4296ff78d4cf44584c37379a0df51daf859ce 2008-11-30T20:27:11-08:00 2008-11-30T20:27:11-08:00 Parse the invalid foo@bar <baz@yow> as if it were "foo@bar" <baz@yow>. 484ac59bf7460e7ef8a0a547b4ce9ebf069d2fb3 Matt Armstrong matt@rfc20.org