From: Eric Wong <e@80x24.org>
Date: Sat, 18 Sep 2021 21:09:14 +0000 (+0000)
Subject: net_reader: quote URL properly for Tor .onion hint
X-Git-Tag: v1.7.0~336
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=1d008cccb51ce8da92c97185840886bfc8b1e351;p=public-inbox.git

net_reader: quote URL properly for Tor .onion hint

The semicolon in ';AUTH=ANONYMOUS' requires quoting in Bourne shell.
---

diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index ccfdd261..30b8f810 100644
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -71,19 +71,21 @@ sub onion_hint ($$) {
 	my ($lei, $uri) = @_;
 	$uri->host =~ /\.onion\z/i or return "\n";
 	my $t = $uri->isa('PublicInbox::URIimap') ? 'imap' : 'nntp';
-	my $url = uri_section($uri);
+	my $url = PublicInbox::Config::squote_maybe(uri_section($uri));
 	my $set_cfg = 'lei config';
 	if (!$lei) { # public-inbox-watch
-		my $f = $ENV{PI_CONFIG} || '~/.public-inbox/config';
+		my $f = PublicInbox::Config::squote_maybe(
+				$ENV{PI_CONFIG} || '~/.public-inbox/config');
 		$set_cfg = "git config -f $f";
 	}
+	my $dq = substr($url, 0, 1) eq "'" ? '"' : '';
 	<<EOM
 
 Assuming you have Tor configured and running locally on port 9050,
 try configuring a socks5h:// proxy:
 
 	url=$url
-	$set_cfg $t.\$url.proxy socks5h://127.0.0.1:9050
+	$set_cfg $t.$dq\$url$dq.proxy socks5h://127.0.0.1:9050
 
 ...before retrying your current command
 EOM