Fix json output when a node with attributes has the same key several times

src/json_output.rs

@@ -214,28 +214,62 @@ impl JsonOutput {
                             .to_string(),
                 }
                 })?;
+                // We do a linear probe in case XML contains duplicate keys
+                if let Some(old_attribute) = value.insert(format!("{}_attributes", name), Value::Null) {
+                    if let Some(old_value) = value.insert(name.to_string(), Value::Null) {
+                        let mut free_slot = 1;
+                        // If it is a concrete value, we look for another slot.
+                        while value.get(&format!("{}_{}", name, free_slot)).is_some() || value.get(&format!("{}_{}_attributes", name, free_slot)).is_some() {
+                            // Value is an empty object - we can override it's value.
+                            free_slot += 1
+                        }
+                        if let Some(old_value_object) = old_value.as_object() {
+                            if !old_value_object.is_empty(){
+                                value.insert(format!("{}_{}", name, free_slot), old_value);
+                            }
+                        };
+                        if let Some(old_attribute_object) = old_attribute.as_object() {
+                            if !old_attribute_object.is_empty() {
+                                value.insert(format!("{}_{}_attributes", name, free_slot), old_attribute);
+                            };
+                        };
+                    };
+                };
 
                 value.insert(format!("{}_attributes", name), Value::Object(attributes));
 
                 // If the element's main value is empty, we want to remove it because we
                 // do not want the value to represent an empty object.
-                if value[name] == Value::Object(Map::new()) {
+                if value[name].is_null() || value[name] == Value::Object(Map::new()) {
                     value.remove(name);
                 }
             } else {
-                let value = self
-                    .get_or_create_current_path()
-                    .as_object_mut()
-                    .ok_or_else(|| {
-                        SerializationError::JsonStructureError {
-                    message:
-                        "This is a bug - expected current value to exist, and to be an object type.
-                            Check that the value is not `Value::null`"
-                            .to_string(),
-                }
-                    })?;
+                let container = self.get_current_parent().as_object_mut().ok_or_else(|| {
+                    SerializationError::JsonStructureError {
+                        message:
+                            "This is a bug - expected parent container to exist, and to be an object type.\
+                                Check that the referencing parent is not `Value::null`"
+                                .to_string(),
+                    }
+                })?;
+                // We do a linear probe in case XML contains duplicate keys
+                if let Some(old_value) = container.insert(name.to_string(), Value::Null) {
+                    if let Some(map) = old_value.as_object() {
+                        if !map.is_empty() {
+                            let mut free_slot = 1;
+                            // If it is a concrete value, we look for another slot.
+                            while container.get(&format!("{}_{}", name, free_slot)).is_some() {
+                                // Value is an empty object - we can override it's value.
+                                free_slot += 1
+                            }
+                            container.insert(format!("{}_{}", name, free_slot), old_value);
+                        }
+                    }
+                };
 
+                let mut value = Map::new();
                 value.insert("#attributes".to_owned(), Value::Object(attributes));
+                container.insert(name.to_string(), Value::Object(value));
             }
         } else {
             // If the object does not have attributes, replace it with a null placeholder,

tests/snapshots/test_record_samples__event_json_with_multiple_nodes_same_name.snap

@@ -83,6 +83,11 @@ expression: "&value"
               "name": "NoProxy"
             }
           },
+          "Action_1": {
+            "#attributes": {
+              "name": "NoProxy"
+            }
+          },
           "HTTPRequestHeadersInfo": {
             "Header": "Connection: Keep-Alive",
             "Header_1": "GET /pki/crl/products/microsoftrootcert.crl HTTP/1.1",

tests/snapshots/test_record_samples__event_json_with_multiple_nodes_same_name_separate.snap

@@ -1,6 +1,5 @@
 ---
 source: tests/test_record_samples.rs
-assertion_line: 276
 expression: "&value"
 ---
 {
@@ -64,6 +63,9 @@ expression: "&value"
           "Action_attributes": {
             "name": "NoProxy"
           },
+          "Action_1_attributes": {
+            "name": "NoProxy"
+          },
           "HTTPRequestHeadersInfo": {
             "Header": "Connection: Keep-Alive",
             "Header_1": "GET /pki/crl/products/microsoftrootcert.crl HTTP/1.1",