sup 0.19.0 → 0.23

data/test/gnupg_test_home/sup-test-2@foo.bar.asc

@@ -1,20 +1,23 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.20 (GNU/Linux)
 
-mI0EUgi0fAEEAOLAcQW96NEUSB7YE/la8X56jGW5BMX3aAixOF8LvOwMBbUK1T+U
-0H2PGIrXVcYyHcPqWRpRahbsIAldBqzffPlzMa+aqJaB1xKkNruxSoIzwPdidZMe
-l0Dxz2FDsoXD0KPyWnAYhGmQyz2MFpZxu2tlYqvwWVW//XGnk/KHvIXbABEBAAG0
-PlN1cCBUZXN0IFJlY2VpdmVyIChUZXN0IHJlY2VpdmVyIGZvciBTdXApIDxzdXAt
-dGVzdC0yQGZvby5iYXI+iL8EEwECACkFAlIItHwCGwMFCQHhM4AHCwkIBwMCAQYV
-CAIJCgsEFgIDAQIeAQIXgAAKCRAsABl+cWpykMMVBADHkQPgTz0CqKKp3k+z3dbm
-ocmI4tYNn1dOkDQqyfoBTfs6L3g4j5OE2UrguntRYyg5oon+uO5d18CQ5dY0sCw/
-o5IwyzTrxI8IocbtZvBdSb+XjLndynGuIQoqaJq9i6n1V4klFHVOna8Q9JstLfRX
-H1d4xPhnvKcaDDx/NV3X/biNBFIItHwBBADBpb43MpkrUWlg7HWJ1ZfOlxnOxrJ3
-Gz9WFNV06UbcZEuFKA/vHRjM6gWzUn5903FLuCWu3eBrq5xQfWipbp187PmocpoG
-skJ6gosLs1fMYRBjv2VbG9xJVKdKJMjqZw5FUpXKAaHr8P9jN6g2STQrbeQ8CVUK
-h7zOWRXAXSKUgwARAQABiKUEGAECAA8FAlIItHwCGwwFCQHhM4AACgkQLAAZfnFq
-cpDV1QQAzcxFXznEX92DjWxWRC7gRHgIsQk9WJnDzjtnDjSWCp3H85qeTZGZrn9W
-NoneV/S5Y7K3Mkceh4rFaANQ3zx4b05y1LFt5N/lPwIe5VB0vcPumtZum2fSGfpK
-nTXvzelcWcm2aGyUSaWvOkntWKEEt1kB5Oq6EtZoRZLMzAxLd7s=
-=aKsV
+mQGNBF7leTkBDAC3auy8xodH6jxoISylFZTpVqy/0L2ul879YUb/QbC58+F/H36S
+CjLfPxFlq0FAOXHelOvktxaybg+BG5UpSvTgBLbcArq5nctee+04TMXCzQzrG2V1
+zb9gIRT665fX3+WYncSIXdr4LAp7r8Jw3RT3tTOZqbaencumCWaJblnvfFwPrMKf
+AXWa/NVndNMAXmJ5uBf1MRr45KXaQ2tczPIeHqSOKhKNnKZPRqPs0fg4i3d0Vb6G
+yItgtJapfBo50FV+PvtodMHo3LDlz/BBjdEJHSvghqEjb1S7xGo+hdXs+lfCMfa0
+3PAWoj+OeHNorbK0YbVKOtS0E0xYvScbyC7bfwtA9yb3LZYmy7VHsKJmQfygCNQ6
+wIKQGAVN1NcQcJsvWyAwk9+WMN5oqB5lb76u40beoWlUjSJRlph2VvWvkGuh/huU
+sVGqcN7EO4SFkwi2YQLoWfQRGur3mids/PQTBywpGE1SyziPZK76pT6SqP8b+OpI
+CG1QbcTZzYpbv6kAEQEAAbQSc3VwLXRlc3QtMkBmb28uYmFyiQHOBBMBCgA4FiEE
+e0oXvVeqMzUcfd1s2bF8xbTizW8FAl7leTkCGw8FCwkIBwIGFQoJCAsCBBYCAwEC
+HgECF4AACgkQ2bF8xbTizW92TAv/WGlYfDTKNEmJ0K+kxt33T2ldmZXaJKL04Mft
+h5s5KlRZWDNpkCC/L55uyaeEg+Uy+BEEQKLAEeJrrLMV8UMJwMPDOizSTT9uLyiz
+b8RjnQw4iMT8wt9TQboXGaTMslwdXvFPii7w44KgCimE7VuPetJuLMLMbnl147G8
++QhkNUsrB51TuPS8xZJ4qjbH+K/Y2NlvwLtJrxNE3SRQuy2ApYJxKPZIj1KpUL8M
+7Jy/2hI8DaRm/0Fpu8HwRIVsd6/dgdkqdj1uVyLj+wyhgdzqV5WrPLFCRVhd3icd
+lPNRIDjg8YKCh353LVHjKwefOW4SnkOPn4uVMdCP9gUFd9zpMP9lMFpjk0o0tcYO
+NiFrOclS4q5qZ5jrj1MnBF0NaGhuC83DDgRfKV+p5noVeJxg0nXYZSlsSMfAT/K7
+FbdNEg0XUsrLgWVzhvWv/ebMetFPSfGHIveZ7lhiq1qpA5hLBNfSSBb1JJsFmtQt
+cEUluymdNe5W7Y6UGs1CpvcIvbj+
+=Cy9S
 -----END PGP PUBLIC KEY BLOCK-----

data/test/integration/test_maildir.rb

@@ -0,0 +1,75 @@
+require "test_helper"
+
+class TestMaildir < Minitest::Test
+
+  def setup
+    @path = Dir.mktmpdir
+
+    @test_message_1 = <<EOS
+From: Bob <bob@bob.com>
+To: a dear friend
+
+Hello there friend. How are you? Blah is blah blah.
+Wow. Maildir FTW, am I right?
+EOS
+
+  end
+
+  def teardown
+    ObjectSpace.each_object(Class).select {|a| a < Redwood::Singleton}.each do |klass|
+      klass.deinstantiate! unless klass == Redwood::Logger
+    end
+    FileUtils.rm_r @path
+  end
+
+  def create_a_maildir(extra='')
+    maildir = File.join @path, "test_maildir#{extra}"
+    ['', 'cur', 'new', 'tmp'].each do |dir|
+      Dir.mkdir(File.join maildir, dir)
+    end
+    maildir
+  end
+
+  def create_a_maildir_email(folder, content)
+    File.write(File.join(folder, "#{Time.now.to_f}.hostname:2,S"), content)
+  end
+
+  def start_sup_and_add_source(source)
+    start
+    Index.init @path
+    Index.load
+    SourceManager.instance.instance_eval '@sources = {}'
+    SourceManager.instance.add_source source
+    PollManager.poll_from source
+  end
+
+  # and now, let the tests begin!
+
+  def test_can_index_a_maildir_directory
+
+    maildir = create_a_maildir
+    create_a_maildir_email(File.join(maildir, 'cur'), @test_message_1)
+    start_sup_and_add_source Maildir.new "maildir:#{maildir}"
+
+    messages_in_index = []
+    Index.instance.each_message {|a| messages_in_index << a}
+    refute_empty messages_in_index, 'There are no messages in the index'
+    assert_equal(messages_in_index.first.raw_message, @test_message_1)
+
+  end
+
+  def test_can_index_a_maildir_directory_with_special_characters
+
+    maildir = create_a_maildir URI_ENCODE_CHARS
+    create_a_maildir_email(File.join(maildir, 'cur'), @test_message_1)
+    start_sup_and_add_source Maildir.new "maildir:#{maildir}"
+
+    messages_in_index = []
+    Index.instance.each_message {|a| messages_in_index << a}
+    refute_empty messages_in_index, 'There are no messages in the index'
+    assert_equal(messages_in_index.first.raw_message, @test_message_1)
+
+  end
+
+end
+

data/test/integration/test_mbox.rb

@@ -0,0 +1,69 @@
+require "test_helper"
+
+class TestMbox < MiniTest::Test
+
+  def setup
+    @path = Dir.mktmpdir
+
+    @test_message_1 = <<EOS
+From sup-talk-bounces@rubyforge.org Mon Apr 27 12:56:18 2009
+From: Bob <bob@bob.com>
+To: Joe <joe@joe.com>
+
+Hello there friend. How are you? Blah is blah blah.
+I like mboxes, don't you?
+EOS
+
+  end
+
+  def teardown
+    ObjectSpace.each_object(Class).select {|a| a < Redwood::Singleton}.each do |klass|
+      klass.deinstantiate! unless klass == Redwood::Logger
+    end
+    FileUtils.rm_r @path
+  end
+
+  def create_a_mbox(extra='')
+    mbox = File.join(@path, "test_mbox#{extra}.mbox")
+    File.write(mbox, @test_message_1)
+    mbox
+  end
+
+  def start_sup_and_add_source(source)
+    start
+    Index.init @path
+    Index.load
+    SourceManager.instance.instance_eval '@sources = {}'
+    SourceManager.instance.add_source source
+    PollManager.poll_from source
+  end
+
+  # and now, let the tests begin!
+
+  def test_can_index_a_mbox_directory
+
+    mbox = create_a_mbox
+    start_sup_and_add_source MBox.new "mbox:#{mbox}"
+
+    messages_in_index = []
+    Index.instance.each_message {|a| messages_in_index << a}
+    refute_empty messages_in_index, 'There are no messages in the index'
+    test_message_without_first_line = @test_message_1.sub(/^.*\n/,'')
+    assert_equal(messages_in_index.first.raw_message, test_message_without_first_line)
+
+  end
+
+  def test_can_index_a_mbox_directory_with_special_characters
+
+    mbox = create_a_mbox URI_ENCODE_CHARS
+    start_sup_and_add_source MBox.new "mbox:#{mbox}"
+
+    messages_in_index = []
+    Index.instance.each_message {|a| messages_in_index << a}
+    refute_empty messages_in_index, 'There are no messages in the index'
+    test_message_without_first_line = @test_message_1.sub(/^.*\n/,'')
+    assert_equal(messages_in_index.first.raw_message, test_message_without_first_line)
+
+  end
+
+end

