-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
use warnings;
use Test::More;
use PublicInbox::TestCommon;
require_git(2.6);
-use PublicInbox::MIME;
+use PublicInbox::Eml;
use PublicInbox::Config;
-use PublicInbox::WWW;
use PublicInbox::MID qw(mids);
require_mods(qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
URI::Escape Plack::Builder));
use_ok($_) for (qw(HTTP::Request::Common Plack::Test));
+use_ok 'PublicInbox::WWW';
use_ok 'PublicInbox::V2Writable';
my ($inboxdir, $for_destroy) = tmpdir();
my $ibx = {
my $im = PublicInbox::V2Writable->new($ibx, 1);
$im->{parallel} = 0;
-my $mime = PublicInbox::MIME->create(
- header => [
- From => 'a@example.com',
- To => 'test@example.com',
- Subject => 'this is a subject',
- 'Message-ID' => '<a-mid@b>',
- Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
- ],
- body => "hello world\n",
-);
+my $mime = PublicInbox::Eml->new(<<'EOF');
+From oldbug-pre-a0c07cba0e5d8b6a Fri Oct 2 00:00:00 1993
+From: a@example.com
+To: test@example.com
+Subject: this is a subject
+Message-ID: <a-mid@b>
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+
+hello world
+EOF
ok($im->add($mime), 'added one message');
$mime->body_set("hello world!\n");
$new_mid = $mids->[1];
$im->done;
+my $msg = $ibx->msg_by_mid('a-mid@b');
+like($$msg, qr/\AFrom oldbug/s,
+ '"From_" line stored to test old bug workaround');
+
my $cfgpfx = "publicinbox.v2test";
my $cfg = <<EOF;
$cfgpfx.address=$ibx->{-primary_address}
my ($res, $raw, @from_);
test_psgi(sub { $www->call(@_) }, sub {
my ($cb) = @_;
+ $res = $cb->(GET('/v2test/description'));
+ like($res->content, qr!\$INBOX_DIR/description missing!,
+ 'got v2 description missing message');
$res = $cb->(GET('/v2test/a-mid@b/raw'));
$raw = $res->content;
+ unlike($raw, qr/^From oldbug/sm, 'buggy "From_" line omitted');
like($raw, qr/^hello world$/m, 'got first message');
like($raw, qr/^hello world!$/m, 'got second message');
@from_ = ($raw =~ m/^From /mg);
my $third = $mids->[-1];
$im->done;
-test_psgi(sub { $www->call(@_) }, sub {
+my $client = sub {
my ($cb) = @_;
$res = $cb->(GET("/v2test/$third/raw"));
$raw = $res->content;
SKIP: {
eval { require IO::Uncompress::Gunzip };
- skip 'IO::Uncompress::Gunzip missing', 4 if $@;
+ skip 'IO::Uncompress::Gunzip missing', 6 if $@;
+ my ($in, $out, $status);
+ my $req = GET('/v2test/a-mid@b/raw');
+ $req->header('Accept-Encoding' => 'gzip');
+ $res = $cb->($req);
+ is($res->header('Content-Encoding'), 'gzip', 'gzip encoding');
+ $in = $res->content;
+ IO::Uncompress::Gunzip::gunzip(\$in => \$out);
+ is($out, $raw, 'gzip response matches');
$res = $cb->(GET('/v2test/a-mid@b/t.mbox.gz'));
- my $out;
- my $in = $res->content;
- my $status = IO::Uncompress::Gunzip::gunzip(\$in => \$out);
+ $in = $res->content;
+ $status = IO::Uncompress::Gunzip::gunzip(\$in => \$out);
+ unlike($out, qr/^From oldbug/sm, 'buggy "From_" line omitted');
like($out, qr/^hello world$/m, 'got first in t.mbox.gz');
like($out, qr/^hello world!$/m, 'got second in t.mbox.gz');
like($out, qr/^hello ghosts$/m, 'got third in t.mbox.gz');
$res = $cb->(POST('/v2test/?q=m:a-mid@b&x=m'));
$in = $res->content;
$status = IO::Uncompress::Gunzip::gunzip(\$in => \$out);
+ unlike($out, qr/^From oldbug/sm, 'buggy "From_" line omitted');
like($out, qr/^hello world$/m, 'got first in mbox POST');
like($out, qr/^hello world!$/m, 'got second in mbox POST');
like($out, qr/^hello ghosts$/m, 'got third in mbox POST');
$res = $cb->(GET('/v2test/all.mbox.gz'));
$in = $res->content;
$status = IO::Uncompress::Gunzip::gunzip(\$in => \$out);
+ unlike($out, qr/^From oldbug/sm, 'buggy "From_" line omitted');
like($out, qr/^hello world$/m, 'got first in all.mbox');
like($out, qr/^hello world!$/m, 'got second in all.mbox');
like($out, qr/^hello ghosts$/m, 'got third in all.mbox');
my @over = ($raw =~ m/\d{4}-\d+-\d+\s+\d+:\d+ +(?:\d+\% )?(.+)$/gm);
is_deeply(\@over, [ '<a', '` <a', '` <a' ], 'threaded messages show up');
+ $res = $cb->(GET('/v2test/?q=m:a-mid@b&x=A'));
+ is($res->code, 200, 'success with Atom search');
+ SKIP: {
+ require_mods(qw(XML::TreePP), 2);
+ my $t = XML::TreePP->new->parse($res->content);
+ like($t->{feed}->{-xmlns}, qr/\bAtom\b/,
+ 'looks like an an Atom feed');
+ is(scalar @{$t->{feed}->{entry}}, 3, 'parsed three entries');
+ };
+
local $SIG{__WARN__} = 'DEFAULT';
$res = $cb->(GET('/v2test/a-mid@b/'));
$raw = $res->content;
like($raw, qr!>\Q$mid\E</a>!s, "Message-ID $mid shown");
}
like($raw, qr/\b3\+ messages\b/, 'thread overview shown');
+};
+
+test_psgi(sub { $www->call(@_) }, $client);
+SKIP: {
+ require_mods(qw(Plack::Test::ExternalServer), 37);
+ my $cfgpath = "$inboxdir/$$.config";
+ open my $fh, '>', $cfgpath or BAIL_OUT $!;
+ print $fh <<EOF or BAIL_OUT $!;
+[publicinbox "v2test"]
+ inboxdir = $inboxdir
+ address = test\@example.com
+EOF
+ close $fh or BAIL_OUT $!;
+ my $env = { PI_CONFIG => $cfgpath };
+ my $sock = tcp_server() or die;
+ my ($out, $err) = map { "$inboxdir/std$_.log" } qw(out err);
+ my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
+ my $td = start_script($cmd, $env, { 3 => $sock });
+ my ($h, $p) = ($sock->sockhost, $sock->sockport);
+ local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
+ Plack::Test::ExternalServer::test_psgi(client => $client);
+ $td->join('TERM');
+ open $fh, '<', $err or BAIL_OUT $!;
+ is(do { local $/; <$fh> }, '', 'no errors');
+};
+test_psgi(sub { $www->call(@_) }, sub {
+ my ($cb) = @_;
my $exp = [ qw(<a-mid@b> <reuse@mid>) ];
$mime->header_set('Message-Id', @$exp);
$mime->header_set('Subject', '4th dupe');
$res = $cb->(GET('/v2test/reuse@mid/T/'));
$raw = $res->content;
like($raw, qr/\b4\+ messages\b/, 'thread overview shown with /T/');
- @over = ($raw =~ m/^\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
+ my @over = ($raw =~ m/^\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
is_deeply(\@over, [ '<a', '` <a', '` <a', '` <a' ],
'duplicate messages share the same root');
# ensure conflicted attachments can be resolved
foreach my $body (qw(old new)) {
- my $parts = [
- PublicInbox::MIME->create(
- attributes => { content_type => 'text/plain' },
- body => 'blah',
- ),
- PublicInbox::MIME->create(
- attributes => {
- filename => 'attach.txt',
- content_type => 'text/plain',
- },
- body => $body
- )
- ];
- $mime = PublicInbox::MIME->create(
- parts => $parts,
- header_str => [ From => 'root@z',
- 'Message-ID' => '<a@dup>',
- Subject => 'hi']
- );
+ $mime = eml_load "t/psgi_v2-$body.eml";
ok($im->add($mime), "added attachment $body");
}
$im->done;
is($old->content, 'old', 'got expected old content');
is($new->content, 'new', 'got expected new content');
}
+ $res = $cb->(GET('/v2test/?t=1970'.'01'.'01'.'000000'));
+ is($res->code, 404, '404 for out-of-range t= param');
});
done_testing();