conviso-cli 2.3.0.dev3__tar.gz → 2.3.0rc0__tar.gz

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.3.0.dev3
+Version: 2.3.0rc0
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com
 License: UNKNOWN
 Project-URL: Source, https://github.com/convisoappsec/convisocli/
 Platform: UNKNOWN
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 
 # CLI

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.3.0.dev3
+Version: 2.3.0rc0
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com
 License: UNKNOWN
 Project-URL: Source, https://github.com/convisoappsec/convisocli/
 Platform: UNKNOWN
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 
 # CLI

{conviso-cli-2.3.0.dev3 → conviso-cli-2.3.0rc0}/conviso_cli.egg-info/SOURCES.txt

@@ -66,6 +66,7 @@ convisoappsec/flowcli/__main__.py
 convisoappsec/flowcli/common.py
 convisoappsec/flowcli/context.py
 convisoappsec/flowcli/entrypoint.py
+convisoappsec/flowcli/environment_checker.py
 convisoappsec/flowcli/help_option.py
 convisoappsec/flowcli/requirements_verifier.py
 convisoappsec/flowcli/assets/__init__.py

conviso-cli-2.3.0rc0/conviso_cli.egg-info/requires.txt

@@ -0,0 +1,13 @@
+GitPython==3.1.44
+click==8.1.8
+requests==2.32.3
+urllib3==2.3.0
+semantic-version==2.10.0
+docker==7.1.0
+PyYAML==6.0.2
+click-log==0.4.0
+transitions==0.9.2
+jsonschema==4.23.0
+giturlparse<=0.12.0
+jmespath==1.0.1
+setuptools==75.8.0

{conviso-cli-2.3.0.dev3 → conviso-cli-2.3.0rc0}/convisoappsec/common/git_data_parser.py

@@ -70,7 +70,4 @@ class GitDataParser:
         )
 
     def __validate_git_repo(self, repository_dir):
-        repo = Repo(repository_dir)
-        repo.git.config("--global", "--add", "safe.directory", repository_dir)
-
-        return repo
+        return Repo(repository_dir)

{conviso-cli-2.3.0.dev3 → conviso-cli-2.3.0rc0}/convisoappsec/flow/graphql_api/v1/resources_api.py

@@ -240,6 +240,64 @@ class IssuesApi(object):
 
         return issues_stats
 
+    def send_issues_file(self, company_id, asset_id, file_path, api_key, vulnerability_type='SAST_FINDING',
+                         deploy_id=None, commit_ref=None):
+        """Send issues file to Conviso platform"""
+
+        url = self.__conviso_graphql_client.url
+
+        if not isinstance(vulnerability_type, list):
+            vulnerability_type = [vulnerability_type]
+
+        vulnerability_type = [v.upper() for v in vulnerability_type]
+
+        variables = {
+            "companyId": company_id,
+            "assetId": asset_id,
+            "vulnerabilityTypes": vulnerability_type,
+            "deployId": deploy_id,
+            "commitRef": commit_ref,
+            "file": None
+        }
+
+        operations = {
+            "query": mutations.IMPORT_FINDINGS,
+            "variables": variables
+        }
+
+        file_map = {"0": ["variables.file"]}
+
+        headers = {
+            'x-api-key': api_key,
+            "User-Agent": f"AST:{__version__}"
+        }
+
+        try:
+            with open(file_path, 'rb') as file:
+                files = {
+                    'operations': (None, json.dumps(operations), 'application/json'),
+                    'map': (None, json.dumps(file_map), 'application/json'),
+                    '0': (file_path, file, 'application/octet-stream')
+                }
+
+                response = requests.post(url, files=files, headers=headers)
+                response.raise_for_status()
+                json_response = response.json()
+
+                self._handle_graphql_errors(json_response)
+                return json_response.get('data')
+
+        except requests.RequestException as e:
+            raise Exception(f"GraphQL request failed: {e}")
+
+    @staticmethod
+    def _handle_graphql_errors(json_response):
+        """Handle GraphQL errors"""
+        errors = json_response.get('errors')
+        if errors:
+            error_messages = [error.get('message', 'Unknown error') for error in errors]
+            raise Exception(f"GraphQL request failed with errors: {', '.join(error_messages)}")
+
 
 class DeploysApi(object):
     """ Class for deploys resources """
