Merge #8400: [qa]: enable rpcbind_test
9bbb414
[qa]: enable rpcbind_test (whythat)0ff4375
[qa]: add parsing for '<host>:<port>' argument form to rpc_url() (whythat)
This commit is contained in:
commit
cf2cecb187
3 changed files with 97 additions and 124 deletions
|
@ -159,7 +159,7 @@ testScriptsExt = [
|
||||||
'txn_clone.py --mineblock',
|
'txn_clone.py --mineblock',
|
||||||
'forknotify.py',
|
'forknotify.py',
|
||||||
'invalidateblock.py',
|
'invalidateblock.py',
|
||||||
# 'rpcbind_test.py', #temporary, bug in libevent, see #6655
|
'rpcbind_test.py',
|
||||||
'smartfees.py',
|
'smartfees.py',
|
||||||
'maxblocksinflight.py',
|
'maxblocksinflight.py',
|
||||||
'p2p-acceptblock.py',
|
'p2p-acceptblock.py',
|
||||||
|
|
|
@ -5,143 +5,108 @@
|
||||||
|
|
||||||
# Test for -rpcbind, as well as -rpcallowip and -rpcconnect
|
# Test for -rpcbind, as well as -rpcallowip and -rpcconnect
|
||||||
|
|
||||||
# TODO extend this test from the test framework (like all other tests)
|
|
||||||
|
|
||||||
import tempfile
|
import tempfile
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
from test_framework.util import *
|
from test_framework.util import *
|
||||||
from test_framework.netutil import *
|
from test_framework.netutil import *
|
||||||
|
|
||||||
def run_bind_test(tmpdir, allow_ips, connect_to, addresses, expected):
|
class RPCBindTest(BitcoinTestFramework):
|
||||||
'''
|
|
||||||
Start a node with requested rpcallowip and rpcbind parameters,
|
|
||||||
then try to connect, and check if the set of bound addresses
|
|
||||||
matches the expected set.
|
|
||||||
'''
|
|
||||||
expected = [(addr_to_hex(addr), port) for (addr, port) in expected]
|
|
||||||
base_args = ['-disablewallet', '-nolisten']
|
|
||||||
if allow_ips:
|
|
||||||
base_args += ['-rpcallowip=' + x for x in allow_ips]
|
|
||||||
binds = ['-rpcbind='+addr for addr in addresses]
|
|
||||||
nodes = start_nodes(self.num_nodes, tmpdir, [base_args + binds], connect_to)
|
|
||||||
try:
|
|
||||||
pid = bitcoind_processes[0].pid
|
|
||||||
assert_equal(set(get_bind_addrs(pid)), set(expected))
|
|
||||||
finally:
|
|
||||||
stop_nodes(nodes)
|
|
||||||
wait_bitcoinds()
|
|
||||||
|
|
||||||
def run_allowip_test(tmpdir, allow_ips, rpchost, rpcport):
|
def __init__(self):
|
||||||
'''
|
super().__init__()
|
||||||
Start a node with rpcwallow IP, and request getinfo
|
self.setup_clean_chain = True
|
||||||
at a non-localhost IP.
|
self.num_nodes = 1
|
||||||
'''
|
|
||||||
base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips]
|
|
||||||
nodes = start_nodes(self.num_nodes, tmpdir, [base_args])
|
|
||||||
try:
|
|
||||||
# connect to node through non-loopback interface
|
|
||||||
url = "http://rt:rt@%s:%d" % (rpchost, rpcport,)
|
|
||||||
node = get_rpc_proxy(url, 1)
|
|
||||||
node.getinfo()
|
|
||||||
finally:
|
|
||||||
node = None # make sure connection will be garbage collected and closed
|
|
||||||
stop_nodes(nodes)
|
|
||||||
wait_bitcoinds()
|
|
||||||
|
|
||||||
|
def setup_network(self):
|
||||||
def run_test(tmpdir):
|
|
||||||
assert(sys.platform.startswith('linux')) # due to OS-specific network stats queries, this test works only on Linux
|
|
||||||
# find the first non-loopback interface for testing
|
|
||||||
non_loopback_ip = None
|
|
||||||
for name,ip in all_interfaces():
|
|
||||||
if ip != '127.0.0.1':
|
|
||||||
non_loopback_ip = ip
|
|
||||||
break
|
|
||||||
if non_loopback_ip is None:
|
|
||||||
assert(not 'This test requires at least one non-loopback IPv4 interface')
|
|
||||||
print("Using interface %s for testing" % non_loopback_ip)
|
|
||||||
|
|
||||||
defaultport = rpc_port(0)
|
|
||||||
|
|
||||||
# check default without rpcallowip (IPv4 and IPv6 localhost)
|
|
||||||
run_bind_test(tmpdir, None, '127.0.0.1', [],
|
|
||||||
[('127.0.0.1', defaultport), ('::1', defaultport)])
|
|
||||||
# check default with rpcallowip (IPv6 any)
|
|
||||||
run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1', [],
|
|
||||||
[('::0', defaultport)])
|
|
||||||
# check only IPv4 localhost (explicit)
|
|
||||||
run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1', ['127.0.0.1'],
|
|
||||||
[('127.0.0.1', defaultport)])
|
|
||||||
# check only IPv4 localhost (explicit) with alternative port
|
|
||||||
run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171'],
|
|
||||||
[('127.0.0.1', 32171)])
|
|
||||||
# check only IPv4 localhost (explicit) with multiple alternative ports on same host
|
|
||||||
run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171', '127.0.0.1:32172'],
|
|
||||||
[('127.0.0.1', 32171), ('127.0.0.1', 32172)])
|
|
||||||
# check only IPv6 localhost (explicit)
|
|
||||||
run_bind_test(tmpdir, ['[::1]'], '[::1]', ['[::1]'],
|
|
||||||
[('::1', defaultport)])
|
|
||||||
# check both IPv4 and IPv6 localhost (explicit)
|
|
||||||
run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1', ['127.0.0.1', '[::1]'],
|
|
||||||
[('127.0.0.1', defaultport), ('::1', defaultport)])
|
|
||||||
# check only non-loopback interface
|
|
||||||
run_bind_test(tmpdir, [non_loopback_ip], non_loopback_ip, [non_loopback_ip],
|
|
||||||
[(non_loopback_ip, defaultport)])
|
|
||||||
|
|
||||||
# Check that with invalid rpcallowip, we are denied
|
|
||||||
run_allowip_test(tmpdir, [non_loopback_ip], non_loopback_ip, defaultport)
|
|
||||||
try:
|
|
||||||
run_allowip_test(tmpdir, ['1.1.1.1'], non_loopback_ip, defaultport)
|
|
||||||
assert(not 'Connection not denied by rpcallowip as expected')
|
|
||||||
except ValueError:
|
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def main():
|
def setup_nodes(self):
|
||||||
import optparse
|
pass
|
||||||
|
|
||||||
parser = optparse.OptionParser(usage="%prog [options]")
|
def run_bind_test(self, allow_ips, connect_to, addresses, expected):
|
||||||
parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true",
|
'''
|
||||||
help="Leave bitcoinds and test.* datadir on exit or error")
|
Start a node with requested rpcallowip and rpcbind parameters,
|
||||||
parser.add_option("--srcdir", dest="srcdir", default="../../src",
|
then try to connect, and check if the set of bound addresses
|
||||||
help="Source directory containing bitcoind/bitcoin-cli (default: %default%)")
|
matches the expected set.
|
||||||
parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
|
'''
|
||||||
help="Root directory for datadirs")
|
expected = [(addr_to_hex(addr), port) for (addr, port) in expected]
|
||||||
(options, args) = parser.parse_args()
|
base_args = ['-disablewallet', '-nolisten']
|
||||||
|
if allow_ips:
|
||||||
|
base_args += ['-rpcallowip=' + x for x in allow_ips]
|
||||||
|
binds = ['-rpcbind='+addr for addr in addresses]
|
||||||
|
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [base_args + binds], connect_to)
|
||||||
|
try:
|
||||||
|
pid = bitcoind_processes[0].pid
|
||||||
|
assert_equal(set(get_bind_addrs(pid)), set(expected))
|
||||||
|
finally:
|
||||||
|
stop_nodes(self.nodes)
|
||||||
|
wait_bitcoinds()
|
||||||
|
|
||||||
os.environ['PATH'] = options.srcdir+":"+os.environ['PATH']
|
def run_allowip_test(self, allow_ips, rpchost, rpcport):
|
||||||
|
'''
|
||||||
|
Start a node with rpcwallow IP, and request getinfo
|
||||||
|
at a non-localhost IP.
|
||||||
|
'''
|
||||||
|
base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips]
|
||||||
|
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [base_args])
|
||||||
|
try:
|
||||||
|
# connect to node through non-loopback interface
|
||||||
|
node = get_rpc_proxy(rpc_url(0, "%s:%d" % (rpchost, rpcport)), 0)
|
||||||
|
node.getinfo()
|
||||||
|
finally:
|
||||||
|
node = None # make sure connection will be garbage collected and closed
|
||||||
|
stop_nodes(self.nodes)
|
||||||
|
wait_bitcoinds()
|
||||||
|
|
||||||
check_json_precision()
|
def run_test(self):
|
||||||
|
# due to OS-specific network stats queries, this test works only on Linux
|
||||||
|
assert(sys.platform.startswith('linux'))
|
||||||
|
# find the first non-loopback interface for testing
|
||||||
|
non_loopback_ip = None
|
||||||
|
for name,ip in all_interfaces():
|
||||||
|
if ip != '127.0.0.1':
|
||||||
|
non_loopback_ip = ip
|
||||||
|
break
|
||||||
|
if non_loopback_ip is None:
|
||||||
|
assert(not 'This test requires at least one non-loopback IPv4 interface')
|
||||||
|
print("Using interface %s for testing" % non_loopback_ip)
|
||||||
|
|
||||||
success = False
|
defaultport = rpc_port(0)
|
||||||
nodes = []
|
|
||||||
try:
|
|
||||||
print("Initializing test directory "+options.tmpdir)
|
|
||||||
if not os.path.isdir(options.tmpdir):
|
|
||||||
os.makedirs(options.tmpdir)
|
|
||||||
initialize_chain(options.tmpdir)
|
|
||||||
|
|
||||||
run_test(options.tmpdir)
|
# check default without rpcallowip (IPv4 and IPv6 localhost)
|
||||||
|
self.run_bind_test(None, '127.0.0.1', [],
|
||||||
|
[('127.0.0.1', defaultport), ('::1', defaultport)])
|
||||||
|
# check default with rpcallowip (IPv6 any)
|
||||||
|
self.run_bind_test(['127.0.0.1'], '127.0.0.1', [],
|
||||||
|
[('::0', defaultport)])
|
||||||
|
# check only IPv4 localhost (explicit)
|
||||||
|
self.run_bind_test(['127.0.0.1'], '127.0.0.1', ['127.0.0.1'],
|
||||||
|
[('127.0.0.1', defaultport)])
|
||||||
|
# check only IPv4 localhost (explicit) with alternative port
|
||||||
|
self.run_bind_test(['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171'],
|
||||||
|
[('127.0.0.1', 32171)])
|
||||||
|
# check only IPv4 localhost (explicit) with multiple alternative ports on same host
|
||||||
|
self.run_bind_test(['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171', '127.0.0.1:32172'],
|
||||||
|
[('127.0.0.1', 32171), ('127.0.0.1', 32172)])
|
||||||
|
# check only IPv6 localhost (explicit)
|
||||||
|
self.run_bind_test(['[::1]'], '[::1]', ['[::1]'],
|
||||||
|
[('::1', defaultport)])
|
||||||
|
# check both IPv4 and IPv6 localhost (explicit)
|
||||||
|
self.run_bind_test(['127.0.0.1'], '127.0.0.1', ['127.0.0.1', '[::1]'],
|
||||||
|
[('127.0.0.1', defaultport), ('::1', defaultport)])
|
||||||
|
# check only non-loopback interface
|
||||||
|
self.run_bind_test([non_loopback_ip], non_loopback_ip, [non_loopback_ip],
|
||||||
|
[(non_loopback_ip, defaultport)])
|
||||||
|
|
||||||
success = True
|
# Check that with invalid rpcallowip, we are denied
|
||||||
|
self.run_allowip_test([non_loopback_ip], non_loopback_ip, defaultport)
|
||||||
except AssertionError as e:
|
try:
|
||||||
print("Assertion failed: "+e.message)
|
self.run_allowip_test(['1.1.1.1'], non_loopback_ip, defaultport)
|
||||||
except Exception as e:
|
assert(not 'Connection not denied by rpcallowip as expected')
|
||||||
print("Unexpected exception caught during testing: "+str(e))
|
except JSONRPCException:
|
||||||
traceback.print_tb(sys.exc_info()[2])
|
pass
|
||||||
|
|
||||||
if not options.nocleanup:
|
|
||||||
print("Cleaning up")
|
|
||||||
wait_bitcoinds()
|
|
||||||
shutil.rmtree(options.tmpdir)
|
|
||||||
|
|
||||||
if success:
|
|
||||||
print("Tests successful")
|
|
||||||
sys.exit(0)
|
|
||||||
else:
|
|
||||||
print("Failed")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
RPCBindTest ().main ()
|
||||||
|
|
|
@ -171,7 +171,15 @@ def rpc_auth_pair(n):
|
||||||
|
|
||||||
def rpc_url(i, rpchost=None):
|
def rpc_url(i, rpchost=None):
|
||||||
rpc_u, rpc_p = rpc_auth_pair(i)
|
rpc_u, rpc_p = rpc_auth_pair(i)
|
||||||
return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, rpchost or '127.0.0.1', rpc_port(i))
|
host = '127.0.0.1'
|
||||||
|
port = rpc_port(i)
|
||||||
|
if rpchost:
|
||||||
|
parts = rpchost.split(':')
|
||||||
|
if len(parts) == 2:
|
||||||
|
host, port = parts
|
||||||
|
else:
|
||||||
|
host = rpchost
|
||||||
|
return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, host, int(port))
|
||||||
|
|
||||||
def wait_for_bitcoind_start(process, url, i):
|
def wait_for_bitcoind_start(process, url, i):
|
||||||
'''
|
'''
|
||||||
|
|
Loading…
Add table
Reference in a new issue