Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ impl Message {
}

let id_bytes = Bytes::decode(payload)?;
let id = RequestId(id_bytes.to_vec());
let id = RequestId::decode(id_bytes.to_vec())?;

let message = match msg_type {
1 => {
Expand Down Expand Up @@ -859,6 +859,29 @@ mod tests {
assert_eq!(Message::decode(&encoded_message).unwrap(), message);
}

#[test]
fn reject_oversized_request_id() {
// A PING request with a 9-byte request ID should be rejected.
// The discv5 spec limits request IDs to a maximum of 8 bytes.
let id = RequestId(vec![1, 2, 3, 4, 5, 6, 7, 8, 9]); // 9 bytes
let request = Request {
id,
body: RequestBody::Ping { enr_seq: 1 },
};
let encoded = request.encode();
Message::decode(&encoded).expect_err("should reject request ID longer than 8 bytes");

// An 8-byte request ID should be accepted.
let id = RequestId(vec![1, 2, 3, 4, 5, 6, 7, 8]);
let request = Message::Request(Request {
id,
body: RequestBody::Ping { enr_seq: 1 },
});
let encoded = request.clone().encode();
let decoded = Message::decode(&encoded).expect("8-byte request ID should be valid");
assert_eq!(request, decoded);
}

#[test]
fn test_large_enr_hex_data() {
// This is the exact hex data from the logs that was failing to decode
Expand Down
Loading