diff options
| author | Eric Wong <e@80x24.org> | 2021-04-30 09:24:37 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-04-30 19:59:47 +0000 |
| commit | 3af54d4bdba7fb8abce42cce820668d20f348451 (patch) | |
| tree | b56dd12e90d497a568254913dd46fd6a40883f38 /lib/PublicInbox | |
| parent | 715c52fd1afe128d235cc1b9bade3db4ed647514 (diff) | |
| download | public-inbox-3af54d4bdba7fb8abce42cce820668d20f348451.tar.gz | |
Since Net::NNTP doesn't support Socket or RawSocket options/accessors like Mail::IMAPClient does; we must perform localized @ISA manipulation and massage Net::NNTP into using IO::Socket::Socks rather than IO::Socket::IP. This is a bit fragile, but Net::Cmd and Net::NNTP rarely change; and I keep an eye on them, anyways.
Diffstat (limited to 'lib/PublicInbox')
| -rw-r--r-- | lib/PublicInbox/NetNNTPSocks.pm | 33 | ||||
| -rw-r--r-- | lib/PublicInbox/NetReader.pm | 12 |
2 files changed, 44 insertions, 1 deletions
diff --git a/lib/PublicInbox/NetNNTPSocks.pm b/lib/PublicInbox/NetNNTPSocks.pm new file mode 100644 index 00000000..8495204a --- /dev/null +++ b/lib/PublicInbox/NetNNTPSocks.pm @@ -0,0 +1,33 @@ +# Copyright (C) 2021 all contributors <meta@public-inbox.org> +# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> + +# wrap Net::NNTP client with SOCKS support +package PublicInbox::NetNNTPSocks; +use strict; +use v5.10.1; +use Net::NNTP; +our %OPT; +our @ISA = qw(IO::Socket::Socks); +my @SOCKS_KEYS = qw(ProxyAddr ProxyPort SocksVersion SocksDebug SocksResolve); + +# use this instead of Net::NNTP->new if using Proxy* +sub new_socks { + my (undef, %opt) = @_; + require IO::Socket::Socks; + local @Net::NNTP::ISA = (qw(Net::Cmd), __PACKAGE__); + local %OPT = map {; + defined($opt{$_}) ? ($_ => $opt{$_}) : () + } @SOCKS_KEYS; + Net::NNTP->new(%opt); # this calls our new() below: +} + +# called by Net::NNTP->new +sub new { + my ($self, %opt) = @_; + @OPT{qw(ConnectAddr ConnectPort)} = @opt{qw(PeerAddr PeerPort)}; + my $ret = $self->SUPER::new(%OPT) or + die 'SOCKS error: '.eval('$IO::Socket::Socks::SOCKS_ERROR'); + $ret; +} + +1; diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index ac23e701..b2c4fee2 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -116,7 +116,13 @@ sub try_starttls ($) { sub nn_new ($$$) { my ($nn_arg, $nntp_opt, $uri) = @_; - my $nn = Net::NNTP->new(%$nn_arg) or die "E: <$uri> new: $!\n"; + my $nn; + if (defined $nn_arg->{ProxyAddr}) { + eval { $nn = PublicInbox::NetNNTPSocks->new_socks(%$nn_arg) }; + die "E: <$uri> $@\n" if $@; + } else { + $nn = Net::NNTP->new(%$nn_arg) or die "E: <$uri> new: $!\n"; + } # default to using STARTTLS if it's available, but allow # it to be disabled for localhost/VPN users @@ -170,6 +176,10 @@ sub nn_for ($$$$) { # nn = Net::NNTP SSL => $uri->secure, # snews == nntps %$common, # may Debug .... }; + if ($lei && $lei->{socks5h}) { + require PublicInbox::NetNNTPSocks; + %$nn_arg = (%$nn_arg, %{$lei->{socks5h}}); + } my $nn = nn_new($nn_arg, $nntp_opt, $uri); if ($cred) { $cred->fill($lei); # may prompt user here |