From 9871fb726cb58ef47dde582967ebb4da2dd7f190 Mon Sep 17 00:00:00 2001 From: furszy Date: Sat, 25 Jul 2026 11:05:07 -0400 Subject: [PATCH] p2p: reject filtered block inv early when bloom is disabled A peer should not request filtered blocks from a node that does not advertise NODE_BLOOM. Perform this check before looking up the block to avoid an unnecessary disk read. Note: currently, the request is ignored only after the block has been read from disk, in the bloom filter existence check. --- src/net_processing.cpp | 8 ++++++++ test/functional/p2p_nobloomfilter_messages.py | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 00852a0925f..7387f78b931 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2365,6 +2365,14 @@ void PeerManagerImpl::RelayAddress(NodeId originator, void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv& inv) { + // First perform the stateless checks: + // A filtered-block can only ever be requested if we offer NODE_BLOOM + if (inv.IsMsgFilteredBlk() && !(peer.m_our_services & NODE_BLOOM)) { + LogDebug(BCLog::NET, "filtered block request received when NODE_BLOOM service disabled, %s", pfrom.DisconnectMsg()); + pfrom.fDisconnect = true; + return; + } + std::shared_ptr a_recent_block; std::shared_ptr a_recent_compact_block; { diff --git a/test/functional/p2p_nobloomfilter_messages.py b/test/functional/p2p_nobloomfilter_messages.py index 2d5d7addc75..77618742a79 100755 --- a/test/functional/p2p_nobloomfilter_messages.py +++ b/test/functional/p2p_nobloomfilter_messages.py @@ -11,7 +11,7 @@ Test that, when bloom filters are not enabled, peers are disconnected if: 4. They send a p2p filterclear message """ -from test_framework.messages import msg_mempool, msg_filteradd, msg_filterload, msg_filterclear +from test_framework.messages import msg_mempool, msg_filteradd, msg_filterload, msg_filterclear, CInv, MSG_FILTERED_BLOCK, msg_getdata from test_framework.p2p import P2PInterface from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_equal @@ -43,6 +43,10 @@ class P2PNoBloomFilterMessages(BitcoinTestFramework): self.log.info("Test that peer is disconnected if it sends a filterclear message") self.test_message_causes_disconnect(msg_filterclear()) + self.log.info("Test that peer is disconnected if it requests a filtered block") + with self.nodes[0].assert_debug_log(['filtered block request received when NODE_BLOOM service disabled']): + self.test_message_causes_disconnect(msg_getdata([CInv(MSG_FILTERED_BLOCK, int(self.nodes[0].getbestblockhash(), 16))])) + if __name__ == '__main__': P2PNoBloomFilterMessages(__file__).main()