data/test/test_crypto.rb

@@ -25,10 +25,11 @@ require 'tmpdir'
 
 module Redwood
 
-class TestCryptoManager < ::Minitest::Unit::TestCase
+class TestCryptoManager < Minitest::Test
 
     def setup
         @from_email = 'sup-test-1@foo.bar'
+        @from_email_ecc = 'sup-fake-ecc@fake.fake'
         @to_email   = 'sup-test-2@foo.bar'
         # Use test gnupg setup
         @orig_gnupghome = ENV['GNUPGHOME']
@@ -37,7 +38,7 @@ class TestCryptoManager < ::Minitest::Unit::TestCase
         @path = Dir.mktmpdir
         Redwood::HookManager.init File.join(@path, 'hooks')
 
-        am = {:default=> {:name => "test", :email=> 'sup-test-1@foo.bar'}}
+        am = {:default=> {name: "test", email: @from_email, alternates: [@from_email_ecc]}}
         Redwood::AccountManager.init am
 
         Redwood::CryptoManager.init
@@ -60,6 +61,8 @@ class TestCryptoManager < ::Minitest::Unit::TestCase
         if CryptoManager.have_crypto? then
             signed = CryptoManager.sign @from_email,@to_email,"ABCDEFG"
             assert_instance_of RMail::Message, signed
+            assert_equal("multipart/signed; protocol=application/pgp-signature; micalg=pgp-sha256",
+                         signed.header["Content-Type"])
             assert_equal "ABCDEFG", signed.body[0]
             assert signed.body[1].body.length > 0 , "signature length must be > 0"
             assert (signed.body[1].body.include? "-----BEGIN PGP SIGNATURE-----") , "Expecting PGP armored data"
@@ -104,6 +107,15 @@ class TestCryptoManager < ::Minitest::Unit::TestCase
             CryptoManager.verify signed.body[0], signed.body[1], true
         end
     end
+
+    def test_verify_unknown_keytype
+        if CryptoManager.have_crypto?
+            signed = CryptoManager.sign @from_email_ecc, @to_email, "ABCDEFG"
+            assert_instance_of RMail::Message, signed
+            assert_instance_of String, (signed.body[1].body)
+            CryptoManager.verify signed.body[0], signed.body[1], true
+        end
+    end
 end
 
 end

data/test/test_header_parsing.rb

@@ -6,7 +6,7 @@ require 'stringio'
 
 include Redwood
 
-class TestMBoxParsing < Minitest::Unit::TestCase
+class TestMBoxParsing < Minitest::Test
 
   def setup
     @path = Dir.mktmpdir

data/test/test_helper.rb

@@ -2,6 +2,9 @@ require "rubygems" rescue nil
 require 'minitest/autorun'
 require "rr"
 
-class Minitest::Unit::TestCase
-  include ::RR::Adapters::MiniTest
-end
+def fixture(filename)
+  file = ''
+  path = File.expand_path("../fixtures/#{filename}", __FILE__)
+  File.open(path) { |io| file = io.read }
+  file
+end

data/test/test_message.rb

@@ -6,27 +6,9 @@ require 'stringio'
 
 require 'dummy_source'
 
-# override File.exists? to make it work with StringIO for testing.
-# FIXME: do aliasing to avoid breaking this when sup moves from
-# File.exists? to File.exist?
-
-class File
-
-  def File.exists? file
-    # puts "fake File::exists?"
-
-    if file.is_a?(StringIO)
-      return false
-    end
-    # use the different function
-    File.exist?(file)
-  end
-
-end
-
 module Redwood
 
-class TestMessage < ::Minitest::Unit::TestCase
+class TestMessage < Minitest::Test
 
   def setup
     @path = Dir.mktmpdir
@@ -39,38 +21,7 @@ class TestMessage < ::Minitest::Unit::TestCase
   end
 
   def test_simple_message
-
-    message = <<EOS
-Return-path: <fake_sender@example.invalid>
-Envelope-to: fake_receiver@localhost
-Delivery-date: Sun, 09 Dec 2007 21:48:19 +0200
-Received: from fake_sender by localhost.localdomain with local (Exim 4.67)
-      (envelope-from <fake_sender@example.invalid>)
-      id 1J1S8R-0006lA-MJ
-      for fake_receiver@localhost; Sun, 09 Dec 2007 21:48:19 +0200
-Date: Sun, 9 Dec 2007 21:48:19 +0200
-Mailing-List: contact example-help@example.invalid; run by ezmlm
-Precedence: bulk
-List-Id: <example.list-id.example.invalid>
-List-Post: <mailto:example@example.invalid>
-List-Help: <mailto:example-help@example.invalid>
-List-Unsubscribe: <mailto:example-unsubscribe@example.invalid>
-List-Subscribe: <mailto:example-subscribe@example.invalid>
-Delivered-To: mailing list example@example.invalid
-Delivered-To: moderator for example@example.invalid
-From: Fake Sender <fake_sender@example.invalid>
-To: Fake Receiver <fake_receiver@localhost>
-Subject: Re: Test message subject
-Message-ID: <20071209194819.GA25972@example.invalid>
-References: <E1J1Rvb-0006k2-CE@localhost.localdomain>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <E1J1Rvb-0006k2-CE@localhost.localdomain>
-User-Agent: Sup/0.3
-
-Test message!
-EOS
+    message = fixture('simple-message.eml')
 
     source = DummySource.new("sup-test://test_simple_message")
     source.messages = [ message ]
