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 DE6191FA01 for ; Thu, 18 Feb 2021 20:22:27 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCHv3 4/4] lei: check for IMAP auth errors Date: Thu, 18 Feb 2021 23:22:25 +0300 Message-Id: <20210218202225.85440-5-e@80x24.org> In-Reply-To: <20210218110647.9822-2-e@80x24.org> References: <20210218110647.9822-2-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We need to ensure authentication failures and error codes get propagated to the parent process(es) properly. v2: update MANIFEST v3: LeiAuth.pm ->_lei_cfg bit moved to a previous commit --- MANIFEST | 1 + lib/PublicInbox/NetReader.pm | 3 +++ xt/lei-auth-fail.t | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 xt/lei-auth-fail.t diff --git a/MANIFEST b/MANIFEST index 19f73356..3d9ad616 100644 --- a/MANIFEST +++ b/MANIFEST @@ -466,6 +466,7 @@ xt/git_async_cmp.t xt/httpd-async-stream.t xt/imapd-mbsync-oimap.t xt/imapd-validate.t +xt/lei-auth-fail.t xt/lei-sigpipe.t xt/mem-imapd-tls.t xt/mem-msgview.t diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index ad8c18d0..61ea538b 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -89,6 +89,9 @@ sub mic_for { # mic = Mail::IMAPClient $self->{mic_arg}->{uri_section($uri)} = $mic_arg; } else { $err = "E: <$url> LOGIN: $@\n"; + if ($cred && defined($cred->{password})) { + $err =~ s/\Q$cred->{password}\E/*******/g; + } $mic = undef; } $cred->run($mic ? 'approve' : 'reject') if $cred; diff --git a/xt/lei-auth-fail.t b/xt/lei-auth-fail.t new file mode 100644 index 00000000..5308d0f9 --- /dev/null +++ b/xt/lei-auth-fail.t @@ -0,0 +1,20 @@ +#!perl -w +# Copyright (C) 2021 all contributors +# License: AGPL-3.0+ +use strict; use v5.10.1; use PublicInbox::TestCommon; + +# TODO: mock IMAP server which fails at authentication so we don't +# have to make external connections to test this: +my $imap_fail = $ENV{TEST_LEI_IMAP_FAIL_URL} // + 'imaps://AzureDiamond:Hunter2@public-inbox.org:994/INBOX'; +test_lei(sub { + ok(!lei(qw(convert -o mboxrd:/dev/stdout), $imap_fail), + 'IMAP auth failure on convert'); + like($lei_err, qr!\bE:.*?imaps://.*?!sm, 'error shown'); + unlike($lei_err, qr!Hunter2!s, 'password not shown'); + is($lei_out, '', 'nothing output'); + ok(!lei(qw(import), $imap_fail), 'IMAP auth failure on import'); + like($lei_err, qr!\bE:.*?imaps://.*?!sm, 'error shown'); + unlike($lei_err, qr!Hunter2!s, 'password not shown'); +}); +done_testing;