From 04d962ca3faf7a0da829bfd2151f2ef4da35fdb8 Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Sat, 8 Oct 2022 09:36:18 +0900 Subject: [PATCH 1/3] fixed eventsID sum up process with metrics option #729 --- src/timeline/metrics.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/timeline/metrics.rs b/src/timeline/metrics.rs index 1126e88f..33934b18 100644 --- a/src/timeline/metrics.rs +++ b/src/timeline/metrics.rs @@ -96,7 +96,7 @@ impl EventMetrics { if let Some(idnum) = utils::get_event_value("EventID", &record.record) { let count: &mut usize = self .stats_list - .entry((idnum.to_string(), channel)) + .entry((idnum.to_string().replace('\"', ""), channel)) .or_insert(0); *count += 1; }; From 7d5300f0a64133da78c345d31275afc0549c4a2d Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Sat, 8 Oct 2022 09:42:32 +0900 Subject: [PATCH 2/3] fixed section in changelog --- CHANGELOG-Japanese.md | 2 +- CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-Japanese.md b/CHANGELOG-Japanese.md index b2220eb7..5b04507a 100644 --- a/CHANGELOG-Japanese.md +++ b/CHANGELOG-Japanese.md @@ -5,10 +5,10 @@ **改善:** - 検知ルールを利用しないオプション(`-M`と`-L`オプション)の時のメッセージの出力内容を修正した。 (#730) (@hitenkoku) +- より正確な結果を出力するために、チャンネルとEIDの情報を`rules/config/channel_eid_info.txt`に基づいてチェックするようにした。 (#463) (@garigariganzy) **バグ修正:** -- より正確な結果を出力するために、チャンネルとEIDの情報を`rules/config/channel_eid_info.txt`に基づいてチェックするようにした。 (#463) (@garigariganzy) ## 1.7.0 [2022/09/29] diff --git a/CHANGELOG.md b/CHANGELOG.md index e7e694a5..cdd1c1a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,10 @@ **Enhancements:** - Do not display a message about loading detection rules when using the `-M` or `-L` options. (#730) (@hitenkoku) +- Hayabusa now checks Channel and EID information based on `rules/config/channel_eid_info.txt` to provide more accurate results. (#463) (@garigariganzy) **Bug Fixes:** -- Hayabusa now checks Channel and EID information based on `rules/config/channel_eid_info.txt` to provide more accurate results. (#463) (@garigariganzy) ## 1.7.0 [2022/09/29] From 55fbc0380ecca68590150f2d2827416cd051856d Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Sat, 8 Oct 2022 09:45:46 +0900 Subject: [PATCH 3/3] updated changelog #729 --- CHANGELOG-Japanese.md | 1 + CHANGELOG.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG-Japanese.md b/CHANGELOG-Japanese.md index 5b04507a..31d5110c 100644 --- a/CHANGELOG-Japanese.md +++ b/CHANGELOG-Japanese.md @@ -9,6 +9,7 @@ **バグ修正:** +- mericオプションのEventIDのキー名の数え上げが原因となっていたイベント集計の誤りを修正した。 (#729) (@hitenkoku) ## 1.7.0 [2022/09/29] diff --git a/CHANGELOG.md b/CHANGELOG.md index cdd1c1a2..9c8f6367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ **Bug Fixes:** +- Fixed duplicate event outputted with metric option due to sum up of event IDs key name. (#729) (@hitenkoku) ## 1.7.0 [2022/09/29]