fix :コメントで指摘されたところ

This commit is contained in:
Kazuminn
2020-10-04 17:07:09 +09:00
parent e3631abeb3
commit 3e3f7bc51e

View File

@@ -16,16 +16,11 @@ pub fn check_command(
servicecmd: usize, servicecmd: usize,
servicename: &str, servicename: &str,
creator: &str, creator: &str,
mut rdr: csv::Reader<&[u8]>,
) { ) {
let mut text = "".to_string(); let mut text = "".to_string();
let mut base64 = "".to_string(); let mut base64 = "".to_string();
let mut f = File::open("whitelist.txt").expect("file not found");
let mut contents = String::new();
f.read_to_string(&mut contents);
let mut rdr = csv::Reader::from_reader(contents.as_bytes());
for entry in rdr.records() { for entry in rdr.records() {
if let Ok(_data) = entry { if let Ok(_data) = entry {
if let Ok(_re) = Regex::new(&_data[0]) { if let Ok(_re) = Regex::new(&_data[0]) {
@@ -199,6 +194,8 @@ fn check_creator(command: &str, creator: &str) -> std::string::String {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::detections::utils; use crate::detections::utils;
use std::fs::File;
use std::io::Read;
#[test] #[test]
fn test_check_regex() { fn test_check_regex() {
let regextext = utils::check_regex("\\cvtres.exe", 0); let regextext = utils::check_regex("\\cvtres.exe", 0);
@@ -221,7 +218,14 @@ mod tests {
#[test] #[test]
fn test_check_command() { fn test_check_command() {
utils::check_command(1, "dir", 100, 100, "dir", "dir"); let mut f = File::open("whitelist.txt").expect("file not found");
let mut contents = String::new();
f.read_to_string(&mut contents);
let rdr = csv::Reader::from_reader(contents.as_bytes());
utils::check_command(1, "dir", 100, 100, "dir", "dir", rdr);
let rdr = csv::Reader::from_reader(contents.as_bytes());
utils::check_command( utils::check_command(
1, 1,
"\"C:\\Program Files\\Google\\Update\\GoogleUpdate.exe\"", "\"C:\\Program Files\\Google\\Update\\GoogleUpdate.exe\"",
@@ -229,6 +233,7 @@ mod tests {
100, 100,
"dir", "dir",
"dir", "dir",
rdr,
); );
} }
} }