www_stream: sh-friendly .onion URLs wrapping

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

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index be9e762e6e334d575899864db4fc30ac89226a17..57c2369091485112751e77a786662608fef0f41b 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -7,13 +7,15 @@
 # See PublicInbox::GzipFilter parent class for more info.
 package PublicInbox::WwwStream;
 use strict;
+use v5.10.1;
 use parent qw(Exporter PublicInbox::GzipFilter);
 our @EXPORT_OK = qw(html_oneshot);
-use bytes (); # length
 use PublicInbox::Hval qw(ascii_html prurl ts2str);
 our $TOR_URL = 'https://www.torproject.org/';
-our $CODE_URL = [ qw(http://ou63pmih66umazou.onion/public-inbox.git
-       https://public-inbox.org/public-inbox.git) ];
+
+our $CODE_URL = [ qw(
+http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/public-inbox.git
+https://public-inbox.org/public-inbox.git) ];
 
 sub base_url ($) {
        my $ctx = shift;
@@ -51,9 +53,10 @@ sub html_top ($) {
        } elsif ($ctx->{qp}->{t}) {
                $top = qq(<a\nhref="./">$top</a>);
        }
+       my $code = $ibx->{coderepo} ? qq( / <a\nhref=#code>code</a>) : '';
        my $links = qq(<a\nhref="$help">help</a> / ).
                        qq(<a\nhref="$color">color</a> / ).
-                       qq(<a\nhref=#mirror>mirror</a> / ).
+                       qq(<a\nhref=#mirror>mirror</a>$code / ).
                        qq(<a\nhref="$atom">Atom feed</a>);
        if ($ibx->isrch) {
                my $q_val = delete($ctx->{-q_value_html}) // '';
@@ -84,16 +87,20 @@ sub coderepos ($) {
        my $upfx = ($ctx->{-upfx} // ''). '../';
        my @ret;
        for my $cr_name (@$cr) {
-               my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl") // next;
                $ret[0] //= <<EOF;
-code repositories for the project(s) associated with this inbox:
+<a id=code>code repositories for project(s) associated with this inbox:
 EOF
-               for (@$urls) {
-                       # relative or absolute URL?, prefix relative "foo.git"
-                       # with appropriate number of "../"
-                       my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_;
-                       $u = ascii_html(prurl($ctx->{env}, $u));
-                       $ret[0] .= qq(\n\t<a\nhref="$u">$u</a>);
+               my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl");
+               if ($urls) {
+                       for (@$urls) {
+                               # relative or absolute URL?, prefix relative
+                               # "foo.git" with appropriate number of "../"
+                               my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_;
+                               $u = ascii_html(prurl($ctx->{env}, $u));
+                               $ret[0] .= qq(\n\t<a\nhref="$u">$u</a>);
+                       }
+               } else {
+                       $ret[0] .= qq[\n\t$cr_name.git (no URL configured)];
                }
        }
        @ret; # may be empty, this sub is called as an arg for join()
@@ -102,7 +109,13 @@ EOF
 sub code_footer ($) {
        my ($env) = @_;
        my $u = prurl($env, $CODE_URL);
-       qq(AGPL code for this site: git clone <a\nhref="$u">$u</a>)
+       my $arg = $u;
+       if ($arg =~ s!\A(https?://)([^/\.]+)\.onion/!$1\$hostname\.onion/!i) {
+               "AGPL code for this site:\n\thostname=$2\n\t" .
+               qq(torsocks git clone <a\nhref="$u">$arg</a>)
+       } else {
+               qq(AGPL code for this site: git clone <a\nhref="$u">$u</a>)
+       }
 }
 
 sub _html_end {
@@ -120,6 +133,9 @@ EOF
        my $max = $ibx->max_git_epoch;
        my $dir = (split(m!/!, $http))[-1];
        my %seen = ($http => 1);
+       # TODO: some of these URLs may be too long and we may need to
+       # do something like code_footer() above, but these are local
+       # admin-defined
        if (defined($max)) { # v2
                for my $i (0..$max) {
                        # old epochs my be deleted:
@@ -211,7 +227,7 @@ sub html_oneshot ($$;$) {
        };
        $ctx->zmore($$sref) if $sref;
        my $bdy = $ctx->zflush(_html_end($ctx));
-       $res_hdr->[3] = bytes::length($bdy);
+       $res_hdr->[3] = length($bdy);
        [ $code, $res_hdr, [ $bdy ] ]
 }