From ff185419a0c6f5b7b097fc8bec32b2da9e1169cf Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Tue, 19 Dec 2023 11:36:16 +0900 Subject: [PATCH 1/4] UI(main): added message about reporting issues and FPss when json-timeline or csv-timeline is used #1236 --- src/main.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main.rs b/src/main.rs index 57314c14f..945324a50 100644 --- a/src/main.rs +++ b/src/main.rs @@ -726,6 +726,15 @@ impl App { "General Overview {#general_overview}", &stored_static.html_report_flag, ); + match stored_static.config.action { + Some(Action::CsvTimeline(_)) | Some(Action::JsonTimeline(_)) => { + println!(); + println!("Please report any issues with Hayabusa rules to: https://github.com/Yamato-Security/hayabusa-rules/issues"); + println!("Please report any false positives with Sigma rules to: https://github.com/SigmaHQ/sigma/issues"); + println!("Please submit new detection rules with pull requests to: https://github.com/SigmaHQ/sigma/pulls"); + } + _ => {} + } // Qオプションを付けた場合もしくはパースのエラーがない場合はerrorのstackが0となるのでエラーログファイル自体が生成されない。 if ERROR_LOG_STACK.lock().unwrap().len() > 0 { From 185238b0a54e68ee5c38631b97335c678d0e8f26 Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Tue, 19 Dec 2023 11:40:32 +0900 Subject: [PATCH 2/4] docs(CHANGELOG): added #1236 --- CHANGELOG-Japanese.md | 1 + CHANGELOG.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG-Japanese.md b/CHANGELOG-Japanese.md index f1b296f58..1ceec5afc 100644 --- a/CHANGELOG-Japanese.md +++ b/CHANGELOG-Japanese.md @@ -5,6 +5,7 @@ **改善:** - JSON出力において、MitreTactics、MitreTags, OtherTagsの出力を要素ごとに文字列で出力させるように修正した。 (#1230) (@hitenkoku) +- `csv-timeline` or `json-timeline` コマンドが利用されたときにissueやpull-requestの連絡先についてのメッセージを追加した。 (#1236) (@hitenkoku) **バグ修正:** diff --git a/CHANGELOG.md b/CHANGELOG.md index ec5f51f3f..9aca5ca29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ **Enhancements:** - `%MitreTactics%`, `%MitreTags%`, `%OtherTags%` fields are now outputted as an array of strings in JSON output. (#1230) (@hitenkoku) +- Printed message about reporting issues and false positives when `csv-timeline` or `json-timeline` command was used. (#1236) (@hitenkoku) **Bug Fixes:** From 7a2e09de199c09ff562cd2381ca0922a74155a8f Mon Sep 17 00:00:00 2001 From: Yamato Security <71482215+YamatoSecurity@users.noreply.github.com> Date: Tue, 19 Dec 2023 15:40:52 +0900 Subject: [PATCH 3/4] update msg --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 945324a50..dfa100784 100644 --- a/src/main.rs +++ b/src/main.rs @@ -731,7 +731,7 @@ impl App { println!(); println!("Please report any issues with Hayabusa rules to: https://github.com/Yamato-Security/hayabusa-rules/issues"); println!("Please report any false positives with Sigma rules to: https://github.com/SigmaHQ/sigma/issues"); - println!("Please submit new detection rules with pull requests to: https://github.com/SigmaHQ/sigma/pulls"); + println!("Please submit new Sigma rules with pull requests to: https://github.com/SigmaHQ/sigma/pulls"); } _ => {} } From de2f9ffcefa78106b5318dd7cc4dd7e9ccb4f319 Mon Sep 17 00:00:00 2001 From: Yamato Security <71482215+YamatoSecurity@users.noreply.github.com> Date: Tue, 19 Dec 2023 15:42:04 +0900 Subject: [PATCH 4/4] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aca5ca29..e2070593a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ **Enhancements:** - `%MitreTactics%`, `%MitreTags%`, `%OtherTags%` fields are now outputted as an array of strings in JSON output. (#1230) (@hitenkoku) -- Printed message about reporting issues and false positives when `csv-timeline` or `json-timeline` command was used. (#1236) (@hitenkoku) +- Output messages about reporting issues and false positives when using `csv-timeline` or `json-timeline` commands. (#1236) (@hitenkoku) **Bug Fixes:**