diff options
author | Eric Wong <e@80x24.org> | 2016-01-18 21:16:14 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-04-05 18:58:27 +0000 |
commit | fa8e2e7e001d7585d6e41c254ee4443a1672bca5 (patch) | |
tree | 81a4e40fea90aa27f3c49b32333da841b5c54b0f | |
parent | b89e53a37e14f5f659c94f8c880e2cf4b7efe1b4 (diff) | |
download | public-inbox-fa8e2e7e001d7585d6e41c254ee4443a1672bca5.tar.gz |
We'll use HTML attributes + anchor links to link to filenames in coming commits.
-rw-r--r-- | lib/PublicInbox/Hval.pm | 33 | ||||
-rw-r--r-- | t/hval.t | 20 |
2 files changed, 52 insertions, 1 deletions
diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm index d908bec2..c0db5667 100644 --- a/lib/PublicInbox/Hval.pm +++ b/lib/PublicInbox/Hval.pm @@ -10,7 +10,7 @@ use Encode qw(find_encoding); use URI::Escape qw(uri_escape_utf8); use PublicInbox::MID qw/mid_clean/; use base qw/Exporter/; -our @EXPORT_OK = qw/ascii_html utf8_html/; +our @EXPORT_OK = qw/ascii_html utf8_html to_attr from_attr/; # for user-generated content (UGC) which may have excessively long lines # and screw up rendering on some browsers. This is the only CSS style @@ -97,4 +97,35 @@ sub prurl { index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u; } +# convert a filename (or any string) to HTML attribute + +my %ESCAPES = map { chr($_) => sprintf('::%02x', $_) } (0..255); +$ESCAPES{'/'} = ':'; # common + +sub to_attr ($) { + my ($str) = @_; + + # git would never do this to us: + die "invalid filename: $str" 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; diff --git a/t/hval.t b/t/hval.t new file mode 100644 index 00000000..f824752c --- /dev/null +++ b/t/hval.t @@ -0,0 +1,20 @@ +# Copyright (C) 2015 all contributors <meta@public-inbox.org> +# License: AGPL-3.0+ (https://www.gnu.org/licenses/agpl-3.0.txt) +use strict; +use warnings; +use Test::More; +use PublicInbox::Hval qw(to_attr from_attr); + +foreach my $s ('Hello/World.pm', 'Zcat', 'hello world.c', 'Eléanor', '$at') { + my $attr = to_attr($s); + is(from_attr($attr), $s, "$s => $attr => $s round trips"); +} + +{ + my $bad = eval { to_attr('foo//bar') }; + my $err = $@; + ok(!$bad, 'double-slash rejected'); + like($err, qr/invalid filename:/, 'got exception message'); +} + +done_testing(); |