inboxwritable: fix From_ line unescaping

We can't rely on Email::MIME noticing the change to our
scalar ref after calling `PublicInbox::MIME->new'.

This is because Email::MIME::body_set (unlike
Email::Simple::body_set) will copy the contents of the body into
`->{body_raw}' as a new scalar.

Furthermore, we need to escape multiple From lines in the body,
not just the first one, using the `g' modifier to `s//'.

Reported-by: Kyle Meyer <kyle@kyleam.com>

diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index ce979ea2bf8c65fe2f5f72ce16ef5d58515b5762..f2ba21fcbdfa02051d1a5d8677a81279942978f5 100644 (file)
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -157,12 +157,12 @@ my $from_strict = qr/^From \S+ +\S+ \S+ +\S+ [^:]+:[^:]+:[^:]+ [^:]+/;
 sub mb_add ($$$$) {
        my ($im, $variant, $filter, $msg) = @_;
        $$msg =~ s/(\r?\n)+\z/$1/s;
-       my $mime = PublicInbox::MIME->new($msg);
        if ($variant eq 'mboxrd') {
-               $$msg =~ s/^>(>*From )/$1/sm;
+               $$msg =~ s/^>(>*From )/$1/gms;
        } elsif ($variant eq 'mboxo') {
-               $$msg =~ s/^>From /From /sm;
+               $$msg =~ s/^>From /From /gms;
        }
+       my $mime = PublicInbox::MIME->new($msg);
        if ($filter) {
                my $ret = $filter->scrub($mime) or return;
                return if $ret == REJECT();