-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) 2018-2021 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::MIME;
-use PublicInbox::Config;
+use v5.10.1;
use PublicInbox::TestCommon;
+use PublicInbox::Eml;
+use PublicInbox::Config;
my @mods = qw(DBD::SQLite HTTP::Request::Common Plack::Test
- URI::Escape Plack::Builder PublicInbox::WWW);
+ URI::Escape Plack::Builder);
+require_git 2.6;
require_mods(@mods);
use_ok($_) for @mods;
use_ok 'PublicInbox::WWW';
-use_ok 'PublicInbox::V2Writable';
-my ($inboxdir, $for_destroy) = tmpdir();
-my $cfgpfx = "publicinbox.bad-mids";
-my $ibx = {
- inboxdir => $inboxdir,
- name => 'bad-mids',
- version => 2,
- -primary_address => 'test@example.com',
- indexlevel => 'basic',
-};
-$ibx = PublicInbox::Inbox->new($ibx);
-my $im = PublicInbox::V2Writable->new($ibx, 1);
-$im->{parallel} = 0;
-
my $msgs = <<'';
F1V5OR6NMF.3M649JTLO9IXD@tux.localdomain/hehe1"'<foo
F1V5NB0PTU.3U0DCVGAJ750Z@tux.localdomain"'<>/foo
+F1V5NB0PTU.3U0DCVGAJ750Z@tux&.ampersand
F1V5MIHGCU.2ABINKW6WBE8N@tux.localdomain/raw
F1V5LF9D9C.2QT5PGXZQ050E@tux.localdomain/t.atom
F1V58X3CMU.2DCCVAKQZGADV@tux.localdomain/../../../../foo
F1TVKINT3G.2S6I36MXMHYG6@tux.localdomain" onclick="alert(1)"
my @mids = split(/\n/, $msgs);
-my $i = 0;
-foreach my $mid (@mids) {
- my $data = << "";
+my $ibx = create_inbox 'bad-mids', version => 2, indexlevel => 'basic', sub {
+ my ($im) = @_;
+ my $i = 0;
+ for my $mid (@mids) {
+ $im->add(PublicInbox::Eml->new(<<"")) or BAIL_OUT;
Subject: test
Message-ID: <$mid>
From: a\@example.com
To: b\@example.com
Date: Fri, 02 Oct 1993 00:00:0$i +0000
+ $i++;
+ }
+};
- my $mime = PublicInbox::MIME->new(\$data);
- ok($im->add($mime), "added $mid");
- $i++
-}
-$im->done;
-
+my $cfgpfx = "publicinbox.bad-mids";
my $cfg = <<EOF;
$cfgpfx.address=$ibx->{-primary_address}
-$cfgpfx.inboxdir=$inboxdir
+$cfgpfx.inboxdir=$ibx->{inboxdir}
EOF
my $config = PublicInbox::Config->new(\$cfg);
my $www = PublicInbox::WWW->new($config);
ok(index($raw, $mid) < 0, "escaped $mid");
}
- my (@xmids) = ($raw =~ m!\bhref="([^"]+)/t\.mbox\.gz"!sg);
+ my (@xmids) = ($raw =~ m!\bhref="([^"]+?)/T/#u"!sg);
is(scalar(@xmids), scalar(@mids),
'got escaped links to all messages');
@xmids = reverse @xmids;
+ my %uxs = ( gt => '>', lt => '<' );
foreach my $i (0..$#xmids) {
- $res = $cb->(GET("/bad-mids/$xmids[$i]/raw"));
- is($res->code, 200, 'got 200 OK raw message');
+ my $uri = $xmids[$i];
+ $uri =~ s/&#([0-9]+);/sprintf("%c", $1)/sge;
+ $uri =~ s/&(lt|gt);/$uxs{$1}/sge;
+ $res = $cb->(GET("/bad-mids/$uri/raw"));
+ is($res->code, 200, 'got 200 OK raw message '.$uri);
like($res->content, qr/Message-ID: <\Q$mids[$i]\E>/s,
'retrieved correct message');
}
});
-done_testing();
-
-1;
+done_testing;