view: implement optional address obfuscation

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

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 652aef3daee55ab926e31262e0b722b1efbe568e..2379b918514d398763fd3cf17a1151e60e1b5ed1 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/;
 
 # 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 {
@@ -52,15 +50,28 @@ my %xhtml_map = (
        '>' => '>',
 );
 
+$xhtml_map{chr($_)} = sprintf('\\x%02x', $_) for (0..31);
+# some of these overrides are standard C escapes so they're
+# easy-to-understand when rendered.
+$xhtml_map{"\x00"} = '\\0'; # NUL
+$xhtml_map{"\x07"} = '\\a'; # bell
+$xhtml_map{"\x08"} = '\\b'; # backspace
+$xhtml_map{"\x09"} = "\t"; # obvious to show as-is
+$xhtml_map{"\x0a"} = "\n"; # obvious to show as-is
+$xhtml_map{"\x0b"} = '\\v'; # vertical tab
+$xhtml_map{"\x0c"} = '\\f'; # form feed
+$xhtml_map{"\x0d"} = '\\r'; # carriage ret (not preceding \n)
+$xhtml_map{"\x1b"} = '^['; # ASCII escape (mutt seems to escape this way)
+$xhtml_map{"\x7f"} = '\\x7f'; # DEL
+
 sub ascii_html {
        my ($s) = @_;
        $s =~ s/\r\n/\n/sg; # fixup bad line endings
-       $s =~ s/([<>&'"])/$xhtml_map{$1}/ge;
+       $s =~ s/([<>&'"\x7f\x00-\x1f])/$xhtml_map{$1}/sge;
        $enc_ascii->encode($s, Encode::HTMLCREF);
 }
 
 sub as_html { ascii_html($_[0]->{raw}) }
-sub as_href { ascii_html(uri_escape_utf8($_[0]->{href})) }
 
 sub raw {
        if (defined $_[1]) {
@@ -75,4 +86,11 @@ sub prurl {
        index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u;
 }
 
+# for misguided people who believe in this stuff, give them a
+# substitution for '.'
+# &#8228; &#183; and &#890; were also candidates:
+#   https://public-inbox.org/meta/20170615015250.GA6484@starla/
+# However, &#8226; was chosen to make copy+paste errors more obvious
+sub obfuscate_addrs ($) { $_[0] =~ s/(\S+@[^\.]+)\./$1&#8226;/g }
+
 1;