@@ -80,11 +31,9 @@ EOS
     sup_message.load_from_source!
 
     # see how well parsing the header went
-
     to = sup_message.to
-    # "to" is an Array containing person items
-
-    # there should be only one item
+    assert(to.is_a? Array)
+    assert(to.first.is_a? Person)
     assert_equal(1, to.length)
 
     # sup doesn't do capitalized letters in email addresses
@@ -92,8 +41,7 @@ EOS
     assert_equal("Fake Receiver", to[0].name)
 
     from = sup_message.from
-    # "from" is just a simple person item
-
+    assert(from.is_a? Person)
     assert_equal("fake_sender@example.invalid", from.email)
     assert_equal("Fake Sender", from.name)
 
@@ -124,13 +72,8 @@ EOS
     assert_equal(1, replytos.length)
     assert_equal("E1J1Rvb-0006k2-CE@localhost.localdomain", replytos[0])
 
-    cc = sup_message.cc
-    # there are no ccs
-    assert_equal(0, cc.length)
-
-    bcc = sup_message.bcc
-    # there are no bccs
-    assert_equal(0, bcc.length)
+    assert_empty(sup_message.cc)
+    assert_empty(sup_message.bcc)
 
     recipient_email = sup_message.recipient_email
     assert_equal("fake_receiver@localhost", recipient_email)
@@ -142,86 +85,22 @@ EOS
     assert_equal(message_source_info, source_info)
 
     # read the message body chunks
-
     chunks = sup_message.load_from_source!
 
     # there should be only one chunk
     assert_equal(1, chunks.length)
 
-    lines = chunks[0].lines
+    lines = chunks.first.lines
 
     # there should be only one line
     assert_equal(1, lines.length)
 
-    assert_equal("Test message!", lines[0])
-
+    assert_equal("Test message!", lines.first)
   end
 
   def test_multipart_message
+    message = fixture('multi-part.eml')
 
-    message = <<EOS
-From fake_receiver@localhost Sun Dec 09 22:33:37 +0200 2007
-Subject: Re: Test message subject
-From: Fake Receiver <fake_receiver@localhost>
-To: Fake Sender <fake_sender@example.invalid>
-References: <E1J1Rvb-0006k2-CE@localhost.localdomain> <20071209194819.GA25972example.invalid>
-In-Reply-To: <20071209194819.GA25972example.invalid>
-Date: Sun, 09 Dec 2007 22:33:37 +0200
-Message-Id: <1197232243-sup-2663example.invalid>
-User-Agent: Sup/0.3
-Content-Type: multipart/mixed; boundary="=-1197232418-506707-26079-6122-2-="
-MIME-Version: 1.0
-
-
---=-1197232418-506707-26079-6122-2-=
-Content-Type: text/plain; charset=utf-8
-Content-Disposition: inline
-
-Excerpts from Fake Sender's message of Sun Dec 09 21:48:19 +0200 2007:
-> Test message!
-
-Thanks for the message!
---=-1197232418-506707-26079-6122-2-=
-Content-Disposition: attachment; filename="HACKING"
-Content-Type: application/octet-stream; name="HACKING"
-Content-Transfer-Encoding: base64
-
-UnVubmluZyBTdXAgbG9jYWxseQotLS0tLS0tLS0tLS0tLS0tLS0tCkludm9r
-ZSBpdCBsaWtlIHRoaXM6CgpydWJ5IC1JIGxpYiAtdyBiaW4vc3VwCgpZb3Un
-bGwgaGF2ZSB0byBpbnN0YWxsIGFsbCBnZW1zIG1lbnRpb25lZCBpbiB0aGUg
-UmFrZWZpbGUgKGxvb2sgZm9yIHRoZSBsaW5lCnNldHRpbmcgcC5leHRyYV9k
-ZXBzKS4gSWYgeW91J3JlIG9uIGEgRGViaWFuIG9yIERlYmlhbi1iYXNlZCBz
-eXN0ZW0gKGUuZy4KVWJ1bnR1KSwgeW91J2xsIGhhdmUgdG8gbWFrZSBzdXJl
-IHlvdSBoYXZlIGEgY29tcGxldGUgUnVieSBpbnN0YWxsYXRpb24sCmVzcGVj
-aWFsbHkgbGlic3NsLXJ1YnkuCgpDb2Rpbmcgc3RhbmRhcmRzCi0tLS0tLS0t
-LS0tLS0tLS0KCi0gRG9uJ3Qgd3JhcCBjb2RlIHVubGVzcyBpdCByZWFsbHkg
-YmVuZWZpdHMgZnJvbSBpdC4gVGhlIGRheXMgb2YKICA4MC1jb2x1bW4gZGlz
-cGxheXMgYXJlIGxvbmcgb3Zlci4gQnV0IGRvIHdyYXAgY29tbWVudHMgYW5k
-IG90aGVyCiAgdGV4dCBhdCB3aGF0ZXZlciBFbWFjcyBtZXRhLVEgZG9lcy4K
-LSBJIGxpa2UgcG9ldHJ5IG1vZGUuCi0gVXNlIHt9IGZvciBvbmUtbGluZXIg
-YmxvY2tzIGFuZCBkby9lbmQgZm9yIG11bHRpLWxpbmUgYmxvY2tzLgoK
-
---=-1197232418-506707-26079-6122-2-=
-Content-Disposition: attachment; filename="Manifest.txt"
-Content-Type: text/plain; name="Manifest.txt"
-Content-Transfer-Encoding: quoted-printable
-
-HACKING
-History.txt
-LICENSE
-Manifest.txt
-README.txt
-Rakefile
-bin/sup
-bin/sup-add
-bin/sup-config
-bin/sup-dump
-bin/sup-recover-sources
-bin/sup-sync
-bin/sup-sync-back
-
---=-1197232418-506707-26079-6122-2-=--
-EOS
     source = DummySource.new("sup-test://test_multipart_message")
     source.messages = [ message ]
     source_info = 0
@@ -230,17 +109,16 @@ EOS
     sup_message.load_from_source!
 
     # read the message body chunks
-
     chunks = sup_message.load_from_source!
 
     # this time there should be four chunks: first the quoted part of
     # the message, then the non-quoted part, then the two attachments
     assert_equal(4, chunks.length)
 
-    assert_equal(chunks[0].class, Redwood::Chunk::Quote)
-    assert_equal(chunks[1].class, Redwood::Chunk::Text)
-    assert_equal(chunks[2].class, Redwood::Chunk::Attachment)
-    assert_equal(chunks[3].class, Redwood::Chunk::Attachment)
+    assert(chunks[0].is_a? Redwood::Chunk::Quote)
+    assert(chunks[1].is_a? Redwood::Chunk::Text)
+    assert(chunks[2].is_a? Redwood::Chunk::Attachment)
+    assert(chunks[3].is_a? Redwood::Chunk::Attachment)
 
     # further testing of chunks will happen in test_message_chunks.rb
     # (possibly not yet implemented)
@@ -248,29 +126,7 @@ EOS
   end
 
   def test_broken_message_1
-
-    # an example of a broken message, missing "to" and "from" fields
-
-    message = <<EOS
-Return-path: <fake_sender@example.invalid>
-Envelope-to: fake_receiver@localhost
-Delivery-date: Sun, 09 Dec 2007 21:48:19 +0200
-Received: from fake_sender by localhost.localdomain with local (Exim 4.67)
-      (envelope-from <fake_sender@example.invalid>)
-      id 1J1S8R-0006lA-MJ
-      for fake_receiver@localhost; Sun, 09 Dec 2007 21:48:19 +0200
-Date: Sun, 9 Dec 2007 21:48:19 +0200
-Subject: Re: Test message subject
-Message-ID: <20071209194819.GA25972@example.invalid>
-References: <E1J1Rvb-0006k2-CE@localhost.localdomain>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <E1J1Rvb-0006k2-CE@localhost.localdomain>
-User-Agent: Sup/0.3
-
-Test message!
-EOS
+    message = fixture('missing-from-to.eml')
 
     source = DummySource.new("sup-test://test_broken_message_1")
     source.messages = [ message ]
@@ -281,9 +137,9 @@ EOS
 
     to = sup_message.to
 
-    # there should no items, since the message doesn't have any
-    # recipients -- still not nil
-    assert_equal(0, to.length)
+    # there should no items, since the message doesn't have any recipients -- still not nil
+    assert(!to.nil?)
+    assert_empty(to)
 
     # from will have bogus values
     from = sup_message.from
@@ -294,29 +150,7 @@ EOS
   end
 
   def test_broken_message_2
-
-    # an example of a broken message, no body at all
-
-    message = <<EOS
-Return-path: <fake_sender@example.invalid>
-From: Fake Sender <fake_sender@example.invalid>
-To: Fake Receiver <fake_receiver@localhost>
-Envelope-to: fake_receiver@localhost
-Delivery-date: Sun, 09 Dec 2007 21:48:19 +0200
-Received: from fake_sender by localhost.localdomain with local (Exim 4.67)
-      (envelope-from <fake_sender@example.invalid>)
-      id 1J1S8R-0006lA-MJ
-      for fake_receiver@localhost; Sun, 09 Dec 2007 21:48:19 +0200
-Date: Sun, 9 Dec 2007 21:48:19 +0200
-Subject: Re: Test message subject
-Message-ID: <20071209194819.GA25972@example.invalid>
-References: <E1J1Rvb-0006k2-CE@localhost.localdomain>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <E1J1Rvb-0006k2-CE@localhost.localdomain>
-User-Agent: Sup/0.3
-EOS
+    message = fixture('no-body.eml')
 
     source = DummySource.new("sup-test://test_broken_message_1")
     source.messages = [ message ]
@@ -329,90 +163,12 @@ EOS
 
     chunks = sup_message.load_from_source!
 
-    # the chunks list should be empty
-
-    assert_equal(0, chunks.length)
-
+    assert_empty(chunks)
   end
 
   def test_multipart_message_2
+    message = fixture('multi-part-2.eml')
 
-    message = <<EOS
-Return-path: <vim-mac-return-3938-fake_receiver=localhost@vim.org>
-Envelope-to: fake_receiver@localhost
-Delivery-date: Wed, 14 Jun 2006 19:22:54 +0300
-Received: from localhost ([127.0.0.1] helo=localhost.localdomain)
-	by localhost.localdomain with esmtp (Exim 4.60)
-	(envelope-from <vim-mac-return-3938-fake_receiver=localhost@vim.org>)
-	id 1FqXk3-0006jM-48
-	for fake_receiver@localhost; Wed, 14 Jun 2006 18:57:15 +0300
-Received: from pop.gmail.com
-	by localhost.localdomain with POP3 (fetchmail-6.3.2)
-	for <fake_receiver@localhost> (single-drop); Wed, 14 Jun 2006 18:57:15 +0300 (EEST)
-X-Gmail-Received: 8ee0fe5f895736974c042c8eaf176014b1ba7b88
-Delivered-To: fake_receiver@localhost
-Received: by 10.49.8.16 with SMTP id l16cs11327nfi;
-        Sun, 26 Mar 2006 19:31:56 -0800 (PST)
-Received: by 10.66.224.8 with SMTP id w8mr2172862ugg;
-        Sun, 26 Mar 2006 19:31:56 -0800 (PST)
-Received: from foobar.math.fu-berlin.de (foobar.math.fu-berlin.de [160.45.45.151])
-        by mx.gmail.com with SMTP id j3si553645ugd.2006.03.26.19.31.56;
-        Sun, 26 Mar 2006 19:31:56 -0800 (PST)
-Received-SPF: neutral (gmail.com: 160.45.45.151 is neither permitted nor denied by best guess record for domain of vim-mac-return-3938-fake_receiver=localhost@vim.org)
-Message-Id: <44275cac.74a494f1.315a.ffff825cSMTPIN_ADDED@mx.gmail.com>
-Received: (qmail 24265 invoked by uid 200); 27 Mar 2006 02:32:39 -0000
-Mailing-List: contact vim-mac-help@vim.org; run by ezmlm
-Precedence: bulk
-Delivered-To: mailing list vim-mac@vim.org
-Received: (qmail 7913 invoked from network); 26 Mar 2006 23:37:34 -0000
-Received: from cpe-138-217-96-243.vic.bigpond.net.au (HELO vim.org) (138.217.96.243)
-  by foobar.math.fu-berlin.de with SMTP; 26 Mar 2006 23:37:34 -0000
-From: fake_sender@example.invalid
-To: vim-mac@vim.org
-Subject: Mail Delivery (failure vim-mac@vim.org)
-Date: Mon, 27 Mar 2006 10:29:39 +1000
-MIME-Version: 1.0
-Content-Type: multipart/related;
-	type="multipart/alternative";
-	boundary="----=_NextPart_000_001B_01C0CA80.6B015D10"
-X-Priority: 3
-X-MSMail-Priority: Normal
-
-------=_NextPart_000_001B_01C0CA80.6B015D10
-Content-Type: multipart/alternative;
-	boundary="----=_NextPart_001_001C_01C0CA80.6B015D10"
-
-------=_NextPart_001_001C_01C0CA80.6B015D10
-Content-Type: text/plain;
-	charset="iso-8859-1"
-Content-Transfer-Encoding: quoted-printable
-
-------=_NextPart_001_001C_01C0CA80.6B015D10
-Content-Type: text/html;
-	charset="iso-8859-1"
-Content-Transfer-Encoding: quoted-printable
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD>
-<META content=3D"text/html; charset=3Diso-8859-1" =
-http-equiv=3DContent-Type>
-<META content=3D"MSHTML 5.00.2920.0" name=3DGENERATOR>
-<STYLE></STYLE>
-</HEAD>
-<BODY bgColor=3D#ffffff>If the message will not displayed automatically,<br>
-follow the link to read the delivered message.<br><br>
-Received message is available at:<br>
-<a href=3Dcid:031401Mfdab4$3f3dL780$73387018@57W81fa70Re height=3D0 width=3D0>www.vim.org/inbox/vim-mac/read.php?sessionid-18559</a>
-<iframe
-src=3Dcid:031401Mfdab4$3f3dL780$73387018@57W81fa70Re height=3D0 width=3D0></iframe>
-<DIV>&nbsp;</DIV></BODY></HTML>
-
-------=_NextPart_001_001C_01C0CA80.6B015D10--
-
-------=_NextPart_000_001B_01C0CA80.6B015D10--
-
-
-EOS
     source = DummySource.new("sup-test://test_multipart_message_2")
     source.messages = [ message ]
     source_info = 0
