Skip to content

Use Mail::Address methods instead of Email::Address::XS #1155

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

Merged
TamaraNaboulsi merged 2 commits into from
Apr 13, 2026
Merged

Use Mail::Address methods instead of Email::Address::XS #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b037d71
Use Mail::Address methods instead of Email::Address::XS
TamaraNaboulsi Apr 9, 2026
70370f7
Fix regex typo
TamaraNaboulsi Apr 9, 2026
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
1 change: 0 additions & 1 deletion cpanfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ requires 'DB_File';
requires 'DBD::mysql';
requires 'DBI';
requires 'Digest::MD5';
requires 'Email::Address::XS';
requires 'File::Spec::Functions';
requires 'GD::Simple';
requires 'Hash::Merge';
Expand Down
48 changes: 23 additions & 25 deletions modules/EnsEMBL/Web/Mailer.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ use strict;
use warnings;

use Mail::Mailer;
use Mail::Address;
use MIME::Base64 qw(encode_base64);
use EnsEMBL::Web::Exceptions;
use Email::Address::XS qw(parse_email_addresses split_address);
use Encode 'decode';
use feature 'unicode_strings';

Expand Down Expand Up @@ -162,7 +162,25 @@ sub send_plain {
return 1;
}

sub _parse_email_addresses {
my ($address_string, $type) = @_;

my @addresses = Mail::Address->parse($address_string);
if (@addresses != 1) {
warn "EnsEMBL/Web/Mailer: Illegal $type: addr: '$address_string'";
return 0;
}

if ($type eq 'To') {
my $host = $addresses[0]->host;
if ($host !~ /(ebi\.ac\.uk|ensembl\.org)$/) {
warn "EnsEMBL/Web/Mailer: Rcpt addr not within EBI: '$address_string'";
return 0;
}
}

return $addresses[0]->address;
}

sub send {
my $self = shift;
Expand All @@ -171,35 +189,15 @@ sub send {

# First validate user-supplied data

my @addresses = parse_email_addresses($self->{'to'});
if (@addresses != 1) {
warn "EnsEMBL/Web/Mailer: Illegal To: addr: '$self->{'to'}'";
return 0;
}
my $helpdesk_mail = $addresses[0]->address();
my ($user, $host) = split_address($helpdesk_mail);
if ($host !~ /(ebi\.ac\.uk|ensembl\.org)$/) {
warn "EnsEMBL/Web/Mailer: Rcpt addr not within EBI: '$self->{'to'}'";
return 0;
}
my $helpdesk_mail = _parse_email_addresses($self->{'to'}, 'To');
$valid_params{'To'} = $helpdesk_mail;

@addresses = parse_email_addresses($self->{'from'});
if (@addresses != 1) {
warn "EnsEMBL/Web/Mailer: Illegal From: addr: '$self->{'from'}'";
return 0;
}
my $from_mail = $addresses[0]->address();
my $from_mail = _parse_email_addresses($self->{'from'}, 'From');
$valid_params{'From'} = $from_mail;

$valid_params{'Reply-To'} = undef;
if ($self->{'reply'}) {
@addresses = parse_email_addresses($self->{'reply'});
if (@addresses != 1) {
warn "EnsEMBL/Web/Mailer: Illegal Reply-To: addr: '$self->{'reply'}'";
return 0;
}
$valid_params{'Reply-To'} = $addresses[0]->address();
$valid_params{'Reply-To'} = _parse_email_addresses($self->{'reply'}, 'Reply-To');
}


Expand All @@ -213,7 +211,7 @@ sub send {
}

if ($self->{'base_url'}) {
if ($self->{'base_url'} !~ m{^http(s)?://[A-Za-z0-9.-/]+$}){
if ($self->{'base_url'} !~ m{^http(s)?://[A-Za-z0-9.\-/]+$}){
warn "EnsEMBL/Web/Mailer: Unexpected URL: '$self->{'base_url'}'";
return 0;
}
Expand Down