diff options
author | Eric Wong <e@80x24.org> | 2016-05-25 01:44:46 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-05-25 01:49:54 +0000 |
commit | 23a4e44bedabe5b8b651346cabc2a870c5377a30 (patch) | |
tree | e92220e935276cd1a2f466fa4bc6bf1e29fdb8e0 /lib/PublicInbox/Import.pm | |
parent | 64aea34d06f71828b0bdd6ae177b9bcf22d752b4 (diff) | |
download | public-inbox-23a4e44bedabe5b8b651346cabc2a870c5377a30.tar.gz |
git has stricter requirements for ident names (no '<>') which Email::Address allows. Even in 1.908, Email::Address also has an incomplete fix for CVE-2015-7686 with a DoS-able regexp for comments. Since we don't care for or need all the RFC compliance of Email::Address, avoiding it entirely may be preferable. Email::Address will still be installed as a requirement for Email::MIME, but it is only used by the Email::MIME::header_str_set which we do not use
Diffstat (limited to 'lib/PublicInbox/Import.pm')
-rw-r--r-- | lib/PublicInbox/Import.pm | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index 1afcf5d2..e3d65f4a 100644 --- a/lib/PublicInbox/Import.pm +++ b/lib/PublicInbox/Import.pm @@ -8,7 +8,6 @@ package PublicInbox::Import; use strict; use warnings; use Fcntl qw(:flock :DEFAULT); -use Email::Address; use PublicInbox::Spawn qw(spawn); use PublicInbox::MID qw(mid_mime mid2path); @@ -141,21 +140,21 @@ sub add { my ($self, $mime) = @_; # mime = Email::MIME my $from = $mime->header('From'); - my @from = Email::Address->parse($from); - my $name = $from[0]->name; - my $email = $from[0]->address; - my $date = $mime->header('Date'); - my $subject = $mime->header('Subject'); - $subject = '(no subject)' unless defined $subject; - my $mid = mid_mime($mime); - my $path = mid2path($mid); - + my ($email) = ($from =~ /([^<\s]+\@[^>\s]+)/g); + my $name = $from; + $name =~ s/\s*\S+\@\S+\s*\z//; # git gets confused with: # "'A U Thor <u@example.com>' via foo" <foo@example.com> # ref: # <CAD0k6qSUYANxbjjbE4jTW4EeVwOYgBD=bXkSu=akiYC_CB7Ffw@mail.gmail.com> $name =~ tr/<>// and $name = $email; + my $date = $mime->header('Date'); + my $subject = $mime->header('Subject'); + $subject = '(no subject)' unless defined $subject; + my $mid = mid_mime($mime); + my $path = mid2path($mid); + my ($r, $w) = $self->gfi_start; my $tip = $self->{tip}; if ($tip ne '') { |