From 14961d231ecedeb8fd036db703ff9e7389b96112 Mon Sep 17 00:00:00 2001 From: Tommy Verrall Date: Fri, 3 Nov 2023 12:46:55 +0100 Subject: [PATCH 1/5] - add checks around message lengths --- wasm/client/src/encoded_payload_helper.rs | 66 ++++++++++++++++++++--- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/wasm/client/src/encoded_payload_helper.rs b/wasm/client/src/encoded_payload_helper.rs index 17ae92fbf8..0f980288d5 100644 --- a/wasm/client/src/encoded_payload_helper.rs +++ b/wasm/client/src/encoded_payload_helper.rs @@ -86,15 +86,25 @@ pub fn decode_payload(message: Vec) -> Result { pub(crate) fn parse_payload(message: &[u8]) -> anyhow::Result<(EncodedPayloadMetadata, &[u8])> { // 1st 8 bytes are the size (as u64 big endian) let mut size = [0u8; 8]; + if message.len() < 8 { + return Err(anyhow::anyhow!( + "Message is too short to contain size information" + )); + } size.clone_from_slice(&message[0..8]); - let size = u64::from_be_bytes(size) as usize; + let metadata_size = u64::from_be_bytes(size) as usize; - // then the metadata - let metadata = String::from_utf8_lossy(&message[8..8 + size]).into_owned(); - let metadata: EncodedPayloadMetadata = serde_json::from_str(metadata.as_str())?; + if metadata_size + 8 > message.len() { + return Err(anyhow::anyhow!( + "Metadata size with prefix exceeds message length" + )); + } - // finally the payload - let payload = &message[8 + size..]; + //then the metadata + let metadata = String::from_utf8_lossy(&message[8..8 + metadata_size]).into_owned(); + let metadata: EncodedPayloadMetadata = serde_json::from_str(&metadata)?; + + let payload = &message[8 + metadata_size..]; Ok((metadata, payload)) } @@ -235,4 +245,48 @@ mod tests { assert_eq!(res.0.headers, None); assert_eq!(res.1, empty); } + + #[wasm_bindgen_test] + async fn test_parse_payload_too_short() { + let message = vec![0u8; 7]; + let result = parse_payload(&message); + assert!(result.is_err()); + let error = result.unwrap_err(); + assert_eq!(error.to_string(), "message is too short to contain size information"); + } + + #[wasm_bindgen_test] + async fn test_parse_payload_size_exceeds_length() { + let mut message = vec![0u8; 8]; + message.extend(vec![1u8; 10]); + message[0..8].copy_from_slice(&(20u64.to_be_bytes())); + + let result = parse_payload(&message); + assert!(result.is_err()); + let error = result.unwrap_err(); + assert_eq!(error.to_string(), "metadata size with prefix exceeds message length"); + } + + #[wasm_bindgen_test] + async fn test_parse_payload_valid() { + let metadata = EncodedPayloadMetadata { + mime_type: "text/plain".to_string(), + headers: Some("test headers".to_string()), + }; + let payload_data = vec![2u8, 3u8, 5u8]; + + let serialized_metadata = serde_json::to_string(&metadata).unwrap(); + let metadata_length = serialized_metadata.len() as u64; + + let mut message = metadata_length.to_be_bytes().to_vec(); + message.extend_from_slice(serialized_metadata.as_bytes()); + message.extend_from_slice(&payload_data); + + let (parsed_metadata, parsed_payload) = parse_payload(&message).unwrap(); + + assert_eq!(parsed_metadata.mime_type, metadata.mime_type); + assert!(parsed_metadata.headers.is_some()); + assert_eq!(parsed_metadata.headers.unwrap(), "test headers"); + assert_eq!(parsed_payload, payload_data.as_slice()); + } } From 41bbbed70493d724ebac689acb8baac6fe1fa2c2 Mon Sep 17 00:00:00 2001 From: Tommy Verrall Date: Fri, 3 Nov 2023 12:49:35 +0100 Subject: [PATCH 2/5] keep notes --- wasm/client/src/encoded_payload_helper.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/wasm/client/src/encoded_payload_helper.rs b/wasm/client/src/encoded_payload_helper.rs index 0f980288d5..9f98636ece 100644 --- a/wasm/client/src/encoded_payload_helper.rs +++ b/wasm/client/src/encoded_payload_helper.rs @@ -104,6 +104,7 @@ pub(crate) fn parse_payload(message: &[u8]) -> anyhow::Result<(EncodedPayloadMet let metadata = String::from_utf8_lossy(&message[8..8 + metadata_size]).into_owned(); let metadata: EncodedPayloadMetadata = serde_json::from_str(&metadata)?; + //finally the payload let payload = &message[8 + metadata_size..]; Ok((metadata, payload)) From b6ccab79d2dd1bec01954f9f0c47ebffe3b638f6 Mon Sep 17 00:00:00 2001 From: Tommy Verrall Date: Tue, 7 Nov 2023 13:18:25 +0100 Subject: [PATCH 3/5] pr comments - update based on comments --- wasm/client/src/encoded_payload_helper.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/wasm/client/src/encoded_payload_helper.rs b/wasm/client/src/encoded_payload_helper.rs index 9f98636ece..22267f5506 100644 --- a/wasm/client/src/encoded_payload_helper.rs +++ b/wasm/client/src/encoded_payload_helper.rs @@ -87,22 +87,19 @@ pub(crate) fn parse_payload(message: &[u8]) -> anyhow::Result<(EncodedPayloadMet // 1st 8 bytes are the size (as u64 big endian) let mut size = [0u8; 8]; if message.len() < 8 { - return Err(anyhow::anyhow!( - "Message is too short to contain size information" - )); + bail!("Message is too short to contain size information") } size.clone_from_slice(&message[0..8]); let metadata_size = u64::from_be_bytes(size) as usize; if metadata_size + 8 > message.len() { return Err(anyhow::anyhow!( - "Metadata size with prefix exceeds message length" + format!("Metadata size: {}, exceeds message with length of: {}", metadata_size, message.len()), )); } //then the metadata - let metadata = String::from_utf8_lossy(&message[8..8 + metadata_size]).into_owned(); - let metadata: EncodedPayloadMetadata = serde_json::from_str(&metadata)?; + let metadata: EncodedPayloadMetadata = serde_json::from_slice(&message[8..8 + metadata_size])?; //finally the payload let payload = &message[8 + metadata_size..]; @@ -253,7 +250,7 @@ mod tests { let result = parse_payload(&message); assert!(result.is_err()); let error = result.unwrap_err(); - assert_eq!(error.to_string(), "message is too short to contain size information"); + assert_eq!(error.to_string(), "Message is too short to contain size information"); } #[wasm_bindgen_test] @@ -265,7 +262,7 @@ mod tests { let result = parse_payload(&message); assert!(result.is_err()); let error = result.unwrap_err(); - assert_eq!(error.to_string(), "metadata size with prefix exceeds message length"); + assert_eq!(error.to_string(), "Metadata size: 20, exceeds message with length of: 18"); } #[wasm_bindgen_test] From 189fd0ece4d28a5d4264d57becfd30990173e18b Mon Sep 17 00:00:00 2001 From: Tommy Verrall Date: Tue, 7 Nov 2023 13:20:25 +0100 Subject: [PATCH 4/5] insert import --- wasm/client/src/encoded_payload_helper.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/wasm/client/src/encoded_payload_helper.rs b/wasm/client/src/encoded_payload_helper.rs index 22267f5506..300dbbc8f4 100644 --- a/wasm/client/src/encoded_payload_helper.rs +++ b/wasm/client/src/encoded_payload_helper.rs @@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize}; use wasm_bindgen::prelude::*; use wasm_bindgen::JsCast; +use anyhow::bail; #[wasm_bindgen(typescript_custom_section)] const TS_DEFS: &'static str = r#" From a0c667927c0504a31a9edf6396a9412a5ce35446 Mon Sep 17 00:00:00 2001 From: Tommy Verrall Date: Tue, 7 Nov 2023 16:21:59 +0100 Subject: [PATCH 5/5] one last change --- wasm/client/src/encoded_payload_helper.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wasm/client/src/encoded_payload_helper.rs b/wasm/client/src/encoded_payload_helper.rs index 300dbbc8f4..d0df6edf87 100644 --- a/wasm/client/src/encoded_payload_helper.rs +++ b/wasm/client/src/encoded_payload_helper.rs @@ -93,7 +93,7 @@ pub(crate) fn parse_payload(message: &[u8]) -> anyhow::Result<(EncodedPayloadMet size.clone_from_slice(&message[0..8]); let metadata_size = u64::from_be_bytes(size) as usize; - if metadata_size + 8 > message.len() { + if metadata_size + 8 != message.len() { return Err(anyhow::anyhow!( format!("Metadata size: {}, exceeds message with length of: {}", metadata_size, message.len()), ));