mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Merge #19727: test: Remove unused classes from p2p_leak.py
ed5cd12869e0691a785199d2d977ce5879095180 test: Distinguish between nodes(bitcoind) and peers(mininodes) in p2p_leak.py (Dhruv Mehta) f6f082b9343522bc8005f23937ac6ecf56548c98 test: remove `CNodeNoVersionIdle` from p2p_leak.py (Dhruv Mehta) 45cf55ccac94689e48dd0648ed2401918a778024 test: remove `CNodeNoVersionMisbehavior` from p2p_leak.py (Dhruv Mehta) Pull request description: - Removes `CNodeNoVersionMisbehavior` per recommendation at https://github.com/bitcoin/bitcoin/pull/19657#issuecomment-669926458 - Removes `CNodeNoVersionIdle` because it is similarly unnecessary - As someone new to the codebase, I found it easier to understand it if `no_version_disconnect_node` tries to overwhelm the peer with any message that is not version/verack. - Per recommendation at https://github.com/bitcoin/bitcoin/pull/19727#pullrequestreview-468093555, made a clear distinction between nodes(bitcoind) and peers(mininode interface implementations) ACKs for top commit: jnewbery: tested ACK ed5cd12869e0691a785199d2d977ce5879095180 amitiuttarwar: utACK ed5cd12869 Tree-SHA512: 310a24c91fd837e7f65177edb55fe6142fb3559fae7867c5cdd9c9a23b1a02202b935ca9a82633fa7649f3de2fa221f6da906a7b5e499fc20f7254085033757d
This commit is contained in:
fanquake
Konstantin Akimov
parent
941b39d9a9
commit
063c9b744d
@ -16,7 +16,6 @@ import time
|
||||
from test_framework.messages import (
|
||||
msg_getaddr,
|
||||
msg_ping,
|
||||
msg_verack,
|
||||
msg_version,
|
||||
)
|
||||
from test_framework.p2p import p2p_lock, P2PInterface
|
||||
@ -29,7 +28,7 @@ from test_framework.util import (
|
||||
banscore = 10
|
||||
|
||||
|
||||
class CLazyNode(P2PInterface):
|
||||
class LazyPeer(P2PInterface):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.unexpected_msg = False
|
||||
@ -42,6 +41,7 @@ class CLazyNode(P2PInterface):
|
||||
def on_open(self):
|
||||
self.ever_connected = True
|
||||
|
||||
# Does not respond to "version" with "verack"
|
||||
def on_version(self, message): self.bad_message(message)
|
||||
def on_verack(self, message): self.bad_message(message)
|
||||
def on_inv(self, message): self.bad_message(message)
|
||||
@ -63,21 +63,8 @@ class CLazyNode(P2PInterface):
|
||||
def on_blocktxn(self, message): self.bad_message(message)
|
||||
|
||||
|
||||
# Node that never sends a version. We'll use this to send a bunch of messages
|
||||
# anyway, and eventually get disconnected.
|
||||
class CNodeNoVersionBan(CLazyNode):
|
||||
pass
|
||||
|
||||
|
||||
# Node that never sends a version. This one just sits idle and hopes to receive
|
||||
# any message (it shouldn't!)
|
||||
class CNodeNoVersionIdle(CLazyNode):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
|
||||
|
||||
# Node that sends a version but not a verack.
|
||||
class CNodeNoVerackIdle(CLazyNode):
|
||||
# Peer that sends a version but not a verack.
|
||||
class NoVerackIdlePeer(LazyPeer):
|
||||
def __init__(self):
|
||||
self.version_received = False
|
||||
super().__init__()
|
||||
@ -96,6 +83,7 @@ class P2PVersionStore(P2PInterface):
|
||||
version_received = None
|
||||
|
||||
def on_version(self, msg):
|
||||
# Responds with an appropriate verack
|
||||
super().on_version(msg)
|
||||
self.version_received = msg
|
||||
|
||||
@ -110,38 +98,45 @@ class P2PLeakTest(BitcoinTestFramework):
|
||||
self.setup_nodes()
|
||||
|
||||
def run_test(self):
|
||||
no_version_bannode = self.nodes[0].add_p2p_connection(CNodeNoVersionBan(), send_version=False, wait_for_verack=False)
|
||||
no_version_idlenode = self.nodes[0].add_p2p_connection(CNodeNoVersionIdle(), send_version=False, wait_for_verack=False)
|
||||
no_verack_idlenode = self.nodes[0].add_p2p_connection(CNodeNoVerackIdle(), wait_for_verack=False)
|
||||
# Peer that never sends a version. We will send a bunch of messages
|
||||
# from this peer anyway and verify eventual disconnection.
|
||||
no_version_ban_peer = self.nodes[0].add_p2p_connection(
|
||||
LazyPeer(), send_version=False, wait_for_verack=False)
|
||||
|
||||
# Send enough veracks without a message to reach the peer discouragement
|
||||
# threshold. This should get us disconnected.
|
||||
# Another peer that never sends a version, nor any other messages. It shouldn't receive anything from the node.
|
||||
no_version_idle_peer = self.nodes[0].add_p2p_connection(LazyPeer(), send_version=False, wait_for_verack=False)
|
||||
|
||||
# Peer that sends a version but not a verack.
|
||||
no_verack_idle_peer = self.nodes[0].add_p2p_connection(NoVerackIdlePeer(), wait_for_verack=False)
|
||||
|
||||
# Send enough ping messages (any non-version message will do) prior to sending
|
||||
# version to reach the peer discouragement threshold. This should get us disconnected.
|
||||
for _ in range(banscore):
|
||||
no_version_bannode.send_message(msg_verack())
|
||||
no_version_ban_peer.send_message(msg_ping())
|
||||
|
||||
# Wait until we got the verack in response to the version. Though, don't wait for the other node to receive the
|
||||
# Wait until we got the verack in response to the version. Though, don't wait for the node to receive the
|
||||
# verack, since we never sent one
|
||||
no_verack_idlenode.wait_for_verack()
|
||||
no_verack_idle_peer.wait_for_verack()
|
||||
|
||||
self.wait_until(lambda: no_version_bannode.ever_connected, timeout=10, lock=p2p_lock)
|
||||
self.wait_until(lambda: no_version_idlenode.ever_connected, timeout=10, lock=p2p_lock)
|
||||
self.wait_until(lambda: no_verack_idlenode.version_received, timeout=10, lock=p2p_lock)
|
||||
self.wait_until(lambda: no_version_ban_peer.ever_connected, timeout=10, lock=p2p_lock)
|
||||
self.wait_until(lambda: no_version_idle_peer.ever_connected, timeout=10, lock=p2p_lock)
|
||||
self.wait_until(lambda: no_verack_idle_peer.version_received, timeout=10, lock=p2p_lock)
|
||||
|
||||
# Mine a block and make sure that it's not sent to the connected nodes
|
||||
self.nodes[0].generatetoaddress(1, self.nodes[0].get_deterministic_priv_key().address)
|
||||
# Mine a block and make sure that it's not sent to the connected peers
|
||||
self.nodes[0].generate(nblocks=1)
|
||||
|
||||
#Give the node enough time to possibly leak out a message
|
||||
time.sleep(5)
|
||||
|
||||
#This node should have been banned
|
||||
assert not no_version_bannode.is_connected
|
||||
#This peer should have been banned
|
||||
assert not no_version_ban_peer.is_connected
|
||||
|
||||
self.nodes[0].disconnect_p2ps()
|
||||
|
||||
# Make sure no unexpected messages came in
|
||||
assert no_version_bannode.unexpected_msg == False
|
||||
assert no_version_idlenode.unexpected_msg == False
|
||||
assert no_verack_idlenode.unexpected_msg == False
|
||||
assert no_version_ban_peer.unexpected_msg == False
|
||||
assert no_version_idle_peer.unexpected_msg == False
|
||||
assert no_verack_idle_peer.unexpected_msg == False
|
||||
|
||||
self.log.info('Check that the version message does not leak the local address of the node')
|
||||
p2p_version_store = self.nodes[0].add_p2p_connection(P2PVersionStore())
|
||||
@ -154,13 +149,13 @@ class P2PLeakTest(BitcoinTestFramework):
|
||||
assert_equal(ver.nStartingHeight, 201)
|
||||
assert_equal(ver.nRelay, 1)
|
||||
|
||||
self.log.info('Check that old nodes are disconnected')
|
||||
p2p_old_node = self.nodes[0].add_p2p_connection(P2PInterface(), send_version=False, wait_for_verack=False)
|
||||
self.log.info('Check that old peers are disconnected')
|
||||
p2p_old_peer = self.nodes[0].add_p2p_connection(P2PInterface(), send_version=False, wait_for_verack=False)
|
||||
old_version_msg = msg_version()
|
||||
old_version_msg.nVersion = 31799
|
||||
with self.nodes[0].assert_debug_log(['peer=4 using obsolete version 31799; disconnecting']):
|
||||
p2p_old_node.send_message(old_version_msg)
|
||||
p2p_old_node.wait_for_disconnect()
|
||||
p2p_old_peer.send_message(old_version_msg)
|
||||
p2p_old_peer.wait_for_disconnect()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
Loading…
Reference in New Issue
Block a user