PR Clone fix

rohitcoder · rohitcoder · commit 5e860b0359a1 · 2024-11-22T15:55:51.000+05:30
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/hela:v7
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/hela:v8
diff --git a/src/scans/tools/license_tool.rs b/src/scans/tools/license_tool.rs
@@ -1,20 +1,27 @@
-
 use std::{collections::HashMap, time::Instant};
 
 use mongodb::bson::uuid;
 use serde_json::json;
 
-use crate::{utils::{common::{execute_command, post_json_data}, file_utils::find_files_recursively}, scans::tools::sca_tool::SUPPORTED_MANIFESTS};
-
+use crate::{
+    scans::tools::sca_tool::SUPPORTED_MANIFESTS,
+    utils::{common::execute_command, file_utils::find_files_recursively},
+};
 
 pub struct LicenseTool;
 
 impl LicenseTool {
     pub fn new() -> Self {
         LicenseTool
     }
-    
-    pub async fn run_scan(&self, _path: &str, _commit_id: Option<&str>, _branch: Option<&str>, verbose: bool) {
+
+    pub async fn run_scan(
+        &self,
+        _path: &str,
+        _commit_id: Option<&str>,
+        _branch: Option<&str>,
+        verbose: bool,
+    ) {
         let start_time = Instant::now();
         if verbose {
             println!("[+] Running License compliance scan on path: {}", _path);
@@ -33,11 +40,11 @@ impl LicenseTool {
                 if let Some(_branch) = _branch {
                     let clone_command = format!("git clone -b {} {} /tmp/app", _branch, _path);
                     execute_command(&clone_command, false).await;
-                }else{
+                } else {
                     let clone_command = format!("git clone {} /tmp/app", _path);
                     execute_command(&clone_command, false).await;
                 }
-            }else{
+            } else {
                 if verbose {
                     println!("[+] Copying project to /tmp/app...");
                 }
@@ -58,20 +65,27 @@ impl LicenseTool {
             // now run secret scan on /tmp/code folder
             _path = format!("/tmp/code");
         }
-        let manifests = find_files_recursively(&_path, unsafe { SUPPORTED_MANIFESTS.to_vec() }, ignore_dirs).await;
+        let manifests =
+            find_files_recursively(&_path, unsafe { SUPPORTED_MANIFESTS.to_vec() }, ignore_dirs)
+                .await;
         let mut manifest_license = HashMap::new();
         for manifest in manifests.iter() {
             let file_name = manifest.split("/").last().unwrap();
             let folder_path = manifest.replace(file_name, "");
             let random_file_name = format!("{}.json", uuid::Uuid::new().to_string());
             // if manifest ends with pom.xml then pass -t java otherwise nothing
-            let mut license_command = format!("cd {} && cdxgen -o {}", folder_path, random_file_name);
+            let mut license_command =
+                format!("cd {} && cdxgen -o {}", folder_path, random_file_name);
             if file_name.ends_with("pom.xml") {
-                license_command = format!("cd {} && cdxgen -o {} -t java", folder_path, random_file_name);
+                license_command = format!(
+                    "cd {} && cdxgen -o {} -t java",
+                    folder_path, random_file_name
+                );
             }
             execute_command(&license_command, false).await;
             // Read JSON file and parse data
-            let license_json = std::fs::read_to_string(format!("{}/{}", folder_path, random_file_name)).unwrap();
+            let license_json =
+                std::fs::read_to_string(format!("{}/{}", folder_path, random_file_name)).unwrap();
             let json_data = serde_json::from_str::<serde_json::Value>(&license_json).unwrap();
             // extract license data from "components" key there will be list of components so grab licenses from there
             let components = json_data["components"].as_array().unwrap();
@@ -87,8 +101,14 @@ impl LicenseTool {
                         license_names.push(license["id"].as_str().unwrap().to_string());
                     }
                 }
-                component_licenses.insert(format!("{}@{}", component_name, component_version), license_names);
-                manifest_license.insert(format!("{}/{}", folder_path, file_name), component_licenses.clone());
+                component_licenses.insert(
+                    format!("{}@{}", component_name, component_version),
+                    license_names,
+                );
+                manifest_license.insert(
+                    format!("{}/{}", folder_path, file_name),
+                    component_licenses.clone(),
+                );
             }
         }
         // save data in output.json and before that get json data from output.json file if it exists and then append new data to it
@@ -99,10 +119,17 @@ impl LicenseTool {
             output_json = serde_json::from_str::<serde_json::Value>(&output_json_data).unwrap();
         }
         output_json["license"] = json!(manifest_license);
-        std::fs::write("/tmp/output.json", serde_json::to_string_pretty(&output_json).unwrap()).unwrap();
+        std::fs::write(
+            "/tmp/output.json",
+            serde_json::to_string_pretty(&output_json).unwrap(),
+        )
+        .unwrap();
         let end_time = Instant::now();
         let elapsed_time = end_time - start_time;
         let elapsed_seconds = elapsed_time.as_secs_f64().round();
-        println!("Execution time for License Compliance scan: {:?} seconds", elapsed_seconds);
+        println!(
+            "Execution time for License Compliance scan: {:?} seconds",
+            elapsed_seconds
+        );
     }
-}
+}
diff --git a/src/scans/tools/sast_tool.rs b/src/scans/tools/sast_tool.rs
@@ -21,7 +21,7 @@ impl SastTool {
     ) {
         let start_time = Instant::now();
         if verbose {
-            println!("[+] Running SAST scan on path: {}", _path.clone());
+            println!("[+] Running SAST scan on path: {}", _path);
         }
         println!("Commit ID: {:?}", _commit_id);
         println!("Branch: {:?}", _branch);
@@ -54,7 +54,7 @@ impl SastTool {
                 if verbose {
                     println!("[+] Copying project to /tmp/app...");
                 }
-                let copy_command = format!("cp -r {} /tmp/app", _path.clone());
+                let copy_command = format!("cp -r {} /tmp/app", _path);
                 execute_command(&copy_command, true).await;
             }
         }
