jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: add empty decode buffer check (#1628)

Browse Source
This commit is contained in:
Matthias Seitz
2023-03-04 21:51:35 +01:00
committed by GitHub
parent 446d76bc29
commit 7b71af2409
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/net/eth-wire/src/p2pstream.rs
View File

@ -698,8 +698,22 @@ impl Encodable for P2PMessage {
/// The [`Decodable`](reth_rlp::Decodable) implementation for [`P2PMessage`] assumes that each of
/// the message variants are snappy compressed, except for the [`P2PMessage::Hello`] variant since
/// the hello message is never compressed in the `p2p` subprotocol.
/// The [`Decodable`] implementation for [`P2PMessage::Ping`] and
/// [`P2PMessage::Pong`] expects a snappy encoded payload, see [`Encodable`] implementation.
impl Decodable for P2PMessage {
fn decode(buf: &mut &[u8]) -> Result<Self, DecodeError> {
/// Removes the snappy prefix from the Ping/Pong buffer
fn advance_snappy_ping_pong_payload(buf: &mut &[u8]) -> Result<(), DecodeError> {
if buf.len() < 3 {
return Err(DecodeError::InputTooShort)
}
if buf[..3] != [0x01, 0x00, EMPTY_LIST_CODE] {
return Err(DecodeError::Custom("expected snappy payload"))
}
buf.advance(3);
Ok(())
}
let message_id = u8::decode(&mut &buf[..])?;
let id = P2PMessageID::try_from(message_id)
.or(Err(DecodeError::Custom("unknown p2p message id")))?;
@ -708,11 +722,11 @@ impl Decodable for P2PMessage {
P2PMessageID::Hello => Ok(P2PMessage::Hello(HelloMessage::decode(buf)?)),
P2PMessageID::Disconnect => Ok(P2PMessage::Disconnect(DisconnectReason::decode(buf)?)),
P2PMessageID::Ping => {
buf.advance(1);
advance_snappy_ping_pong_payload(buf)?;
Ok(P2PMessage::Ping)
}
P2PMessageID::Pong => {
buf.advance(1);
advance_snappy_ping_pong_payload(buf)?;
Ok(P2PMessage::Pong)
}
}

10
crates/storage/codecs/derive/src/arbitrary.rs
View File

@ -36,10 +36,12 @@ pub fn maybe_generate_tests(args: TokenStream, ast: &DeriveInput) -> TokenStream
{
let mut buf = vec![];
let len = field.clone().encode(&mut buf);
let decoded = super::#type_ident::decode(&mut buf.as_slice()).unwrap();
assert!(field == decoded);
let len = field.encode(&mut buf);
let mut b = &mut buf.as_slice();
let decoded = super::#type_ident::decode(b).unwrap();
assert_eq!(field, decoded);
// ensure buffer is fully consumed by decode
assert!(b.is_empty());
}
});
} else if let Ok(num) = arg.to_string().parse() {