@@ -320,19 +378,18 @@ class DeploysApi(object):
             raise Exception("GraphQL request failed with errors.")
 
 
-class SbomApi(object):
-    """ Class for sbom file resources """
+class BaseApi:
+    """ Base class for handling file uploads to Conviso platform """
 
     def __init__(self, conviso_graphql_client):
         self._conviso_graphql_client = conviso_graphql_client
 
-    def send_sbom_file(self, company_id, asset_id, file_path, api_key):
-        """ Send SBOM file to Conviso platform """
-
+    def send_file(self, company_id, asset_id, file_path, api_key, mutation):
+        """ Generic method for sending a file """
         url = self._conviso_graphql_client.url
 
         operations = {
-            "query": mutations.IMPORT_SBOM,
+            "query": mutation,
             "variables": {
                 "companyId": company_id,
                 "assetId": asset_id,
@@ -340,41 +397,50 @@ class SbomApi(object):
             }
         }
 
-        file_map = {
-            "0": ["variables.file"]
-        }
+        file_map = {"0": ["variables.file"]}
 
-        with open(file_path, 'rb') as sbom_file:
+        with open(file_path, 'rb') as file:
             files = {
                 'operations': (None, json.dumps(operations), 'application/json'),
                 'map': (None, json.dumps(file_map), 'application/json'),
-                '0': (file_path, sbom_file, 'application/octet-stream')
+                '0': (file_path, file, 'application/octet-stream')
             }
 
             headers = {
-                'x-api-key': f'{api_key}',
-                "User-Agent": "AST:{version}".format(version=__version__)
+                'x-api-key': api_key,
+                "User-Agent": f"AST:{__version__}"
             }
 
             response = requests.post(url, files=files, headers=headers)
-
             response.raise_for_status()
             json_response = response.json()
 
             self._handle_graphql_errors(json_response)
-
             return json_response.get('data')
 
     @staticmethod
     def _handle_graphql_errors(json_response):
         """ Handle GraphQL errors """
         if 'errors' in json_response:
-            errors = json_response['errors']
-            for error in errors:
+            for error in json_response['errors']:
                 print(f"GraphQL Error: {error.get('message')}")
             raise Exception("GraphQL request failed with errors.")
 
 
+class SbomApi(BaseApi):
+    """ Class for SBOM file resources """
+
+    def send_sbom_file(self, company_id, asset_id, file_path, api_key):
+        return self.send_file(company_id, asset_id, file_path, api_key, mutations.IMPORT_SBOM)
+
+
+class ContainerApi(BaseApi):
+    """ Class for container finding file resources """
+
+    def send_container_file(self, company_id, asset_id, file_path, api_key):
+        return self.send_file(company_id, asset_id, file_path, api_key, mutations.IMPORT_CONTAINER)
+
+
 class LogAstError(object):
     """ Class to send AST errors to Conviso Platform """
     def __init__(self, conviso_graphql_client):
@@ -402,57 +468,3 @@ class LogAstError(object):
         )
 
         return success
