import: drop '<' and '>' characters in addresses

Some strange "From:" lines will cause Email::Address::XS to
leave '<' (and presumably '>') in the address which
git-fast-import won't accept even if quoted.  Workaround this
problem by deleting '<' and '>' the same way we delete them for
the ident name.

Reported-by: Leah Neukirchen <leah@vuxu.org>
Link: https://public-inbox.org/meta/87h7zfemur.fsf@vuxu.org/

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index d8dc49b82f9494815b2d49e140560fbe2fbc41b7..68dc0c7e83c1b223796ee171200d879065e1add2 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -293,6 +293,10 @@ sub extract_cmt_info ($) {
                }
        }
        if (defined $email) {
+               # Email::Address::XS may leave quoted '<' in addresses,
+               # which git-fast-import doesn't like
+               $email =~ tr/<>//d;
+
                # quiet down wide character warnings with utf8::encode
                utf8::encode($email);
        } else {

diff --git a/t/import.t b/t/import.t
index e71dd7146354a5a3d85e52d97b4ac68319878671..b88d308e919079d5216f6bafe9cc018c4397e9c8 100644 (file)
--- a/t/import.t
+++ b/t/import.t
@@ -55,6 +55,8 @@ $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');