X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_v2.t;h=7d73b606dbef5f0ad736cc57ddaef5b5d222e4b8;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=1e45c2633a6bc36576ad27ee41857edd4e694925;hpb=26895bbd94dc93b76274652f9ea35626fd63a5fa;p=public-inbox.git diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 1e45c263..7d73b606 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -1,67 +1,78 @@ -# Copyright (C) 2018 all contributors +#!perl -w +# Copyright (C) 2018-2021 all contributors # License: AGPL-3.0+ use strict; -use warnings; -use Test::More; -use File::Temp qw/tempdir/; -use PublicInbox::MIME; +use v5.10.1; +use PublicInbox::TestCommon; +require_git(2.6); +use PublicInbox::Eml; use PublicInbox::Config; -use PublicInbox::WWW; -my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test - URI::Escape Plack::Builder); -foreach my $mod (@mods) { - eval "require $mod"; - plan skip_all => "$mod missing for psgi_v2_dupes.t" if $@; -} -use_ok($_) for @mods; -use_ok 'PublicInbox::V2Writable'; -my $mainrepo = tempdir('pi-v2_dupes-XXXXXX', TMPDIR => 1, CLEANUP => 1); -my $ibx = { - mainrepo => $mainrepo, - name => 'test-v2writable', - version => 2, - -primary_address => 'test@example.com', -}; -$ibx = PublicInbox::Inbox->new($ibx); -my $new_mid; - -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' => '', - Date => 'Fri, 02 Oct 1993 00:00:00 +0000', - ], - body => "hello world\n", -); -ok($im->add($mime), 'added one message'); -$mime->body_set("hello world!\n"); - -my @warn; -local $SIG{__WARN__} = sub { push @warn, @_ }; -$mime->header_set(Date => 'Fri, 02 Oct 1993 00:01:00 +0000'); -ok($im->add($mime), 'added duplicate-but-different message'); -is(scalar(@warn), 1, 'got one warning'); -my @mids = $mime->header_obj->header_raw('Message-Id'); -$new_mid = PublicInbox::MID::mid_clean($mids[0]); -$im->done; +use PublicInbox::MID qw(mids); +require_mods(qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test + URI::Escape Plack::Builder HTTP::Date)); +use_ok($_) for (qw(HTTP::Request::Common Plack::Test)); +use_ok 'PublicInbox::WWW'; +my ($tmpdir, $for_destroy) = tmpdir(); +my $eml = 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: +Date: Fri, 02 Oct 1993 00:00:00 +0000 +Content-Type: text/plain; charset=iso-8859-1 -my $cfgpfx = "publicinbox.v2test"; -my $cfg = { - "$cfgpfx.address" => $ibx->{-primary_address}, - "$cfgpfx.mainrepo" => $mainrepo, +hello world +EOF +my $new_mid; +my $ibx = create_inbox 'v2-1', version => 2, indexlevel => 'medium', + tmpdir => "$tmpdir/v2", sub { + my ($im, $ibx) = @_; + $im->add($eml) or BAIL_OUT; + $eml->body_set("hello world!\n"); + my @warn; + local $SIG{__WARN__} = sub { push @warn, @_ }; + $eml->header_set(Date => 'Fri, 02 Oct 1993 00:01:00 +0000'); + $im->add($eml) or BAIL_OUT; + is(scalar(@warn), 1, 'got one warning'); + my $mids = mids($eml->header_obj); + $new_mid = $mids->[1]; + open my $fh, '>', "$ibx->{inboxdir}/new_mid" or BAIL_OUT; + print $fh $new_mid or BAIL_OUT; + close $fh or BAIL_OUT; +}; +$new_mid //= do { + open my $fh, '<', "$ibx->{inboxdir}/new_mid" or BAIL_OUT; + local $/; + <$fh>; }; -my $config = PublicInbox::Config->new($cfg); -my $www = PublicInbox::WWW->new($config); +my $cfgpath = "$ibx->{inboxdir}/pi_config"; +{ + open my $fh, '>', $cfgpath or BAIL_OUT $!; + print $fh <{inboxdir} + address = $ibx->{-primary_address} +EOF + close $fh or BAIL_OUT; +} + +my $msg = $ibx->msg_by_mid('a-mid@b'); +like($$msg, qr/\AFrom oldbug/s, + '"From_" line stored to test old bug workaround'); +my $cfg = PublicInbox::Config->new($cfgpath); +my $www = PublicInbox::WWW->new($cfg); my ($res, $raw, @from_); -test_psgi(sub { $www->call(@_) }, sub { +my $client0 = 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')); + is($res->header('Content-Type'), 'text/plain; charset=iso-8859-1', + 'charset from message used'); $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); @@ -84,21 +95,40 @@ test_psgi(sub { $www->call(@_) }, sub { @bodies = ($res->content =~ /^(hello [^<]+)$/mg); is_deeply(\@bodies, [ "hello world!\n", "hello world\n" ], 'new.html ordering is chronological'); -}); -$mime->header_set('Message-Id', 'a-mid@b'); -$mime->body_set("hello ghosts\n"); -ok($im->add($mime), 'added 3rd duplicate-but-different message'); -is(scalar(@warn), 2, 'got another warning'); -like($warn[0], qr/mismatched/, 'warned about mismatched messages'); -is($warn[0], $warn[1], 'both warnings are the same'); + $res = $cb->(GET('/v2test/new.atom')); + my @dates = ($res->content =~ m!title>([^<]+)!g); + is_deeply(\@dates, [ "1993-10-02T00:01:00Z", "1993-10-02T00:00:00Z" ], + 'Date headers made it through'); +}; +test_psgi(sub { $www->call(@_) }, $client0); +my $env = { TMPDIR => $tmpdir, PI_CONFIG => $cfgpath }; +test_httpd($env, $client0, 9); -@mids = $mime->header_obj->header_raw('Message-Id'); -my $third = PublicInbox::MID::mid_clean($mids[0]); +$eml->header_set('Message-ID', 'a-mid@b'); +$eml->body_set("hello ghosts\n"); +my $im = $ibx->importer(0); +{ + my @warn; + local $SIG{__WARN__} = sub { push @warn, @_ }; + ok($im->add($eml), 'added 3rd duplicate-but-different message'); + is(scalar(@warn), 1, 'got another warning'); + like($warn[0], qr/mismatched/, 'warned about mismatched messages'); +} +my $mids = mids($eml->header_obj); +my $third = $mids->[-1]; $im->done; -test_psgi(sub { $www->call(@_) }, sub { +my $client1 = sub { my ($cb) = @_; + $res = $cb->(GET('/v2test/_/text/config/raw')); + my $lm = $res->header('Last-Modified'); + ok($lm, 'Last-Modified set w/ ->mm'); + $lm = HTTP::Date::str2time($lm); + is($lm, $ibx->mm->created_at, + 'Last-Modified for text/config/raw matches ->created_at'); + delete $ibx->{mm}; + $res = $cb->(GET("/v2test/$third/raw")); $raw = $res->content; like($raw, qr/^hello ghosts$/m, 'got third message'); @@ -112,23 +142,158 @@ test_psgi(sub { $www->call(@_) }, sub { like($raw, qr/^hello ghosts$/m, 'got third message'); @from_ = ($raw =~ m/^From /mg); is(scalar(@from_), 3, 'three From_ lines'); + $cfg->each_inbox(sub { $_[0]->search->reopen }); 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'); - @from_ = ($raw =~ m/^From /mg); + @from_ = ($out =~ m/^From /mg); is(scalar(@from_), 3, 'three From_ lines in t.mbox.gz'); + + # search interface + $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'); + @from_ = ($out =~ m/^From /mg); + is(scalar(@from_), 3, 'three From_ lines in mbox POST'); + + # all.mbox.gz interface + $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'); + @from_ = ($out =~ m/^From /mg); + is(scalar(@from_), 3, 'three From_ lines in all.mbox'); }; -}); -done_testing(); + $res = $cb->(GET('/v2test/?q=m:a-mid@b&x=t')); + is($res->code, 200, 'success with threaded search'); + my $raw = $res->content; + ok($raw =~ s/\A.*>Results 1-3 of 3\b//s, 'got all results'); + my @over = ($raw =~ m/\d{4}-\d+-\d+\s+\d+:\d+ +(?:\d+\% )?(.+)$/gm); + is_deeply(\@over, [ '(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/^hello world$/m, 'got first message'); + like($raw, qr/^hello world!$/m, 'got second message'); + like($raw, qr/^hello ghosts$/m, 'got third message'); + @from_ = ($raw =~ m/>From: /mg); + is(scalar(@from_), 3, 'three From: lines'); + foreach my $mid ('a-mid@b', $new_mid, $third) { + like($raw, qr!>\Q$mid\E!s, "Message-ID $mid shown"); + } + like($raw, qr/\b3\+ messages\b/, 'thread overview shown'); +}; + +test_psgi(sub { $www->call(@_) }, $client1); +test_httpd($env, $client1, 38); + +{ + my $exp = [ qw( ) ]; + $eml->header_set('Message-Id', @$exp); + $eml->header_set('Subject', '4th dupe'); + local $SIG{__WARN__} = sub {}; + ok($im->add($eml), 'added one message'); + $im->done; + my @h = $eml->header('Message-ID'); + is_deeply($exp, \@h, 'reused existing Message-ID'); + $cfg->each_inbox(sub { $_[0]->search->reopen }); +} + +my $client2 = sub { + my ($cb) = @_; + my $res = $cb->(GET('/v2test/new.atom')); + my @ids = ($res->content =~ m!urn:uuid:([^<]+)!sg); + my %ids; + $ids{$_}++ for @ids; + is_deeply([qw(1 1 1 1)], [values %ids], 'feed ids unique'); + + $res = $cb->(GET('/v2test/reuse@mid/T/')); + $raw = $res->content; + like($raw, qr/\b4\+ messages\b/, 'thread overview shown with /T/'); + my @over = ($raw =~ m/^\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm); + is_deeply(\@over, [ '(GET('/v2test/reuse@mid/t/')); + $raw = $res->content; + like($raw, qr/\b4\+ messages\b/, 'thread overview shown with /t/'); + + $res = $cb->(GET('/v2test/0/info/refs')); + is($res->code, 200, 'got info refs for dumb clones'); + $res = $cb->(GET('/v2test/0.git/info/refs')); + is($res->code, 200, 'got info refs for dumb clones w/ .git suffix'); + $res = $cb->(GET('/v2test/info/refs')); + is($res->code, 404, 'v2 git URL w/o shard fails'); +}; + +test_psgi(sub { $www->call(@_) }, $client2); +test_httpd($env, $client2, 8); +{ + # ensure conflicted attachments can be resolved + local $SIG{__WARN__} = sub {}; + foreach my $body (qw(old new)) { + $im->add(eml_load "t/psgi_v2-$body.eml") or BAIL_OUT; + } + $im->done; +} +$cfg->each_inbox(sub { $_[0]->search->reopen }); + +my $client3 = sub { + my ($cb) = @_; + my $res = $cb->(GET('/v2test/a@dup/')); + my @links = ($res->content =~ m!"\.\./([^/]+/2-attach\.txt)\"!g); + is(scalar(@links), 2, 'both attachment links exist'); + isnt($links[0], $links[1], 'attachment links are different'); + { + my $old = $cb->(GET('/v2test/' . $links[0])); + my $new = $cb->(GET('/v2test/' . $links[1])); + 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'); + my @warn = (); + local $SIG{__WARN__} = sub { push @warn, @_ }; + $res = $cb->(GET('/v2test/?t=1970'.'01'.'01')); + is_deeply(\@warn, [], 'no warnings on YYYYMMDD only'); +}; +test_psgi(sub { $www->call(@_) }, $client3); +test_httpd($env, $client3, 4); -1; +done_testing;