reply: follow obfuscation rules for HTML in sh args

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

diff --git a/lib/PublicInbox/Reply.pm b/lib/PublicInbox/Reply.pm
index 0cd36fdad542ee53e2cd9d95b3ef60bedc9d74e9..eee41173562d37161defd376d02f94357b56b568 100644 (file)
--- a/lib/PublicInbox/Reply.pm
+++ b/lib/PublicInbox/Reply.pm
@@ -4,7 +4,7 @@ package PublicInbox::Reply;
 use strict;
 use warnings;
 use URI::Escape qw/uri_escape_utf8/;
-use PublicInbox::Hval qw/ascii_html/;
+use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
 use PublicInbox::Address;
 use PublicInbox::MID qw/mid_clean mid_escape/;
 
@@ -32,7 +32,8 @@ my $reply_headers = join('|', @reply_headers);
 sub mailto_arg_link {
        my ($ibx, $hdr) = @_;
        my $cc = {}; # everyone else
-       my $to; # this is the From address by default
+       my $to; # this is the From address by defaultq
+       my $reply_to_all = 'reply-to-all'; # the only good default :P
 
        foreach my $rt (split(/\s*,\s*/, $ibx->{replyto} || ':all')) {
                if ($rt eq ':all') {
@@ -43,8 +44,10 @@ sub mailto_arg_link {
                                add_addrs(\$to, $cc, @addrs);
                        }
                } elsif ($rt eq ':list') {
+                       $reply_to_all = 'reply-to-list';
                        add_addrs(\$to, $cc, $ibx->{-primary_address});
                } elsif ($rt =~ /\A(?:$reply_headers)\z/io) {
+                       # ugh, this is weird...
                        my $v = $hdr->header($rt);
                        if (defined($v) && ($v ne '')) {
                                my @addrs = PublicInbox::Address::emails($v);
@@ -67,8 +70,9 @@ sub mailto_arg_link {
        delete $cc->{$to};
        if ($obfs) {
                my $arg_to = $to;
-               $arg_to =~ s/\./\$(echo .)/;
+               obfuscate_addrs($ibx, $arg_to, '$(echo .)');
                push @arg, "--to=$arg_to";
+               # no $subj for $href below
        } else {
                push @arg, "--to=$to";
                $to = uri_escape_utf8($to);
@@ -79,8 +83,9 @@ sub mailto_arg_link {
        if (@cc) {
                if ($obfs) {
                        push(@arg, map {
-                               s/\./\$(echo .)/;
-                               "--cc=$_";
+                               my $addr = $_;
+                               obfuscate_addrs($ibx, $addr, '$(echo .)');
+                               "--cc=$addr";
                        } @cc);
                } else {
                        $cc = '&Cc=' . uri_escape_utf8(join(',', @cc));
@@ -91,13 +96,13 @@ sub mailto_arg_link {
        # I'm not sure if address obfuscation and mailto: links can
        # be made compatible; and address obfuscation is misguided,
        # anyways.
-       return (\@arg, '') if $obfs;
+       return (\@arg, '', $reply_to_all) if $obfs;
 
        # order matters, Subject is the least important header,
        # so it is last in case it's lost/truncated in a copy+paste
        my $href = "mailto:$to?In-Reply-To=$irt${cc}&Subject=$subj";
 
-       (\@arg, ascii_html($href));
+       (\@arg, ascii_html($href), $reply_to_all);
 }
 
 1;