-
Notifications
You must be signed in to change notification settings - Fork 258
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge bitcoin/bitcoin#20234: net: don't bind on 0.0.0.0 if binds are …
…restricted to Tor 2feec3c net: don't bind on 0.0.0.0 if binds are restricted to Tor (Vasil Dimov) Pull request description: The semantic of `-bind` is to restrict the binding only to some address. If not specified, then the user does not care and we bind to `0.0.0.0`. If specified then we should honor the restriction and bind only to the specified address. Before this change, if no `-bind` is given then we would bind to `0.0.0.0:8333` and to `127.0.0.1:8334` (incoming Tor) which is ok - the user does not care to restrict the binding. However, if only `-bind=addr:port=onion` is given (without ordinary `-bind=`) then we would bind to `addr:port` _and_ to `0.0.0.0:8333` in addition. Change the above to not do the additional bind: if only `-bind=addr:port=onion` is given (without ordinary `-bind=`) then bind to `addr:port` (only) and consider incoming connections to that as Tor and do not advertise it. I.e. a Tor-only node. ACKs for top commit: laanwj: Code review ACK 2feec3c jonatack: utACK 2feec3c per `git diff a004833 2feec3c` hebasto: ACK 2feec3c, tested on Linux Mint 20.1 (x86_64): Tree-SHA512: a04483af601706da928958b92dc560f9cfcc78ab0bb9d74414636eed1c6f29ed538ce1fb5a17d41ed82c9c9a45ca94899d0966e7ef93da809c9bcdcdb1d1f040
- Loading branch information
Showing
5 changed files
with
129 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| #!/usr/bin/env python3 | ||
| # Copyright (c) 2014-2021 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
| """ | ||
| Test starting bitcoind with -bind and/or -bind=...=onion and confirm | ||
| that bind happens on the expected ports. | ||
| """ | ||
|
|
||
| import sys | ||
|
|
||
| from test_framework.netutil import ( | ||
| addr_to_hex, | ||
| get_bind_addrs, | ||
| ) | ||
| from test_framework.test_framework import ( | ||
| BitcoinTestFramework, | ||
| SkipTest, | ||
| ) | ||
| from test_framework.util import ( | ||
| PORT_MIN, | ||
| PORT_RANGE, | ||
| assert_equal, | ||
| rpc_port, | ||
| ) | ||
|
|
||
| class BindExtraTest(BitcoinTestFramework): | ||
| def set_test_params(self): | ||
| self.setup_clean_chain = True | ||
| # Avoid any -bind= on the command line. Force the framework to avoid | ||
| # adding -bind=127.0.0.1. | ||
| self.bind_to_localhost_only = False | ||
| self.num_nodes = 2 | ||
|
|
||
| def setup_network(self): | ||
| # Override setup_network() because we want to put the result of | ||
| # p2p_port() in self.extra_args[], before the nodes are started. | ||
| # p2p_port() is not usable in set_test_params() because PortSeed.n is | ||
| # not set at that time. | ||
|
|
||
| # Due to OS-specific network stats queries, we only run on Linux. | ||
| self.log.info("Checking for Linux") | ||
| if not sys.platform.startswith('linux'): | ||
| raise SkipTest("This test can only be run on Linux.") | ||
|
|
||
| loopback_ipv4 = addr_to_hex("127.0.0.1") | ||
|
|
||
| # Start custom ports after p2p and rpc ports. | ||
| port = PORT_MIN + 2 * PORT_RANGE | ||
|
|
||
| # Array of tuples [command line arguments, expected bind addresses]. | ||
| self.expected = [] | ||
|
|
||
| # Node0, no normal -bind=... with -bind=...=onion, thus only the tor target. | ||
| self.expected.append( | ||
| [ | ||
| [f"-bind=127.0.0.1:{port}=onion"], | ||
| [(loopback_ipv4, port)] | ||
| ], | ||
| ) | ||
| port += 1 | ||
|
|
||
| # Node1, both -bind=... and -bind=...=onion. | ||
| self.expected.append( | ||
| [ | ||
| [f"-bind=127.0.0.1:{port}", f"-bind=127.0.0.1:{port + 1}=onion"], | ||
| [(loopback_ipv4, port), (loopback_ipv4, port + 1)] | ||
| ], | ||
| ) | ||
| port += 2 | ||
|
|
||
| self.extra_args = list(map(lambda e: e[0], self.expected)) | ||
| self.add_nodes(self.num_nodes, self.extra_args) | ||
| # Don't start the nodes, as some of them would collide trying to bind on the same port. | ||
|
|
||
| def run_test(self): | ||
| for i in range(len(self.expected)): | ||
| self.log.info(f"Starting node {i} with {self.expected[i][0]}") | ||
| self.start_node(i) | ||
| pid = self.nodes[i].process.pid | ||
| binds = set(get_bind_addrs(pid)) | ||
| # Remove IPv6 addresses because on some CI environments "::1" is not configured | ||
| # on the system (so our test_ipv6_local() would return False), but it is | ||
| # possible to bind on "::". This makes it unpredictable whether to expect | ||
| # that bitcoind has bound on "::1" (for RPC) and "::" (for P2P). | ||
| ipv6_addr_len_bytes = 32 | ||
| binds = set(filter(lambda e: len(e[0]) != ipv6_addr_len_bytes, binds)) | ||
| # Remove RPC ports. They are not relevant for this test. | ||
| binds = set(filter(lambda e: e[1] != rpc_port(i), binds)) | ||
| assert_equal(binds, set(self.expected[i][1])) | ||
| self.stop_node(i) | ||
| self.log.info(f"Stopped node {i}") | ||
|
|
||
| if __name__ == '__main__': | ||
| BindExtraTest().main() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters