use strict;
use warnings;
use Test::More;
-use Email::MIME;
use PublicInbox::TestCommon;
my ($tmpdir, $for_destroy) = tmpdir();
my $maindir = "$tmpdir/main.git";
use PublicInbox::Import;
use PublicInbox::Git;
use PublicInbox::Config;
+use PublicInbox::Eml;
use_ok 'PublicInbox::WwwAttach';
my $config = PublicInbox::Config->new(\<<EOF);
$cfgpfx.address=$addr
$im->init_bare;
{
- open my $fh, '<', '/dev/urandom' or die "unable to open urandom: $!\n";
- sysread($fh, my $buf, 8);
- is(8, length($buf), 'read some random data');
my $qp = "abcdef=g\n==blah\n";
- my $b64 = 'b64'.$buf."\n";
+ my $b64 = "b64\xde\xad\xbe\xef\n";
my $txt = "plain\ntext\npass\nthrough\n";
my $dot = "dotfile\n";
- my $parts = [
- Email::MIME->create(
- attributes => {
- filename => 'queue-pee',
- content_type => 'text/plain',
- encoding => 'quoted-printable'
- },
- body => $qp),
- Email::MIME->create(
- attributes => {
- filename => 'bayce-sixty-four',
- content_type => 'appication/octet-stream',
- encoding => 'base64',
- },
- body => $b64),
- Email::MIME->create(
- attributes => {
- filename => 'noop.txt',
- content_type => 'text/plain',
- },
- body => $txt),
- Email::MIME->create(
- attributes => {
- filename => '.dotfile',
- content_type => 'text/plain',
- },
- body => $dot),
- ];
- my $mime = Email::MIME->create(
- parts => $parts,
- header_str => [ From => 'root@z', 'Message-Id' => '<Z@B>',
- Subject => 'hi']
- );
- $mime = $mime->as_string;
- $mime =~ s/\r\n/\n/g; # normalize to LF only
- $mime = PublicInbox::MIME->new($mime);
- $im->add($mime);
+ $im->add(eml_load('t/psgi_attach.eml'));
+ $im->add(eml_load('t/data/message_embed.eml'));
$im->done;
my $www = PublicInbox::WWW->new($config);
ok(length($dot_res) >= length($dot), 'dot almost matches');
$res = $cb->(GET('/test/Z%40B/4-any-filename.txt'));
is($res->content, $dot_res, 'user-specified filename is OK');
+
+ my $mid = '20200418222508.GA13918@dcvr';
+ my $irt = '20200418222020.GA2745@dcvr';
+ $res = $cb->(GET("/test/$mid/"));
+ unlike($res->content, qr! multipart/mixed, Size: 0 bytes!,
+ '0-byte download not offered');
+ like($res->content, qr/\bhref="2-embed2x\.eml"/s,
+ 'href to message/rfc822 attachment visible');
+ like($res->content, qr/\bhref="2\.1\.2-test\.eml"/s,
+ 'href to nested message/rfc822 attachment visible');
+
+ $res = $cb->(GET("/test/$mid/2-embed2x.eml"));
+ my $eml = PublicInbox::Eml->new(\($res->content));
+ is_deeply([ $eml->header_raw('Message-ID') ], [ "<$irt>" ],
+ 'got attached eml');
+ my @subs = $eml->subparts;
+ is(scalar(@subs), 2, 'attachment had 2 subparts');
+ like($subs[0]->body_str, qr/^testing embedded message\n*\z/sm,
+ '1st attachment is as expected');
+ is($subs[1]->header('Content-Type'), 'message/rfc822',
+ '2nd attachment is as expected');
+
+ $res = $cb->(GET("/test/$mid/2.1.2-test.eml"));
+ $eml = PublicInbox::Eml->new(\($res->content));
+ is_deeply([ $eml->header_raw('Message-ID') ],
+ [ '<20200418214114.7575-1-e@yhbt.net>' ],
+ 'nested eml retrieved');
});
}
done_testing();