Fixed alerting and save input.

Author: Sandesh Grangdan

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "antivirus"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 # Github Repo
@@ -12,6 +12,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 clap = { version = "4.5.16", features = ["derive"] }
+rand = "0.8.5"
 regex = "1.10.6"
 tokio = {version = "1.40.0" , features = ["full"] }
 

Cargo.toml

@@ -17,10 +17,10 @@ A command-line utility for scanning directories with ClamAV, updating virus defi
 
 ### *Method 2*: Install prebuilt binaries via shell script (Linux, macOS)
 ```bash
-curl --proto '=https' --tlsv1.2 -LsSf https://github.com/sandeshgrangdan/antivirus/releases/download/v0.1.2/antivirus-installer.sh | sh
+curl --proto '=https' --tlsv1.2 -LsSf https://github.com/sandeshgrangdan/antivirus/releases/download/v0.1.3/antivirus-installer.sh | sh
 ```
 
-### *Method 3*:
+### *SETUP PATH*:
 To add $HOME/.cargo/bin to your PATH, either restart your shell or run:
 ```bash
     source $HOME/.cargo/env (sh, bash, zsh)
@@ -40,7 +40,6 @@ $ antivirus
 ```
 >You need to first setup freshclam
 - *(Linux)*: Create /usr/local/etc/clamav/freshclam.conf from /usr/local/etc/clamav/freshclam.conf.sample.
-- *(MacOS)*: Create /opt/homebrew/etc/clamav/freshclam.conf from /opt/homebrew/etc/clamav/freshclam.conf.sample (For Mac).
 - Remove or comment-out the Example line from freshclam.conf
 - Run freshclam to download the latest malware definitions.
 ```

README.md

@@ -1,9 +1,10 @@
 use std::{env, thread};
 use std::process::{Command, Stdio};
 use std::io::{self, BufRead};
+use rand::Rng;
 use regex::Regex;
 use clap::Parser;
-use std::fs;
+use std::fs::{self, File};
 use std::io::Write;
 
 mod linux;
@@ -26,7 +27,9 @@ pub struct Antivirus {
     home_dir: String,
     google_chat_url: String,
     summary: String,
-    args: Args
+    infected_files: String,
+    args: Args,
+    tmp_file : String
 }
 
 fn is_clamav_installed() -> io::Result<bool> {
@@ -37,6 +40,14 @@ fn is_clamav_installed() -> io::Result<bool> {
     Ok(!output.stdout.is_empty())
 }
 
+fn generate_random_file_name() -> String {
+    let mut rng = rand::thread_rng();
+    let random_string: String = (0..10)
+        .map(|_| rng.sample(rand::distributions::Alphanumeric) as char)
+        .collect();
+    format!("/tmp/{}.txt", random_string)
+}
+
 fn handle_freshclam_copy(path: &str) -> std::io::Result<()>{
     let sample_path = format!("{}/freshclam.conf.sample",path);
     let config_path = &format!("{}/freshclam.conf",path);
@@ -178,6 +189,8 @@ impl Antivirus {
         Self {
             home_dir : env::var("HOME").expect("Failed to get HOME directory"),
             summary: String::new(),
+            infected_files: String::new(),
+            tmp_file: generate_random_file_name(),
             google_chat_url,
             args
         }
@@ -195,8 +208,8 @@ impl Antivirus {
             "--archive-verbose",
             "--alert-exceeds-max=yes",
             "--alert-encrypted=yes",
-            "--max-filesize=4095M",
-            "--max-scansize=4095M",
+            "--max-filesize=10000M",
+            "--max-scansize=10000M",
             "--max-files=1000000",
             "--max-recursion=512",
             "--max-htmlnotags=256M",
@@ -212,6 +225,7 @@ impl Antivirus {
         .expect("Failed to execute clamscan");
 
         let regex_patterns = vec![
+            Regex::new(r": FOUND$").unwrap(),
             Regex::new(r"^----------- SCAN SUMMARY -----------").unwrap(),
             Regex::new(r"^Known viruses:").unwrap(),
             Regex::new(r"^Engine version:").unwrap(),
@@ -225,6 +239,10 @@ impl Antivirus {
             Regex::new(r"^End Date:").unwrap(),
         ];
 
+        let infected_regex_patterns = vec![
+            Regex::new(r": FOUND$").unwrap(),
+        ];
+
         self.summary.push_str(&format!("{}\n\n", self.home_dir));
 
         if let Some(stdout) = child.stdout.take() {
@@ -236,6 +254,9 @@ impl Antivirus {
                         if regex_patterns.iter().any(|regex| regex.is_match(&line)) {
                             self.summary.push_str(&format!("{}\n", line));
                         }
+                        if infected_regex_patterns.iter().any(|regex| regex.is_match(&line)) {
+                            self.infected_files.push_str(&format!("{}\n", line));
+                        }
                     },
                     Err(err) => eprintln!("Error reading line: {}", err),
                 }
@@ -248,37 +269,44 @@ impl Antivirus {
 
     }
 
-    pub async fn notify(&self){
+    pub async fn notify(&mut self){
         if self.google_chat_url != "" {
-
-            let message = format!(r#"{{"text": "{}"}}"#, self.summary);
-
-            let output = Command::new("curl")
-                .arg("-X")
-                .arg("POST")
-                .arg("-H")
-                .arg("Content-Type: application/json")
-                .arg("-d")
-                .arg(message)
-                .arg(&self.google_chat_url)
-                .output()
-                .expect("Failed to execute curl");
-
-            if output.status.success() {
-                println!("Message sent successfully to google chat!");
-            } else {
-                println!("Failed to send message.");
+            self.google_chat(&self.summary);
+            if self.infected_files != "" {
+                self.infected_files.push_str(&format!("\nResult Output: {}\n", self.tmp_file));
+                self.google_chat(&self.infected_files);
             }
         }
     }
 
-    // fn generate_random_file_name() -> String {
-    //     let mut rng = rand::thread_rng();
-    //     let random_string: String = (0..10)
-    //         .map(|_| rng.sample(rand::distributions::Alphanumeric) as char)
-    //         .collect();
-    //     format!("/tmp/{}.txt", random_string)
-    // }
+    fn google_chat(&self,message: &String){
+        let send_message = format!(r#"{{"text": "{}"}}"#, message);
+
+        let output = Command::new("curl")
+            .arg("-X")
+            .arg("POST")
+            .arg("-H")
+            .arg("Content-Type: application/json")
+            .arg("-d")
+            .arg(send_message)
+            .arg(&self.google_chat_url)
+            .output()
+            .expect("Failed to execute curl");
+
+        if output.status.success() {
+            println!("Message sent successfully to google chat!");
+        } else {
+            println!("Failed to send message.");
+        }
+    }
 
+    pub fn save_infected_file_on_temp(&self){
+        let mut output = File::create(&self.tmp_file).unwrap();
+
+        write!(output, "{}", self.summary).unwrap();
+        if self.infected_files != "" {
+            write!(output, "{}", self.infected_files).unwrap();
+        }
+    }
 
 }

src/antivirus.rs

@@ -8,5 +8,7 @@ async fn main() {
 
     app.scan();
     app.notify().await;
+
+    app.save_infected_file_on_temp();
 }