@@ -420,86 +176,58 @@ EOS
     sup_message = Message.build_from_source(source, source_info)
     sup_message.load_from_source!
 
-    # read the message body chunks
+    chunks = sup_message.load_from_source! # read the message body chunks
+
+    # TODO: Add more asserts
+  end
+
+  def test_text_attachment_decoding
+    message = fixture('text-attachments-with-charset.eml')
 
+    source = DummySource.new("sup-test://test_text_attachment_decoding")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
     sup_message.load_from_source!
+
+    chunks = sup_message.load_from_source!
+    assert_equal(5, chunks.length)
+    assert(chunks[0].is_a? Redwood::Chunk::Text)
+    ## The first attachment declares charset=us-ascii
+    assert(chunks[1].is_a? Redwood::Chunk::Attachment)
+    assert_equal(["This is ASCII"], chunks[1].lines)
+    ## The second attachment declares charset=koi8-r and has some Cyrillic
+    assert(chunks[2].is_a? Redwood::Chunk::Attachment)
+    assert_equal(["\u041f\u0440\u0438\u0432\u0435\u0442"], chunks[2].lines)
+    ## The third attachment declares charset=utf-8 and has an emoji
+    assert(chunks[3].is_a? Redwood::Chunk::Attachment)
+    assert_equal(["\u{1f602}"], chunks[3].lines)
+    ## The fourth attachment declares no charset and has a non-ASCII byte,
+    ## which will be replaced with U+FFFD REPLACEMENT CHARACTER
+    assert(chunks[4].is_a? Redwood::Chunk::Attachment)
+    assert_equal(["Embedded\ufffdgarbage"], chunks[4].lines)
   end
 
-  def test_blank_header_lines
+  def test_mailing_list_header
+    message = fixture('mailing-list-header.eml')
 
-    message = <<EOS
-Return-Path: <monitor-list-bounces@widget.com>
-X-Original-To: nobody@localhost
-Delivered-To: nobody@localhost.eng.widget.com
-Received: from localhost (localhost.localdomain [127.0.0.1])
-	by soquel.eng.widget.com (Postfix) with ESMTP id 609BC13C0DB1
-	for <nobody@localhost>; Thu, 19 Mar 2009 13:43:21 -0700 (PDT)
-MIME-Version: 1.0
-Received: from pa-excas-vip.widget.com [10.16.67.200]
-	by localhost with IMAP (fetchmail-6.2.5)
-	for nobody@localhost (single-drop); Thu, 19 Mar 2009 13:43:21 -0700 (PDT)
-Received: from pa-exht01.widget.com (10.113.81.167) by pa-excaht11.widget.com
- (10.113.81.197) with Microsoft SMTP Server (TLS) id 8.1.311.2; Thu, 19 Mar
- 2009 13:42:30 -0700
-Received: from mailman2.widget.com (10.16.64.159) by pa-exht01.widget.com
- (10.113.81.167) with Microsoft SMTP Server id 8.1.336.0; Thu, 19 Mar 2009
- 13:42:30 -0700
-Received: by mailman2.widget.com (Postfix)	id 47095AE30856; Thu, 19 Mar 2009
- 13:42:29 -0700 (PDT)
-Received: from countchocula.widget.com (localhost.localdomain [127.0.0.1])	by
- mailman2.widget.com (Postfix) with ESMTP id 5F782ABC5948;	Thu, 19 Mar 2009
- 13:42:28 -0700 (PDT)
-Received: from mailhost4.widget.com (mailhost4.widget.com [10.16.67.124])	by
- mailman2.widget.com (Postfix) with ESMTP id 6CDCCABC5948	for
- <monitor-list@mailman2.widget.com>;	Thu, 19 Mar 2009 13:42:26 -0700 (PDT)
-Received: by mailhost4.widget.com (Postfix)	id 2364AC9AC4; Thu, 19 Mar 2009
- 13:42:26 -0700 (PDT)
-Received: from pa-exht01.widget.com (pa-exht01.widget.com [10.113.81.167])	by
- mailhost4.widget.com (Postfix) with ESMTP id 17A68C9AC3	for
- <monitor-list@widget.com>; Thu, 19 Mar 2009 13:42:26 -0700 (PDT)
-Received: from PA-EXMBX04.widget.com ([10.113.81.142]) by pa-exht01.widget.com
-	([10.113.81.167]) with mapi; Thu, 19 Mar 2009 13:42:26 -0700
-From: Some User <someuser@widget.com>
-To: "monitor-list@widget.com" <monitor-list@widget.com>
-Sender: "monitor-list-bounces@widget.com" <monitor-list-bounces@widget.com>
-Date: Thu, 19 Mar 2009 13:42:25 -0700
-Subject: Looking for a mac
-Thread-Topic: Looking for a mac
-Thread-Index: AQHJqNM1xIqqjNRWuUCUBaxzPFK5eQ==
-Message-ID:
- <D3C12B2AD838B44DA9D6B2CA334246D011E72A73A4@PA-EXMBX04.widget.com>
-List-Help: <mailto:monitor-list-request@widget.com?subject=help>
-List-Subscribe: <http://mailman2.widget.com/mailman/listinfo/monitor-list>,
-	<mailto:monitor-list-request@widget.com?subject=subscribe>
-List-Unsubscribe:
- <http://mailman2.widget.com/mailman/listinfo/monitor-list>,
- 	<mailto:monitor-list-request@widget.com?subject=unsubscribe>
-Accept-Language: en-US
-Content-Language: en-US
-X-MS-Exchange-Organization-AuthAs: Anonymous
-X-MS-Exchange-Organization-AuthSource: pa-exht01.widget.com
-X-MS-Has-Attach:
-X-Auto-Response-Suppress: All
-X-MS-TNEF-Correlator:
-acceptlanguage: en-US
-delivered-to: monitor-list@widget.com
-errors-to: monitor-list-bounces@widget.com
-list-id: engineering monitor related <monitor-list.widget.com>
-x-mailman-version: 2.1.8
-x-beenthere: monitor-list@widget.com
-x-original-to: monitor-list@mailman2.widget.com
-list-post: <mailto:monitor-list@widget.com>
-list-archive: <http://mailman2.widget.com/pipermail/monitor-list>
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: quoted-printable
-
-Hi all,
-
-    Just wondering if anybody can lend me a mac to reproduce PR 384931 ?
-    Thanks.
-
-Michael=
-EOS
+    source = DummySource.new("sup-test://test_mailing_list_header")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
+    sup_message.load_from_source!
+
+    assert(sup_message.list_subscribe.nil?)
+    assert_equal("<https://lists.openembedded.org/g/openembedded-devel/unsub>",
+                 sup_message.list_unsubscribe)
+    assert_equal("openembedded-devel@lists.openembedded.org", sup_message.list_address.email)
+    assert_equal("openembedded-devel", sup_message.list_address.name)
+  end
+
+  def test_blank_header_lines
+    message = fixture('blank-header-fields.eml')
 
     source = DummySource.new("sup-test://test_blank_header_lines")
     source.messages = [ message ]
