www_stream: sh-friendly .onion URLs wrapping

The long v3 .onion URL was causing havoc on small mobile
displays, so extract "hostname" into a variable which can
still used as a Bourne shell snippet.

While we're at it, include "torsocks" in the git command used
for .onion URLs since that's the (near)-universal wrapper for
Tor-ifying things (like git) which are dynamically linked to
libc.

Cc: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Link: https://public-inbox.org/meta/20210816163654.c6gfzuezhji4l6s7@nitro.local/

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index adcb5fe24314305c436e07048983c6dbaf8d9401..57c2369091485112751e77a786662608fef0f41b 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -12,8 +12,10 @@ use parent qw(Exporter PublicInbox::GzipFilter);
 our @EXPORT_OK = qw(html_oneshot);
 use PublicInbox::Hval qw(ascii_html prurl ts2str);
 our $TOR_URL = 'https://www.torproject.org/';
-our $CODE_URL = [ qw(http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.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;
@@ -107,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 {
@@ -125,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: