From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 5462F1F566 for ; Tue, 3 Oct 2023 06:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1696315433; bh=qtTrkqCg9x5lD1OIJK55nQnggJzM4Q4qDrqBQ8IwNrg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=5S92f5CBnSvBckyyQAkKgw6oquQqPHtKG/6ElZDIyIM0Dtu9c+I0w2815f+fgOSvi cg+NCe/39K/pZICs5wSXpV8zzzOqq4Ddmhg7fOP785CeEQaI0hKN57aHKefo3lufM1 UVhlbHl9KPjuwm0q5Qq3V70BOyZYs0O/DIg//Gcc= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/8] config: fix key-only truthy values with urlmatch Date: Tue, 3 Oct 2023 06:43:47 +0000 Message-ID: <20231003064352.2902298-4-e@80x24.org> In-Reply-To: <20231003064352.2902298-1-e@80x24.org> References: <20231003064352.2902298-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: When using --get-urlmatch, we need a way to distinguish between between key-only or a `key=val' pair even if the `val' is empty. In other words, git interprets `-c imap.debug' as true and `-c imap.debug=' as false, but an untyped --get-urlmatch invocation has no way to distinguish between them. So we must specify we want `--bool' (we're avoiding `--type=bool' since that only appears in git 2.18+) Fixes: f170d220f876 (lei: fix `-c NAME=VALUE' config support) --- lib/PublicInbox/Config.pm | 18 ++++++++++++------ lib/PublicInbox/NetReader.pm | 18 +++++------------- t/imapd-tls.t | 4 +++- t/nntpd-tls.t | 4 +++- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 9f764c32..15e0872e 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -568,28 +568,34 @@ sub config_cmd { } sub urlmatch { - my ($self, $key, $url, $try_git) = @_; + my $self = shift; + my @bool = $_[0] eq '--bool' ? (shift) : (); + my ($key, $url, $try_git) = @_; state $urlmatch_broken; # requires git 1.8.5 return if $urlmatch_broken; my (%env, %opt); my $cmd = $self->config_cmd(\%env, \%opt); - push @$cmd, qw(-z --includes --get-urlmatch), $key, $url; + push @$cmd, @bool, qw(--includes -z --get-urlmatch), $key, $url; my $fh = popen_rd($cmd, \%env, \%opt); local $/ = "\0"; my $val = <$fh>; if (!close($fh)) { undef $val; - if (($? >> 8) != 1) { + if (@bool && ($? >> 8) == 128) { # not boolean + } elsif (($? >> 8) != 1) { $urlmatch_broken = 1; } elsif ($try_git) { # n.b. this takes cwd into account - $cmd = [qw(git config -z --get-urlmatch), $key, $url]; - $fh = popen_rd($cmd); + $fh = popen_rd([qw(git config), @bool, + qw(-z --get-urlmatch), $key, $url]); $val = <$fh>; close($fh) or undef($val); } } $? = 0; # don't influence lei exit status - chomp $val if defined $val; + if (defined($val)) { + chomp $val; + $val = git_bool($val) if @bool; + } $val; } diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index e14b5805..5819f210 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -319,14 +319,6 @@ sub cfg_intvl ($$$) { } } -sub cfg_bool ($$$) { - my ($cfg, $key, $url) = @_; - my $orig = $cfg->urlmatch($key, $url) // return; - my $bool = $cfg->git_bool($orig); - warn "W: $key=$orig for $url is not boolean\n" unless defined($bool); - $bool; -} - # flesh out common IMAP-specific data structures sub imap_common_init ($;$) { my ($self, $lei) = @_; @@ -344,8 +336,8 @@ sub imap_common_init ($;$) { # knobs directly for Mail::IMAPClient->new for my $k (qw(Starttls Debug Compress)) { - my $bool = cfg_bool($cfg, "imap.$k", $$uri) // next; - $mic_common->{$sec}->{$k} = $bool; + my $v = $cfg->urlmatch('--bool', "imap.$k", $$uri); + $mic_common->{$sec}->{$k} = $v if defined $v; } my $to = cfg_intvl($cfg, 'imap.timeout', $$uri); $mic_common->{$sec}->{Timeout} = $to if $to; @@ -398,7 +390,7 @@ sub nntp_common_init ($;$) { my $args = $nn_common->{$sec} //= {}; # Debug and Timeout are passed to Net::NNTP->new - my $v = cfg_bool($cfg, 'nntp.Debug', $$uri); + my $v = $cfg->urlmatch(qw(--bool nntp.Debug), $$uri); $args->{Debug} = $v if defined $v; my $to = cfg_intvl($cfg, 'nntp.Timeout', $$uri); $args->{Timeout} = $to if $to; @@ -407,8 +399,8 @@ sub nntp_common_init ($;$) { # Net::NNTP post-connect commands for my $k (qw(starttls compress)) { - $v = cfg_bool($cfg, "nntp.$k", $$uri) // next; - $self->{cfg_opt}->{$sec}->{$k} = $v; + $v = $cfg->urlmatch('--bool', "nntp.$k", $$uri); + $self->{cfg_opt}->{$sec}->{$k} = $v if defined $v; } # -watch internal option diff --git a/t/imapd-tls.t b/t/imapd-tls.t index 44ab350c..673a9436 100644 --- a/t/imapd-tls.t +++ b/t/imapd-tls.t @@ -158,8 +158,10 @@ for my $args ( test_lei(sub { lei_ok qw(ls-mail-source), "imap://$starttls_addr", \'STARTTLS not used by default'; - ok(!lei(qw(ls-mail-source -c imap.starttls=true), + ok(!lei(qw(ls-mail-source -c imap.starttls), "imap://$starttls_addr"), 'STARTTLS verify fails'); + unlike $lei_err, qr!W: imap\.starttls= .*? is not boolean!i, + 'no non-boolean warning'; }); SKIP: { diff --git a/t/nntpd-tls.t b/t/nntpd-tls.t index 2a76867a..095aef96 100644 --- a/t/nntpd-tls.t +++ b/t/nntpd-tls.t @@ -149,10 +149,12 @@ for my $args ( test_lei(sub { lei_ok qw(ls-mail-source), "nntp://$starttls_addr", \'STARTTLS not used by default'; - ok(!lei(qw(ls-mail-source -c nntp.starttls=true), + ok(!lei(qw(ls-mail-source -c nntp.starttls), "nntp://$starttls_addr"), 'STARTTLS verify fails'); like $lei_err, qr/STARTTLS requested/, 'STARTTLS noted in stderr'; + unlike $lei_err, qr!W: nntp\.starttls= .*? is not boolean!i, + 'no non-boolean warning'; }); SKIP: {