X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_attach.t;h=79665d6f1fc42d669307499d07049f4f5ec30fe4;hb=7b7d4bd01b564969eb0c1904a5bd9ee4f3dbba72;hp=12f9e6eeecd6586b9c345a37d76800b452bc2c17;hpb=77aa1a9eae83fa60eb8208710a714aa4f39d9b34;p=public-inbox.git
diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 12f9e6ee..79665d6f 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,90 +1,115 @@
-# Copyright (C) 2016-2020 all contributors
+#!perl -w
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
+use v5.10.1;
use PublicInbox::TestCommon;
-my ($tmpdir, $for_destroy) = tmpdir();
-my $maindir = "$tmpdir/main.git";
-my $addr = 'test-public@example.com';
-my $cfgpfx = "publicinbox.test";
my @mods = qw(HTTP::Request::Common Plack::Builder Plack::Test URI::Escape);
require_mods(@mods);
use_ok $_ foreach @mods;
use_ok 'PublicInbox::WWW';
-use PublicInbox::Import;
-use PublicInbox::Git;
use PublicInbox::Config;
use PublicInbox::Eml;
use_ok 'PublicInbox::WwwAttach';
-my $config = PublicInbox::Config->new(\<add(eml_load('t/psgi_attach.eml')) or BAIL_OUT;
+ $im->add(eml_load('t/data/message_embed.eml')) or BAIL_OUT;
+ $cfgpath = "$ibx->{inboxdir}/pi_config";
+ open my $fh, '>', $cfgpath or BAIL_OUT $!;
+ print $fh <{-primary_address}
+ inboxdir = $ibx->{inboxdir}
EOF
-my $git = PublicInbox::Git->new($maindir);
-my $im = PublicInbox::Import->new($git, 'test', $addr);
-$im->init_bare;
+ close $fh or BAIL_OUT $!;
+};
+my $ibx = create_inbox 'test', $creat_cb;
+$cfgpath //= "$ibx->{inboxdir}/pi_config";
+my $qp = "abcdef=g\n==blah\n";
+my $b64 = "b64\xde\xad\xbe\xef\n";
+my $txt = "plain\ntext\npass\nthrough\n";
+my $dot = "dotfile\n";
+my $www = PublicInbox::WWW->new(PublicInbox::Config->new($cfgpath));
+my $client = sub {
+ my ($cb) = @_;
+ my $res;
+ $res = $cb->(GET('/test/Z%40B/'));
+ my @href = ($res->content =~ /^href="([^"]+)"/gms);
+ @href = grep(/\A[\d\.]+-/, @href);
+ is_deeply([qw(1-queue-pee 2-bayce-sixty-four 3-noop.txt
+ 4-a.txt)],
+ \@href, 'attachment links generated');
-{
- my $qp = "abcdef=g\n==blah\n";
- my $b64 = "b64\xde\xad\xbe\xef\n";
- my $txt = "plain\ntext\npass\nthrough\n";
- my $dot = "dotfile\n";
- $im->add(eml_load('t/psgi_attach.eml'));
- $im->add(eml_load('t/data/message_embed.eml'));
- $im->done;
+ $res = $cb->(GET('/test/Z%40B/1-queue-pee'));
+ my $qp_res = $res->content;
+ ok(length($qp_res) >= length($qp), 'QP length is close');
+ like($qp_res, qr/\n\z/s, 'trailing newline exists');
+ # is(index($qp_res, $qp), 0, 'QP trailing newline is there');
+ $qp_res =~ s/\r\n/\n/g;
+ is(index($qp_res, $qp), 0, 'QP trailing newline is there');
- my $www = PublicInbox::WWW->new($config);
- test_psgi(sub { $www->call(@_) }, sub {
- my ($cb) = @_;
- my $res;
- $res = $cb->(GET('/test/Z%40B/'));
- my @href = ($res->content =~ /^href="([^"]+)"/gms);
- @href = grep(/\A[\d\.]+-/, @href);
- is_deeply([qw(1-queue-pee 2-bayce-sixty-four 3-noop.txt
- 4-a.txt)],
- \@href, 'attachment links generated');
+ $res = $cb->(GET('/test/Z%40B/2-base-sixty-four'));
+ is(quotemeta($res->content), quotemeta($b64),
+ 'Base64 matches exactly');
- $res = $cb->(GET('/test/Z%40B/1-queue-pee'));
- my $qp_res = $res->content;
- ok(length($qp_res) >= length($qp), 'QP length is close');
- like($qp_res, qr/\n\z/s, 'trailing newline exists');
- # is(index($qp_res, $qp), 0, 'QP trailing newline is there');
- $qp_res =~ s/\r\n/\n/g;
- is(index($qp_res, $qp), 0, 'QP trailing newline is there');
+ $res = $cb->(GET('/test/Z%40B/3-noop.txt'));
+ my $txt_res = $res->content;
+ ok(length($txt_res) >= length($txt),
+ 'plain text almost matches');
+ like($txt_res, qr/\n\z/s, 'trailing newline exists in text');
+ is(index($txt_res, $txt), 0, 'plain text not truncated');
- $res = $cb->(GET('/test/Z%40B/2-base-sixty-four'));
- is(quotemeta($res->content), quotemeta($b64),
- 'Base64 matches exactly');
+ $res = $cb->(GET('/test/Z%40B/4-a.txt'));
+ my $dot_res = $res->content;
+ 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');
- $res = $cb->(GET('/test/Z%40B/3-noop.txt'));
- my $txt_res = $res->content;
- ok(length($txt_res) >= length($txt),
- 'plain text almost matches');
- like($txt_res, qr/\n\z/s, 'trailing newline exists in text');
- is(index($txt_res, $txt), 0, 'plain text not truncated');
+ 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/Z%40B/4-a.txt'));
- my $dot_res = $res->content;
- 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');
+ $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');
- my $mid = '20200418222508.GA13918@dcvr';
- my $irt = '20200418222020.GA2745@dcvr';
- $res = $cb->(GET("/test/$mid/"));
- like($res->content, qr/\bhref="2-embed2x\.eml"/s,
- 'href to 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');
+};
+
+test_psgi(sub { $www->call(@_) }, $client);
+SKIP: {
+ require_mods(qw(DBD::SQLite Plack::Test::ExternalServer), 18);
+ $ibx = create_inbox 'test-indexed', indexlevel => 'basic', $creat_cb;
+ $cfgpath = "$ibx->{inboxdir}/pi_config";
+ my $env = { PI_CONFIG => $cfgpath };
+ $www = PublicInbox::WWW->new(PublicInbox::Config->new($cfgpath));
+ test_psgi(sub { $www->call(@_) }, $client);
+ my $sock = tcp_server() or die;
+ my ($tmpdir, $for_destroy) = tmpdir();
+ my ($out, $err) = map { "$tmpdir/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) = tcp_host_port($sock);
+ local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
+ Plack::Test::ExternalServer::test_psgi(client => $client);
}
-done_testing();
+done_testing;