X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHval.pm;h=c134e297280eeff734f0a2170eeac48386c395ec;hb=96348c1a2229ffcf04153539c028f61bbe36c8b4;hp=47b41a5844c875ddff9eeabf271485025a157f68;hpb=89f34da9a510bf87293721942d688b1425bb9cf7;p=public-inbox.git

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 47b41a58..c134e297 100644
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -1,52 +1,151 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
-# represents a header value in various forms
+# represents a header value in various forms.  Used for HTML generation
+# in our web interface(s)
 package PublicInbox::Hval;
 use strict;
 use warnings;
-use fields qw(raw -as_utf8);
 use Encode qw(find_encoding);
-use CGI qw(escapeHTML);
-use URI::Escape qw(uri_escape);
-
-my $enc_utf8 = find_encoding('utf8');
+use PublicInbox::MID qw/mid_clean mid_escape/;
+use base qw/Exporter/;
+our @EXPORT_OK = qw/ascii_html obfuscate_addrs to_filename src_escape
+		to_attr from_attr/;
 my $enc_ascii = find_encoding('us-ascii');
 
+# safe-ish acceptable filename pattern for portability
+our $FN = '[a-zA-Z0-9][a-zA-Z0-9_\-\.]+[a-zA-Z0-9]'; # needs \z anchor
+
 sub new {
-	my ($class, $raw) = @_;
-	my $self = fields::new($class);
+	my ($class, $raw, $href) = @_;
 
-	# we never care about leading/trailing whitespace
-	$raw =~ s/\A\s*//;
+	# we never care about trailing whitespace
 	$raw =~ s/\s*\z//;
-	$self->{raw} = $raw;
-	$self;
+	bless {
+		raw => $raw,
+		href => defined $href ? $href : $raw,
+	}, $class;
 }
 
 sub new_msgid {
-	my ($class, $raw) = @_;
-	$raw =~ s/\A<//;
-	$raw =~ s/>\z//;
-	$class->new($raw);
+	my ($class, $msgid) = @_;
+	$class->new($msgid, mid_escape($msgid));
+}
+
+# some of these overrides are standard C escapes so they're
+# easy-to-understand when rendered.
+my %escape_sequence = (
+	"\x00" => '\\0', # NUL
+	"\x07" => '\\a', # bell
+	"\x08" => '\\b', # backspace
+	"\x09" => "\t", # obvious to show as-is
+	"\x0a" => "\n", # obvious to show as-is
+	"\x0b" => '\\v', # vertical tab
+	"\x0c" => '\\f', # form feed
+	"\x0d" => '\\r', # carriage ret (not preceding \n)
+	"\x1b" => '^[', # ASCII escape (mutt seems to escape this way)
+	"\x7f" => '\\x7f', # DEL
+);
+
+my %xhtml_map = (
+	'"' => '&#34;',
+	'&' => '&#38;',
+	"'" => '&#39;',
+	'<' => '&lt;',
+	'>' => '&gt;',
+);
+
+$xhtml_map{chr($_)} = sprintf('\\x%02x', $_) for (0..31);
+%xhtml_map = (%xhtml_map, %escape_sequence);
+
+sub src_escape ($) {
+	$_[0] =~ s/\r\n/\n/sg;
+	$_[0] =~ s/([\x7f\x00-\x1f])/$xhtml_map{$1}/sge;
+	$_[0] = $enc_ascii->encode($_[0], Encode::HTMLCREF);
+}
+
+sub ascii_html {
+	my ($s) = @_;
+	$s =~ s/\r\n/\n/sg; # fixup bad line endings
+	$s =~ s/([<>&'"\x7f\x00-\x1f])/$xhtml_map{$1}/sge;
+	$enc_ascii->encode($s, Encode::HTMLCREF);
+}
+
+sub as_html { ascii_html($_[0]->{raw}) }
+
+sub raw {
+	if (defined $_[1]) {
+		$_[0]->{raw} = $_[1];
+	} else {
+		$_[0]->{raw};
+	}
 }
 
-sub new_oneline {
-	my ($class, $raw) = @_;
-	$raw = '' unless defined $raw;
-	$raw =~ tr/\t\n / /s; # squeeze spaces
-	$raw =~ tr/\r//d; # kill CR
-	$class->new($raw);
+sub prurl {
+	my ($env, $u) = @_;
+	index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u;
 }
 
-sub as_utf8 {
-	my ($self) = @_;
-	$self->{-as_utf8} ||= $enc_utf8->encode($self->{raw});
+# 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 ($$;$) {
+	my $ibx = $_[0];
+	my $repl = $_[2] || '&#8226;';
+	my $re = $ibx->{-no_obfuscate_re}; # regex of domains
+	my $addrs = $ibx->{-no_obfuscate}; # { adddress => 1 }
+	$_[1] =~ s/(([\w\.\+=\-]+)\@([\w\-]+\.[\w\.\-]+))/
+		my ($addr, $user, $domain) = ($1, $2, $3);
+		if ($addrs->{$addr} || ((defined $re && $domain =~ $re))) {
+			$addr;
+		} else {
+			$domain =~ s!([^\.]+)\.!$1$repl!;
+			$user . '@' . $domain
+		}
+		/sge;
 }
 
-sub ascii_html { $enc_ascii->encode(escapeHTML($_[0]), Encode::HTMLCREF) }
+# 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
+}
+
+# convert a filename (or any string) to HTML attribute
+
+my %ESCAPES = map { chr($_) => sprintf('::%02x', $_) } (0..255);
+$ESCAPES{'/'} = ':'; # common
 
-sub as_html { ascii_html($_[0]->as_utf8) }
-sub as_href { ascii_html(uri_escape($_[0]->as_utf8)) }
+sub to_attr ($) {
+	my ($str) = @_;
+
+	# git would never do this to us:
+	return if index($str, '//') >= 0;
+
+	my $first = '';
+	if ($str =~ s/\A([^A-Ya-z])//ms) { # start with a letter
+		  $first = sprintf('Z%02x', ord($1));
+	}
+	$str =~ s/([^A-Za-z0-9_\.\-])/$ESCAPES{$1}/egms;
+	$first . $str;
+}
+
+# reverse the result of to_attr
+sub from_attr ($) {
+	my ($str) = @_;
+	my $first = '';
+	if ($str =~ s/\AZ([a-f0-9]{2})//ms) {
+		$first = chr(hex($1));
+	}
+	$str =~ s!::([a-f0-9]{2})!chr(hex($1))!egms;
+	$str =~ tr!:!/!;
+	$first . $str;
+}
 
 1;