From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: 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 14CEB1F9FF for ; Mon, 22 Mar 2021 07:54:03 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/8] net_reader: escape nasty chars from Net::NNTP->message Date: Mon, 22 Mar 2021 07:53:56 +0000 Message-Id: <20210322075402.27834-3-e@80x24.org> In-Reply-To: <20210322075402.27834-1-e@80x24.org> References: <20210322075402.27834-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Net::Cmd::message (used by Net::NNTP) does no escaping at all, so "\r" was causing confusing/nonsensical error messages when I tried to import from the wrong group. --- lib/PublicInbox/NetReader.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index d3094fc7..bc211029 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -7,11 +7,15 @@ use strict; use v5.10.1; use parent qw(Exporter PublicInbox::IPC); use PublicInbox::Eml; - our %IMAPflags2kw = map {; "\\\u$_" => $_ } qw(seen answered flagged draft); our @EXPORT = qw(uri_section imap_uri nntp_uri); +sub ndump { + require Data::Dumper; + Data::Dumper->new(\@_)->Useqq(1)->Terse(1)->Dump; +} + # returns the git config section name, e.g [imap "imaps://user@example.com"] # without the mailbox, so we can share connections between different inboxes sub uri_section ($) { @@ -530,7 +534,7 @@ sub _nntp_fetch_all ($$$) { my $sec = uri_section($uri); my ($nr, $beg, $end) = $nn->group($group); unless (defined($nr)) { - chomp(my $msg = $nn->message); + my $msg = ndump($nn->message); return "E: GROUP $group <$sec> $msg"; } @@ -566,7 +570,7 @@ sub _nntp_fetch_all ($$$) { } my $raw = $nn->article($art); unless (defined($raw)) { - my $msg = $nn->message; + my $msg = ndump($nn->message); if ($nn->code == 421) { # pseudo response from Net::Cmd $err = "E: $msg"; last;