mbox: support inline filename via Content-Disposition header

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

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index f262073767807cfbd37919f442001d181c77e355..00a923eaecba6768e4ff5153983c0080b90f8309 100644 (file)
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -7,10 +7,9 @@ package PublicInbox::Hval;
 use strict;
 use warnings;
 use Encode qw(find_encoding);
-use URI::Escape qw(uri_escape_utf8);
-use PublicInbox::MID qw/mid_clean/;
+use PublicInbox::MID qw/mid_clean mid_escape/;
 use base qw/Exporter/;
-our @EXPORT_OK = qw/ascii_html/;
+our @EXPORT_OK = qw/ascii_html obfuscate_addrs to_filename/;
 
 # for user-generated content (UGC) which may have excessively long lines
 # and screw up rendering on some browsers.  This is the only CSS style
@@ -32,8 +31,7 @@ sub new {
 
 sub new_msgid {
        my ($class, $msgid) = @_;
-       $msgid = mid_clean($msgid);
-       $class->new($msgid, $msgid);
+       $class->new($msgid, mid_escape($msgid));
 }
 
 sub new_oneline {
@@ -74,7 +72,6 @@ sub ascii_html {
 }
 
 sub as_html { ascii_html($_[0]->{raw}) }
-sub as_href { ascii_html(uri_escape_utf8($_[0]->{href})) }
 
 sub raw {
        if (defined $_[1]) {
@@ -89,4 +86,34 @@ sub prurl {
        index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u;
 }
 
+# for misguided people who believe in this stuff, give them a
+# substitution for '.'
+# ․ · and ͺ were also candidates:
+#   https://public-inbox.org/meta/20170615015250.GA6484@starla/
+# However, • was chosen to make copy+paste errors more obvious
+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);
+               if ($addrs->{$addr} || ((defined $re && $domain =~ $re))) {
+                       $addr;
+               } else {
+                       $addr =~ s!([^\.]+)\.!$1•!;
+                       $addr
+               }
+               /sge;
+}
+
+# like format_sanitized_subject in git.git pretty.c with '%f' format string
+sub to_filename ($) {
+       my ($s, undef) = split(/\n/, $_[0]);
+       $s =~ s/[^A-Za-z0-9_\.]+/-/g;
+       $s =~ tr/././s;
+       $s =~ s/[\.\-]+\z//;
+       $s =~ s/\A[\.\-]+//;
+       $s
+}
+
 1;