test/fixtures/apple_unquoted_content_type
test/fixtures/unquoted_filename_in_attachment
@@ -243,6 +243,8 @@ module TMail
def do_parse
quote_boundary
+ quote_unquoted_name
+ quote_unquoted_bencode
obj = Parser.parse(self.class::PARSE_TYPE, @body, @comments)
set obj if obj
end
@@ -817,7 +819,7 @@ module TMail
if v
strategy.meta ';'
strategy.space
- strategy.kv_pair k, v
+ strategy.kv_pair k, unquote(v)
end
end
end
lib/tmail/header.rb
@@ -57,8 +57,11 @@ module TMail
end
class Attachment
+
+ include TextUtils
+
def original_filename(to_charset = 'utf-8')
- Unquoter.unquote_and_convert_to(quoted_filename, to_charset)
+ Unquoter.unquote_and_convert_to(quoted_filename, to_charset).chomp
end
end
lib/tmail/quoting.rb
@@ -161,7 +161,7 @@ module TMail
# Unwraps supplied string from inside double quotes
# Returns unquoted string
def unquote( str )
- str =~ /^"(.*?)"$/ ? $1 : str
+ str =~ /^"(.*?)"$/m ? $1 : str
end
# Provides a method to join a domain name by it's parts and also makes it
@@ -329,9 +329,33 @@ module TMail
end
end
end
+
+ # AppleMail generates illegal character contained Content-Type parameter like:
+ # name==?ISO-2022-JP?B?...=?=
+ # so quote. (This case is only value fits in one line.)
+ def quote_unquoted_bencode
+ @body = @body.gsub(%r"(;\s+[-a-z]+=)(=\?.+?)([;\r\n ]|\z)"m) {
+ head, should_quoted, tail = $~.captures
+ # head: "; name="
+ # should_quoted: "=?ISO-2022-JP?B?...=?="
+
+ head << quote_token(should_quoted) << tail
+ }
+ end
+
+ # AppleMail generates name=filename attributes in the content type that
+ # contain spaces. Need to handle this so the TMail Parser can.
+ def quote_unquoted_name
+ @body = @body.gsub(%r|(name=)([\w\s.]+)(.*)|m) {
+ head, should_quoted, tail = $~.captures
+ # head: "; name="
+ # should_quoted: "=?ISO-2022-JP?B?...=?="
+ head << quote_token(should_quoted) << tail
+ }
+ end
+
#:startdoc:
-
-
+
end
end
lib/tmail/utils.rb
@@ -75,7 +75,9 @@
<p>You can get the latest version of TMail from the TMail
<a href="http://rubyforge.org/frs/?group_id=4512&release_id=15889"
title="RubyForge: TMail: Project Filelist">RubyForge</a> project
- or via Ruby Gems "tmail"</p>
+ or via Ruby Gems "tmail", or feel free to grab the source code and
+ submit patches via the <a href="http://github.com/mikel/tmail/tree/master"
+ title="mikel's tmail at master - GitHub">GitHub TMail</a> site.</p>
<p>TMail is written in Ruby and a (very) small bit of supporting C
that has pure ruby replacements if you can't compile on your computer.
site/index.html
@@ -92,7 +92,7 @@ class TestAddress < Test::Unit::TestCase
assert_equal ok[:address], a.spec, str.inspect + " (spec)\n"
assert_equal ok[:local], a.local, str.inspect + " (local)\n"
assert_equal ok[:domain], a.domain, str.inspect + " (domain)\n"
- # assert_equal ok[:format], a.to_s, str.inspect + " (to_s)\n"
+ #assert_equal ok[:format], a.to_s, str.inspect + " (to_s)\n"
end
def validate_case__group( str, groupname, addrlist )
test/test_address.rb
@@ -51,7 +51,7 @@ HERE
fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email_with_quoted_attachment_filename")
mail = TMail::Mail.parse(fixture)
attachment = mail.attachments.last
- str = "Eelanalüüsi päring.jpg"
+ str = "Eelanalüüsi päring.jpg"
assert_equal str, attachment.original_filename
end
@@ -72,5 +72,17 @@ HERE
mail = TMail::Mail.parse(fixture)
assert_equal(1, mail.attachments.length)
end
+
+ def test_content_nil_returned_if_name_of_attachment_type_unquoted
+ fixture = File.read(File.dirname(__FILE__) + "/fixtures/unquoted_filename_in_attachment")
+ mail = TMail::Mail.parse(fixture)
+ assert_equal("image/png", mail.attachments.first.content_type)
+ end
+
+ def test_unquoted_apple_mail_content_type
+ fixture = File.read(File.dirname(__FILE__) + "/fixtures/apple_unquoted_content_type")
+ mail = TMail::Mail.parse(fixture)
+ assert_equal("application/pdf", mail.attachments.first.content_type)
+ end
end
test/test_attachments.rb
@@ -999,4 +999,23 @@ class ContentDispositionHeaderTester < Test::Unit::TestCase
assert_not_equal(message_id, mail.message_id)
end
+ def test_content_type_does_not_unquote_parameter_values
+ japanese_jis_filename = "¥e$B4A;z¥e(B.jpg"
+ mailsrc =<<ENDSTRING
+Content-Type: image/jpeg;
+ name="#{japanese_jis_filename}"
+Content-Transfer-Encoding: Base64
+Content-Disposition: attachment
+ENDSTRING
+ result =<<ENDSTRING
+Content-Type: image/jpeg; name*=iso-2022-jp'ja'%c2%a5e$B4A%3bz%c2%a5e%28B.jpg
+Content-Transfer-Encoding: Base64
+Content-Disposition: attachment
+
+ENDSTRING
+
+ mail = TMail::Mail.parse(mailsrc)
+ assert_equal(result.gsub("\n", "\r\n"), mail.encoded)
+ end
+
end
test/test_header.rb
@@ -734,20 +734,7 @@ EOF
part = TMail::Mail.parse("Content-Type: text/plain\n\nBlah")
mail.parts << part
mail.preamble = 'This is the preamble'
- # normalize the boundary to something non-random to assert against
- str = mail.encoded
- result = str.gsub(str[/boundary="(.*?)"/, 1], 'this-is-the-boundary').gsub(/\r\n\t/, ' ')
- expected =<<EOF
-Content-Type: multipart/mixed; boundary="this-is-the-boundary"
-
-This is the preamble
---this-is-the-boundary
-Content-Type: text/plain
-
-Blah
---this-is-the-boundary--
-EOF
- assert_equal(crlf(expected), result)
+ assert(mail.encoded =~ /\r\n\r\nThis is the preamble\r\n--mimepart/)
end
end
test/test_mail.rb
test/fixtures/attachment_type.eml.txt
test/fixtures/nil_attachment_type
3952471cc4b232ec428cd1bdca199fda6711a7df
Mikel Lindsaar
raasdnil@gmail.com
http://github.com/mikel/tmail/commit/d3f1d826df44e83287c690d58194f54b42500b0d
d3f1d826df44e83287c690d58194f54b42500b0d
2009-08-06T23:19:34-07:00
2009-08-06T23:19:34-07:00
Applied two patches from taimamiso (shirai-kaoru) and tests
40c50c1598c5afa1909793f08192717ea47b8bbb
Mikel Lindsaar
raasdnil@gmail.com