From: Jason Ish <jason.ish@oisf.net>
Date: Mon, 8 Jun 2020 18:27:05 +0000 (-0600)
Subject: jsonbuilder: setter for formatted data
X-Git-Tag: suricata-6.0.0-beta1~334
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a545cdef6ad2aa4217b3966b9d22690339bd242f;p=thirdparty%2Fsuricata.git

jsonbuilder: setter for formatted data

Create a method to set preformatted data that contains the key
and the value already formatted.

This is an optimization for static data.
---

diff --git a/rust/src/jsonbuilder.rs b/rust/src/jsonbuilder.rs
index 0cd9ed6b05..a16823a591 100644
--- a/rust/src/jsonbuilder.rs
+++ b/rust/src/jsonbuilder.rs
@@ -405,6 +405,22 @@ impl JsonBuilder {
         Ok(self)
     }
 
+    pub fn set_formatted(&mut self, formatted: &str) -> Result<&mut Self, JsonError> {
+        match self.current_state() {
+            State::ObjectNth => {
+                self.buf.push(',');
+            }
+            State::ObjectFirst => {
+                self.set_state(State::ObjectNth);
+            }
+            _ => {
+                return Err(JsonError::InvalidState);
+            }
+        }
+        self.buf.push_str(formatted);
+        Ok(self)
+    }
+
     /// Set a key and a string value (from bytes) on an object.
     pub fn set_string_from_bytes(&mut self, key: &str, val: &[u8]) -> Result<&mut Self, JsonError> {
         match std::str::from_utf8(val) {
@@ -619,6 +635,14 @@ pub unsafe extern "C" fn jb_set_string_from_bytes(
     return false;
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn jb_set_formatted(js: &mut JsonBuilder, formatted: *const c_char) -> bool {
+    if let Ok(formatted) = CStr::from_ptr(formatted).to_str() {
+        return js.set_formatted(formatted).is_ok();
+    }
+    return false;
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn jb_set_jsont(
     jb: &mut JsonBuilder, key: *const c_char, jsont: &mut json::JsonT,
@@ -976,6 +1000,17 @@ mod test {
         assert_eq!(jb.current_state(), State::ObjectNth);
         assert_eq!(jb.state.len(), 2);
     }
+
+    #[test]
+    fn test_set_formatted() {
+        let mut jb = JsonBuilder::new_object();
+        jb.set_formatted("\"foo\":\"bar\"").unwrap();
+        assert_eq!(jb.buf, r#"{"foo":"bar""#);
+        jb.set_formatted("\"bar\":\"foo\"").unwrap();
+        assert_eq!(jb.buf, r#"{"foo":"bar","bar":"foo""#);
+        jb.close().unwrap();
+        assert_eq!(jb.buf, r#"{"foo":"bar","bar":"foo"}"#);
+    }
 }
 
 // Escape table as seen in serde-json (MIT/Apache license)