X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwText.pm;h=fbbe8e3b6583a8c636cf3e6058f4bee205b0fb0f;hb=1234e3e4d384bd92b073fa1e3549aa916113c3fa;hp=975ebddb2e67207970731a71045cca8431f5eaae;hpb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;p=public-inbox.git diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm index 975ebddb..fbbe8e3b 100644 --- a/lib/PublicInbox/WwwText.pm +++ b/lib/PublicInbox/WwwText.pm @@ -9,6 +9,7 @@ use bytes (); # only for bytes::length use PublicInbox::Linkify; use PublicInbox::WwwStream; use PublicInbox::Hval qw(ascii_html); +use URI::Escape qw(uri_escape_utf8); our $QP_URL = 'https://xapian.org/docs/queryparser.html'; our $WIKI_URL = 'https://en.wikipedia.org/wiki'; my $hl = eval { @@ -29,14 +30,14 @@ sub get_text { my $have_tslash = ($key =~ s!/\z!!) if !$raw; my $txt = ''; - if (!_default_text($ctx, $key, \$txt)) { + my $hdr = [ 'Content-Type', 'text/plain', 'Content-Length', undef ]; + if (!_default_text($ctx, $key, $hdr, \$txt)) { $code = 404; $txt = "404 Not Found ($key)\n"; } if ($raw) { - return [ $code, [ 'Content-Type', 'text/plain', - 'Content-Length', bytes::length($txt) ], - [ $txt ] ] + $hdr->[3] = bytes::length($txt); + return [ $code, $hdr, [ $txt ] ] } # enforce trailing slash for "wget -r" compatibility @@ -52,27 +53,25 @@ sub get_text { # Follow git commit message conventions, # first line is the Subject/title my ($title) = ($txt =~ /\A([^\n]*)/s); - _do_linkify($txt); + $ctx->{txt} = \$txt; $ctx->{-title_html} = ascii_html($title); - my $nslash = ($key =~ tr!/!/!); $ctx->{-upfx} = '../../../' . ('../' x $nslash); - - PublicInbox::WwwStream->response($ctx, $code, sub { - my ($nr, undef) = @_; - $nr == 1 ? '
'.$txt.'' : undef - }); + PublicInbox::WwwStream->response($ctx, $code, \&_do_linkify); } sub _do_linkify { + my ($nr, $ctx) = @_; + return unless $nr == 1; my $l = PublicInbox::Linkify->new; - $l->linkify_1($_[0]); + my $txt = delete $ctx->{txt}; + $l->linkify_1($$txt); if ($hl) { - $hl->do_hl_text(\($_[0])); + $hl->do_hl_text($txt); } else { - $_[0] = ascii_html($_[0]); + $$txt = ascii_html($$txt); } - $_[0] = $l->linkify_2($_[0]); + '
' . $l->linkify_2($$txt) . ''; } sub _srch_prefix ($$) { @@ -123,9 +122,76 @@ EOF $$txt .= PublicInbox::UserContent::sample($ibx, $env) . "```\n"; } -sub _default_text ($$$) { - my ($ctx, $key, $txt) = @_; +# git-config section names are quoted in the config file, so escape them +sub dq_escape ($) { + my ($name) = @_; + $name =~ s/\\/\\\\/g; + $name =~ s/"/\\"/g; + $name; +} + +sub URI_PATH () { '^A-Za-z0-9\-\._~/' } + +# n.b. this is a perfect candidate for memoization +sub inbox_config ($$$) { + my ($ctx, $hdr, $txt) = @_; + my $ibx = $ctx->{-inbox}; + push @$hdr, 'Content-Disposition', 'inline; filename=inbox.config'; + my $name = dq_escape($ibx->{name}); + $$txt .= <