refactor: rename and reorganize alert reporting for improved clarity and functionality

Author: Kremilly

src/core/dump.rs

@@ -18,7 +18,7 @@ use crate::{
     handlers::dump_handlers::DumpHandlers,
 
     ui::{
-        normal_alerts::NormalAlerts, 
+        report_alerts::ReportAlerts, 
         success_alerts::SuccessAlerts
     },
 
@@ -132,7 +132,7 @@ impl Dump {
             let dump_count = DUMP_COUNT.load(Ordering::SeqCst);
 
             if let Some(last_dump) = DumpHandlers.get_most_recent_sql_file(&dump_file_path_clone) {
-                NormalAlerts::report(&dump_file_path_clone, dump_count, &last_dump);
+                ReportAlerts::report(&dump_file_path_clone, dump_count, &last_dump);
             }
 
             SuccessAlerts::terminate();

src/plugins/reports_xss.rs

@@ -10,8 +10,8 @@ use std::{
 
 use crate::{
     utils::file::FileUtils,
-    ui::report_alerts::ReportAlerts,
     handlers::html_handlers::HTMLHandlers,
+    ui::report_xss_alerts::ReportXSSAlerts,
 
     constants::{
         urls::Urls,
@@ -50,7 +50,7 @@ impl ReportsXSS {
 
         file.write_all(b"</XSSDetectionReport>\n")?;
 
-        ReportAlerts::generated(output_path);
+        ReportXSSAlerts::generated(output_path);
         Ok(())
     }
 
@@ -68,7 +68,7 @@ impl ReportsXSS {
             writeln!(file, "---------------------")?;
         }
 
-        ReportAlerts::generated(output_path);
+        ReportXSSAlerts::generated(output_path);
         Ok(())
     }
 
@@ -87,7 +87,7 @@ impl ReportsXSS {
 
         writer.flush()?;
 
-        ReportAlerts::generated(output_path);
+        ReportXSSAlerts::generated(output_path);
         Ok(())
     }
 
@@ -105,7 +105,7 @@ impl ReportsXSS {
         let file = File::create(output_path)?;
         to_writer_pretty(file, &detections)?;
 
-        ReportAlerts::generated(output_path);
+        ReportXSSAlerts::generated(output_path);
         Ok(())
     }
 
@@ -135,7 +135,7 @@ impl ReportsXSS {
 
         file.write_all(b"</table></div></body></html>")?;
 
-        ReportAlerts::generated(output_path);
+        ReportXSSAlerts::generated(output_path);
         Ok(())
     }
 
@@ -149,7 +149,7 @@ impl ReportsXSS {
                 "xml" => self.xml(detections, file_path),
                 "json" => self.json(detections, file_path),
                 "html" => self.html(detections, file_path),
-                _ => Ok(ReportAlerts::invalid_format()),
+                _ => Ok(ReportXSSAlerts::invalid_format()),
             };
 
             result?;

src/ui/mod.rs

@@ -3,9 +3,10 @@ pub mod ui_base;
 pub mod scan_alerts;
 pub mod share_alerts;
 pub mod schema_alerts;
-pub mod report_alerts;
 pub mod checksum_alerts;
+pub mod report_xss_alerts;
 
 pub mod normal_alerts;
+pub mod report_alerts;
 pub mod errors_alerts;
 pub mod success_alerts;

src/ui/normal_alerts.rs

@@ -19,12 +19,4 @@ impl NormalAlerts {
         );
     }
 
-    pub fn report(dump_file_path: &str, dump_count: usize, last_dump: &str) {
-        println!("\nFinal Report:\n");
-
-        println!("Directory: {}", dump_file_path.bold().blue());
-        println!("Total number of dumps: {}", dump_count.to_string().bold().blue());
-        println!("Last dump: {}", last_dump.bold().cyan());
-    }
-
 }

src/ui/report_alerts.rs

@@ -6,18 +6,12 @@ pub struct ReportAlerts;
 
 impl ReportAlerts {
 
-    pub fn generated(output_path: &str) {
-        println!("{}", "-".repeat(50));
-        println!("Report generated and salved in: {}", output_path.green());
-    }
-
-    pub fn invalid_format() {
-        let message = "Invalid file format, only TXT, CSV, HTML and JSON are supported.";
+    pub fn report(dump_file_path: &str, dump_count: usize, last_dump: &str) {
+        println!("\nFinal Report:\n");
 
-        println!("{}", "-".repeat(50));
-        println!(
-            "{}", message.red().bold(), 
-        );
+        println!("Directory: {}", dump_file_path.bold().blue());
+        println!("Total number of dumps: {}", dump_count.to_string().bold().blue());
+        println!("Last dump: {}", last_dump.bold().cyan());
     }
 
 }

src/ui/report_xss_alerts.rs

@@ -0,0 +1,23 @@
+extern crate colored;
+
+use colored::*;
+
+pub struct ReportXSSAlerts;
+
+impl ReportXSSAlerts {
+
+    pub fn generated(output_path: &str) {
+        println!("{}", "-".repeat(50));
+        println!("Report generated and salved in: {}", output_path.green());
+    }
+
+    pub fn invalid_format() {
+        let message = "Invalid file format, only TXT, CSV, HTML and JSON are supported.";
+
+        println!("{}", "-".repeat(50));
+        println!(
+            "{}", message.red().bold(), 
+        );
+    }
+
+}