diff options
author | Eric Wong <e@yhbt.net> | 2020-02-26 10:21:12 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2020-03-01 17:18:53 -0600 |
commit | 03255d56a53d390a7f7bb069e0f1c6ea5d34756c (patch) | |
tree | ded98a63726e1600893d12d3e6f35ab080e1febc | |
parent | 9dfddf147f4c8e45eae18d3684e9f60c8a631704 (diff) | |
download | public-inbox-03255d56a53d390a7f7bb069e0f1c6ea5d34756c.tar.gz |
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/
-rw-r--r-- | lib/PublicInbox/Import.pm | 4 | ||||
-rw-r--r-- | t/import.t | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index d8dc49b8..68dc0c7e 100644 --- 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 { @@ -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'); |