github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-09 07:17:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(ipc): trim leading whitespace in StreamCodec decode (#20615)

Browse Source 
Signed-off-by: Hwangjae Lee <meetrick@gmail.com>
This commit is contained in:
Hwangjae Lee
2025-12-31 17:51:56 +09:00
committed by GitHub
parent 454b060d5a
commit 9cfe5c7363
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/rpc/ipc/src/stream_codec.rs
View File

@@ -27,7 +27,7 @@
// This basis of this file has been taken from the deprecated jsonrpc codebase:
// https://github.com/paritytech/jsonrpc
use bytes::BytesMut;
use bytes::{Buf, BytesMut};
use std::{io, str};
/// Separator for enveloping messages in streaming codecs
@@ -113,7 +113,10 @@ impl tokio_util::codec::Decoder for StreamCodec {
is_escaped = byte == b'\\' && !is_escaped && in_str;
if depth == 0 && idx != start_idx && idx - start_idx + 1 > whitespaces {
let bts = buf.split_to(idx + 1);
if start_idx > 0 {
buf.advance(start_idx);
}
let bts = buf.split_to(idx + 1 - start_idx);
return match String::from_utf8(bts.into()) {
Ok(val) => Ok(Some(val)),
Err(_) => Ok(None),
@@ -210,14 +213,13 @@ mod tests {
.decode(&mut buf)
.expect("There should be no error in first 2nd test")
.expect("There should be a request in 2nd whitespace test");
// TODO: maybe actually trim it out
assert_eq!(request2, "\n\n\n\n{ test: 2 }");
assert_eq!(request2, "{ test: 2 }");
let request3 = codec
.decode(&mut buf)
.expect("There should be no error in first 3rd test")
.expect("There should be a request in 3rd whitespace test");
assert_eq!(request3, "\n\r{\n test: 3 }");
assert_eq!(request3, "{\n test: 3 }");
let request4 = codec.decode(&mut buf).expect("There should be no error in first 4th test");
assert!(
@@ -254,8 +256,7 @@ mod tests {
#[test]
fn huge() {
let request = r#"
{
let request = r#"{
"jsonrpc":"2.0",
"method":"say_hello",
"params": [