issues 25, 26, 27

RELEASES.md

@@ -1,5 +1,7 @@
 # 0.2.0
   * Clippy updates for 1.76
+  * Removed dbg! macros for now for performance reason until we have a better solution.
+  * Fixed issue where bad IPFIX options template causes panic.
 
 # 0.1.9
   * Fixed bug with flow counts in V9.

src/lib.rs

@@ -370,6 +370,15 @@ mod tests {
         assert_yaml_snapshot!(NetflowParser::default().parse_bytes(&packet));
     }
 
+    #[test]
+    fn it_doesnt_panic_with_invalid_options_ipfix_template() {
+        let packet = [
+            0, 10, 0, 44, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 3, 0, 28, 1, 4, 0, 13, 0, 1,
+            128, 123, 0, 4, 0, 0, 0, 2, 0, 41, 0, 2, 0, 42, 0, 2, 0, 0,
+        ];
+        NetflowParser::default().parse_bytes(&packet);
+    }
+
     #[test]
     fn it_parses_ipfix_data_cached_template() {
         let packet = [

src/variable_versions/ipfix.rs

@@ -172,7 +172,7 @@ pub struct TemplateField {
 /// Parses options template
 fn parse_options_template(i: &[u8], length: u16) -> IResult<&[u8], OptionsTemplate> {
     let (remaining, taken) = take(length.checked_sub(4).unwrap_or(length))(i)?;
-    let (_, option_template) = OptionsTemplate::parse(taken).unwrap();
+    let (_, option_template) = OptionsTemplate::parse(taken)?;
     Ok((remaining, option_template))
 }
 
@@ -216,7 +216,7 @@ fn parse_fields<T: CommonTemplateFields>(
     let template = match template {
         Some(t) => t,
         None => {
-            dbg!("Could not fetch any v10 templates!");
+            // dbg!("Could not fetch any v10 templates!");
             return Err(NomErr::Error(NomError::new(i, ErrorKind::Fail)));
         }
     };
@@ -333,12 +333,12 @@ impl NetflowByteParserVariable for IPFixParser {
 
         let mut total_left = v10_header.length as usize;
 
-        dbg!("remaining: {}", remaining);
+        // dbg!("remaining: {}", remaining);
 
         while total_left != 0 {
             let (left_remaining, v10_set) = Set::parse(remaining, self)
                 .map_err(|e| format!("Could not parse v10_set: {e}"))?;
-            dbg!("left remaining: {}", left_remaining);
+            // dbg!("left remaining: {}", left_remaining);
             remaining = left_remaining;
             let parsed = total_left
                 .checked_sub(remaining.len())

src/variable_versions/v9.rs

@@ -348,7 +348,7 @@ fn parse_fields(
     let template = match template {
         Some(t) => t,
         None => {
-            dbg!("Could not fetch any v10 templates!");
+            // dbg!("Could not fetch any v9 templates!");
             return Err(NomErr::Error(NomError::new(i, ErrorKind::Fail)));
         }
     };
@@ -446,7 +446,7 @@ fn parse_options_data_fields(
     templates: HashMap<u16, OptionsTemplate>,
 ) -> IResult<&[u8], Vec<OptionDataField>> {
     let template = templates.get(&flow_set_id).ok_or_else(|| {
-        dbg!("Could not fetch any v9 options templates!");
+        // dbg!("Could not fetch any v9 options templates!");
         NomErr::Error(NomError::new(i, ErrorKind::Fail))
     })?;
     let mut fields = vec![];
@@ -465,7 +465,7 @@ fn parse_scope_data_fields(
     templates: HashMap<u16, OptionsTemplate>,
 ) -> IResult<&[u8], Vec<ScopeDataField>> {
     let template = templates.get(&flow_set_id).ok_or_else(|| {
-        dbg!("Could not fetch any v9 options templates!");
+        // dbg!("Could not fetch any v9 options templates!");
         NomErr::Error(NomError::new(i, ErrorKind::Fail))
     })?;
     let mut fields = vec![];