X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimport.t;h=ae76858ba2ab7827bc7aaa1d45db377a0954ee64;hb=b5454f38b1903735594e3c253617a66dd267062f;hp=ba4abd9cb321e0cba0c741ed8168285e590a56c6;hpb=46742d95647c7a80cb2f60d5c134717dd91e22e2;p=public-inbox.git
diff --git a/t/import.t b/t/import.t
index ba4abd9c..ae76858b 100644
--- a/t/import.t
+++ b/t/import.t
@@ -1,21 +1,21 @@
-# Copyright (C) 2016-2020 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 Fcntl qw(:DEFAULT SEEK_SET);
-use File::Temp qw/tempfile/;
use PublicInbox::TestCommon;
+use MIME::Base64 3.05; # Perl 5.10.0 / 5.9.2
my ($dir, $for_destroy) = tmpdir();
my $git = PublicInbox::Git->new($dir);
my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
$im->init_bare;
-my $mime = PublicInbox::MIME->new(<<'EOF');
+my $mime = PublicInbox::Eml->new(<<'EOF');
From: a@example.com
To: b@example.com
Subject: this is a subject
@@ -26,24 +26,18 @@ hello world
EOF
my $v2 = require_git(2.6, 1);
-my $smsg = {} if $v2;
+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');
- is($mime->as_string, ${$smsg->{-raw_email}}, 'string matches');
- is($smsg->{bytes}, length(${$smsg->{-raw_email}}), 'length matches');
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: $!";
- seek($in, 0, SEEK_SET);
- my $out = tempfile();
- my $pid = spawn(\@cmd, {}, { 0 => $in, 1 => $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');
- seek($out, 0, SEEK_SET);
- chomp(my $hashed_obj = <$out>);
is($hashed_obj, $smsg->{blob}, "blob object_id matches exp");
}
@@ -101,4 +95,28 @@ eval {
};
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();