foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00
Code Issues Activity

addrman: Replace assert with throw on corrupt data

Browse source 
Assert should only be used for program internal logic errors, not to
sanitize external user input.
This commit is contained in:
MarcoFalke 2021-08-18 09:57:56 +02:00
parent fa298971e6
commit fa7a883f5a
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/addrman.cpp
View file

@ -386,7 +386,12 @@ void CAddrMan::Unserialize(Stream& s_)
LogPrint(BCLog::ADDRMAN, "addrman lost %i new and %i tried addresses due to collisions or invalid addresses\n", nLostUnk, nLost); LogPrint(BCLog::ADDRMAN, "addrman lost %i new and %i tried addresses due to collisions or invalid addresses\n", nLostUnk, nLost);
} }
Check(); const int check_code{ForceCheckAddrman()};
if (check_code != 0) {
throw std::ios_base::failure(strprintf(
"Corrupt data. Consistency check failed with code %s",
check_code));
}
} }
// explicit instantiation // explicit instantiation

11
test/functional/feature_addrman.py
View file

@ -19,6 +19,7 @@ def serialize_addrman(
format=1, format=1,
lowest_compatible=3, lowest_compatible=3,
net_magic="regtest", net_magic="regtest",
bucket_key=1,
len_new=None, len_new=None,
len_tried=None, len_tried=None,
mock_checksum=None, mock_checksum=None,
@ -29,7 +30,7 @@ def serialize_addrman(
r = MAGIC_BYTES[net_magic] r = MAGIC_BYTES[net_magic]
r += struct.pack("B", format) r += struct.pack("B", format)
r += struct.pack("B", INCOMPATIBILITY_BASE + lowest_compatible) r += struct.pack("B", INCOMPATIBILITY_BASE + lowest_compatible)
r += ser_uint256(1) r += ser_uint256(bucket_key)
r += struct.pack("i", len_new or len(new)) r += struct.pack("i", len_new or len(new))
r += struct.pack("i", len_tried or len(tried)) r += struct.pack("i", len_tried or len(tried))
ADDRMAN_NEW_BUCKET_COUNT = 1 << 10 ADDRMAN_NEW_BUCKET_COUNT = 1 << 10
@ -119,6 +120,14 @@ class AddrmanTest(BitcoinTestFramework):
match=ErrorMatch.FULL_REGEX, match=ErrorMatch.FULL_REGEX,
) )
self.log.info("Check that corrupt addrman cannot be read (failed check)")
self.stop_node(0)
write_addrman(peers_dat, bucket_key=0)
self.nodes[0].assert_start_raises_init_error(
expected_msg=init_error("Corrupt data. Consistency check failed with code -16: .*"),
match=ErrorMatch.FULL_REGEX,
)
self.log.info("Check that missing addrman is recreated") self.log.info("Check that missing addrman is recreated")
self.stop_node(0) self.stop_node(0)
os.remove(peers_dat) os.remove(peers_dat)