diff options
author | Eric Wong <e@80x24.org> | 2021-09-19 12:50:32 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-09-19 19:53:03 +0000 |
commit | 20c940a876728fe91892200dd874dd917cd677ac (patch) | |
tree | 7a33c0075d6bb11fe9f746cc3c6ff5b421bbf165 /lib/PublicInbox | |
parent | 207f0f93632e26818f2ed3b9d78bf3251b5a69b3 (diff) | |
download | public-inbox-20c940a876728fe91892200dd874dd917cd677ac.tar.gz |
At least not by default, to match existing NNTP behavior. Tor .onions are already encrypted, and there's no point in encrypting traffic on localhost outside of testing.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/NetReader.pm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index 236e824c..e305523e 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -91,6 +91,16 @@ try configuring a socks5h:// proxy: EOM } +# Net::NNTP doesn't support CAPABILITIES, yet; and both IMAP+NNTP +# servers may have multiple listen sockets. +sub try_starttls ($) { + my ($host) = @_; + return if $host =~ /\.onion\z/si; + return if $host =~ /\A127\.[0-9]+\.[0-9]+\.[0-9]+\z/s; + return if $host eq '::1'; + 1; +} + # mic_for may prompt the user and store auth info, prepares mic_get sub mic_for ($$$$) { # mic = Mail::IMAPClient my ($self, $uri, $mic_common, $lei) = @_; @@ -122,6 +132,7 @@ sub mic_for ($$$$) { # mic = Mail::IMAPClient # it to be disabled since I usually connect to localhost if (!$mic_arg->{Ssl} && !defined($mic_arg->{Starttls}) && $mic->has_capability('STARTTLS') && + try_starttls($host) && $mic->can('starttls')) { $mic->starttls or die "E: <$uri> STARTTLS: $@\n"; } @@ -164,15 +175,6 @@ sub mic_for ($$$$) { # mic = Mail::IMAPClient $mic; } -# Net::NNTP doesn't support CAPABILITIES, yet -sub try_starttls ($) { - my ($host) = @_; - return if $host =~ /\.onion\z/s; - return if $host =~ /\A127\.[0-9]+\.[0-9]+\.[0-9]+\z/s; - return if $host eq '::1'; - 1; -} - sub nn_new ($$$) { my ($nn_arg, $nntp_cfg, $uri) = @_; my $nn; |