-
-class ContainerApi(object):
-    """ Class for container finding file resources """
-
-    def __init__(self, conviso_graphql_client):
-        self._conviso_graphql_client = conviso_graphql_client
-
-    def send_container_file(self, company_id, asset_id, file_path, api_key):
-        """ Send Container file to Conviso platform """
-
-        url = self._conviso_graphql_client.url
-
-        operations = {
-            "query": mutations.IMPORT_CONTAINER,
-            "variables": {
-                "companyId": company_id,
-                "assetId": asset_id,
-                "file": None
-            }
-        }
-
-        file_map = {
-            "0": ["variables.file"]
-        }
-
-        with open(file_path, 'rb') as container_file:
-            files = {
-                'operations': (None, json.dumps(operations), 'application/json'),
-                'map': (None, json.dumps(file_map), 'application/json'),
-                '0': (file_path, container_file, 'application/octet-stream')
-            }
-
-            headers = {
-                'x-api-key': f'{api_key}',
-                "User-Agent": "AST:{version}".format(version=__version__)
-            }
-
-            response = requests.post(url, files=files, headers=headers)
-
-            response.raise_for_status()
-            json_response = response.json()
-
-            self._handle_graphql_errors(json_response)
-
-            return json_response.get('data')
-
-    @staticmethod
-    def _handle_graphql_errors(json_response):
-        """ Handle GraphQL errors """
-        if 'errors' in json_response:
-            errors = json_response['errors']
-            for error in errors:
-                print(f"GraphQL Error: {error.get('message')}")
-            raise Exception("GraphQL request failed with errors.")

{conviso-cli-2.3.0.dev3 → conviso-cli-2.3.0rc0}/convisoappsec/flow/graphql_api/v1/schemas/mutations/__init__.py

@@ -171,3 +171,27 @@ mutation (
   }
 }
 """
+
+IMPORT_FINDINGS = """
+mutation (
+  $file: Upload!,
+  $assetId: ID!,
+  $companyId: ID!
+  $vulnerabilityTypes: [Issue!]!
+  $deployId: ID
+  $commitRef: String
+) {
+  importAstFindingsFile(
+    input: {
+      file: $file,
+      assetId: $assetId,
+      companyId: $companyId,
+      vulnerabilityTypes: $vulnerabilityTypes,
+      deployId: $deployId,
+      commitRef: $commitRef
+    }
+  ) {
+    success
+  }
+}
+"""

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

@@ -163,6 +163,9 @@ def perform_deploy(context, flow_context, prepared_context):
     try:
         LOGGER.info("Creating new deploy...")
         created_deploy = values.invoke(context)
+
+        if created_deploy is None:
+            raise CreateDeployException("Deploy not created.")
         try:
             conviso_api = flow_context.create_conviso_graphql_client()
             api_key = flow_context.key
@@ -227,10 +230,7 @@ def perform_deploy(context, flow_context, prepared_context):
                 ast_log=full_trace
             )
 
-        if created_deploy:
-            return created_deploy
-
-        raise CreateDeployException("Deploy not created.")
+        return created_deploy
 
     except CreateDeployException as err:
         raise PerformDeployException(err)

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

@@ -91,8 +91,8 @@ def run(
             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'
+            'asset_id', 'send_to_flow', 'asset_name', 'vulnerability_auto_close',
+            'project_code', 'repository_dir', 'company_id'
         ]
 
         for param_name in params_to_copy:

{conviso-cli-2.3.0.dev3 → conviso-cli-2.3.0rc0}/convisoappsec/flowcli/entrypoint.py

@@ -23,15 +23,6 @@ from .container import container
 
 click_log.basic_config(LOGGER)
 
-
-def api_url_autocompletion(*args, **kargs):
-    return [
-        api.PRODUCTION_API_URL,
-        api.STAGING_API_URL,
-        api.DEVELOPMENT_API_URL,
-    ]
-
-
 @click.group()
 @click_log.simple_verbosity_option(LOGGER, '-l', '--verbosity')
 @click.option(
@@ -48,7 +39,6 @@ def api_url_autocompletion(*args, **kargs):
     envvar=("CONVISO_API_URL", "FLOW_API_URL"),
     default=api.DEFAULT_API_URL,
     show_default=True,
-    autocompletion=api_url_autocompletion,
     help='The api url to access Conviso Platform resources.',
 )
 @click.option(

conviso-cli-2.3.0rc0/convisoappsec/flowcli/environment_checker.py

@@ -0,0 +1,45 @@
+import os
+import platform
+import subprocess
+
+class EnvironmentChecker:
+    """
+    A class to check the system environment for required software and services.
+    """
+
+    def __init__(self):
+        self.checks = {}
+
+    def _run_command(self, command, check_running=False):
+        """Helper function to run shell commands and capture output/errors."""
+        try:
+            process = subprocess.run(command, capture_output=True, text=True, check=not check_running)
+            if check_running:
+                return process.returncode == 0, "", ""
+            return process.returncode == 0, process.stdout.strip(), process.stderr.strip()
+        except FileNotFoundError:
+            return False, "", "Command not found"
+        except subprocess.CalledProcessError as e:
+            return False, "", e.stderr.strip()
+
+    def check_docker(self):
+        """Checks if Docker is installed and the daemon is running."""
+        installed, _, _ = self._run_command(["docker", "--version"])
+        running, _, _ = self._run_command(["docker", "info"], check_running=True)
+        self.checks["docker_installed"] = installed
+        self.checks["docker_running"] = running
+        return installed and running
+
+    def run_all_checks(self):
+        """Runs all checks and prints a summary."""
+        self.check_docker()
+
+        print("Environment Check Summary:")
+        for check, result in self.checks.items():
+            if "version" in check:
+                print(f"- {check.replace('_',' ').title()}: {result}")
+            else:
+                status = "OK" if result else "FAILED"
+                print(f"- {check.replace('_',' ').title()}: {status}")
+
+        return all(self.checks.values())

{conviso-cli-2.3.0.dev3 → conviso-cli-2.3.0rc0}/convisoappsec/flowcli/iac/run.py

@@ -109,13 +109,11 @@ def run(context, flow_context, project_code, asset_id, company_id, repository_di
       This command will perform IAC analysis at the source code. The analysis
       results can be reported or not to flow application.
     """
