CSEC_PUBLIC/hayabusa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

To save order of output csv column order #165

Browse Source
This commit is contained in:
DastInDark
2022-07-29 10:53:04 +09:00
parent 6e68ba1d3b
commit 7d7e3362ca
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/detections/message.rs
View File

@@ -158,8 +158,8 @@ pub fn insert(
if exist_detail { if exist_detail {
profile_converter.insert("%Details%".to_string(), detect_info.detail.to_owned()); profile_converter.insert("%Details%".to_string(), detect_info.detail.to_owned());
} }
let mut tmp_converted_info: HashMap<String, String> = HashMap::new(); let mut tmp_converted_info: LinkedHashMap<String, String> = LinkedHashMap::new();
for (k, v) in detect_info.ext_field.iter() { for (k, v) in &detect_info.ext_field {
let converted_reserve_info = convert_profile_reserved_info(v, profile_converter); let converted_reserve_info = convert_profile_reserved_info(v, profile_converter);
tmp_converted_info.insert( tmp_converted_info.insert(
k.to_owned(), k.to_owned(),

4
src/detections/rule/count.rs
View File

@@ -326,12 +326,12 @@ impl CountStrategy for FieldStrategy {
} }
let record_value = &datas[idx as usize].field_record_value; let record_value = &datas[idx as usize].field_record_value;
let key_val = self.value_2_cnt.get_mut(record_value); let key_val = self.value_2_cnt.get_key_value_mut(record_value);
if key_val.is_none() { if key_val.is_none() {
return; return;
} }
let val: &mut i64 = key_val.unwrap(); let val: &mut i64 = key_val.unwrap().1;
if val <= &mut 1 { if val <= &mut 1 {
// 0になる場合はキー自体削除する // 0になる場合はキー自体削除する
self.value_2_cnt.remove(record_value); self.value_2_cnt.remove(record_value);