update color scheme

CHANGELOG-Japanese.md

@@ -11,6 +11,7 @@
 - `yaml-rust`クレートを`yaml-rust2`に更新した。(#461) (@yamatosecurity)
 - `windash`文字が、`rules/config/windash_characters.txt`から動的に読み込まれるようになった。(#1440) (@fukusuket)
 - `logon-summary`コマンドがRDPイベントからのログオン情報を表示するようになった。注意: ファイルに保存する場合、Hayabusaはより詳細な情報を出力する。(#1468) (@fukusuket)
+- 見やすくなるように色を更新した。 (#1480) (@yamatosecurity)
 
 **バグ修正:**
 

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Updated the `yaml-rust` crate to `yaml-rust2`. (#461) (@yamatosecurity)
 - `windash` characters are now being dynamically read from `rules/config/windash_characters.txt`. (#1440) (@fukusuket)
 - `logon-summary` command now displays logon information from RDP events. Note: Hayabusa will output more detailed information when saving to a file. (#1468) (@fukusuket)
+- The colors were updated to make it easier to read. (#1480) (@yamatosecurity)
 
 **Bug Fixes:**
 

Cargo.toml

@@ -9,11 +9,13 @@ include = ["src/**/*", "LICENSE.txt", "README.md", "CHANGELOG.md"]
 
 [dependencies]
 aho-corasick = "*"
+ansi_term = "0.*"
 base64 = "*"
 bytesize = "1.*"
 chrono = "0.4.*"
 cidr-utils = "0.6.*"
 clap = { version = "4.*", features = ["derive", "cargo", "color"]}
+colored = "2"
 comfy-table = "7.*"
 compact_str = "0.8.*"
 console = "0.15.*"

src/main.rs

@@ -23,6 +23,7 @@ use std::{
 use bytesize::ByteSize;
 use chrono::{DateTime, Datelike, Local, NaiveDateTime, Utc};
 use clap::Command;
+use colored::Colorize;
 use compact_str::CompactString;
 use console::{style, Style};
 use dialoguer::Confirm;
@@ -779,7 +780,7 @@ impl App {
                 for profile in profile_list.iter() {
                     write_color_buffer(
                         &BufferWriter::stdout(ColorChoice::Always),
-                        Some(Color::Green),
+                        Some(Color::Rgb(0, 255, 0)),
                         &format!("- {:<25}", &format!("{}:", profile[0])),
                         false,
                     )
@@ -1539,20 +1540,27 @@ impl App {
         }
 
         let template = if stored_static.common_options.no_color {
-            "[{elapsed_precise}] {human_pos} / {human_len} {spinner} [{bar:40}] {percent}%\r\n\r\n{msg}"
+            "[{elapsed_precise}] {human_pos} / {human_len} {spinner} [{bar:40}] {percent}%\r\n\r\n{msg}".to_string()
         } else {
-            "[{elapsed_precise}] {human_pos} / {human_len} {spinner:.green} [{bar:40.green}] {percent}%\r\n\r\n{msg}"
+            let spinner = "{spinner}".truecolor(0, 255, 0).to_string();
+            let bar = "{bar:40}".truecolor(0, 255, 0).to_string();
+            format!(
+                "[{{elapsed_precise}}] {{human_pos}} / {{human_len}} {} [{}] {{percent}}%\r\n\r\n{{msg}}",
+                spinner, bar
+            )
         };
-        let progress_style = ProgressStyle::with_template(template)
+
+        let progress_style = ProgressStyle::with_template(&template) // Pass `&template` here
             .unwrap()
             .progress_chars("=> ");
+
         let pb = ProgressBar::with_draw_target(
             Some(evtx_files.len() as u64),
             ProgressDrawTarget::stdout_with_hz(10),
         )
         .with_tab_width(55);
         pb.set_style(progress_style);
-        // I tried progress bar with low memory option(output log on detection) but it seemts that progress bar didn't go well with low memory option.
+        // I tried progress bar with low memory option(output log on detection) but it seems that progress bar didn't go well with low memory option.
         // I disabled progress bar if low memory option is specified.
         let is_show_progress = !stored_static.is_low_memory || stored_static.output_path.is_some();
         if is_show_progress {
@@ -2321,7 +2329,7 @@ impl App {
         let output_color = if stored_static.common_options.no_color {
             None
         } else {
-            Some(Color::Green)
+            Some(Color::Rgb(0,255,0))
         };
         write_color_buffer(
             &BufferWriter::stdout(ColorChoice::Always),