-    context.params['company_id'] = company_id if company_id is not None else None
-
     if not from_ast:
         prepared_context = RequirementsVerifier.prepare_context(clone(context))
 
         params_to_copy = [
-            'project_code', 'asset_id', 'repository_dir', 'send_to_flow',
+            'project_code', 'asset_id', 'company_id', 'repository_dir', 'send_to_flow',
             'deploy_id', 'scanner_timeout', 'parallel_workers', 'experimental'
         ]
 

{conviso-cli-2.3.0.dev3 → conviso-cli-2.3.0rc0}/convisoappsec/flowcli/requirements_verifier.py

@@ -92,6 +92,8 @@ class RequirementsVerifier:
     @staticmethod
     def create_asset_with_custom_name(context, company_id, asset_name):
         """ Create an asset with custom name pass with a custom name """
+        if not asset_name or not asset_name.strip():  # Check for None or blank string
+            raise ValueError("Asset name cannot be None or blank.")
 
         # we need to verify if already has an asset with the name provided.
         # because graphql will return an error if already has.

{conviso-cli-2.3.0.dev3 → conviso-cli-2.3.0rc0}/convisoappsec/flowcli/sast/run.py

@@ -202,71 +202,23 @@ def deploy_results_to_conviso_beta(
 ):
     """Send SAST results to the Conviso platform."""
 
-    duplicated_issues = 0
-    total_issues = 0
-    errors_occurred = 0
-
     results_context = click.progressbar(
-        results_filepaths, label="Sending SAST reports to the Conviso Platform..."
+        results_filepaths, label="🔧 Sending SAST report to the Conviso Platform ..."
     )
 
     with results_context as reports:
         for report_path in reports:
+            api_key = flow_context.key
+            conviso_api = flow_context.create_conviso_graphql_client()
+
             try:
