hval: only allow domain obfuscation in address

[public-inbox.git] / lib / PublicInbox / Hval.pm

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 00a923eaecba6768e4ff5153983c0080b90f8309..0e199025adcec36d72d55e139900e1bf03f26edc 100644 (file)
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -95,13 +95,13 @@ sub obfuscate_addrs ($$) {
        my $ibx = $_[0];
        my $re = $ibx->{-no_obfuscate_re}; # regex of domains
        my $addrs = $ibx->{-no_obfuscate}; # { adddress => 1 }
-       $_[1] =~ s/([\w\.\+=\-]+\@([\w\-]+\.[\w\.\-]+))/
-               my ($addr, $domain) = ($1, $2);
+       $_[1] =~ s/(([\w\.\+=\-]+)\@([\w\-]+\.[\w\.\-]+))/
+               my ($addr, $user, $domain) = ($1, $2, $3);
                if ($addrs->{$addr} || ((defined $re && $domain =~ $re))) {
                        $addr;
                } else {
-                       $addr =~ s!([^\.]+)\.!$1•!;
-                       $addr
+                       $domain =~ s!([^\.]+)\.!$1•!;
+                       $user . '@' . $domain
                }
                /sge;
 }