Skip to content

Improve email address parsing #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dracos wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Improve email address parsing #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d77b859
Allow non-ASCII characters in email addresses.
dracos May 13, 2016
fa81a51
Bring regexes more in line with RFC5322.
dracos May 13, 2016
b142fb6
Try and prevent backtracking regex explosions.
dracos May 13, 2016
9066167
Use regex recusion for comment nesting.
dracos May 13, 2016
7205fc9
Don't extract "comments" from in quoted strings.
dracos May 14, 2016
c61bb28
Fetch phrase/user/host from main regex.
dracos May 14, 2016
5182577
Parse display name for multiple quoted strings.
dracos May 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 8 additions & 25 deletions lib/Email/Address.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@ to be correct, and very very fast.
my $CTL = q{\x00-\x1F\x7F};
my $special = q{()<>\\[\\]:;@\\\\,."};

my $text = qr/[^\x0A\x0D]/;
my $quoted_pair = qr/\\[[:graph:] \t]/;

my $quoted_pair = qr/\\$text/;

my $ctext = qr/(?>[^()\\]+)/;
my $ctext = qr/[^$CTL()\\]/;
my ($ccontent, $comment) = (q{})x2;
for (1 .. $COMMENT_NEST_LEVEL) {
$ccontent = qr/$ctext|$quoted_pair|$comment/;
$comment = qr/\s*\((?:\s*$ccontent)*\s*\)\s*/;
$comment = qr/\($ccontent*\)/;
}
my $cfws = qr/$comment|\s+/;

Expand All @@ -46,33 +44,18 @@ my $atom = qr/$cfws*$atext+$cfws*/;
my $dot_atom_text = qr/$atext+(?:\.$atext+)*/;
my $dot_atom = qr/$cfws*$dot_atom_text$cfws*/;

my $qtext = qr/[^\\"]/;
my $qtext = qr/[^$CTL\\"]/;
my $qcontent = qr/$qtext|$quoted_pair/;
my $quoted_string = qr/$cfws*"$qcontent*"$cfws*/;

my $word = qr/$atom|$quoted_string/;

# XXX: This ($phrase) used to just be: my $phrase = qr/$word+/; It was changed
# to resolve bug 22991, creating a significant slowdown. Given current speed
# problems. Once 16320 is resolved, this section should be dealt with.
# -- rjbs, 2006-11-11
#my $obs_phrase = qr/$word(?:$word|\.|$cfws)*/;

# XXX: ...and the above solution caused endless problems (never returned) when
# examining this address, now in a test:
# admin+=E6=96=B0=E5=8A=A0=E5=9D=A1_Weblog-- ATAT --test.socialtext.com
# So we disallow the hateful CFWS in this context for now. Of modern mail
# agents, only Apple Web Mail 2.0 is known to produce obs-phrase.
# -- rjbs, 2006-11-19
my $simple_word = qr/$atom|\.|\s*"$qcontent+"\s*/;
my $obs_phrase = qr/$simple_word+/;

my $obs_phrase = qr/$word(?:$word|\.|$cfws)*/;
my $phrase = qr/$obs_phrase|(?:$word+)/;

my $local_part = qr/$dot_atom|$quoted_string/;
my $dtext = qr/[^\[\]\\]/;
my $dcontent = qr/$dtext|$quoted_pair/;
my $domain_literal = qr/$cfws*\[(?:\s*$dcontent)*\s*\]$cfws*/;
my $dtext = qr/[^$CTL\[\]\\]/;
my $domain_literal = qr/$cfws*\[$dtext*\]$cfws*/;
my $domain = qr/$dot_atom|$domain_literal/;

my $display_name = $phrase;
Expand Down Expand Up @@ -127,7 +110,7 @@ following comment.
our $addr_spec = qr/$local_part\@$domain/;
our $angle_addr = qr/$cfws*<$addr_spec>$cfws*/;
our $name_addr = qr/(?>$display_name?)$angle_addr/;
our $mailbox = qr/(?:$name_addr|$addr_spec)$comment*/;
our $mailbox = qr/$name_addr|$addr_spec/;

sub _PHRASE () { 0 }
sub _ADDRESS () { 1 }
Expand Down
2 changes: 1 addition & 1 deletion t/tests.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,7 @@ my @list = (
'"Greg Norris (humble visionary genius)" <nextrightmove-- ATAT --bang.example.net>, <advocacy-- ATAT --p.example.org>',
[
[
'Greg Norris',
'Greg Norris ',

@pali pali Feb 2, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is incorrect change. String "Greg Norris (humble visionary genius)" <nextrightmove-- ATAT --bang.example.net> (after replacing -- ATAT -- with @) must be parsed as:

  • phrase: Greg Norris (humble visionary genius)
  • mailbox: nextrightmove
  • domain: bang.example.net

You are missing part after space in parenthesis in phrase part. In quoted string content of parenthesis is not comment which you probably missed.

@pali pali Feb 2, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this is fixed in next commit. In this commit is just test noise.

@dracos dracos Feb 2, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I tried to explain that in the commit message, sorry if it wasn't clear enough.

'nextrightmove-- ATAT --bang.example.net',
'(humble visionary genius)'
],
Expand Down