@@ -514,17 +242,63 @@ EOS
 
     # Look at another header field whose first line was blank.
     list_unsubscribe = sup_message.list_unsubscribe
-    assert_equal("<http://mailman2.widget.com/mailman/listinfo/monitor-list>,\n \t" +
+    assert_equal("<http://mailman2.widget.com/mailman/listinfo/monitor-list>,\n\t" +
                  "<mailto:monitor-list-request@widget.com?subject=unsubscribe>",
                  list_unsubscribe)
 
   end
 
+  def test_malicious_attachment_names
+    message = fixture('malicious-attachment-names.eml')
+
+    source = DummySource.new("sup-test://test_blank_header_lines")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
+    chunks = sup_message.load_from_source!
+
+    # See if attachment filenames can be safely used for saving.
+    # We do that by verifying that any folder-related character (/ or \)
+    # are not interpreted: the filename must not be interpreted into a
+    # path.
+    fn = chunks[3].safe_filename
+    assert_equal(fn, File.basename(fn))
+  end
   # TODO: test different error cases, malformed messages etc.
 
   # TODO: test different quoting styles, see that they are all divided
   # to chunks properly
 
+  def test_zimbra_quote_with_bottom_post
+    # Zimbra does an Outlook-style "Original Message" delimiter and then *also*
+    # prefixes each quoted line with a > marker. That's okay until the sender
+    # tries to do the right thing and reply after the quote.
+    # In this case we want to just look at the > markers when determining where
+    # the quoted chunk ends.
+    message = fixture('zimbra-quote-with-bottom-post.eml')
+
+    source = DummySource.new("sup-test://test_zimbra_quote_with_bottom_post")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
+    chunks = sup_message.load_from_source!
+
+    assert_equal(3, chunks.length)
+
+    # TODO this chunk should ideally be part of the quote chunk after it.
+    assert(chunks[0].is_a? Redwood::Chunk::Text)
+    assert_equal(1, chunks[0].lines.length)
+    assert_equal("----- Original Message -----", chunks[0].lines.first)
+
+    assert(chunks[1].is_a? Redwood::Chunk::Quote)
+
+    assert(chunks[2].is_a? Redwood::Chunk::Text)
+    assert_equal(3, chunks[2].lines.length)
+    assert_equal("This is the reply from the Zimbra user.",
+                 chunks[2].lines[2])
+  end
 end
 
 end