Add more buffer length checks

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [codec-0.9.2] - 2024-02-01
+
+* Add more buffer length checks
+
 ## [1.0.2] - 2024-01-19
 
 * SenderLink close notification

codec/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "ntex-amqp-codec"
-version = "0.9.1"
+version = "0.9.2"
 description = "AMQP 1.0 Protocol Codec"
 authors = ["Nikolay Kim <[email protected]>", "Max Gortman <[email protected]>", "Mike Yagley <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2018"
 
 [dependencies]
-ntex-bytes = "0.1.21"
+ntex-bytes = "0.1.24"
 ntex-codec = "0.6.2"
 byteorder = "1.5"
 fxhash = "0.2.1"

codec/src/codec/decode.rs

@@ -250,6 +250,7 @@
 {
     fn decode_with_format(input: &mut Bytes, fmt: u8) -> Result<Self, AmqpParseError> {
         let header = decode_map_header(input, fmt)?;
+        decode_check_len!(input, header.size as usize);
         let mut map_input = input.split_to(header.size as usize);
         let count = header.count / 2;
         let mut map: collections::HashMap<K, V, S> =
@@ -267,6 +268,7 @@
 impl<T: DecodeFormatted> DecodeFormatted for Vec<T> {
     fn decode_with_format(input: &mut Bytes, fmt: u8) -> Result<Self, AmqpParseError> {
         let header = decode_array_header(input, fmt)?;
+        decode_check_len!(input, 1);
         let item_fmt = input[0]; // todo: support descriptor
         input.split_to(1);
         let mut result: Vec<T> = Vec::with_capacity(header.count as usize);
@@ -281,6 +283,7 @@
 impl DecodeFormatted for VecSymbolMap {
     fn decode_with_format(input: &mut Bytes, fmt: u8) -> Result<Self, AmqpParseError> {
         let header = decode_map_header(input, fmt)?;
+        decode_check_len!(input, header.size as usize);
         let mut map_input = input.split_to(header.size as usize);
         let count = header.count / 2;
         let mut map = Vec::with_capacity(count as usize);
@@ -297,6 +300,7 @@
 impl DecodeFormatted for VecStringMap {
     fn decode_with_format(input: &mut Bytes, fmt: u8) -> Result<Self, AmqpParseError> {
         let header = decode_map_header(input, fmt)?;
+        decode_check_len!(input, header.size as usize);
         let mut map_input = input.split_to(header.size as usize);
         let count = header.count / 2;
         let mut map = Vec::with_capacity(count as usize);
@@ -673,10 +677,10 @@
     #[test]
     fn test_timestamp() {
         let mut b1 = BytesMut::with_capacity(0);
         let datetime = Utc.ymd(2011, 7, 26).and_hms_milli(18, 21, 3, 521);
         datetime.encode(&mut b1);
 
         let expected = Utc.ymd(2011, 7, 26).and_hms_milli(18, 21, 3, 521);
         assert_eq!(
             expected,
             unwrap_value(DateTime::<Utc>::decode(&mut b1.freeze()))
@@ -686,10 +690,10 @@
     #[test]
     fn test_timestamp_pre_unix() {
         let mut b1 = BytesMut::with_capacity(0);
         let datetime = Utc.ymd(1968, 7, 26).and_hms_milli(18, 21, 3, 521);
         datetime.encode(&mut b1);
 
         let expected = Utc.ymd(1968, 7, 26).and_hms_milli(18, 21, 3, 521);
         assert_eq!(
             expected,
             unwrap_value(DateTime::<Utc>::decode(&mut b1.freeze()))
@@ -745,7 +749,7 @@
     #[test]
     fn variant_timestamp() {
         let mut b1 = BytesMut::with_capacity(0);
         let datetime = Utc.ymd(2011, 7, 26).and_hms_milli(18, 21, 3, 521);
         Variant::Timestamp(datetime).encode(&mut b1);
 
         let expected = Utc.ymd(2011, 7, 26).and_hms_milli(18, 21, 3, 521);

codec/src/io.rs

@@ -135,7 +135,7 @@ impl Decoder for ProtocolIdCodec {
         if src.len() < PROTOCOL_HEADER_LEN {
             Ok(None)
         } else {
-            let src = src.split_to(8);
+            let src = src.split_to(PROTOCOL_HEADER_LEN);
             if &src[0..4] != PROTOCOL_HEADER_PREFIX {
                 Err(ProtocolIdError::InvalidHeader)
             } else if &src[5..8] != PROTOCOL_VERSION {