corgea-cli 1.3.1__tar.gz → 1.3.3__tar.gz

{corgea_cli-1.3.1 → corgea_cli-1.3.3}/Cargo.lock

@@ -195,7 +195,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "corgea"
-version = "1.3.1"
+version = "1.3.3"
 dependencies = [
  "clap",
  "dirs",

{corgea_cli-1.3.1 → corgea_cli-1.3.3}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "corgea"
-version = "1.3.1"
+version = "1.3.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

{corgea_cli-1.3.1 → corgea_cli-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: corgea-cli
-Version: 1.3.1
+Version: 1.3.3
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{corgea_cli-1.3.1 → corgea_cli-1.3.3}/src/scan.rs

@@ -144,7 +144,7 @@ pub fn parse_scan(config: &Config, input: String, save_to_file: bool) {
                     }
                 }
             // checkmarx report generated by CLI
-            } else if input.contains("Cx") && data.get("results").is_some() && data.get("scanID").is_some() {
+            } else if data.get("totalCount").is_some() && data.get("results").is_some() && data.get("scanID").is_some() {
                 debug("Detected checkmarx cli schema");
                 scanner = "checkmarx".to_string();
                 if let Some(results) = data.get("results").and_then(|v| v.as_array()) {
@@ -163,7 +163,7 @@ pub fn parse_scan(config: &Config, input: String, save_to_file: bool) {
                     }
                 }
             // for checkmarx report generated by web
-            } else if input.contains("Cx") && data.get("scanResults").is_some() && data.get("reportId").is_some() {
+            } else if data.get("scanResults").is_some() && data.get("reportId").is_some() {
                 debug("Detected checkmarx web schema");
                 scanner = "checkmarx".to_string();
                 if let Some(scan_results) = data.get("scanResults") {
@@ -244,6 +244,8 @@ fn upload_scan(config: &Config, paths: Vec<String>, scanner: String, input: Stri
     println!("Uploading required files for the scan...");
 
     let mut uploaded_paths = HashSet::new();
+    let mut uploaded_count = 0;
+    let mut upload_error_count = 0;
 
     for path in &paths {
         if !Path::new(&path).exists() {
@@ -261,30 +263,47 @@ fn upload_scan(config: &Config, paths: Vec<String>, scanner: String, input: Stri
         debug(&format!("Uploading file: {}", path));
         let fp = Path::new(&path);
 
-        let form = reqwest::blocking::multipart::Form::new()
-            .file("file", fp)
-            .expect("Failed to read file");
-
-
-        debug(&format!("POST: {}", src_upload_url));
-        let res = client.post(&src_upload_url)
-            .multipart(form)
-            .send();
-
-        match res {
-            Ok(response) => {
-                if !response.status().is_success() {
-                    eprintln!("Failed to upload file: {}", response.status());
+        let mut attempts = 0;
+        let mut success = false;
+
+        while attempts < 3 && !success {
+            let form = reqwest::blocking::multipart::Form::new()
+                .file("file", fp)
+                .expect("Failed to read file");
+
+            debug(&format!("POST: {}", src_upload_url));
+            let res = client.post(&src_upload_url)
+                .multipart(form)
+                .send();
+
+            match res {
+                Ok(response) => {
+                    if !response.status().is_success() {
+                        eprintln!("Failed to upload file {} {}... retrying", response.status(), path);
+                        std::thread::sleep(std::time::Duration::from_secs(1));
+                        attempts += 1;
+                    } else {
+                        uploaded_count += 1;
+                        success = true;
+                        uploaded_paths.insert(path.clone());
+                    }
+                }
+                Err(e) => {
+                    eprintln!("Failed to send request: {}", e);
                     std::process::exit(1);
-                } else {
-                    uploaded_paths.insert(path.clone());
                 }
             }
-            Err(e) => {
-                eprintln!("Failed to send request: {}", e);
-                std::process::exit(1);
-            }
         }
+
+        if attempts == 3 && !success {
+            upload_error_count += 1;
+            eprintln!("Failed to upload file: {} after 3 attempts. skipping...", path);
+        }
+    }
+
+    if uploaded_count == 0 {
+        eprintln!("Failed to upload any files for the scan, exiting.");
+        std::process::exit(1);
     }
 
     println!("Uploading the scan...");
@@ -371,5 +390,10 @@ fn upload_scan(config: &Config, paths: Vec<String>, scanner: String, input: Stri
     }
 
     println!("Successfully scanned using {} and uploaded to Corgea.", scanner);
+
+    if upload_error_count > 0 {
+        println!("Failed to upload {} files, you may not see all fixes in Corgea.", upload_error_count);
+    }
+
     println!("Go to {base_url} to see results.");
 }