Skip to content

Commit 78fd3c2

Browse files
committed
Merge bitcoin/bitcoin#28588: test: BIP324: add checks for v1 prefix matching / wrong network magic detection
e130896 test: BIP324: add checks for v1 prefix matching / wrong network magic detection (Sebastian Falbesoner) Pull request description: This PR adds missing test coverage for the detection of incoming v1 connections and wrong network magic on BIP324-enabled (i.e. running with `-v2transport=1`) nodes. Both checks are using prefix sizes of 16 bytes (previously only 12 bytes were used for the v1 prefix matching, which was fixed by PR #28577). ACKs for top commit: Sjors: utACK e130896 MarcoFalke: lgtm ACK e130896 Tree-SHA512: d4d1567277297f42c543b9638a6c64d14b17ff0ddbf85a7efff22f45c619478139dbedcb9dc4f449b4814b00856ee43644f15df1aa20c8931d5496a607ca2fd4
2 parents 2eacc61 + e130896 commit 78fd3c2

File tree

1 file changed

+27
-1
lines changed

1 file changed

+27
-1
lines changed

test/functional/p2p_v2_transport.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
"""
66
Test v2 transport
77
"""
8+
import socket
89

910
from test_framework.messages import NODE_P2P_V2
11+
from test_framework.p2p import MAGIC_BYTES
1012
from test_framework.test_framework import BitcoinTestFramework
11-
from test_framework.util import assert_equal
13+
from test_framework.util import (
14+
assert_equal,
15+
p2p_port,
16+
)
17+
1218

1319
class V2TransportTest(BitcoinTestFramework):
1420
def set_test_params(self):
@@ -123,5 +129,25 @@ def run_test(self):
123129
self.sync_all()
124130
assert_equal(self.nodes[4].getblockcount(), 11)
125131

132+
# Check v1 prefix detection
133+
V1_PREFIX = MAGIC_BYTES["regtest"] + b"version\x00\x00\x00\x00\x00"
134+
assert_equal(len(V1_PREFIX), 16)
135+
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
136+
num_peers = len(self.nodes[0].getpeerinfo())
137+
s.connect(("127.0.0.1", p2p_port(0)))
138+
self.wait_until(lambda: len(self.nodes[0].getpeerinfo()) == num_peers + 1)
139+
s.sendall(V1_PREFIX[:-1])
140+
assert_equal(self.nodes[0].getpeerinfo()[-1]["transport_protocol_type"], "detecting")
141+
s.sendall(bytes([V1_PREFIX[-1]])) # send out last prefix byte
142+
self.wait_until(lambda: self.nodes[0].getpeerinfo()[-1]["transport_protocol_type"] == "v1")
143+
144+
# Check wrong network prefix detection (hits if the next 12 bytes correspond to a v1 version message)
145+
wrong_network_magic_prefix = MAGIC_BYTES["signet"] + V1_PREFIX[4:]
146+
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
147+
s.connect(("127.0.0.1", p2p_port(0)))
148+
with self.nodes[0].assert_debug_log("V2 transport error: V1 peer with wrong MessageStart"):
149+
s.sendall(wrong_network_magic_prefix + b"somepayload")
150+
151+
126152
if __name__ == '__main__':
127153
V2TransportTest().main()

0 commit comments

Comments
 (0)