From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 55BDA1F8C8
	for <meta@public-inbox.org>; Sat, 18 Sep 2021 21:09:14 +0000 (UTC)
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] net_reader: quote URL properly for Tor .onion hint
Date: Sat, 18 Sep 2021 21:09:14 +0000
Message-Id: <20210918210914.3979-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

The semicolon in ';AUTH=ANONYMOUS' requires quoting in Bourne shell.
---
 lib/PublicInbox/NetReader.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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