Skip to content
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

Add support for IDN hosts in email addresses into Email::MIME::Header::AddressList #50

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

Add support for IDN hosts in email addresses into Email::MIME::Header::AddressList #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8707827
Call Email::Address::XS methods in Email::MIME::Header::AddressList o…
pali Aug 31, 2017
e44b1b4
Add support for IDN hosts in email addresses into Email::MIME::Header…
pali Aug 31, 2017
e416431
Update SYNOPSIS for Email::MIME::Header::AddressList
pali Oct 18, 2017
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
2 changes: 0 additions & 2 deletions lib/Email/MIME/Header.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ sub header_str {

foreach my $header (@header) {
next unless defined $header;
next unless $header =~ /=\?/;

_maybe_decode($_[0], \$header);
}
return $wanta ? @header : $header[0];
Expand Down
37 changes: 27 additions & 10 deletions lib/Email/MIME/Header/AddressList.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use warnings;
use Carp ();
use Email::Address::XS;
use Email::MIME::Encode;
use Net::IDN::Encode;

=encoding utf8

Expand All @@ -17,6 +18,10 @@ Email::MIME::Header::AddressList - MIME support for list of Email::Address::XS o

=head1 SYNOPSIS

use utf8;
use Email::Address::XS;
use Email::MIME::Header::AddressList;

my $address1 = Email::Address::XS->new('Name1' => '[email protected]');
my $address2 = Email::Address::XS->new("Name2 \N{U+263A}" => '[email protected]');
my $mime_address = Email::Address::XS->new('=?UTF-8?B?TmFtZTIg4pi6?=' => '[email protected]');
Expand Down Expand Up @@ -131,14 +136,20 @@ sub new_mime_groups {
$groups[2 * $_ + 1] = [ @{$groups[2 * $_ + 1]} ];
foreach (@{$groups[2 * $_ + 1]}) {
next unless Email::Address::XS->is_obj($_);
my $decode_phrase = (defined $_->phrase and $_->phrase =~ /=\?/);
my $decode_comment = (defined $_->comment and $_->comment =~ /=\?/);
next unless $decode_phrase or $decode_comment;
my $phrase = $_->phrase;
my $comment = $_->comment;
my $host = $_->host;
my $decode_phrase = (defined $phrase and $phrase =~ /=\?/);
my $decode_comment = (defined $comment and $comment =~ /=\?/);
my $decode_host = (defined $host and $host =~ /xn--/);
next unless $decode_phrase or $decode_comment or $decode_host;
$_ = ref($_)->new(copy => $_);
$_->phrase(Email::MIME::Encode::mime_decode($_->phrase))
$_->phrase(Email::MIME::Encode::mime_decode($phrase))
if $decode_phrase;
$_->comment(Email::MIME::Encode::mime_decode($_->comment))
$_->comment(Email::MIME::Encode::mime_decode($comment))
if $decode_comment;
$_->host(Net::IDN::Encode::domain_to_unicode($host))
if $decode_host;
}
}
return $class->new_groups(@groups);
Expand Down Expand Up @@ -205,14 +216,20 @@ sub as_mime_string {
if Email::MIME::Encode::_needs_mime_encode_addr($groups[2 * $_]);
$groups[2 * $_ + 1] = [ @{$groups[2 * $_ + 1]} ];
foreach (@{$groups[2 * $_ + 1]}) {
my $encode_phrase = Email::MIME::Encode::_needs_mime_encode_addr($_->phrase);
my $encode_comment = Email::MIME::Encode::_needs_mime_encode_addr($_->comment);
next unless $encode_phrase or $encode_comment;
my $phrase = $_->phrase;
my $comment = $_->comment;
my $host = $_->host;
my $encode_phrase = Email::MIME::Encode::_needs_mime_encode_addr($phrase);
my $encode_comment = Email::MIME::Encode::_needs_mime_encode_addr($comment);
my $encode_host = (defined $host and $host =~ /\P{ASCII}/);
next unless $encode_phrase or $encode_comment or $encode_host;
$_ = ref($_)->new(copy => $_);
$_->phrase(Email::MIME::Encode::mime_encode($_->phrase, $charset))
$_->phrase(Email::MIME::Encode::mime_encode($phrase, $charset))
if $encode_phrase;
$_->comment(Email::MIME::Encode::mime_encode($_->comment, $charset))
$_->comment(Email::MIME::Encode::mime_encode($comment, $charset))
if $encode_comment;
$_->host(Net::IDN::Encode::domain_to_ascii($host))
if $encode_host;
}
}
return Email::Address::XS::format_email_groups(@groups);
Expand Down
11 changes: 9 additions & 2 deletions t/unicode.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ SKIP: {
'Doy <[email protected]>', # not
'"<[email protected]>," <[email protected]>', # address-like pattern in phrase
'"Döy <[email protected]>," <[email protected]>', # unicode address-like pattern in phrase
'adam@äli.as', # unicode host
'Ädam <adam@äli.as>', # unicode phrase and host
);

for my $subject (@subjects) {
Expand All @@ -93,8 +95,13 @@ SKIP: {
$email->header_str_set('To', $to);
is(scalar($email->header_str('To')), $to,
"To header is correct");
like($email->as_string, qr/test\@example\.com/,
"address isn't encoded");
if ($to =~ /adam/) {
like($email->header_raw('To'), qr/adam\@xn--li-uia.as/,
'To raw header is correct');
} else {
like($email->as_string, qr/test\@example\.com/,
"address isn't encoded");
}
like($email->as_string, qr/\A\p{ASCII}*\z/,
"email doesn't contain any non-ascii characters");
}
Expand Down