-                with open(report_path, 'r') as report_file:
-                    report_content = json.load(report_file)
-            except (OSError, json.JSONDecodeError) as e:
-                LOGGER.warn(f"⚠️ Failed to process the report '{report_path}': {e}")
-                errors_occurred += 1
-                continue
-
-            issues = report_content.get("issues", [])
-            if not issues:
-                continue
-
-            for issue in issues:
-                total_issues += 1
-                issue_cwe = issue.get('cwe_id', '')
-
-                if issue_cwe != '':
-                    issue_cwe = f'CWE-{issue_cwe}'
-
-                issue_model = CreateSastFindingInput(
-                    asset_id=asset_id,
-                    file_name=issue.get("filename"),
-                    vulnerable_line=issue.get("line"),
-                    title=issue.get("title"),
-                    description=issue.get("description"),
-                    severity=issue.get("severity"),
-                    commit_ref=commit_ref,
-                    deploy_id=deploy_id,
-                    code_snippet=parse_code_snippet(issue.get("evidence")),
-                    reference=parse_conviso_references(issue.get("references")),
-                    first_line=parse_first_line_number(issue.get("evidence")),
-                    category=issue_cwe,
-                    original_issue_id_from_tool=issue.get("hash_issue") or issue.get("hash_issue_v2"),
-                    solution=issue.get('solution')
+                conviso_api.issues.send_issues_file(
+                    company_id=company_id, asset_id=asset_id, file_path=report_path, api_key=api_key, vulnerability_type='SAST_FINDING',
+                    deploy_id=deploy_id, commit_ref=commit_ref
                 )
-
-                try:
-                    conviso_api.issues.create_sast(issue_model)
-                except ResponseError as error:
-                    if error.code == 'RECORD_NOT_UNIQUE':
-                        duplicated_issues += 1
-                    else:
-                        retry_handler = RetryHandler(
-                            flow_context=flow_context, company_id=company_id, asset_id=asset_id
-                        )
-                        retry_handler.execute_with_retry(conviso_api.issues.create_sast, issue_model)
-                except Exception:
-                    retry_handler = RetryHandler(
-                        flow_context=flow_context, company_id=company_id, asset_id=asset_id
-                    )
-                    retry_handler.execute_with_retry(conviso_api.issues.create_sast, issue_model)
-
-                    continue
-
-    LOGGER.info(f"💬 {duplicated_issues} issue(s) ignored due to duplication.")
+            except Exception as e:
+                # send to conviso slack and pass
+                pass
 
 
 @click.command()
@@ -393,28 +345,9 @@ def deploy_results_to_conviso_beta(
 @help_option
 @pass_flow_context
 @click.pass_context
-def run(
-        context,
-        flow_context,
-        project_code,
-        asset_id,
-        company_id,
-        end_commit,
-        start_commit,
-        repository_dir,
-        send_to_flow,
-        deploy_id,
-        sastbox_registry,
-        sastbox_repository_name,
-        sastbox_tag,
-        sastbox_skip_login,
-        fail_on_threshold,
-        fail_on_severity_threshold,
-        experimental,
-        asset_name,
-        vulnerability_auto_close,
-        from_ast
-):
+def run(context, flow_context, project_code, asset_id, company_id, end_commit, start_commit, repository_dir,
+        send_to_flow, deploy_id, sastbox_registry, sastbox_repository_name, sastbox_tag, sastbox_skip_login,
+        fail_on_threshold, fail_on_severity_threshold, experimental, asset_name, vulnerability_auto_close, from_ast):
     """
     This command will perform SAST analysis at the source code. The analysis
     results can be reported or not to flow application. The analysis can be
@@ -422,13 +355,11 @@ def run(
 
     This command will write the analysis reports files paths to stdout.
     """
-    context.params['company_id'] = company_id if company_id is not None else None
-
     if not from_ast:
         prepared_context = RequirementsVerifier.prepare_context(clone(context))
 
         params_to_copy = [
-            'project_code', 'asset_id', 'start_commit', 'end_commit',
+            'project_code', 'asset_id', 'company_id', 'start_commit', 'end_commit',
             'repository_dir', 'send_to_flow', 'deploy_id', 'sastbox_registry',
             'sastbox_repository_name', 'sastbox_tag', 'sastbox_skip_login',
             'experimental', 'asset_name', 'vulnerability_auto_close', 'company_id'
@@ -459,24 +390,10 @@ def run(
     )
 
 
-def perform_command(
-        flow_context,
-        project_code,
-        asset_id,
-        end_commit,
-        start_commit,
-        repository_dir,
-        send_to_flow,
-        deploy_id,
-        sastbox_registry,
-        sastbox_repository_name,
-        sastbox_tag,
-        sastbox_skip_login,
-        fail_on_threshold,
-        fail_on_severity_threshold,
-        experimental,
-        company_id
-):
+def perform_command(flow_context, project_code, asset_id, end_commit, start_commit, repository_dir, send_to_flow,
+                    deploy_id, sastbox_registry, sastbox_repository_name, sastbox_tag, sastbox_skip_login,
+                    fail_on_threshold, fail_on_severity_threshold, experimental, company_id):
+
     if send_to_flow and not experimental and not project_code:
         raise click.MissingParameter(
             "It is required when sending reports to Conviso Platform API.",

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

@@ -108,13 +108,6 @@ from convisoappsec.flowcli.common import (asset_id_option, project_code_option)
 @click.pass_context
 def generate(context, flow_context, project_code, asset_id, company_id, repository_dir, send_to_flow, custom_sca_tags,
              scanner_timeout, parallel_workers, deploy_id, experimental, asset_name, vulnerability_auto_close, from_ast):
-
-    # Ensure company_id is valid
-    context.params['company_id'] = context.params.get('company_id') or company_id
-    if not context.params['company_id']:
-        log_func(f"⚠️ Invalid company_id: {company_id}. Exiting.")
-        return
-
     # Prepare context if not coming from AST
     if not from_ast:
         try:
@@ -125,7 +118,7 @@ def generate(context, flow_context, project_code, asset_id, company_id, reposito
 
         # Copy parameters from locals or prepared_context
         params_to_copy = [
-            'project_code', 'asset_id', 'repository_dir', 'send_to_flow',
+            'project_code', 'asset_id', 'company_id', 'repository_dir', 'send_to_flow',
             'deploy_id', 'custom_sca_tags', 'scanner_timeout', 'parallel_workers',
             'experimental', 'asset_name', 'vulnerability_auto_close'
         ]
@@ -169,8 +162,10 @@ def generate(context, flow_context, project_code, asset_id, company_id, reposito
         log_func(f"⚠️ Unexpected error during SBOM generation: {e}")
         return
 
-    # Ensure asset_id is available
+    # Ensure asset_id and company_id is available
     asset_id = asset_id or context.params.get('asset_id')
+    company_id = company_id or context.params.get('company_id')
+
     if not asset_id:
         log_func(f"⚠️ Missing asset_id. Unable to send SBOM.")
         return

{conviso-cli-2.3.0.dev3 → conviso-cli-2.3.0rc0}/convisoappsec/flowcli/sca/run.py

@@ -119,34 +119,17 @@ click_log.basic_config(LOGGER)
 @help_option
 @pass_flow_context
 @click.pass_context
-def run(
-        context,
-        flow_context,
-        project_code,
-        asset_id,
-        company_id,
-        repository_dir,
-        send_to_flow,
-        custom_sca_tags,
-        scanner_timeout,
-        parallel_workers,
-        deploy_id,
-        experimental,
-        asset_name,
-        vulnerability_auto_close,
-        from_ast
-):
+def run(context, flow_context, project_code, asset_id, company_id, repository_dir, send_to_flow, custom_sca_tags,
+        scanner_timeout, parallel_workers, deploy_id, experimental, asset_name, vulnerability_auto_close, from_ast):
     """
       This command will perform SCA analysis at the source code. The analysis
       results can be reported or not to flow application.
     """
-    context.params['company_id'] = company_id if company_id is not None else None
-
     if not from_ast:
         prepared_context = RequirementsVerifier.prepare_context(clone(context))
 
         params_to_copy = [
-            'project_code', 'asset_id', 'repository_dir', 'send_to_flow',
+            'project_code', 'asset_id', 'company_id', 'repository_dir', 'send_to_flow',
             'deploy_id', 'custom_sca_tags', 'scanner_timeout', 'parallel_workers',
             'experimental', 'asset_name', 'vulnerability_auto_close'
         ]