mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-22 06:52:36 +01:00
Merge #20332: test: Mock IBD in net_processing fuzzers
fa4234d877
test: Mock IBD in net_processing fuzzers (MarcoFalke) Pull request description: Without this the fuzzers fail to detect trivial crasher bugs, such as https://github.com/bitcoin/bitcoin/pull/20317#issuecomment-723047111 ACKs for top commit: practicalswift: Tested ACKfa4234d877
Tree-SHA512: ce5da5c0a604b7559805a98ffdde882b44ca4f91b003b493d6e1be230714ce4cccb11dbfc1fc175f9d8fc779551c0a4103ceb4b473552928207d7d78ae329e10
This commit is contained in:
commit
fa8dd34e91
6 changed files with 56 additions and 4 deletions
|
@ -15,6 +15,7 @@ TEST_UTIL_H = \
|
||||||
test/util/setup_common.h \
|
test/util/setup_common.h \
|
||||||
test/util/str.h \
|
test/util/str.h \
|
||||||
test/util/transaction_utils.h \
|
test/util/transaction_utils.h \
|
||||||
|
test/util/validation.h \
|
||||||
test/util/wallet.h
|
test/util/wallet.h
|
||||||
|
|
||||||
libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
|
libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
|
||||||
|
@ -27,6 +28,7 @@ libtest_util_a_SOURCES = \
|
||||||
test/util/setup_common.cpp \
|
test/util/setup_common.cpp \
|
||||||
test/util/str.cpp \
|
test/util/str.cpp \
|
||||||
test/util/transaction_utils.cpp \
|
test/util/transaction_utils.cpp \
|
||||||
|
test/util/validation.cpp \
|
||||||
test/util/wallet.cpp \
|
test/util/wallet.cpp \
|
||||||
$(TEST_UTIL_H)
|
$(TEST_UTIL_H)
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include <test/util/mining.h>
|
#include <test/util/mining.h>
|
||||||
#include <test/util/net.h>
|
#include <test/util/net.h>
|
||||||
#include <test/util/setup_common.h>
|
#include <test/util/setup_common.h>
|
||||||
|
#include <test/util/validation.h>
|
||||||
#include <util/memory.h>
|
#include <util/memory.h>
|
||||||
#include <validationinterface.h>
|
#include <validationinterface.h>
|
||||||
#include <version.h>
|
#include <version.h>
|
||||||
|
@ -63,10 +64,14 @@ void test_one_input(const std::vector<uint8_t>& buffer)
|
||||||
{
|
{
|
||||||
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
|
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
|
||||||
ConnmanTestMsg& connman = *(ConnmanTestMsg*)g_setup->m_node.connman.get();
|
ConnmanTestMsg& connman = *(ConnmanTestMsg*)g_setup->m_node.connman.get();
|
||||||
|
TestChainState& chainstate = *(TestChainState*)&g_setup->m_node.chainman->ActiveChainstate();
|
||||||
|
chainstate.ResetIbd();
|
||||||
const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::COMMAND_SIZE).c_str()};
|
const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::COMMAND_SIZE).c_str()};
|
||||||
if (!LIMIT_TO_MESSAGE_TYPE.empty() && random_message_type != LIMIT_TO_MESSAGE_TYPE) {
|
if (!LIMIT_TO_MESSAGE_TYPE.empty() && random_message_type != LIMIT_TO_MESSAGE_TYPE) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const bool jump_out_of_ibd{fuzzed_data_provider.ConsumeBool()};
|
||||||
|
if (jump_out_of_ibd) chainstate.JumpOutOfIbd();
|
||||||
CDataStream random_bytes_data_stream{fuzzed_data_provider.ConsumeRemainingBytes<unsigned char>(), SER_NETWORK, PROTOCOL_VERSION};
|
CDataStream random_bytes_data_stream{fuzzed_data_provider.ConsumeRemainingBytes<unsigned char>(), SER_NETWORK, PROTOCOL_VERSION};
|
||||||
CNode& p2p_node = *MakeUnique<CNode>(0, ServiceFlags(NODE_NETWORK | NODE_WITNESS | NODE_BLOOM), 0, INVALID_SOCKET, CAddress{CService{in_addr{0x0100007f}, 7777}, NODE_NETWORK}, 0, 0, CAddress{}, std::string{}, ConnectionType::OUTBOUND_FULL_RELAY).release();
|
CNode& p2p_node = *MakeUnique<CNode>(0, ServiceFlags(NODE_NETWORK | NODE_WITNESS | NODE_BLOOM), 0, INVALID_SOCKET, CAddress{CService{in_addr{0x0100007f}, 7777}, NODE_NETWORK}, 0, 0, CAddress{}, std::string{}, ConnectionType::OUTBOUND_FULL_RELAY).release();
|
||||||
p2p_node.fSuccessfullyConnected = true;
|
p2p_node.fSuccessfullyConnected = true;
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include <test/util/mining.h>
|
#include <test/util/mining.h>
|
||||||
#include <test/util/net.h>
|
#include <test/util/net.h>
|
||||||
#include <test/util/setup_common.h>
|
#include <test/util/setup_common.h>
|
||||||
|
#include <test/util/validation.h>
|
||||||
#include <util/memory.h>
|
#include <util/memory.h>
|
||||||
#include <validation.h>
|
#include <validation.h>
|
||||||
#include <validationinterface.h>
|
#include <validationinterface.h>
|
||||||
|
@ -39,7 +40,10 @@ void test_one_input(const std::vector<uint8_t>& buffer)
|
||||||
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
|
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
|
||||||
|
|
||||||
ConnmanTestMsg& connman = *(ConnmanTestMsg*)g_setup->m_node.connman.get();
|
ConnmanTestMsg& connman = *(ConnmanTestMsg*)g_setup->m_node.connman.get();
|
||||||
|
TestChainState& chainstate = *(TestChainState*)&g_setup->m_node.chainman->ActiveChainstate();
|
||||||
|
chainstate.ResetIbd();
|
||||||
std::vector<CNode*> peers;
|
std::vector<CNode*> peers;
|
||||||
|
bool jump_out_of_ibd{false};
|
||||||
|
|
||||||
const auto num_peers_to_add = fuzzed_data_provider.ConsumeIntegralInRange(1, 3);
|
const auto num_peers_to_add = fuzzed_data_provider.ConsumeIntegralInRange(1, 3);
|
||||||
for (int i = 0; i < num_peers_to_add; ++i) {
|
for (int i = 0; i < num_peers_to_add; ++i) {
|
||||||
|
@ -58,6 +62,8 @@ void test_one_input(const std::vector<uint8_t>& buffer)
|
||||||
}
|
}
|
||||||
|
|
||||||
while (fuzzed_data_provider.ConsumeBool()) {
|
while (fuzzed_data_provider.ConsumeBool()) {
|
||||||
|
if (!jump_out_of_ibd) jump_out_of_ibd = fuzzed_data_provider.ConsumeBool();
|
||||||
|
if (jump_out_of_ibd && chainstate.IsInitialBlockDownload()) chainstate.JumpOutOfIbd();
|
||||||
const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::COMMAND_SIZE).c_str()};
|
const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::COMMAND_SIZE).c_str()};
|
||||||
|
|
||||||
CSerializedNetMsg net_msg;
|
CSerializedNetMsg net_msg;
|
||||||
|
|
22
src/test/util/validation.cpp
Normal file
22
src/test/util/validation.cpp
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
// Copyright (c) 2020 The Bitcoin Core developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#include <test/util/validation.h>
|
||||||
|
|
||||||
|
#include <util/check.h>
|
||||||
|
#include <util/time.h>
|
||||||
|
#include <validation.h>
|
||||||
|
|
||||||
|
void TestChainState::ResetIbd()
|
||||||
|
{
|
||||||
|
m_cached_finished_ibd = false;
|
||||||
|
assert(IsInitialBlockDownload());
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestChainState::JumpOutOfIbd()
|
||||||
|
{
|
||||||
|
Assert(IsInitialBlockDownload());
|
||||||
|
m_cached_finished_ibd = true;
|
||||||
|
Assert(!IsInitialBlockDownload());
|
||||||
|
}
|
17
src/test/util/validation.h
Normal file
17
src/test/util/validation.h
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
// Copyright (c) 2020 The Bitcoin Core developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#ifndef BITCOIN_TEST_UTIL_VALIDATION_H
|
||||||
|
#define BITCOIN_TEST_UTIL_VALIDATION_H
|
||||||
|
|
||||||
|
#include <validation.h>
|
||||||
|
|
||||||
|
struct TestChainState : public CChainState {
|
||||||
|
/** Reset the ibd cache to its initial state */
|
||||||
|
void ResetIbd();
|
||||||
|
/** Toggle IsInitialBlockDownload from true to false */
|
||||||
|
void JumpOutOfIbd();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // BITCOIN_TEST_UTIL_VALIDATION_H
|
|
@ -503,9 +503,9 @@ enum class CoinsCacheSizeState
|
||||||
* whereas block information and metadata independent of the current tip is
|
* whereas block information and metadata independent of the current tip is
|
||||||
* kept in `BlockMetadataManager`.
|
* kept in `BlockMetadataManager`.
|
||||||
*/
|
*/
|
||||||
class CChainState {
|
class CChainState
|
||||||
private:
|
{
|
||||||
|
protected:
|
||||||
/**
|
/**
|
||||||
* Every received block is assigned a unique and increasing identifier, so we
|
* Every received block is assigned a unique and increasing identifier, so we
|
||||||
* know which one to give priority in case of a fork.
|
* know which one to give priority in case of a fork.
|
||||||
|
|
Loading…
Add table
Reference in a new issue