corgea-cli 1.8.1__tar.gz → 1.8.2__tar.gz

{corgea_cli-1.8.1 → corgea_cli-1.8.2}/Cargo.lock

@@ -311,7 +311,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "corgea"
-version = "1.8.1"
+version = "1.8.2"
 dependencies = [
  "chrono",
  "clap",

{corgea_cli-1.8.1 → corgea_cli-1.8.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "corgea"
-version = "1.8.1"
+version = "1.8.2"
 edition = "2021"
 readme = "README.md"
 

{corgea_cli-1.8.1 → corgea_cli-1.8.2}/PKG-INFO

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

{corgea_cli-1.8.1 → corgea_cli-1.8.2}/src/main.rs

@@ -52,6 +52,12 @@ enum Commands {
     Upload {
         /// Option path to JSON report to upload
         report: Option<String>,
+
+        #[arg(
+            long,
+            help = "The name of the Corgea project. Defaults to git repository name if found, otherwise to the current directory name."
+        )]
+        project_name: Option<String>,
     },
     /// Scan the current directory. Supports blast, semgrep and snyk.
     Scan {
@@ -236,18 +242,18 @@ fn main() {
                 }
             }
         }
-        Some(Commands::Upload { report }) => {
+        Some(Commands::Upload { report, project_name }) => {
             verify_token_and_exit_when_fail(&corgea_config);
             match report {
                 Some(report) => {
                     if report.ends_with(".fpr") {
-                        fortify_parse(&corgea_config, report);
+                        fortify_parse(&corgea_config, report, project_name.clone());
                     } else {
-                        scan::read_file_report(&corgea_config, report);
+                        scan::read_file_report(&corgea_config, report, project_name.clone());
                     }
                 }
                 None => {
-                    scan::read_stdin_report(&corgea_config);
+                    scan::read_stdin_report(&corgea_config, project_name.clone());
                 }
             }
         }
@@ -332,8 +338,8 @@ fn main() {
                 }
             }
             match scanner {
-                Scanner::Snyk => scan::run_snyk(&corgea_config),
-                Scanner::Semgrep => scan::run_semgrep(&corgea_config),
+                Scanner::Snyk => scan::run_snyk(&corgea_config, project_name.clone()),
+                Scanner::Semgrep => scan::run_semgrep(&corgea_config, project_name.clone()),
                 Scanner::Blast => scanners::blast::run(&corgea_config, fail_on.clone(), fail, only_uncommitted, scan_type.clone(), policy.clone(), out_format.clone(), out_file.clone(), target.clone(), project_name.clone())
             }
         }

{corgea_cli-1.8.1 → corgea_cli-1.8.2}/src/scan.rs

@@ -51,7 +51,7 @@ pub struct ScanUploadResult {
     pub project_id: Option<String>,
 }
 
