X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimport.t;h=ae76858ba2ab7827bc7aaa1d45db377a0954ee64;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=eee47447d3c9fbada1f9addee0f19423551e8cf4;hpb=cfb8d16578e7f2f2e300f9f436205e4a8fc7f322;p=public-inbox.git
diff --git a/t/import.t b/t/import.t
index eee47447..ae76858b 100644
--- a/t/import.t
+++ b/t/import.t
@@ -1,59 +1,52 @@
-# Copyright (C) 2016-2018 all contributors
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
+use PublicInbox::Smsg;
use PublicInbox::Git;
use PublicInbox::Import;
-use PublicInbox::Spawn qw(spawn);
-use IO::File;
-use Fcntl qw(:DEFAULT);
-use File::Temp qw/tempdir tempfile/;
-my $dir = tempdir('pi-import-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use Fcntl qw(:DEFAULT SEEK_SET);
+use PublicInbox::TestCommon;
+use MIME::Base64 3.05; # Perl 5.10.0 / 5.9.2
+my ($dir, $for_destroy) = tmpdir();
-is(system(qw(git init -q --bare), $dir), 0, 'git init successful');
my $git = PublicInbox::Git->new($dir);
-
my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
-my $mime = PublicInbox::MIME->create(
- header => [
- From => 'a@example.com',
- To => 'b@example.com',
- 'Content-Type' => 'text/plain',
- Subject => 'this is a subject',
- 'Message-ID' => '',
- Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
- ],
- body => "hello world\n",
-);
-
-$im->{want_object_info} = 1 if 'v2';
-like($im->add($mime), qr/\A:\d+\z/, 'added one message');
-
-if ('v2') {
- my $info = $im->{last_object};
- like($info->[0], qr/\A[a-f0-9]{40}\z/, 'got last object_id');
- is($mime->as_string, ${$info->[2]}, 'string matches');
- is($info->[1], length(${$info->[2]}), 'length matches');
+$im->init_bare;
+my $mime = PublicInbox::Eml->new(<<'EOF');
+From: a@example.com
+To: b@example.com
+Subject: this is a subject
+Message-ID:
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+
+hello world
+EOF
+
+my $v2 = require_git(2.6, 1);
+my $smsg = bless {}, 'PublicInbox::Smsg' if $v2;
+like($im->add($mime, undef, $smsg), qr/\A:[0-9]+\z/, 'added one message');
+
+if ($v2) {
+ like($smsg->{blob}, qr/\A[a-f0-9]{40}\z/, 'got last object_id');
my @cmd = ('git', "--git-dir=$git->{git_dir}", qw(hash-object --stdin));
- my $in = tempfile();
+ open my $in, '+<', undef or BAIL_OUT "open(+<): $!";
print $in $mime->as_string or die "write failed: $!";
$in->flush or die "flush failed: $!";
- $in->seek(0, SEEK_SET);
- my $out = tempfile();
- my $pid = spawn(\@cmd, {}, { 0 => fileno($in), 1 => fileno($out)});
- is(waitpid($pid, 0), $pid, 'waitpid succeeds on hash-object');
+ seek($in, 0, SEEK_SET) or die "seek: $!";
+ chomp(my $hashed_obj = xqx(\@cmd, undef, { 0 => $in }));
is($?, 0, 'hash-object');
- $out->seek(0, SEEK_SET);
- chomp(my $hashed_obj = <$out>);
- is($hashed_obj, $info->[0], "last object_id matches exp");
+ is($hashed_obj, $smsg->{blob}, "blob object_id matches exp");
}
$im->done;
my @revs = $git->qx(qw(rev-list HEAD));
is(scalar @revs, 1, 'one revision created');
+my $odd = '"=?iso-8859-1?Q?J_K=FCpper?= header_set('From', $odd);
$mime->header_set('Message-ID', '');
$mime->header_set('Subject', 'msg2');
like($im->add($mime, sub { $mime }), qr/\A:\d+\z/, 'added 2nd message');
@@ -76,7 +69,7 @@ $im->done;
is(scalar @revs, 26, '26 revisions exist after mass import');
my ($mark, $msg) = $im->remove($mime);
like($mark, qr/\A:\d+\z/, 'got mark');
-is(ref($msg), 'PublicInbox::MIME', 'got old message deleted');
+like(ref($msg), qr/\bPublicInbox::(?:Eml|MIME)\b/, 'got old message deleted');
is(undef, $im->remove($mime), 'remove is idempotent');
@@ -94,4 +87,36 @@ is(undef, $im->checkpoint, 'checkpoint works before ->done');
$im->done;
is(undef, $im->checkpoint, 'checkpoint works after ->done');
$im->checkpoint;
+
+my $nogit = PublicInbox::Git->new("$dir/non-existent/dir");
+eval {
+ my $nope = PublicInbox::Import->new($nogit, 'nope', 'no@example.com');
+ $nope->add($mime);
+};
+ok($@, 'Import->add fails on non-existent dir');
+
+my @cls = qw(PublicInbox::Eml);
+SKIP: {
+ require_mods('PublicInbox::MIME', 1);
+ push @cls, 'PublicInbox::MIME';
+};
+
+$main::badchars = "\n\0\r";
+my $from = '=?UTF-8?B?'. encode_base64("B\ra\nd\0\$main::badchars", ''). '?=';
+for my $cls (@cls) {
+ my $eml = $cls->new(<
+Message-ID: <$cls\@example.com>
+
+EOF
+ ok($im->add($eml), "added $cls message with nasty char in From");
+}
+$im->done;
+my $bref = $git->cat_file('HEAD');
+like($$bref, qr/^author Ba d \$main::badchars /sm,
+ 'latest commit accepted by spammer');
+$git->qx(qw(fsck --no-progress --strict));
+is($?, 0, 'fsck reported no errors');
+$main::badchars = undef;
+
done_testing();