X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimport.t;h=9a88416f2cabb0b2529288f05c4eb5611928b2ca;hb=refs%2Ftags%2Fv1.6.1;hp=73f92adbbb6e6e3381c0880b63d4c9d26bf8be1e;hpb=40782735e74e427997b5b900d60cc07597e330c3;p=public-inbox.git

diff --git a/t/import.t b/t/import.t
index 73f92adb..9a88416f 100644
--- a/t/import.t
+++ b/t/import.t
@@ -1,33 +1,60 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-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;
-use Email::MIME;
+use PublicInbox::Eml;
+use PublicInbox::Smsg;
 use PublicInbox::Git;
 use PublicInbox::Import;
-use File::Temp qw/tempdir/;
-my $dir = tempdir('pi-import-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::Spawn qw(spawn);
+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 = Email::MIME->create(
-	header => [
-		From => 'a@example.com',
-		To => 'b@example.com',
-		'Content-Type' => 'text/plain',
-		Subject => 'this is a subject',
-		'Message-ID' => '<a@example.com>',
-	],
-	body => "hello world\n",
-);
-like($im->add($mime), qr/\A:\d+\z/, 'added one message');
+$im->init_bare;
+my $mime = PublicInbox::Eml->new(<<'EOF');
+From: a@example.com
+To: b@example.com
+Subject: this is a subject
+Message-ID: <a@example.com>
+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 $raw_email = $smsg->{-raw_email};
+	is($mime->as_string, $$raw_email, 'string matches');
+	is($smsg->{raw_bytes}, length($$raw_email), 'length matches');
+	my @cmd = ('git', "--git-dir=$git->{git_dir}", qw(hash-object --stdin));
+	open my $in, '+<', undef or BAIL_OUT "open(+<): $!";
+	print $in $mime->as_string or die "write failed: $!";
+	$in->flush or die "flush failed: $!";
+	seek($in, 0, SEEK_SET);
+	open my $out, '+<', undef or BAIL_OUT "open(+<): $!";
+	my $pid = spawn(\@cmd, {}, { 0 => $in, 1 => $out });
+	is(waitpid($pid, 0), $pid, 'waitpid succeeds on hash-object');
+	is($?, 0, 'hash-object');
+	seek($out, 0, SEEK_SET);
+	chomp(my $hashed_obj = <$out>);
+	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?= <usenet"@example.de';
+$mime->header_set('From', $odd);
 $mime->header_set('Message-ID', '<b@example.com>');
 $mime->header_set('Subject', 'msg2');
 like($im->add($mime, sub { $mime }), qr/\A:\d+\z/, 'added 2nd message');
@@ -50,7 +77,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), 'Email::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');
 
@@ -64,6 +91,40 @@ isnt($msg->header('Subject'), $mime->header('Subject'), 'subject mismatch');
 $mime->header_set('Message-Id', '<failcheck@example.com>');
 is($im->add($mime, sub { undef }), undef, 'check callback fails');
 is($im->remove($mime), undef, 'message not added, so not removed');
+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(<<EOF);
+From: $from <spammer\@example.com>
+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 <spammer\@example\.com> /sm,
+	 'latest commit accepted by spammer');
+$git->qx(qw(fsck --no-progress --strict));
+is($?, 0, 'fsck reported no errors');
+$main::badchars = undef;
+
 done_testing();