From 57cbe47ad5e935f5071e37b07c0a2bdcc91beea0 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 25 Feb 2016 03:57:16 +0000 Subject: hval: implement common UI for protocol-relative URLs This allows users to avoid HTTPS -> HTTP downgrade warnings, but we will also avoid encouraging them towards HTTPS, for now. IMHO: the CA system gives a false sense of security, TLS libraries (e.g. OpenSSL) can introduce new bugs and problems (even to attack clients), and TLS libraries also eats memory on cheap servers. --- lib/PublicInbox/WWW.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'lib/PublicInbox/WWW.pm') diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index e87e5594..83729273 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -15,8 +15,8 @@ use strict; use warnings; use PublicInbox::Config qw(try_cat); use URI::Escape qw(uri_escape_utf8 uri_unescape); -use constant SSOMA_URL => 'http://ssoma.public-inbox.org/'; -use constant PI_URL => 'http://public-inbox.org/'; +use constant SSOMA_URL => '//ssoma.public-inbox.org/'; +use constant PI_URL => '//public-inbox.org/'; require PublicInbox::Git; use PublicInbox::GitHTTPBackend; our $LISTNAME_RE = qr!\A/([\w\.\-]+)!; @@ -264,14 +264,16 @@ sub footer { my $urls = try_cat("$git_dir/cloneurl"); my @urls = split(/\r?\n/, $urls || ''); my %seen = map { $_ => 1 } @urls; - my $http = $ctx->{cgi}->base->as_string . $listname; + my $cgi = $ctx->{cgi}; + my $http = $cgi->base->as_string . $listname; $seen{$http} or unshift @urls, $http; + my $ssoma_url = PublicInbox::Hval::prurl($cgi->{env}, SSOMA_URL); if (scalar(@urls) == 1) { - $urls = "URL for ssoma or git clone --mirror \$URL :) . $urls[0]; } else { - $urls = "URLs for ssoma or git clone --mirror \$URL\n) . join("\n", map { "\t$_" } @urls); } @@ -285,7 +287,9 @@ sub footer { $ctx->{footer} = join("\n", '- ' . $desc, - "A public-inbox, ' . + "A {cgi}->{env}, PI_URL) . + '">public-inbox, ' . 'anybody may post in plain-text (not HTML):', $addr, $urls -- cgit v1.2.3-24-ge0c7