net_reader: nntp_opt => cfg_opt

[public-inbox.git] / lib / PublicInbox / NetReader.pm

diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index 08166415cfcb0c6519bd6dd749934a81d54b98a3..e0a642020bab458e84bad7fdbfd27522134a532a 100644 (file)
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -42,16 +42,16 @@ EOM
 
 sub mic_new ($$$$) {
        my ($self, $mic_arg, $sec, $uri) = @_;
-       my %socks;
+       my %mic_arg = %$mic_arg;
        my $sa = $self->{imap_opt}->{$sec}->{-proxy_cfg} || $self->{-proxy_cli};
        if ($sa) {
                my %opt = %$sa;
-               $opt{ConnectAddr} = delete $mic_arg->{Server};
-               $opt{ConnectPort} = delete $mic_arg->{Port};
-               $socks{Socket} = IO::Socket::Socks->new(%opt) or die
+               $opt{ConnectAddr} = delete $mic_arg{Server};
+               $opt{ConnectPort} = delete $mic_arg{Port};
+               $mic_arg{Socket} = IO::Socket::Socks->new(%opt) or die
                        "E: <$$uri> ".eval('$IO::Socket::Socks::SOCKS_ERROR');
        }
-       PublicInbox::IMAPClient->new(%$mic_arg, %socks);
+       PublicInbox::IMAPClient->new(%mic_arg, Keepalive => 1);
 }
 
 sub auth_anon_cb { '' }; # for Mail::IMAPClient::Authcallback
@@ -76,9 +76,9 @@ sub mic_for ($$$$) { # mic = Mail::IMAPClient
                Port => $uri->port,
                Server => $host,
                Ssl => $uri->scheme eq 'imaps',
-               Keepalive => 1, # SO_KEEPALIVE
                %$common, # may set Starttls, Compress, Debug ....
        };
+       $mic_arg->{Ssl} = 1 if $uri->scheme eq 'imaps';
        require PublicInbox::IMAPClient;
        my $mic = mic_new($self, $mic_arg, $sec, $uri) or
                        die "E: <$uri> new: $@\n";
@@ -138,7 +138,7 @@ sub try_starttls ($) {
 }
 
 sub nn_new ($$$) {
-       my ($nn_arg, $nntp_opt, $uri) = @_;
+       my ($nn_arg, $nntp_cfg, $uri) = @_;
        my $nn;
        if (defined $nn_arg->{ProxyAddr}) {
                require PublicInbox::NetNNTPSocks;
@@ -151,19 +151,19 @@ sub nn_new ($$$) {
        # default to using STARTTLS if it's available, but allow
        # it to be disabled for localhost/VPN users
        if (!$nn_arg->{SSL} && $nn->can('starttls')) {
-               if (!defined($nntp_opt->{starttls}) &&
+               if (!defined($nntp_cfg->{starttls}) &&
                                try_starttls($nn_arg->{Host})) {
                        # soft fail by default
                        $nn->starttls or warn <<"";
 W: <$uri> STARTTLS tried and failed (not requested)
 
-               } elsif ($nntp_opt->{starttls}) {
+               } elsif ($nntp_cfg->{starttls}) {
                        # hard fail if explicitly configured
                        $nn->starttls or die <<"";
 E: <$uri> STARTTLS requested and failed
 
                }
-       } elsif ($nntp_opt->{starttls}) {
+       } elsif ($nntp_cfg->{starttls}) {
                $nn->can('starttls') or
                        die "E: <$uri> Net::NNTP too old for STARTTLS\n";
                $nn->starttls or die <<"";
@@ -176,7 +176,7 @@ E: <$uri> STARTTLS requested and failed
 sub nn_for ($$$$) { # nn = Net::NNTP
        my ($self, $uri, $nn_args, $lei) = @_;
        my $sec = uri_section($uri);
-       my $nntp_opt = $self->{nntp_opt}->{$sec} //= {};
+       my $nntp_cfg = $self->{cfg_opt}->{$sec} //= {};
        my $host = $uri->host;
        # Net::NNTP and Net::Netrc both mishandle `0', so we pass `127.0.0.1'
        $host = '127.0.0.1' if $host eq '0';
@@ -197,32 +197,32 @@ sub nn_for ($$$$) { # nn = Net::NNTP
        my $nn_arg = {
                Port => $uri->port,
                Host => $host,
-               SSL => $uri->secure, # snews == nntps
                %$common, # may Debug ....
        };
+       $nn_arg->{SSL} = 1 if $uri->secure; # snews == nntps
        my $sa = $self->{-proxy_cli};
        %$nn_arg = (%$nn_arg, %$sa) if $sa;
-       my $nn = nn_new($nn_arg, $nntp_opt, $uri);
+       my $nn = nn_new($nn_arg, $nntp_cfg, $uri);
        if ($cred) {
                $cred->fill($lei) unless defined($p); # may prompt user here
                if ($nn->authinfo($u, $p)) {
-                       push @{$nntp_opt->{-postconn}}, [ 'authinfo', $u, $p ];
+                       push @{$nntp_cfg->{-postconn}}, [ 'authinfo', $u, $p ];
                } else {
                        warn "E: <$uri> AUTHINFO $u XXXX failed\n";
                        $nn = undef;
                }
        }
 
-       if ($nntp_opt->{compress}) {
+       if ($nntp_cfg->{compress}) {
                # https://rt.cpan.org/Ticket/Display.html?id=129967
                if ($nn->can('compress')) {
                        if ($nn->compress) {
-                               push @{$nntp_opt->{-postconn}}, [ 'compress' ];
+                               push @{$nntp_cfg->{-postconn}}, [ 'compress' ];
                        } else {
                                warn "W: <$uri> COMPRESS failed\n";
                        }
                } else {
-                       delete $nntp_opt->{compress};
+                       delete $nntp_cfg->{compress};
                        warn <<"";
 W: <$uri> COMPRESS not supported by Net::NNTP
 W: see https://rt.cpan.org/Ticket/Display.html?id=129967 for updates
@@ -348,13 +348,13 @@ sub nntp_common_init ($;$) {
                # Net::NNTP post-connect commands
                for my $k (qw(starttls compress)) {
                        $v = cfg_bool($cfg, "nntp.$k", $$uri) // next;
-                       $self->{nntp_opt}->{$sec}->{$k} = $v;
+                       $self->{cfg_opt}->{$sec}->{$k} = $v;
                }
 
                # -watch internal option
                for my $k (qw(pollInterval)) {
                        $to = cfg_intvl($cfg, "nntp.$k", $$uri) // next;
-                       $self->{nntp_opt}->{$sec}->{$k} = $to;
+                       $self->{cfg_opt}->{$sec}->{$k} = $to;
                }
        }
        # make sure we can connect and cache the credentials in memory
@@ -662,9 +662,9 @@ sub nn_get {
        $nn = delete($cached->{$sec}) and return $nn;
        my $nn_arg = $self->{nn_arg}->{$sec} or
                        die "BUG: no Net::NNTP->new arg for $sec";
-       my $nntp_opt = $self->{nntp_opt}->{$sec};
-       $nn = nn_new($nn_arg, $nntp_opt, $uri) or return;
-       if (my $postconn = $nntp_opt->{-postconn}) {
+       my $nntp_cfg = $self->{cfg_opt}->{$sec};
+       $nn = nn_new($nn_arg, $nntp_cfg, $uri) or return;
+       if (my $postconn = $nntp_cfg->{-postconn}) {
                for my $m_arg (@$postconn) {
                        my ($method, @args) = @$m_arg;
                        $nn->$method(@args) and next;