diff options
| author | Eric Wong <e@80x24.org> | 2021-08-26 12:33:33 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-08-28 10:37:00 +0000 |
| commit | 37aa51cd82d34aa2638db24a3dd5aa72339183df (patch) | |
| tree | c41d070c337f22a5f8ec7d64c77e56ca7e40442d /lib/PublicInbox | |
| parent | 70cba5dbade9b1d83ab30fcb2573def773deabe9 (diff) | |
| download | public-inbox-37aa51cd82d34aa2638db24a3dd5aa72339183df.tar.gz | |
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/
Diffstat (limited to 'lib/PublicInbox')
| -rw-r--r-- | lib/PublicInbox/WwwStream.pm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index adcb5fe2..57c23690 100644 --- 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: |