rust/dns: pass byte arrays directly to rust/json

Using the json.set_string_from_bytes which will
safely convert the bytes printable ascii string
before logging.

diff --git a/rust/src/dns/dns.rs b/rust/src/dns/dns.rs
index d80790f87da90a3afdd8fb0595114ce96ff606fc..c2b728032e5331cb87986a971664a81185ec7515 100644 (file)
--- a/rust/src/dns/dns.rs
+++ b/rust/src/dns/dns.rs
@@ -143,18 +143,6 @@ pub struct DNSQueryEntry {
     pub rrclass: u16,
 }
 
-impl DNSQueryEntry {
-
-    pub fn name(&self) -> &str {
-        let r = std::str::from_utf8(&self.name);
-        if r.is_err() {
-            return "";
-        }
-        return r.unwrap();
-    }
-
-}
-
 #[derive(Debug,PartialEq)]
 pub struct DNSAnswerEntry {
     pub name: Vec<u8>,
@@ -165,26 +153,6 @@ pub struct DNSAnswerEntry {
     pub data: Vec<u8>,
 }
 
-impl DNSAnswerEntry {
-
-    pub fn name(&self) -> &str {
-        let r = std::str::from_utf8(&self.name);
-        if r.is_err() {
-            return "";
-        }
-        return r.unwrap();
-    }
-
-    pub fn data_to_string(&self) -> &str {
-        let r = std::str::from_utf8(&self.data);
-        if r.is_err() {
-            return "";
-        }
-        return r.unwrap();
-    }
-
-}
-
 #[derive(Debug)]
 pub struct DNSRequest {
     pub header: DNSHeader,

diff --git a/rust/src/dns/log.rs b/rust/src/dns/log.rs
index 6d176f34650c456d66832c8b177bbd6114e48124..77fad2bd6e8bfdedfbbd107c60c8392abca89057 100644 (file)
--- a/rust/src/dns/log.rs
+++ b/rust/src/dns/log.rs
@@ -19,7 +19,6 @@ extern crate libc;
 
 use std;
 use std::string::String;
-use std::ascii::AsciiExt;
 
 use json::*;
 use dns::dns::*;
@@ -287,28 +286,6 @@ pub fn dns_rrtype_string(rrtype: u16) -> String {
     }.to_string()
 }
 
-fn safe_bytes_to_string(input: &[u8]) -> String {
-    // First attempt to convert from UTF8.
-    match std::str::from_utf8(input) {
-        Ok(value) => {
-            return String::from(value);
-        },
-        _ => {}
-    }
-
-    // If that fails create a string from the printabe characters with
-    // the non-printable characters as hex.
-    let mut output: String = "".to_owned();
-    for c in input {
-        if (*c as char).is_ascii() {
-            output.push(*c as char);
-        } else {
-            output.push_str(&format!("\\x{:x}", c));
-        }
-    }
-    return output;
-}
-
 fn dns_rcode_string(flags: u16) -> String {
     match flags & 0x000f {
         DNS_RCODE_NOERROR => "NOERROR",
@@ -384,7 +361,7 @@ pub extern "C" fn rs_dns_log_json_query(tx: &mut DNSTransaction,
                 let js = Json::object();
                 js.set_string("type", "query");
                 js.set_integer("id", request.header.tx_id as u64);
-                js.set_string("rrname", query.name());
+                js.set_string_from_bytes("rrname", &query.name);
                 js.set_string("rrtype", &dns_rrtype_string(query.rrtype));
                 js.set_integer("tx_id", tx.id - 1);
                 return js.unwrap();
@@ -403,7 +380,7 @@ fn dns_log_json_answer(header: &DNSHeader, answer: &DNSAnswerEntry)
     js.set_string("type", "answer");
     js.set_integer("id", header.tx_id as u64);
     js.set_string("rcode", &dns_rcode_string(header.flags));
-    js.set_string("rrname", answer.name());
+    js.set_string_from_bytes("rrname", &answer.name);
     js.set_string("rrtype", &dns_rrtype_string(answer.rrtype));
     js.set_integer("ttl", answer.ttl as u64);
 
@@ -415,7 +392,7 @@ fn dns_log_json_answer(header: &DNSHeader, answer: &DNSAnswerEntry)
         DNS_RTYPE_MX |
         DNS_RTYPE_TXT |
         DNS_RTYPE_PTR => {
-            js.set_string("rdata", answer.data_to_string());
+            js.set_string_from_bytes("rdata", &answer.data);
         },
         DNS_RTYPE_SSHFP => {
             dns_log_sshfp(&js, &answer);
@@ -443,7 +420,7 @@ fn dns_log_json_failure(r: &DNSResponse, index: usize, flags: u64)
     js.set_string("type", "answer");
     js.set_integer("id", r.header.tx_id as u64);
     js.set_string("rcode", &dns_rcode_string(r.header.flags));
-    js.set_string("rrname", &safe_bytes_to_string(&query.name));
+    js.set_string_from_bytes("rrname", &query.name);
 
     return js.unwrap();
 }
@@ -493,19 +470,3 @@ pub extern "C" fn rs_dns_log_json_authority(tx: &mut DNSTransaction,
     }
     return std::ptr::null_mut();
 }
-
-#[cfg(test)]
-mod tests {
-
-    use dns::log::safe_bytes_to_string;
-
-    #[test]
-    fn test_safe_bytes_to_string() {
-        assert_eq!("suricata-ids.org",
-                   safe_bytes_to_string(
-                       &String::from("suricata-ids.org").into_bytes()));
-        assert_eq!("A\\xf0\\xf1\\xf2",
-                   safe_bytes_to_string(&[ 0x41, 0xf0, 0xf1, 0xf2 ]));
-    }
-
-}

diff --git a/rust/src/dns/lua.rs b/rust/src/dns/lua.rs
index bcd7a7c402df71083ba81893fb28b04fe8b336ad..641431c0837d94a9e288ed8e74c5ea58d3e290fc 100644 (file)
--- a/rust/src/dns/lua.rs
+++ b/rust/src/dns/lua.rs
@@ -43,14 +43,14 @@ pub extern "C" fn rs_dns_lua_get_rrname(clua: &mut CLuaState,
 
     for request in &tx.request {
         for query in &request.queries {
-            lua.pushstring(query.name());
+            lua.pushstring(&String::from_utf8_lossy(&query.name));
             return 1;
         }
     }
 
     for response in &tx.response {
         for query in &response.queries {
-            lua.pushstring(query.name());
+            lua.pushstring(&String::from_utf8_lossy(&query.name));
             return 1;
         }
     }
@@ -88,7 +88,7 @@ pub extern "C" fn rs_dns_lua_get_query_table(clua: &mut CLuaState,
             lua.settable(-3);
 
             lua.pushstring("rrname");
-            lua.pushstring(query.name());
+            lua.pushstring(&String::from_utf8_lossy(&query.name));
             lua.settable(-3);
 
             lua.settable(-3);
@@ -133,7 +133,7 @@ pub extern "C" fn rs_dns_lua_get_answer_table(clua: &mut CLuaState,
             lua.settable(-3);
 
             lua.pushstring("rrname");
-            lua.pushstring(answer.name());
+            lua.pushstring(&String::from_utf8_lossy(&answer.name));
             lua.settable(-3);
 
             if answer.data.len() > 0 {
@@ -143,7 +143,7 @@ pub extern "C" fn rs_dns_lua_get_answer_table(clua: &mut CLuaState,
                         lua.pushstring(&dns_print_addr(&answer.data));
                     }
                     _ => {
-                        lua.pushstring(answer.data_to_string());
+                        lua.pushstring(&String::from_utf8_lossy(&answer.data));
                     }
                 }
                 lua.settable(-3);
@@ -190,7 +190,7 @@ pub extern "C" fn rs_dns_lua_get_authority_table(clua: &mut CLuaState,
             lua.settable(-3);
 
             lua.pushstring("rrname");
-            lua.pushstring(answer.name());
+            lua.pushstring(&String::from_utf8_lossy(&answer.name));
             lua.settable(-3);
 
             lua.settable(-3);