From f2f3a7e99a2a32506d70567c2d3884caee5f6e5c Mon Sep 17 00:00:00 2001 From: akiranishikawa Date: Sat, 10 Oct 2020 09:59:08 +0900 Subject: [PATCH] =?UTF-8?q?Toml=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 11 +++++++ Cargo.toml | 4 ++- rules/test.toml | 2 ++ src/lib.rs | 1 + src/main.rs | 2 ++ src/models/mod.rs | 1 + src/models/rule.rs | 14 +++++++++ src/toml.rs | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 rules/test.toml create mode 100644 src/models/rule.rs create mode 100644 src/toml.rs diff --git a/Cargo.lock b/Cargo.lock index 6b63ca2e..ab932e6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1071,6 +1071,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "toml" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +dependencies = [ + "serde", +] + [[package]] name = "unicode-width" version = "0.1.8" @@ -1185,5 +1194,7 @@ dependencies = [ "quick-xml 0.17.2", "regex", "serde", + "serde_derive", "serde_json", + "toml", ] diff --git a/Cargo.toml b/Cargo.toml index 863e7911..b28772bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,8 +11,10 @@ evtx = { git = "https://github.com/omerbenamram/evtx.git" } quick-xml = {version = "0.17", features = ["serialize"] } serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0"} +serde_derive = "1.0" clap = "*" regex = "1" csv = "1.1" base64 = "*" -flate2 = "1.0" \ No newline at end of file +flate2 = "1.0" +toml = "0.5" diff --git a/rules/test.toml b/rules/test.toml new file mode 100644 index 00000000..08260f64 --- /dev/null +++ b/rules/test.toml @@ -0,0 +1,2 @@ +[rule] +severity = "high" diff --git a/src/lib.rs b/src/lib.rs index 2579ad53..3c230589 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,2 +1,3 @@ pub mod detections; pub mod models; +pub mod toml; \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index e099bf0a..6aa1b3fd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,6 +6,7 @@ use evtx::EvtxParser; use quick_xml::de::DeError; use std::{path::PathBuf, process}; use yamato_event_analyzer::detections::detection; +use yamato_event_analyzer::toml; fn build_app() -> clap::App<'static, 'static> { let program = std::env::args() @@ -58,3 +59,4 @@ fn parse_file(filepath: &str) { let mut detection = detection::Detection::new(); &detection.start(parser); } + diff --git a/src/models/mod.rs b/src/models/mod.rs index 53f11265..e8d63f0a 100644 --- a/src/models/mod.rs +++ b/src/models/mod.rs @@ -1 +1,2 @@ pub mod event; +pub mod rule; \ No newline at end of file diff --git a/src/models/rule.rs b/src/models/rule.rs new file mode 100644 index 00000000..6efd403c --- /dev/null +++ b/src/models/rule.rs @@ -0,0 +1,14 @@ +extern crate serde; +use serde::Deserialize; + +#[derive(Debug, Deserialize)] +pub struct Rule { + pub severity: Option, + +} + +#[derive(Debug, Deserialize)] +pub struct Toml { + pub rule: Rule, + +} diff --git a/src/toml.rs b/src/toml.rs new file mode 100644 index 00000000..484e3abd --- /dev/null +++ b/src/toml.rs @@ -0,0 +1,76 @@ +extern crate serde_derive; +extern crate toml; + +use std::fs; +use std::io; +use std::io::{BufReader, Read}; +use std::path::{Path, PathBuf}; +use crate::models::rule; + + +pub struct ParseToml { + pub rules: Vec>, +} + +impl ParseToml { + + pub fn new() -> ParseToml { + ParseToml { + rules: Vec::new(), + } + } + + fn read_file(&self, path: PathBuf) -> Result { + let mut file_content = String::new(); + + let mut fr = fs::File::open(path) + .map(|f| BufReader::new(f)) + .map_err(|e| e.to_string())?; + + fr.read_to_string(&mut file_content) + .map_err(|e| e.to_string())?; + + Ok(file_content) + } + + fn read_dir>(&mut self, path: P) -> io::Result { + Ok(fs::read_dir(path)? + .filter_map(|entry| { + let entry = entry.ok()?; + if entry.file_type().ok()?.is_file() { + match self.read_file(entry.path()) { + Ok(s) => &self.rules.push(toml::from_str(&s)), + Err(e) => panic!("fail to read file: {}", e), + }; + } + Some("") + }) + .collect()) + } + +} + +#[cfg(test)] +mod tests { + + use crate::toml; + + #[test] + fn test_read_toml() { + let mut toml = toml::ParseToml::new(); + &toml.read_dir("rules".to_string()); + + for rule in toml.rules { + match rule { + Ok(_rule) => { + if let Some(severity) = _rule.rule.severity { + assert_eq!("high", severity); + } + }, + Err(_) => (), + } + } + + } +} +