conviso-cli 2.2.27rc0__tar.gz → 2.3.0.dev0__tar.gz

{conviso-cli-2.2.27rc0 → conviso-cli-2.3.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.2.27rc0
+Version: 2.3.0.dev0
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com

{conviso-cli-2.2.27rc0 → conviso-cli-2.3.0.dev0}/conviso_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.2.27rc0
+Version: 2.3.0.dev0
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com

{conviso-cli-2.2.27rc0 → conviso-cli-2.3.0.dev0}/convisoappsec/flowcli/ast/entrypoint.py

@@ -172,26 +172,31 @@ def perform_deploy(context, flow_context, prepared_context):
             try:
                 branch_name = git_adapter.get_branch_name()
             except Exception:
-                LOGGER.warning("HEAD is detached. Checking for 'main' or 'master'...")
+                LOGGER.warning("HEAD is detached. Checking for latest branch ...")
 
                 result = subprocess.run(
-                    ["git", "branch", "--list", "main", "master"],
+                    ["git", "for-each-ref", "--sort=-creatordate", "--format=%(refname:short)", "refs/heads/"],
                     cwd=repository_dir,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
                     check=True
                 )
+
                 branches = result.stdout.decode().splitlines()
-                branches = [branch.strip() for branch in branches]
 
-                if "main" in branches:
-                    branch_name = "main"
-                elif "master" in branches:
-                    branch_name = "master"
+                if branches:
+                    branch_name = branches[0]
                 else:
-                    LOGGER.warning("Failed to find a branch 'main' or 'master'.")
+                    LOGGER.warning("Failed to find a branch.")
                     branch_name = "not_found"
 
+            log_and_notify_ast_event(
+                flow_context=flow_context,
+                company_id=prepared_context.params['company_id'],
+                asset_id=prepared_context.params['asset_id'],
+                ast_log=f"Branch: {branch_name}, git folder zipped: {zipped_file}",
+            )
+
             response = conviso_api.deploys.create_deploy(
                 asset_id=prepared_context.params['asset_id'],
                 previous_commit=created_deploy['previous_commit'],
@@ -201,6 +206,13 @@ def perform_deploy(context, flow_context, prepared_context):
                 api_key=api_key
             )
 
+            log_and_notify_ast_event(
+                flow_context=flow_context,
+                company_id=prepared_context.params['company_id'],
+                asset_id=prepared_context.params['asset_id'],
+                ast_log=f"Response: {response}",
+            )
+
             response_deploy_id = response['createDeploy']['deploy']['id']
             deploy_id = {"deploy_id": response_deploy_id}
             created_deploy.update(deploy_id)

{conviso-cli-2.2.27rc0 → conviso-cli-2.3.0.dev0}/convisoappsec/flowcli/container/run.py

@@ -4,6 +4,7 @@ import json
 import subprocess
 import shutil
 import os
+import datetime
 from convisoappsec.flowcli import help_option
 from convisoappsec.flowcli.context import pass_flow_context
 from convisoappsec.logger import log_and_notify_ast_event
@@ -14,6 +15,8 @@ from convisoappsec.flowcli.common import (
     project_code_option,
 )
 
+DEBUG_MODE = False
+
 
 @click.command()
 @project_code_option(
@@ -21,6 +24,11 @@ from convisoappsec.flowcli.common import (
     required=False
 )
 @asset_id_option(required=False)
+@click.option(
+    '--debug',
+    is_flag=True,
+    help='Enable debug mode.'
+)
 @click.option(
     '-r',
     '--repository-dir',
@@ -67,13 +75,21 @@ from convisoappsec.flowcli.common import (
 @pass_flow_context
 @click.pass_context
 def run(
-        context, flow_context, project_code, asset_id, company_id, repository_dir, send_to_flow, asset_name, vulnerability_auto_close, image_name,
+        context, flow_context, project_code, asset_id, debug, company_id, repository_dir,
+        send_to_flow, asset_name, vulnerability_auto_close, image_name,
 
 ):
     """ Run command for container vulnerability scan focused on OS vulnerabilities """
+    global DEBUG_MODE
+    DEBUG_MODE = debug
+    start_time = datetime.datetime.now()
+
     if send_to_flow:
         prepared_context = RequirementsVerifier.prepare_context(clone(context))
 
+        if debug:
+            debug_message(f"Context after being prepared: {prepared_context.params}")
+
         params_to_copy = [
             'asset_id', 'send_to_flow', 'asset_name', 'vulnerability_auto_close', 'project_code', 'repository_dir',
             'company_id'
@@ -87,32 +103,59 @@ def run(
         asset_id = context.params['asset_id']
         company_id = context.params['company_id']
     else:
+        # this just verify if the api key is valid.
         RequirementsVerifier.list_assets(company_id=company_id, asset_name='example', scan_type='SAST')
 
+        if debug:
+            debug_message("User validated!")
+
     if command_exists('trivy'):
+        if debug:
+            debug_message("Trivy already installed.")
+
         scan_command = f"trivy image --pkg-types os --format json --output result.json {image_name}"
     else:
+        if debug:
+            debug_message("Installing trivy ...")
+
         subprocess.run(
-            "curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b bin/ v0.57.1",
+            "curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b conviso/ v0.57.1",
             shell=True,
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL
         )
-        scan_command = [f"./bin/trivy image --pkg-types os --format json --output result.json {image_name}"]
+
+        if debug:
+            debug_message("Trivy has been installed successfully!")
+
+        scan_command = [f"./conviso/trivy image --pkg-types os --format json --output result.json {image_name}"]
 
     try:
         log_func(f"🔧 Scanning image {image_name} ...")
+
+        if debug:
+            debug_message(f"Running the following command: {scan_command}")
+
         run_command(scan_command)
         log_func("✅ Scan completed successfully.")
 
-        directory = 'bin/'
+        directory = 'conviso/'
         if os.path.isdir(directory):
+            if debug:
+                debug_message(f"Removing the trivy installation dir, {directory}")
             shutil.rmtree(directory)
 
         if send_to_flow:
             send_to_conviso_plataform(flow_context, asset_id, company_id)
         else:
             output_results()
+
+        end_time = datetime.datetime.now()
+
+        if debug:
+            execution_time = end_time - start_time
+            debug_message(f"Total execution time: {execution_time.total_seconds():.2f} seconds.")
+
     except Exception as error:
         log_func(f"❌ Scan failed: {error}")
 
@@ -151,14 +194,7 @@ def send_to_conviso_plataform(flow_context, asset_id, company_id):
     result_file = "result.json"
 
     try:
-        with open(result_file, 'r') as file:
-            scan_results = json.load(file)
-
-        results = scan_results.get("Results", [])
-        if results and isinstance(results, list) and len(results) > 0:
-            vulnerabilities = results[0].get("Vulnerabilities", [])
-        else:
-            vulnerabilities = []
+        vulnerabilities = extract_vulnerabilities(result_file)
 
         if vulnerabilities:
             log_func("🔍 Sending vulnerabilities to conviso platform.")
@@ -198,14 +234,7 @@ def output_results():
     result_file = "result.json"
 
     try:
-        with open(result_file, 'r') as file:
-            scan_results = json.load(file)
-
-        results = scan_results.get("Results", [])
-        if results and isinstance(results, list) and len(results) > 0:
-            vulnerabilities = results[0].get("Vulnerabilities", [])
-        else:
-            vulnerabilities = []
+        vulnerabilities = extract_vulnerabilities(result_file)
 
         if vulnerabilities:
             log_func(f"🔍 Found: {len(vulnerabilities)} vulnerabilities!")
@@ -227,6 +256,17 @@ def command_exists(command):
     """
     return shutil.which(command) is not None
 
+def extract_vulnerabilities(result_file):
+    """Reads a JSON scan result file and extracts vulnerabilities."""
+    with open(result_file, 'r') as file:
+        scan_results = json.load(file)
+
+    results = scan_results.get("Results", [])
+    if results and isinstance(results, list) and len(results) > 0:
+        return results[0].get("Vulnerabilities", [])
+
+    return []
+
 
 def log_func(msg, new_line=True):
     """
@@ -244,3 +284,22 @@ def log_func(msg, new_line=True):
         str: The output of the message.
     """
     click.echo(click.style(msg), nl=new_line, err=True)
+
+
+def debug_message(msg, new_line=True):
+    """
+    If debug mode is enabled, this function should be
+    used for all debug messages and the message will be styled in orange.
+    Otherwise, it uses the default styling.
+
+        Args:
+        msg (str): The message to log.
+        new_line (bool, optional): Whether to append a newline at the end of the message.
+            Defaults to True.
+
+    Returns:
+        str: The output of the message.
+    """
+    timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    style = {"fg": "bright_yellow"} if DEBUG_MODE else {}
+    click.echo(click.style(f"🪲 [{timestamp}] DEBUG: {msg}", **style), nl=new_line, err=True)

{conviso-cli-2.2.27rc0 → conviso-cli-2.3.0.dev0}/convisoappsec/flowcli/sbom/generate.py

@@ -147,17 +147,17 @@ def generate(context, flow_context, project_code, asset_id, company_id, reposito
             command = [f"syft scan {repository_dir} -o cyclonedx-json={file_name}"]
         else:
             subprocess.run(
-                "curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh",
+                "curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b conviso/",
                 shell=True,
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL
             )
-            command = [f"./bin/syft scan {repository_dir} -o cyclonedx-json={file_name}"]
+            command = [f"./conviso/syft scan {repository_dir} --exclude ./conviso/* -o cyclonedx-json={file_name}"]
 
         # Run SBOM generation command
         subprocess.run(command, shell=True, check=True, capture_output=True)
 
-        directory = 'bin/'
+        directory = 'conviso/'
         if os.path.isdir(directory):
             shutil.rmtree(directory)
 

conviso-cli-2.3.0.dev0/convisoappsec/version.py

@@ -0,0 +1 @@
+__version__ = '2.3.0-dev.0'

conviso-cli-2.2.27rc0/convisoappsec/version.py

@@ -1 +0,0 @@
-__version__ = '2.2.27-rc.0'