-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-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;
-eval { require PublicInbox::SearchIdx; };
-plan skip_all => "Xapian missing for search" if $@;
-use File::Temp qw/tempdir/;
-use Email::MIME;
-my $tmpdir = tempdir('pi-search-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite Search::Xapian));
+require PublicInbox::SearchIdx;
+require PublicInbox::Inbox;
+require PublicInbox::InboxWritable;
+use PublicInbox::MIME;
+my ($tmpdir, $for_destroy) = tmpdir();
my $git_dir = "$tmpdir/a.git";
+my $ibx = PublicInbox::Inbox->new({ inboxdir => $git_dir });
my ($root_id, $last_id);
-is(0, system(qw(git init --shared -q --bare), $git_dir), "git init (main)");
-eval { PublicInbox::Search->new($git_dir) };
+is(0, xsys(qw(git init --shared -q --bare), $git_dir), "git init (main)")
+ or BAIL_OUT("`git init --shared' failed, weird FS or seccomp?");
+eval { PublicInbox::Search->new($ibx)->xdb };
ok($@, "exception raised on non-existent DB");
-my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
-my $ibx = $rw->{-inbox};
+my $rw = PublicInbox::SearchIdx->new($ibx, 1);
$ibx->with_umask(sub {
$rw->_xdb_acquire;
$rw->_xdb_release;
});
$rw = undef;
-my $ro = PublicInbox::Search->new($git_dir);
+my $ro = PublicInbox::Search->new($ibx);
my $rw_commit = sub {
$rw->commit_txn_lazy if $rw;
- $rw = PublicInbox::SearchIdx->new($git_dir, 1);
+ $rw = PublicInbox::SearchIdx->new($ibx, 1);
+ $rw->{qp_flags} = 0; # quiet a warning
$rw->begin_txn_lazy;
};
+sub oct_is ($$$) {
+ my ($got, $exp, $msg) = @_;
+ is(sprintf('0%03o', $got), sprintf('0%03o', $exp), $msg);
+}
+
{
# git repository perms
- is($ibx->_git_config_perm(), &PublicInbox::InboxWritable::PERM_GROUP,
- "undefined permission is group");
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('0644')),
- 0022, "644 => umask(0022)");
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('0600')),
- 0077, "600 => umask(0077)");
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('0640')),
- 0027, "640 => umask(0027)");
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('group')),
- 0007, 'group => umask(0007)');
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('everybody')),
- 0002, 'everybody => umask(0002)');
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('umask')),
- umask, 'umask => existing umask');
+ oct_is($ibx->_git_config_perm(),
+ &PublicInbox::InboxWritable::PERM_GROUP,
+ 'undefined permission is group');
+ my @t = (
+ [ '0644', 0022, '644 => umask(0022)' ],
+ [ '0600', 0077, '600 => umask(0077)' ],
+ [ '0640', 0027, '640 => umask(0027)' ],
+ [ 'group', 0007, 'group => umask(0007)' ],
+ [ 'everybody', 0002, 'everybody => umask(0002)' ],
+ [ 'umask', umask, 'umask => existing umask' ],
+ );
+ for (@t) {
+ my ($perm, $exp, $msg) = @$_;
+ my $got = PublicInbox::InboxWritable::_umask_for(
+ PublicInbox::InboxWritable->_git_config_perm($perm));
+ oct_is($got, $exp, $msg);
+ }
}
$ibx->with_umask(sub {
- my $root = Email::MIME->create(
- header_str => [
- Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
- Subject => 'Hello world',
- 'Message-ID' => '<root@s>',
- From => 'John Smith <js@example.com>',
- To => 'list@example.com',
- ],
- body => "\\m/\n");
- my $last = Email::MIME->create(
- header_str => [
- Date => 'Sat, 02 Oct 2010 00:00:00 +0000',
- Subject => 'Re: Hello world',
- 'In-Reply-To' => '<root@s>',
- 'Message-ID' => '<last@s>',
- From => 'John Smith <js@example.com>',
- To => 'list@example.com',
- Cc => 'foo@example.com',
- ],
- body => "goodbye forever :<\n");
-
+ my $root = PublicInbox::MIME->new(<<'EOF');
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+Subject: Hello world
+Message-ID: <root@s>
+From: John Smith <js@example.com>
+To: list@example.com
+
+\m/
+EOF
+ my $last = PublicInbox::MIME->new(<<'EOF');
+Date: Sat, 02 Oct 2010 00:00:00 +0000
+Subject: Re: Hello world
+In-Reply-To: <root@s>
+Message-ID: <last@s>
+From: John Smith <js@example.com>
+To: list@example.com
+Cc: foo@example.com
+
+goodbye forever :<
+EOF
my $rv;
$rw_commit->();
$root_id = $rw->add_message($root);
$ibx->with_umask(sub {
$rw_commit->();
my $rmid = '<ghost-message@s>';
- my $reply_to_ghost = Email::MIME->create(
- header_str => [
- Date => 'Sat, 02 Oct 2010 00:00:00 +0000',
- Subject => 'Re: ghosts',
- 'Message-ID' => '<ghost-reply@s>',
- 'In-Reply-To' => $rmid,
- From => 'Time Traveler <tt@example.com>',
- To => 'list@example.com',
- ],
- body => "-_-\n");
-
+ my $reply_to_ghost = PublicInbox::MIME->new(<<"EOF");
+Date: Sat, 02 Oct 2010 00:00:00 +0000
+Subject: Re: ghosts
+Message-ID: <ghost-reply\@s>
+In-Reply-To: $rmid
+From: Time Traveler <tt\@example.com>
+To: list\@example.com
+
+-_-
+EOF
my $rv;
my $reply_id = $rw->add_message($reply_to_ghost);
is($reply_id, int($reply_id), "reply_id is an integer: $reply_id");
- my $was_ghost = Email::MIME->create(
- header_str => [
- Date => 'Sat, 02 Oct 2010 00:00:01 +0000',
- Subject => 'ghosts',
- 'Message-ID' => $rmid,
- From => 'Laggy Sender <lag@example.com>',
- To => 'list@example.com',
- ],
- body => "are real\n");
+ my $was_ghost = PublicInbox::MIME->new(<<"EOF");
+Date: Sat, 02 Oct 2010 00:00:01 +0000
+Subject: ghosts
+Message-ID: $rmid
+From: Laggy Sender <lag\@example.com>
+To: list\@example.com
+are real
+EOF
my $ghost_id = $rw->add_message($was_ghost);
is($ghost_id, int($ghost_id), "ghost_id is an integer: $ghost_id");
my $msgs = $rw->{over}->get_thread('ghost-message@s');
$rw_commit->();
$ro->reopen;
my $long_mid = 'last' . ('x' x 60). '@s';
-
- my $long = Email::MIME->create(
- header_str => [
- Date => 'Sat, 02 Oct 2010 00:00:00 +0000',
- Subject => 'long message ID',
- 'References' => '<root@s> <last@s>',
- 'In-Reply-To' => '<last@s>',
- 'Message-ID' => "<$long_mid>",
- From => '"Long I.D." <long-id@example.com>',
- To => 'list@example.com',
- ],
- body => "wut\n");
+ my $long = PublicInbox::MIME->new(<<EOF);
+Date: Sat, 02 Oct 2010 00:00:00 +0000
+Subject: long message ID
+References: <root\@s> <last\@s>
+In-Reply-To: <last\@s>
+Message-ID: <$long_mid>,
+From: "Long I.D." <long-id\@example.com>
+To: list\@example.com
+
+wut
+EOF
my $long_id = $rw->add_message($long);
is($long_id, int($long_id), "long_id is an integer: $long_id");
my @res;
my $long_reply_mid = 'reply-to-long@1';
- my $long_reply = Email::MIME->create(
- header_str => [
- Subject => 'I break references',
- Date => 'Sat, 02 Oct 2010 00:00:00 +0000',
- 'Message-ID' => "<$long_reply_mid>",
- # No References:
- # 'References' => '<root@s> <last@s> <'.$long_mid.'>',
- 'In-Reply-To' => "<$long_mid>",
- From => 'no1 <no1@example.com>',
- To => 'list@example.com',
- ],
- body => "no References\n");
+ my $long_reply = PublicInbox::MIME->new(<<EOF);
+Subject: I break references
+Date: Sat, 02 Oct 2010 00:00:00 +0000
+Message-ID: <$long_reply_mid>
+In-Reply-To: <$long_mid>
+From: no1 <no1\@example.com>
+To: list\@example.com
+
+no References
+EOF
ok($rw->add_message($long_reply) > $long_id, "inserted long reply");
$rw_commit->();
$ro->reopen;
- my $t = $ro->get_thread('root@s');
- is(scalar(@$t), 4, "got all 4 mesages in thread");
+ my $t = $ro->{over_ro}->get_thread('root@s');
+ is(scalar(@$t), 4, "got all 4 messages in thread");
my @exp = sort($long_reply_mid, 'root@s', 'last@s', $long_mid);
@res = filter_mids($t);
is_deeply(\@res, \@exp, "get_thread works");
# quote prioritization
$ibx->with_umask(sub {
$rw_commit->();
- $rw->add_message(Email::MIME->create(
- header_str => [
- Date => 'Sat, 02 Oct 2010 00:00:01 +0000',
- Subject => 'Hello',
- 'Message-ID' => '<quote@a>',
- From => 'Quoter <quoter@example.com>',
- To => 'list@example.com',
- ],
- body => "> theatre illusions\nfade\n"));
-
- $rw->add_message(Email::MIME->create(
- header_str => [
- Date => 'Sat, 02 Oct 2010 00:00:02 +0000',
- Subject => 'Hello',
- 'Message-ID' => '<nquote@a>',
- From => 'Non-Quoter<non-quoter@example.com>',
- To => 'list@example.com',
- ],
- body => "theatre\nfade\n"));
+ $rw->add_message(PublicInbox::MIME->new(<<'EOF'));
+Date: Sat, 02 Oct 2010 00:00:01 +0000
+Subject: Hello
+Message-ID: <quote@a>
+From: Quoter <quoter@example.com>
+To: list@example.com
+
+> theatre illusions
+fade
+EOF
+ $rw->add_message(PublicInbox::MIME->new(<<'EOF'));
+Date: Sat, 02 Oct 2010 00:00:02 +0000
+Subject: Hello
+Message-ID: <nquote@a>
+From: Non-Quoter<non-quoter@example.com>
+To: list@example.com
+
+theatre
+fade
+EOF
my $res = $rw->query("theatre");
is(scalar(@$res), 2, "got both matches");
is($res->[0]->mid, 'nquote@a', "non-quoted scores higher") if scalar(@$res);
# circular references
$ibx->with_umask(sub {
my $s = 'foo://'. ('Circle' x 15).'/foo';
- my $doc_id = $rw->add_message(Email::MIME->create(
- header => [ Subject => $s ],
- header_str => [
- Date => 'Sat, 02 Oct 2010 00:00:01 +0000',
- 'Message-ID' => '<circle@a>',
- 'References' => '<circle@a>',
- 'In-Reply-To' => '<circle@a>',
- From => 'Circle <circle@example.com>',
- To => 'list@example.com',
- ],
- body => "LOOP!\n"));
+ my $doc_id = $rw->add_message(PublicInbox::MIME->new(<<EOF));
+Subject: $s
+Date: Sat, 02 Oct 2010 00:00:01 +0000
+Message-ID: <circle\@a>
+References: <circle\@a>
+In-Reply-To: <circle\@a>
+From: Circle <circle\@example.com>
+To: list\@example.com
+
+LOOP!
+EOF
ok($doc_id > 0, "doc_id defined with circular reference");
my $smsg = $rw->query('m:circle@a', {limit=>1})->[0];
is(defined($smsg), 1, 'found m:circl@a');
});
$ibx->with_umask(sub {
- my $str = eval {
- my $mbox = 't/utf8.mbox';
- open(my $fh, '<', $mbox) or die "failed to open mbox: $mbox\n";
- local $/;
- <$fh>
- };
- $str =~ s/\AFrom [^\n]+\n//s;
- my $mime = Email::MIME->new($str);
+ my $mime = mime_load 't/utf8.eml';
my $doc_id = $rw->add_message($mime);
ok($doc_id > 0, 'message indexed doc_id with UTF-8');
my $msg = $rw->query('m:testmessage@example.com', {limit => 1})->[0];
my $mset = $ro->query('t:list@example.com', {mset => 1});
is($mset->size, 6, 'searched To: successfully');
foreach my $m ($mset->items) {
- my $smsg = $ro->lookup_article($m->get_docid);
+ my $smsg = $ro->{over_ro}->get_art($m->get_docid);
like($smsg->to, qr/\blist\@example\.com\b/, 'to appears');
}
$mset = $ro->query('tc:list@example.com', {mset => 1});
is($mset->size, 6, 'searched To+Cc: successfully');
foreach my $m ($mset->items) {
- my $smsg = $ro->lookup_article($m->get_docid);
+ my $smsg = $ro->{over_ro}->get_art($m->get_docid);
my $tocc = join("\n", $smsg->to, $smsg->cc);
like($tocc, qr/\blist\@example\.com\b/, 'tocc appears');
}
my $mset = $ro->query($pfx . 'foo@example.com', { mset => 1 });
is($mset->items, 1, "searched $pfx successfully for Cc:");
foreach my $m ($mset->items) {
- my $smsg = $ro->lookup_article($m->get_docid);
+ my $smsg = $ro->{over_ro}->get_art($m->get_docid);
like($smsg->cc, qr/\bfoo\@example\.com\b/,
'cc appears');
}
}
$ibx->with_umask(sub {
- my $part1 = Email::MIME->create(
- attributes => {
- content_type => 'text/plain',
- disposition => 'attachment',
- charset => 'US-ASCII',
- encoding => 'quoted-printable',
- filename => 'attached_fart.txt',
- },
- body_str => 'inside the attachment',
- );
- my $part2 = Email::MIME->create(
- attributes => {
- content_type => 'text/plain',
- disposition => 'attachment',
- charset => 'US-ASCII',
- encoding => 'quoted-printable',
- filename => 'part_deux.txt',
- },
- body_str => 'inside another',
- );
- my $amsg = Email::MIME->create(
- header_str => [
- Subject => 'see attachment',
- 'Message-ID' => '<file@attached>',
- From => 'John Smith <js@example.com>',
- To => 'list@example.com',
- ],
- parts => [ $part1, $part2 ],
- );
+ my $amsg = mime_load 't/search-amsg.eml';
ok($rw->add_message($amsg), 'added attachment');
$rw_commit->();
$ro->reopen;
if (scalar(@$n) >= 1) {
my $mid = $n->[0]->mid;
my ($id, $prev);
- $art = $ro->next_by_mid($mid, \$id, \$prev);
+ $art = $ro->{over_ro}->next_by_mid($mid, \$id, \$prev);
ok($art, 'article exists in OVER DB');
}
$rw->unindex_blob($amsg);
$rw->commit_txn_lazy;
- is($ro->lookup_article($art->{num}), undef, 'gone from OVER DB') if defined($art);
+ SKIP: {
+ skip('$art not defined', 1) unless defined $art;
+ is($ro->{over_ro}->get_art($art->{num}), undef,
+ 'gone from OVER DB');
+ };
});
+my $all_mask = 07777;
+my $dir_mask = 02770;
+
+# FreeBSD and apparently OpenBSD does not allow non-root users to set S_ISGID,
+# so git doesn't set it, either (see DIR_HAS_BSD_GROUP_SEMANTICS in git.git)
+if ($^O =~ /(?:free|open)bsd/i) {
+ $all_mask = 0777;
+ $dir_mask = 0770;
+}
+
foreach my $f ("$git_dir/public-inbox/msgmap.sqlite3",
"$git_dir/public-inbox",
glob("$git_dir/public-inbox/xapian*/"),
glob("$git_dir/public-inbox/xapian*/*")) {
my @st = stat($f);
my ($bn) = (split(m!/!, $f))[-1];
- is($st[2] & 07777, -f _ ? 0660 : 02770,
+ oct_is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask,
"sharedRepository respected for $bn");
}
my $mid = "$ua.$digits.2460-100000\@penguin.transmeta.com";
is($ro->reopen->query("m:$digits", { mset => 1})->size, 0,
'no results yet');
- my $pine = Email::MIME->create(
- header_str => [
- Subject => 'blah',
- 'Message-ID' => "<$mid>",
- From => 'torvalds@transmeta',
- To => 'list@example.com',
- ],
- body => ""
- );
+ my $pine = PublicInbox::MIME->new(<<EOF);
+Subject: blah
+Message-ID: <$mid>
+From: torvalds\@transmeta
+To: list\@example.com
+
+EOF
my $x = $rw->add_message($pine);
$rw->commit_txn_lazy;
is($ro->reopen->query("m:$digits", { mset => 1})->size, 1,