Training/ams2018/v4

rust/gen-c-headers.py

@@ -183,7 +183,7 @@ def gen_headers(filename):
         fnName = fn[1]
 
         for arg in fn[2].split(","):
-            if not arg:
+            if not arg.strip():
                 continue
             arg_name, rs_type = arg.split(":", 1)
             arg_name = arg_name.strip()

rust/rustfmt.toml

@@ -0,0 +1,2 @@
+# Rust default is 100. Use 80 to bring in line with Suricata C code.
+max_width = 80

rust/src/applayertemplate/logger.rs

@@ -0,0 +1,41 @@
+/* Copyright (C) 2018 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+use libc;
+use std;
+use json::*;
+use super::template::TemplateTransaction;
+
+fn log_template(tx: &TemplateTransaction) -> Option<Json> {
+    let js = Json::object();
+    if let Some(ref request) = tx.request {
+        js.set_string("request", request);
+    }
+    if let Some(ref response) = tx.response {
+        js.set_string("response", response);
+    }
+    return Some(js);
+}
+
+#[no_mangle]
+pub extern "C" fn rs_template_logger_log(tx: *mut libc::c_void) -> *mut JsonT {
+    let tx = cast_pointer!(tx, TemplateTransaction);
+    match log_template(tx) {
+        Some(js) => js.unwrap(),
+        None => std::ptr::null_mut(),
+    }
+}

rust/src/applayertemplate/mod.rs

@@ -0,0 +1,22 @@
+/* Copyright (C) 2018 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+pub mod template;
+mod parser;
+/* TEMPLATE_START_REMOVE */
+pub mod logger;
+/* TEMPLATE_END_REMOVE */

rust/src/applayertemplate/parser.rs

@@ -0,0 +1,64 @@
+/* Copyright (C) 2018 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+use std;
+
+fn parse_len(input: &str) -> Result<u32, std::num::ParseIntError> {
+    input.parse::<u32>()
+}
+
+named!(pub parse_message<String>,
+       do_parse!(
+           len: map_res!(
+               map_res!(take_until_s!(":"), std::str::from_utf8), parse_len) >>
+           sep: take!(1) >>
+           msg: take_str!(len) >>
+               (
+                   msg.to_string()
+               )
+       ));
+
+#[cfg(test)]
+mod tests {
+
+    use nom::*;
+    use super::*;
+
+    /// Simple test of some valid data.
+    #[test]
+    fn test_parse_valid() {
+        let buf = b"12:Hello World!4:Bye.";
+
+        let result = parse_message(buf);
+        match result {
+            IResult::Done(remainder, message) => {
+                // Check the first message.
+                assert_eq!(message, "Hello World!");
+
+                // And we should have 6 bytes left.
+                assert_eq!(remainder.len(), 6);
+            }
+            IResult::Incomplete(_) => {
+                panic!("Result should not have been incomplete.");
+            }
+            IResult::Error(err) => {
+                panic!("Result should not be an error: {:?}.", err);
+            }
+        }
+    }
+
+}