diff --git a/src/scans/tools/sca_tool.rs b/src/scans/tools/sca_tool.rs
@@ -3,7 +3,7 @@ use std::{collections::HashMap, fs, time::Instant};
 use serde_json::{json, Value};
 
 use crate::utils::{
-    common::{checkout, execute_command, post_json_data},
+    common::{checkout, execute_command},
     file_utils::find_files_recursively,
 };
 
@@ -251,7 +251,7 @@ impl ScaTool {
                 if verbose {
                     println!("[+] Copying project to /tmp/app...");
                 }
-                let copy_command = format!("cp -r {} /tmp/app", _path.clone());
+                let copy_command = format!("cp -r {} /tmp/app", _path);
                 execute_command(&copy_command, true).await;
             }
         }
diff --git a/src/scans/tools/secret_tool.rs b/src/scans/tools/secret_tool.rs
@@ -32,7 +32,7 @@ impl SecretTool {
                 if verbose {
                     println!("[+] Copying project to /tmp/app...");
                 }
-                let copy_command = format!("cp -r {} /tmp/app", _path.clone());
+                let copy_command = format!("cp -r {} /tmp/app", _path);
                 execute_command(&copy_command, true).await;
             }
         }
diff --git a/src/utils/common.rs b/src/utils/common.rs

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ impl SastTool {`
`21`	`21`	`) {`
`22`	`22`	`let start_time = Instant::now();`
`23`	`23`	`if verbose {`
`24`		`- println!("[+] Running SAST scan on path: {}", _path.clone());`
	`24`	`+ println!("[+] Running SAST scan on path: {}", _path);`
`25`	`25`	`}`
`26`	`26`	`println!("Commit ID: {:?}", _commit_id);`
`27`	`27`	`println!("Branch: {:?}", _branch);`
`@@ -54,7 +54,7 @@ impl SastTool {`
`54`	`54`	`if verbose {`
`55`	`55`	`println!("[+] Copying project to /tmp/app...");`
`56`	`56`	`}`
`57`		`- let copy_command = format!("cp -r {} /tmp/app", _path.clone());`
	`57`	`+ let copy_command = format!("cp -r {} /tmp/app", _path);`
`58`	`58`	`execute_command(&copy_command, true).await;`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ use std::{collections::HashMap, fs, time::Instant};`
`3`	`3`	`use serde_json::{json, Value};`
`4`	`4`
`5`	`5`	`use crate::utils::{`
`6`		`- common::{checkout, execute_command, post_json_data},`
	`6`	`+ common::{checkout, execute_command},`
`7`	`7`	`file_utils::find_files_recursively,`
`8`	`8`	`};`
`9`	`9`
`@@ -251,7 +251,7 @@ impl ScaTool {`
`251`	`251`	`if verbose {`
`252`	`252`	`println!("[+] Copying project to /tmp/app...");`
`253`	`253`	`}`
`254`		`- let copy_command = format!("cp -r {} /tmp/app", _path.clone());`
	`254`	`+ let copy_command = format!("cp -r {} /tmp/app", _path);`
`255`	`255`	`execute_command(&copy_command, true).await;`
`256`	`256`	`}`
`257`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ impl SecretTool {`
`32`	`32`	`if verbose {`
`33`	`33`	`println!("[+] Copying project to /tmp/app...");`
`34`	`34`	`}`
`35`		`- let copy_command = format!("cp -r {} /tmp/app", _path.clone());`
	`35`	`+ let copy_command = format!("cp -r {} /tmp/app", _path);`
`36`	`36`	`execute_command(&copy_command, true).await;`
`37`	`37`	`}`
`38`	`38`	`}`