lei: do not read ~/.netrc by default

Since ~/.netrc isn't widely used by most (if any) NNTP and IMAP
clients, we won't read it by default for lei.  AFAIK, ~/.netrc
is mainly by FTP clients (e.g. ftp(1) and lftp(1)).  wget uses
it by default for HTTP(S) (and FTP), but curl does not.

To avoid breaking stable release use cases, public-inbox-watch
continues to read ~/.netrc by default.

The --netrc switch is supported by all existing lei commands
which may use curl.

diff --git a/lib/PublicInbox/GitCredential.pm b/lib/PublicInbox/GitCredential.pm
index c83fed43c001ea65f4af08ac2e77efffac670a7e..b18bba1ec32454b29a03339a54c2ed53b17c008c 100644 (file)
--- a/lib/PublicInbox/GitCredential.pm
+++ b/lib/PublicInbox/GitCredential.pm
@@ -31,8 +31,12 @@ sub run ($$;$) {
        close $out_r or die "`git credential $op' failed: \$!=$! \$?=$?\n";
 }
 
-sub check_netrc ($) {
-       my ($self) = @_;
+sub check_netrc {
+       my ($self, $lei) = @_;
+
+       # n.b. lei doesn't load ~/.netrc by default, public-inbox-watch does,
+       # which may've been a mistake, but we have to live with it.
+       return if ($lei && !$lei->{opt}->{netrc});
 
        # part of the standard library, but distributions may split it out
        eval { require Net::Netrc };

diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index a0e52fc5abd18fccc2d600893f72559a3562883e..f0f56431282312c37840809be755cac0007ba51e 100644 (file)
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -96,7 +96,7 @@ sub mic_for ($$$$) { # mic = Mail::IMAPClient
                $cred = undef;
        }
        if ($cred) {
-               my $p = $cred->{password} // $cred->check_netrc;
+               my $p = $cred->{password} // $cred->check_netrc($lei);
                $cred->fill($lei) unless defined($p); # may prompt user here
                $mic->User($mic_arg->{User} = $cred->{username});
                $mic->Password($mic_arg->{Password} = $cred->{password});
@@ -191,7 +191,7 @@ sub nn_for ($$$$) { # nn = Net::NNTP
                }, 'PublicInbox::GitCredential';
                ($u, $p) = split(/:/, $ui, 2);
                ($cred->{username}, $cred->{password}) = ($u, $p);
-               $p //= $cred->check_netrc;
+               $p //= $cred->check_netrc($lei);
        }
        my $common = $nn_common->{$sec} // {};
        my $nn_arg = {