X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=07687052c0b7fe4f99b9ab1e6fc1442de2e41e81;hb=e6b7a7f5f70fb89a54ff158bc6c8b564149947e5;hp=a5c982e90be592c735870e28f11aeb4e41f1e1da;hpb=7a3a4b9d310876f68f4ba788afaef77ad15fc62b;p=public-inbox.git
diff --git a/t/v2writable.t b/t/v2writable.t
index a5c982e9..07687052 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -1,55 +1,56 @@
-# Copyright (C) 2018 all contributors
+# Copyright (C) 2018-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
use PublicInbox::MIME;
-use PublicInbox::ContentId qw(content_digest);
-use File::Temp qw/tempdir/;
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
- eval "require $mod";
- plan skip_all => "$mod missing for nntpd.t" if $@;
-}
+use PublicInbox::ContentId qw(content_digest content_id);
+use PublicInbox::TestCommon;
+use Cwd qw(abs_path);
+require_git(2.6);
+require_mods(qw(DBD::SQLite Search::Xapian));
+local $ENV{HOME} = abs_path('t');
use_ok 'PublicInbox::V2Writable';
-my $mainrepo = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+umask 007;
+my ($inboxdir, $for_destroy) = tmpdir();
my $ibx = {
- mainrepo => $mainrepo,
+ inboxdir => $inboxdir,
name => 'test-v2writable',
version => 2,
-primary_address => 'test@example.com',
};
$ibx = PublicInbox::Inbox->new($ibx);
-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",
-);
-
-my $im = eval {
- local $ENV{NPROC} = '1';
- PublicInbox::V2Writable->new($ibx, 1);
-};
-is($im->{partitions}, 1, 'one partition when forced');
+my $mime = PublicInbox::MIME->new(<<'EOF');
+From: a@example.com
+To: test@example.com
+Subject: this is a subject
+Message-ID:
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+
+hello world
+EOF
+my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1});
+is($im->{shards}, 1, 'one shard when forced');
ok($im->add($mime), 'ordinary message added');
+foreach my $f ("$inboxdir/msgmap.sqlite3",
+ glob("$inboxdir/xap*/*"),
+ glob("$inboxdir/xap*/*/*")) {
+ my @st = stat($f);
+ my ($bn) = (split(m!/!, $f))[-1];
+ is($st[2] & 07777, -f _ ? 0660 : 0770,
+ "default sharedRepository respected for $bn");
+}
+
my $git0;
if ('ensure git configs are correct') {
- my @cmd = (qw(git config), "--file=$mainrepo/all.git/config",
+ my @cmd = (qw(git config), "--file=$inboxdir/all.git/config",
qw(core.sharedRepository 0644));
- is(system(@cmd), 0, "set sharedRepository in all.git");
- $git0 = PublicInbox::Git->new("$mainrepo/git/0.git");
- my $fh = $git0->popen(qw(config core.sharedRepository));
- my $v = eval { local $/; <$fh> };
- chomp $v;
+ is(xsys(@cmd), 0, "set sharedRepository in all.git");
+ $git0 = PublicInbox::Git->new("$inboxdir/git/0.git");
+ chomp(my $v = $git0->qx(qw(config core.sharedRepository)));
is($v, '0644', 'child repo inherited core.sharedRepository');
- $fh = $git0->popen(qw(config --bool repack.writeBitmaps));
- $v = eval { local $/; <$fh> };
- chomp $v;
+ chomp($v = $git0->qx(qw(config --bool repack.writeBitmaps)));
is($v, 'true', 'child repo inherited repack.writeBitmaps');
}
@@ -57,118 +58,116 @@ if ('ensure git configs are correct') {
my @warn;
local $SIG{__WARN__} = sub { push @warn, @_ };
is($im->add($mime), undef, 'obvious duplicate rejected');
- like(join(' ', @warn), qr/resent/, 'warned about resent message');
+ is(scalar(@warn), 0, 'no warning about resent message');
@warn = ();
$mime->header_set('Message-Id', '', '');
- ok($im->add($mime), 'secondary MID used');
+ is($im->add($mime), undef, 'secondary MID ignored if first matches');
+ my $sec = PublicInbox::MIME->new($mime->as_string);
+ $sec->header_set('Date');
+ $sec->header_set('Message-Id', '', '');
+ ok($im->add($sec), 'secondary MID used if data is different');
like(join(' ', @warn), qr/mismatched/, 'warned about mismatch');
like(join(' ', @warn), qr/alternative/, 'warned about alternative');
is_deeply([ '', '' ],
- [ $mime->header_obj->header_raw('Message-Id') ],
+ [ $sec->header_obj->header_raw('Message-Id') ],
'no new Message-Id added');
+ my $sane_mid = qr/\A<[\w\-\.]+\@\w+>\z/;
@warn = ();
$mime->header_set('Message-Id', '');
$mime->body_set('different');
ok($im->add($mime), 'reused mid ok');
like(join(' ', @warn), qr/reused/, 'warned about reused MID');
my @mids = $mime->header_obj->header_raw('Message-Id');
- is($mids[1], '', 'original mid not changed');
- like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
+ is($mids[0], '', 'original mid not changed');
+ like($mids[1], $sane_mid, 'new MID added');
is(scalar(@mids), 2, 'only one new MID added');
@warn = ();
$mime->header_set('Message-Id', '');
$mime->body_set('this one needs a random mid');
- my $gen = content_digest($mime)->hexdigest . '@localhost';
+ my $hdr = $mime->header_obj;
+ my $gen = PublicInbox::Import::digest2mid(content_digest($mime), $hdr);
+ unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id');
my $fake = PublicInbox::MIME->new($mime->as_string);
- $fake->header_set('Message-Id', $gen);
+ $fake->header_set('Message-Id', "<$gen>");
ok($im->add($fake), 'fake added easily');
is_deeply(\@warn, [], 'no warnings from a faker');
ok($im->add($mime), 'random MID made');
like(join(' ', @warn), qr/using random/, 'warned about using random');
@mids = $mime->header_obj->header_raw('Message-Id');
- is($mids[1], '', 'original mid not changed');
- like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
+ is($mids[0], '', 'original mid not changed');
+ like($mids[1], $sane_mid, 'new MID added');
is(scalar(@mids), 2, 'only one new MID added');
@warn = ();
$mime->header_set('Message-Id');
ok($im->add($mime), 'random MID made for MID free message');
@mids = $mime->header_obj->header_raw('Message-Id');
- like($mids[0], qr/\A<\w+\@localhost>\z/, 'mid was generated');
+ like($mids[0], $sane_mid, 'mid was generated');
is(scalar(@mids), 1, 'new generated');
+
+ @warn = ();
+ $mime->header_set('Message-Id', '');
+ ok($im->add($mime), 'message added with space in Message-Id');
+ is_deeply([], \@warn);
}
{
$mime->header_set('Message-Id', '', '');
+ $mime->header_set('X-Alt-Message-Id', '');
+ $mime->header_set('References', '');
ok($im->add($mime), 'message with multiple Message-ID');
$im->done;
- my @found;
- $ibx->search->reopen;
- $ibx->search->each_smsg_by_mid('abcde@1', sub { push @found, @_; 1 });
- is(scalar(@found), 1, 'message found by first MID');
- $ibx->search->each_smsg_by_mid('abcde@2', sub { push @found, @_; 1 });
- is(scalar(@found), 2, 'message found by second MID');
- is($found[0]->{doc_id}, $found[1]->{doc_id}, 'same document');
- ok($found[1]->{doc_id} > 0, 'doc_id is positive');
+ my ($total, undef) = $ibx->over->recent;
+ is($ibx->mm->num_highwater, $total, 'got expected highwater value');
+ my $srch = $ibx->search;
+ my $mset1 = $srch->reopen->query('m:abcde@1', { mset => 1 });
+ is($mset1->size, 1, 'message found by first MID');
+ my $mset2 = $srch->reopen->query('m:abcde@2', { mset => 1 });
+ is($mset2->size, 1, 'message found by second MID');
+ is((($mset1->items)[0])->get_docid, (($mset2->items)[0])->get_docid,
+ 'same document') if ($mset1->size);
+
+ my $alt = $srch->reopen->query('m:alt-id-for-nntp', { mset => 1 });
+ is($alt->size, 1, 'message found by alt MID (NNTP)');
+ is((($alt->items)[0])->get_docid, (($mset1->items)[0])->get_docid,
+ 'same document') if ($mset1->size);
+ $mime->header_set('X-Alt-Message-Id');
+
+ my %uniq;
+ for my $mid (qw(abcde@1 abcde@2 alt-id-for-nntp)) {
+ my $msgs = $ibx->over->get_thread($mid);
+ my $key = join(' ', sort(map { $_->{num} } @$msgs));
+ $uniq{$key}++;
+ }
+ is(scalar(keys(%uniq)), 1, 'all alt Message-ID queries give same smsg');
+ is_deeply([values(%uniq)], [3], '3 queries, 3 results');
}
-SKIP: {
- use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);
+{
use Net::NNTP;
- use IO::Socket;
- use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
- eval { require Danga::Socket };
- skip "Danga::Socket missing $@", 2 if $@;
- my $err = "$mainrepo/stderr.log";
- my $out = "$mainrepo/stdout.log";
- my %opts = (
- LocalAddr => '127.0.0.1',
- ReuseAddr => 1,
- Proto => 'tcp',
- Type => SOCK_STREAM,
- Listen => 1024,
- );
+ my $err = "$inboxdir/stderr.log";
+ my $out = "$inboxdir/stdout.log";
my $group = 'inbox.comp.test.v2writable';
- my $pi_config = "$mainrepo/pi_config";
+ my $pi_config = "$inboxdir/pi_config";
open my $fh, '>', $pi_config or die "open: $!\n";
print $fh <new(%opts);
+ my $sock = tcp_server();
ok($sock, 'sock created');
- my $pid;
my $len;
- END { kill 'TERM', $pid if defined $pid };
- $! = 0;
- my $fl = fcntl($sock, F_GETFD, 0);
- ok(! $!, 'no error from fcntl(F_GETFD)');
- is($fl, FD_CLOEXEC, 'cloexec set by default (Perl behavior)');
- $pid = fork;
- if ($pid == 0) {
- use POSIX qw(dup2);
- $ENV{PI_CONFIG} = $pi_config;
- # pretend to be systemd
- fcntl($sock, F_SETFD, $fl &= ~FD_CLOEXEC);
- dup2(fileno($sock), 3) or die "dup2 failed: $!\n";
- $ENV{LISTEN_PID} = $$;
- $ENV{LISTEN_FDS} = 1;
- my $nntpd = 'blib/script/public-inbox-nntpd';
- exec $nntpd, "--stdout=$out", "--stderr=$err";
- die "FAIL: $!\n";
- }
- ok(defined $pid, 'forked nntpd process successfully');
- $! = 0;
- fcntl($sock, F_SETFD, $fl |= FD_CLOEXEC);
- ok(! $!, 'no error from fcntl(F_SETFD)');
+ my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+ my $env = { PI_CONFIG => $pi_config };
+ my $td = start_script($cmd, $env, { 3 => $sock });
my $host_port = $sock->sockhost . ':' . $sock->sockport;
my $n = Net::NNTP->new($host_port);
$n->group($group);
@@ -179,43 +178,145 @@ EOF
is($uniq{$mid}++, 0, "MID for $num is unique in XOVER");
is_deeply($n->xhdr('Message-ID', $num),
{ $num => $mid }, "XHDR lookup OK on num $num");
+
+ # FIXME PublicInbox::NNTP (server) doesn't handle spaces in
+ # Message-ID, but neither does Net::NNTP (client)
+ next if $mid =~ / /;
+
is_deeply($n->xhdr('Message-ID', $mid),
- { $mid => $mid }, "XHDR lookup OK on MID $num");
+ { $mid => $mid }, "XHDR lookup OK on MID $mid ($num)");
}
my %nn;
foreach my $mid (@{$n->newnews(0, $group)}) {
is($nn{$mid}++, 0, "MID is unique in NEWNEWS");
}
is_deeply([sort keys %nn], [sort keys %uniq]);
+
+ my %lg;
+ foreach my $num (@{$n->listgroup($group)}) {
+ is($lg{$num}++, 0, "num is unique in LISTGROUP");
+ }
+ is_deeply([sort keys %lg], [sort keys %$x],
+ 'XOVER and LISTGROUPS return the same article numbers');
+
+ my $xref = $n->xhdr('Xref', '1-');
+ is_deeply([sort keys %lg], [sort keys %$xref], 'Xref range OK');
+
+ my $mids = $n->xhdr('Message-ID', '1-');
+ is_deeply([sort keys %lg], [sort keys %$xref], 'Message-ID range OK');
+
+ my $rover = $n->xrover('1-');
+ is_deeply([sort keys %lg], [sort keys %$rover], 'XROVER range OK');
};
{
- local $ENV{NPROC} = 2;
- my @before = $git0->qx(qw(log --pretty=oneline));
- my $before = $git0->qx(qw(log --pretty=raw --raw -r --no-abbrev));
- $im = PublicInbox::V2Writable->new($ibx, 1);
- is($im->{partitions}, 1, 'detected single partition from previous');
- my $smsg = $im->remove($mime, 'test removal');
- my @after = $git0->qx(qw(log --pretty=oneline));
+ my @log = qw(log --no-decorate --no-abbrev --no-notes --no-color);
+ my @before = $git0->qx(@log, qw(--pretty=oneline));
+ my $before = $git0->qx(@log, qw(--pretty=raw --raw -r));
+ $im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
+ is($im->{shards}, 1, 'detected single shard from previous');
+ my ($mark, $rm_mime, $smsg) = $im->remove($mime, 'test removal');
+ is(content_id($rm_mime), content_id($mime),
+ 'removed object returned matches');
+ ok(defined($mark), 'mark set');
$im->done;
+ my @after = $git0->qx(@log, qw(--pretty=oneline));
my $tip = shift @after;
like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
- 'commit message propaged to git');
+ 'commit message propagated to git');
is_deeply(\@after, \@before, 'only one commit written to git');
is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid');
- like($smsg->num, qr/\A\d+\z/, 'numeric number in return message');
- is($ibx->mm->mid_for($smsg->num), undef, 'no longer in Msgmap by num');
+ my $num = $smsg->{num};
+ like($num, qr/\A\d+\z/, 'numeric number in return message');
+ is($ibx->mm->mid_for($num), undef, 'no longer in Msgmap by num');
my $srch = $ibx->search->reopen;
- my @found = ();
- $srch->each_smsg_by_mid($smsg->mid, sub { push @found, @_; 1 });
- is(scalar(@found), 0, 'no longer found in Xapian skeleton');
+ my $mset = $srch->query('m:'.$smsg->mid, { mset => 1});
+ is($mset->size, 0, 'no longer found in Xapian');
+ my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames));
+ is($srch->{over_ro}->get_art($num), undef,
+ 'removal propagated to Over DB');
- my $after = $git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev));
- if ($after =~ m!( [a-f0-9]+ )A\td$!) {
+ my $after = $git0->qx(@log1);
+ if ($after =~ m!( [a-f0-9]+ )A\td$!m) {
my $oid = $1;
ok(index($before, $oid) > 0, 'no new blob introduced');
} else {
fail('failed to extract blob from log output');
}
+ is($im->remove($mime, 'test removal'), undef,
+ 'remove is idempotent');
+ $im->done;
+ is($git0->qx(@log1),
+ $after, 'no git history made with idempotent remove');
+ eval { $im->done };
+ ok(!$@, '->done is idempotent');
+}
+
+{
+ ok($im->add($mime), 'add message to be purged');
+ local $SIG{__WARN__} = sub {};
+ ok(my $cmts = $im->purge($mime), 'purged message');
+ like($cmts->[0], qr/\A[a-f0-9]{40}\z/, 'purge returned current commit');
+ $im->done;
+
+ # again
+ is($im->purge($mime), undef, 'no-op returns undef');
+}
+
+{
+ my $x = 'x'x250;
+ my $y = 'y'x250;
+ local $SIG{__WARN__} = sub {};
+ $mime->header_set('Subject', 'long mid');
+ $mime->header_set('Message-ID', "<$x>");
+ ok($im->add($mime), 'add excessively long Message-ID');
+
+ $mime->header_set('Message-ID', "<$y>");
+ $mime->header_set('References', "<$x>");
+ ok($im->add($mime), 'add excessively long References');
+ $im->barrier;
+
+ my $msgs = $ibx->search->{over_ro}->get_thread('x'x244);
+ is(2, scalar(@$msgs), 'got both messages');
+ is($msgs->[0]->{mid}, 'x'x244, 'stored truncated mid');
+ is($msgs->[1]->{references}, '<'.('x'x244).'>', 'stored truncated ref');
+ is($msgs->[1]->{mid}, 'y'x244, 'stored truncated mid(2)');
+ $im->done;
+}
+
+my $tmp = {
+ inboxdir => "$inboxdir/non-existent/subdir",
+ name => 'nope',
+ version => 2,
+ -primary_address => 'test@example.com',
+};
+eval {
+ my $nope = PublicInbox::V2Writable->new($tmp);
+ $nope->add($mime);
+};
+ok($@, 'V2Writable fails on non-existent dir');
+
+{
+ my $v2w = PublicInbox::V2Writable->new($tmp, 1);
+ ok($v2w, 'creat flag works');
+ $v2w->{parallel} = 0;
+ $v2w->init_inbox(0);
+ my $alt = "$tmp->{inboxdir}/all.git/objects/info/alternates";
+ open my $fh, '>>', $alt or die $!;
+ print $fh "$inboxdir/all.git/objects\n" or die $!;
+ chmod(0664, $fh) or die "fchmod: $!";
+ close $fh or die $!;
+ open $fh, '<', $alt or die $!;
+ my $before = do { local $/; <$fh> };
+
+ ok($v2w->git_init(3), 'init a new epoch');
+ open $fh, '<', $alt or die $!;
+ my $after = do { local $/; <$fh> };
+ ok(index($after, $before) > 0,
+ 'old contents preserved after adding epoch');
+ like($after, qr!\A[^\n]+?/3\.git/objects\n!s,
+ 'first line is newest epoch');
+ my $mode = (stat($alt))[2] & 07777;
+ is($mode, 0664, sprintf('0%03o', $mode).' is 0664');
}
done_testing();