-pub fn run_semgrep(config: &Config) {
+pub fn run_semgrep(config: &Config, project_name: Option<String>) {
     println!("Scanning with semgrep...");
     let base_command = "semgrep";
     let mut command = std::process::Command::new(base_command);
@@ -61,12 +61,12 @@ pub fn run_semgrep(config: &Config) {
 
     let output = run_command(&base_command.to_string(), command);
 
-    if let Some(result) = parse_scan(config, output, true) {
+    if let Some(result) = parse_scan(config, output, true, project_name) {
         crate::wait::run(config, Some(result.scan_id), result.project_id);
     }
 }
 
-pub fn run_snyk(config: &Config) {
+pub fn run_snyk(config: &Config, project_name: Option<String>) {
     println!("Scanning with snyk...");
     let base_command = "snyk";
     let mut command = std::process::Command::new(base_command);
@@ -76,19 +76,19 @@ pub fn run_snyk(config: &Config) {
 
     let output = run_command(&base_command.to_string(), command);
 
-    if let Some(result) = parse_scan(config, output, true) {
+    if let Some(result) = parse_scan(config, output, true, project_name) {
         crate::wait::run(config, Some(result.scan_id), result.project_id);
     }
 }
 
-pub fn read_stdin_report(config: &Config) {
+pub fn read_stdin_report(config: &Config, project_name: Option<String>) {
     let mut input = String::new();
     let _ = io::stdin().read_to_string(&mut input);
 
-    let _ = parse_scan(config, input, false);
+    let _ = parse_scan(config, input, false, project_name);
 }
 
-pub fn read_file_report(config: &Config, file_path: &str) {
+pub fn read_file_report(config: &Config, file_path: &str, project_name: Option<String>) {
     let input = match std::fs::read_to_string(file_path) {
         Ok(input) => input,
         Err(e) => {
@@ -97,10 +97,10 @@ pub fn read_file_report(config: &Config, file_path: &str) {
         }
     };
 
-    let _ = parse_scan(config, input, false);
+    let _ = parse_scan(config, input, false, project_name);
 }
 
-pub fn parse_scan(config: &Config, input: String, save_to_file: bool) -> Option<ScanUploadResult> {
+pub fn parse_scan(config: &Config, input: String, save_to_file: bool, project_name: Option<String>) -> Option<ScanUploadResult> {
     debug("Parsing the scan report");
 
     // Remove BOM (Byte Order Mark) if present
@@ -115,7 +115,7 @@ pub fn parse_scan(config: &Config, input: String, save_to_file: bool) -> Option<
                 std::process::exit(0);
             }
 
-            return upload_scan(config, parse_result.paths, parse_result.scanner, cleaned_input.to_string(), save_to_file);
+            return upload_scan(config, parse_result.paths, parse_result.scanner, cleaned_input.to_string(), save_to_file, project_name);
         }
 
         Err(error_message) => {
@@ -125,7 +125,7 @@ pub fn parse_scan(config: &Config, input: String, save_to_file: bool) -> Option<
     }
 }
 
-pub fn upload_scan(config: &Config, paths: Vec<String>, scanner: String, input: String, save_to_file: bool) -> Option<ScanUploadResult> {
+pub fn upload_scan(config: &Config, paths: Vec<String>, scanner: String, input: String, save_to_file: bool, project_name: Option<String>) -> Option<ScanUploadResult> {
     let in_ci = running_in_ci();
     let ci_platform = which_ci();
     let github_env_vars = get_github_env_vars();
@@ -133,7 +133,6 @@ pub fn upload_scan(config: &Config, paths: Vec<String>, scanner: String, input:
     let run_id = Uuid::new_v4().to_string();
     let token = config.get_token();
     let base_url = config.get_url();
-    let current_dir = std::env::current_dir().expect("Failed to get current directory");
     let project;
 
     if in_ci {
@@ -142,7 +141,7 @@ pub fn upload_scan(config: &Config, paths: Vec<String>, scanner: String, input:
                           github_env_vars.get("GITHUB_REPOSITORY").expect("Failed to get GITHUB_REPOSITORY").to_string(),
                           github_env_vars.get("GITHUB_PR").expect("Failed to get GITHUB_REPOSITORY").to_string())
     } else {
-        project = current_dir.file_name().expect("Failed to get directory name").to_str().expect("Failed to convert OsStr to str").to_string();
+        project = utils::generic::determine_project_name(project_name.as_deref());
     }
     let repo_data = std::env::var("REPO_DATA").unwrap_or_else(|_| "".to_string()); //encoded data to forward.
 

{corgea_cli-1.8.1 → corgea_cli-1.8.2}/src/scanners/fortify.rs

@@ -9,7 +9,7 @@ use quick_xml::reader::Reader;
 use crate::Config;
 use crate::scan::upload_scan;
 
-pub fn parse(config: &Config, file_path: &str) {
+pub fn parse(config: &Config, file_path: &str, project_name: Option<String>) {
     let temp_dir = match TempDir::new() {
         Ok(dir) => dir,
         Err(e) => {
@@ -48,7 +48,7 @@ pub fn parse(config: &Config, file_path: &str) {
         }
 
         let (scan_data, paths) = extract_file_path(outpath);
-        let _scan_id = upload_scan(config, paths, "fortify".to_string(), scan_data, false);
+        let _scan_id = upload_scan(config, paths, "fortify".to_string(), scan_data, false, project_name);
     } else {
         println!("File 'audit.fvdl' not found in the archive");
     };