]> Sergey Matveev's repositories - public-inbox.git/commitdiff
address: explicitly reject local-only addresses
authorEric Wong <e@80x24.org>
Sat, 14 Dec 2019 05:22:18 +0000 (05:22 +0000)
committerEric Wong <e@80x24.org>
Sun, 15 Dec 2019 19:43:33 +0000 (19:43 +0000)
Apparently, neither our previous address parsing code nor
Email::Address::XS recognizes local, username-only addresses
in the form of <username> (without "@host").  Without
this change, Email::Address::XS->address would return
"undef", so we need to filter it out via "grep { defined }"

It seems the cases where users email each other on the same
machine is small and public-inbox won't be able to index
addresses for those cases...  Oh well :/

lib/PublicInbox/Address.pm
t/address.t

index 433b36ebb4ef4f38170d9ee6cb51972c12b9a6d3..c23a5d622e5ba120b1b7a9c3cc48423180f08791 100644 (file)
@@ -4,12 +4,15 @@ package PublicInbox::Address;
 use strict;
 use warnings;
 
-sub xs_emails { map { $_->address() } parse_email_addresses($_[0]) }
+sub xs_emails {
+       grep { defined } map { $_->address() } parse_email_addresses($_[0])
+}
 
 sub xs_names {
-       map {
+       grep { defined } map {
                my $n = $_->name;
-               $n = $_->user if $n eq $_->address;
+               my $addr = $_->address;
+               $n = $_->user if defined($addr) && $n eq $addr;
                $n;
        } parse_email_addresses($_[0]);
 }
index e7c0d6a8132516dd6649ea88234a4123016f7940..1f20702a2dbb7182a0b2c41fcadb675a2a97a204 100644 (file)
@@ -38,6 +38,11 @@ sub test_pkg {
 
        @names = $names->('"Quote Unneeded" <user@example.com>');
        is_deeply(['Quote Unneeded'], \@names, 'extra quotes dropped');
+
+       my @emails = $emails->('Local User <user>');
+       is_deeply([], \@emails , 'no address for local address');
+       @names = $emails->('Local User <user>');
+       is_deeply([], \@names, 'no address, no name');
 }
 
 test_pkg('PublicInbox::Address');