conviso-cli 2.2.4__tar.gz → 2.2.5.dev0__tar.gz

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/PKG-INFO

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

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/conviso_cli.egg-info/PKG-INFO

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

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/convisoappsec/flowcli/ast/entrypoint.py

@@ -64,7 +64,7 @@ def perform_sast(context) -> None:
     context.params = parse_params(context.params, sast_run.params)
     try:
         LOGGER.info(
-            'Running SAST on deploy ID "{deploy_id}"'
+            'Running SAST on deploy ID "{deploy_id}"...'
             .format(deploy_id=context.params["deploy_id"])
         )
         sast_run.invoke(context)
@@ -84,7 +84,7 @@ def perform_sca(context) -> None:
     context.params = parse_params(context.params, sca_run.params)
     try:
         LOGGER.info(
-            'Running SCA on deploy ID "{deploy_id}"'
+            'Running SCA on deploy ID "{deploy_id}"...'
             .format(deploy_id=context.params["deploy_id"])
         )
         sca_run.invoke(context)
@@ -105,7 +105,7 @@ def perform_iac(context) -> None:
 
     try:
         LOGGER.info(
-            'Running IAC on deploy ID "{deploy_id}"'
+            'Running IAC on deploy ID "{deploy_id}"...'
             .format(deploy_id=context.params["deploy_id"])
         )
         iac_run.invoke(context)
@@ -125,7 +125,7 @@ def perform_vulnerabilities_service(context) -> None:
     context.params = parse_params(context.params, auto_close_run.params)
 
     try:
-        LOGGER.info("[*] Verifying if any vulnerability was fixed ...")
+        LOGGER.info("[*] Verifying if any vulnerability was fixed...")
         auto_close_run.invoke(context)
     except Exception as err:
         raise click.ClickException(str(err)) from err
@@ -152,7 +152,7 @@ def perform_deploy(context):
     )
     context.params = parse_params(context.params, values.params)
     try:
-        LOGGER.info("Creating new deploy ...")
+        LOGGER.info("Creating new deploy...")
         created_deploy = values.invoke(context)
 
         if created_deploy:

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/convisoappsec/flowcli/findings/import_sarif/entrypoint.py

@@ -94,7 +94,7 @@ def perform_command(flow_context, input_file, project_code=None, asset_id=None,
         # check if this function is called by the cli itself, then returns only the converted file.
         return sastboxv1_filepath
 
-    print('Initializing importation of SARIF results to the Conviso Platform...')
+    print('Initializing the importation of SARIF results to the Conviso Platform...')
 
     if experimental:
         conviso_api = flow_context.create_conviso_api_client_beta()
@@ -162,9 +162,9 @@ def create_conviso_findings_from_sarif_on_new_flow(conviso_api, sastboxv1_filepa
                 else:
                     raise(error)
 
-    msg = "\U0001F4AC %s Issue/Issues ignored during duplication" % duplicated_issues
+    msg = "💬 %s Issue/Issues ignored during duplication." % duplicated_issues
     LOGGER.info(msg)
-    LOGGER.info("Success on importation of SARIF file.")
+    LOGGER.info("Successful importation of the SARIF file.")
 
 def parse_code_snippet(encoded_base64):
     decoded_text = b64decode(encoded_base64).decode("utf-8")

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/convisoappsec/flowcli/iac/run.py

@@ -138,7 +138,7 @@ def run(context, flow_context, project_code, asset_id, company_id, repository_di
 
 def deploy_results_to_conviso(conviso_api, results_filepaths, project_code, deploy_id, repository_dir, token, scanner_timeout):
     results_context = click.progressbar(
-        results_filepaths, label="Sending reports to Conviso Platform"
+        results_filepaths, label="Sending results to the Conviso Platform..."
     )
 
     with results_context as reports:
@@ -161,7 +161,7 @@ def deploy_results_to_conviso(conviso_api, results_filepaths, project_code, depl
 def deploy_results_to_conviso_beta(
         conviso_api, results_filepaths, asset_id, deploy_id, repository_dir, token, scanner_timeout, commit_ref=None
 ):
-    results_context = click.progressbar(results_filepaths, label="Sending results to Conviso Platform")
+    results_context = click.progressbar(results_filepaths, label="Sending results to the Conviso Platform...")
 
     duplicated_issues = 0
 
@@ -196,7 +196,7 @@ def deploy_results_to_conviso_beta(
                     else:
                         raise error
 
-    msg = "\U0001F4AC %s Issue/Issues ignored during duplication" % duplicated_issues
+    msg = "💬 %s Issue/Issues ignored during duplication." % duplicated_issues
     LOGGER.info(msg)
     pass
 
@@ -242,7 +242,7 @@ def perform_command(
             },
         }
 
-        LOGGER.info('\U0001F4AC Preparing Environment')
+        LOGGER.info('💬 Preparing Environment...')
         conviso_rest_api = flow_context.create_conviso_rest_api_client()
         token = conviso_rest_api.docker_registry.get_sast_token()
         scanners_wrapper = ContainerWrapper(
@@ -252,7 +252,7 @@ def perform_command(
             timeout=scanner_timeout
         )
 
-        LOGGER.info('\U0001F4AC Starting IaC')
+        LOGGER.info('💬 Starting IaC...')
         scanners_wrapper.run()
 
         results_filepaths = []  # [str(r.results) for r in scanners_wrapper.scanners]
@@ -261,7 +261,7 @@ def perform_command(
             if report_filepath:
                 results_filepaths.append(report_filepath)
 
-        LOGGER.info('\U0001F4AC Processing Results')
+        LOGGER.info('💬 Processing Results...')
         if send_to_flow:
             git_adapater = GitAdapter(repository_dir)
             end_commit = git_adapater.head_commit
@@ -290,7 +290,7 @@ def perform_command(
                     token=token,
                     scanner_timeout=scanner_timeout,
                 )
-        LOGGER.info('\U00002705 IaC Scan Finished')
+        LOGGER.info('✅ IaC Scan Finished.')
 
     except Exception as e:
         on_http_error(e)

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/convisoappsec/flowcli/requirements_verifier.py

@@ -79,10 +79,10 @@ class RequirementsVerifier:
                 existing_assets = RequirementsVerifier.list_assets(company_id, old_name, 'SAST')
             for asset in existing_assets:
                 if asset['name'] == old_name or asset['name'] == new_name:
-                    LOGGER.info('Asset found ...')
+                    LOGGER.info('Asset found...')
                     context.params['asset_name'] = asset['name']
                     return [asset]
-            LOGGER.info('Asset not found creating ...')
+            LOGGER.info('Asset not found; creating...')
             new_asset = RequirementsVerifier.create_asset(company_id, new_name, 'SAST')
             context.params['asset_name'] = new_name
             return [new_asset]
@@ -98,10 +98,10 @@ class RequirementsVerifier:
         existing_asset = RequirementsVerifier.list_assets(company_id, asset_name, 'SAST')
 
         if not existing_asset:
-            LOGGER.info("Asset not found creating with name {} ...".format(asset_name))
+            LOGGER.info("Asset not found; creating with name {}...".format(asset_name))
             asset = RequirementsVerifier.create_asset(company_id, asset_name, 'SAST')
         else:
-            LOGGER.info('Asset found ...')
+            LOGGER.info('Asset found...')
             asset = existing_asset[0]
 
         context.params['asset_name'] = asset_name
@@ -118,7 +118,7 @@ class RequirementsVerifier:
             project = RequirementsVerifier.create_project(company_id, asset_id, project_label)
             return [project]
         elif len(existing_project) > 1:
-            error_msg = 'You need to specify the project using --project-code'
+            error_msg = 'You need to specify the project using --project-code.'
             raise CreateDeployException(error_msg)
 
         return existing_project
@@ -163,12 +163,12 @@ class RequirementsVerifier:
                 RequirementsVerifier.update_project(project['id'], asset_target['id'])
 
             elif len(assets) == 1:
-                LOGGER.info('Asset found ...')
+                LOGGER.info('Asset found...')
                 asset_target = assets[0]
             elif len(assets) > 1:
                 for asset in assets:
                     if asset['name'] == asset_name:
-                        LOGGER.info('Asset found ...')
+                        LOGGER.info('Asset found...')
                         asset_target = asset
                         break
 
@@ -191,14 +191,14 @@ class RequirementsVerifier:
 
             if len(companies_filtered) > 1:
                 raise CreateDeployException(
-                    "Deploy not created. You have access to multiple companies, specify one using CONVISO_COMPANY_ID"
+                    "Deploy not created. You have access to multiple companies; please specify one using CONVISO_COMPANY_ID."
                 )
 
             company = companies_filtered[0]
             company_id = company['id']
 
             if new_management_flag not in company['customFeatures']:
-                error_msg = "Deploy not created. The company '{}' does not have access to the new vulnerability management".format(company['label'])
+                error_msg = "Deploy not created. The company '{}' does not have access to the new vulnerability management.".format(company['label'])
                 raise CreateDeployException(error_msg)
 
             if context.params['asset_name'] is not None:
@@ -223,7 +223,7 @@ class RequirementsVerifier:
             project_label = asset_name + '_ast'
 
             if 'projects' not in asset or len(asset['projects']) == 0:
-                LOGGER.info('Project ast not found, creating ...')
+                LOGGER.info('Project AST not found; creating...')
                 project = RequirementsVerifier.find_or_create_project(
                     flow_context, project_label, company_id, asset['id']
                 )
@@ -235,11 +235,11 @@ class RequirementsVerifier:
 
                 for project in projects:
                     if project['type'] == 'ast' and project['label'] == project_label:
-                        LOGGER.info('Project ast founded ...')
+                        LOGGER.info('Project AST found...')
                         project_code = project['apiCode']
                         break
                 else:
-                    LOGGER.info('Project ast not founded, we will create one ...')
+                    LOGGER.info('Project AST not found; we will create one...')
                     project = RequirementsVerifier.find_or_create_project(
                         flow_context, project_label, company_id, asset['id']
                     )

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/convisoappsec/flowcli/sast/run.py

@@ -98,11 +98,11 @@ def perform_sastbox_scan(
                 logger("Max retries reached. Failed to perform SAST download.")
                 raise Exception(f"Max retries reached. Could not complete the SAST download. Error: {str(e)}")
 
-    logger("Starting SAST scandiff...")
+    logger("Starting SAST scan diff...")
 
     reports = sastbox.run_scan_diff(repository_dir, end_commit, start_commit, log=logger)
 
-    logger("SAST scandiff done")
+    logger("SAST scan diff done.")
 
     results_filepaths = []
     for r in reports:
@@ -110,7 +110,7 @@ def perform_sastbox_scan(
             file_path = str(r)
             results_filepaths.append(file_path)
         except Exception as e:
-            click.echo(f"Error decoding file path: {r} with error {e}", file=sys.stderr)
+            click.echo(f"Error decoding file path: {r} with error {e}.", file=sys.stderr)
 
     return results_filepaths
 
@@ -119,7 +119,7 @@ def deploy_results_to_conviso(
         conviso_api, results_filepaths, project_code, deploy_id=None, commit_refs=None
 ):
     results_context = click.progressbar(
-        results_filepaths, label="Sending SAST reports to Conviso Platform"
+        results_filepaths, label="Sending SAST reports to the Conviso Platform..."
     )
 
     with results_context as reports:
@@ -200,7 +200,7 @@ def deploy_results_to_conviso_beta(
 ):
 
     results_context = click.progressbar(
-        results_filepaths, label="Sending SAST reports to Conviso Platform"
+        results_filepaths, label="Sending SAST reports to the Conviso Platform..."
     )
 
     duplicated_issues = 0
@@ -240,7 +240,7 @@ def deploy_results_to_conviso_beta(
                     else:
                         raise error
 
-    msg = "\U0001F4AC %s Issue/Issues already on conviso platform due internal validation." % duplicated_issues
+    msg = "💬 %s Issue/Issues already on the Conviso Platform due to internal validation." % duplicated_issues
     log_func(msg)
 
 
@@ -269,7 +269,7 @@ def hash_issues_from_cp(context, conviso_api, issues):
                 page += 1
 
         log_func(
-            "\U0001F4AC %s vulnerability/vulnerabilities already on conviso platform." % len(original_issue_ids)
+            "💬 %s vulnerability/vulnerabilities already on the Conviso Platform." % len(original_issue_ids)
         )
 
         data = []
@@ -280,7 +280,7 @@ def hash_issues_from_cp(context, conviso_api, issues):
                 data.append(item)
 
         log_func(
-            "\U0001F4AC %s New vulnerability/vulnerabilities founded." % len(data)
+            "💬 %s New vulnerability/vulnerabilities found." % len(data)
         )
 
         return data
@@ -530,7 +530,7 @@ def perform_command(
 
         if start_commit == end_commit:
             click.echo(
-                "Previous commit ({0}) and Current commit ({1}) are the same, nothing to do.".format(
+                "Previous commit ({0}) and current commit ({1}) are the same; nothing to do.".format(
                     start_commit, end_commit
                 ),
                 file=sys.stderr,

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/convisoappsec/flowcli/sbom/generate.py

@@ -145,7 +145,7 @@ def generate(context, flow_context, project_code, asset_id, company_id, reposito
         subprocess.run(command, shell=True, check=True, capture_output=True)
         log_func("SBOM file generated successfully!")
     except subprocess.CalledProcessError as error:
-        log_func(f"Error generating SBOM file: {error}")
+        log_func(f"Error generating SBOM file: {error}.")
         return
 
     asset_id = asset_id or context.params.get('asset_id')
@@ -158,7 +158,7 @@ def send_sbom_file_to_csc(flow_context, company_id, asset_id, file):
     conviso_api = flow_context.create_conviso_graphql_client()
     api_key = flow_context.key
 
-    log_func(f"Sending sbom to conviso platform ...")
+    log_func(f"Sending SBOM to the Conviso Platform...")
 
     return conviso_api.sbom.send_sbom_file(company_id=company_id, asset_id=asset_id, file_path=file, api_key=api_key)
 

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/convisoappsec/flowcli/sca/run.py

@@ -193,7 +193,7 @@ def deploy_results_to_conviso_beta(conviso_api, results_filepaths, asset_id):
     """ Send vulnerabilities to conviso platform via graphql endpoint """
 
     results_context = click.progressbar(
-        results_filepaths, label="Sending SCA reports to Conviso Platform"
+        results_filepaths, label="Sending SCA reports to the Conviso Platform..."
     )
 
     duplicated_issues = 0
@@ -243,7 +243,7 @@ def deploy_results_to_conviso_beta(conviso_api, results_filepaths, asset_id):
                     else:
                         raise error
 
-    msg = "\U0001F4AC %s Issue/Issues ignored during duplication" % duplicated_issues
+    msg = "💬 %s Issue/Issues ignored during duplication." % duplicated_issues
     LOGGER.info(msg)
 
 
@@ -325,17 +325,17 @@ def perform_command(
 
         conviso_rest_api = flow_context.create_conviso_rest_api_client()
         token = conviso_rest_api.docker_registry.get_sast_token()
-        LOGGER.info('\U0001F4AC Preparing Environment')
+        LOGGER.info('💬 Preparing Environment...')
         scabox = ContainerWrapper(
             token=token,
             containers_map=scanners,
             logger=LOGGER,
             timeout=scanner_timeout
         )
-        LOGGER.info('\U0001F4AC Starting SCA')
+        LOGGER.info('💬 Starting SCA...')
         scabox.run()
 
-        LOGGER.info('\U0001F4AC Processing Results')
+        LOGGER.info('💬 Processing Results...')
         results_filepaths = []
         for unit in scabox.scanners:
             file_path = unit.results
@@ -343,7 +343,7 @@ def perform_command(
                 results_filepaths.append(file_path)
 
         if send_to_flow:
-            LOGGER.info("   Sending data to Conviso Platform...")
+            LOGGER.info("Sending data to the Conviso Platform...")
             conviso_beta_api = flow_context.create_conviso_api_client_beta()
             if experimental:
                 deploy_results_to_conviso_beta(
@@ -360,7 +360,7 @@ def perform_command(
                 )
 
         # TODO add CI Decision block code
-        LOGGER.info('\U00002705 SCA Scan Finished')
+        LOGGER.info('✅ SCA Scan Finished.')
 
         # Generate SBOM when execute a sca only scan.
         sbom_generate = sbom.commands.get('generate')

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/convisoappsec/flowcli/vulnerability/assert_security_rules.py

@@ -79,12 +79,12 @@ def assert_security_rules(
         )
 
         click.secho(
-            '\U0001F4AC Starting vulnerabilities security rules assertion',
+            '💬 Starting vulnerability security rules assertion...',
             bold=True
         )
 
         click.secho(
-            "\U0001F4AC Applying the given rules at security gate:\n{0}".format(yaml.dump(rules)),
+            "💬 Applying the given rules at the security gate:\n{0}".format(yaml.dump(rules)),
             bold=True
         )
 
@@ -94,7 +94,7 @@ def assert_security_rules(
 
             if validate_json(rules)[0] is False:
                 msg = click.secho(
-                    '\U0001F4AC Error: Validation of security gate yaml file, failed in validation step!',
+                    '💬 Error: Validation of the security gate YAML file failed during the validation step!',
                     bold=True
                 )
 
@@ -138,7 +138,7 @@ def assert_security_rules(
         __raise_if_gate_locked(response)
 
         click.secho(
-            '\U00002705 Vulnerabilities security rules assertion finished',
+            '✅ Vulnerability security rules assertion finished.',
             bold=True
         )
     except Exception as e:
@@ -163,14 +163,14 @@ def tolerated_days_by_severity(rules):
 
 def __raise_if_gate_locked(response):
     if response['locked']:
-        click.secho('\U0001F4AC Vulnerabilities summary', bold=True)
+        click.secho('💬 Vulnerabilities summary...', bold=True)
 
         logger.info(
             json.dumps(response['summary'], indent=4)
         )
 
         raise click.ClickException(
-            'Vulnerabilities quantity offending security rules'
+            'Vulnerabilities quantity offending security rules.'
         )
 
 

{conviso-cli-2.2.4 → conviso-cli-2.2.5.dev0}/convisoappsec/flowcli/vulnerability/run.py

@@ -172,7 +172,7 @@ def run(context, flow_context, project_code, asset_id, company_id, end_commit, s
     merged_issues_sast = []
     merged_issues_sca = []
 
-    log_func("Running auto close vulnerabilities ...")
+    log_func("Running automatic closure of vulnerabilities...")
 
     while True:
         issues_from_cp = conviso_api.issues.auto_close_vulnerabilities(
@@ -206,7 +206,7 @@ def run(context, flow_context, project_code, asset_id, company_id, end_commit, s
     sca_issues_without_fix_accepted = [item for item in merged_issues_sca if item['status'] != 'FIX_ACCEPTED']
 
     if len(issues_from_cp) == 0:
-        log_func("No vulnerabilities was founded on conviso platform!")
+        log_func("No vulnerabilities were found on the Conviso Platform!")
         return
 
     # Starting executing the ast again
@@ -220,7 +220,7 @@ def run(context, flow_context, project_code, asset_id, company_id, end_commit, s
     # end ast execution
 
     if len(sast_hash_issues) == 0 and len(sca_hash_issues) == 0:
-        log_func("No vulnerabilities was founded congrats !!!")
+        log_func("No vulnerabilities were found; congratulations!")
         return
 
     set_of_sast_hash_issues = set(sast_hash_issues)
@@ -262,7 +262,7 @@ def close_sast_issues(conviso_api, issues_from_cp, issues_from_current_scan):
     # issues_from_current_scan are issues identify on each time the ast command runs, these are always from a full code
     base scan
     """
-    log_func("SAST: Verifying if any vulnerability was solved ...")
+    log_func("SAST: Verifying if any vulnerability was solved...")
 
     differences = [
         {'id': item['id'], 'originalIssueIdFromTool': item['originalIssueIdFromTool']}
@@ -270,10 +270,10 @@ def close_sast_issues(conviso_api, issues_from_cp, issues_from_current_scan):
     ]
 
     if len(differences) == 0:
-        log_func("No vulnerabilities was fixed yet ...")
+        log_func("No vulnerabilities have been fixed yet...")
         return
 
-    log_func("SAST: Fixing {issues} vulnerabilities on conviso platform ...".format(issues=len(differences)))
+    log_func("SAST: Fixing {issues} vulnerabilities on the Conviso Platform...".format(issues=len(differences)))
 
     for issue in differences:
         issue_id = issue['id']
@@ -287,17 +287,17 @@ def close_sast_issues(conviso_api, issues_from_cp, issues_from_current_scan):
 def close_sca_issues(conviso_api, issues_from_cp, issues_from_current_scan):
     """ method to close sca issues on conviso platform """
 
-    log_func("SCA: Verifying if any vulnerability was solved ...")
+    log_func("SCA: Verifying if any vulnerability was solved...")
     differences = [
         {'id': item['id'], 'originalIssueIdFromTool': item['originalIssueIdFromTool']}
         for item in issues_from_cp if item['originalIssueIdFromTool'] not in issues_from_current_scan
     ]
 
     if len(differences) == 0:
-        log_func("No vulnerabilities was fixed yet ...")
+        log_func("No vulnerabilities have been fixed yet...")
         return
 
-    log_func("SCA: Fixing {issues} vulnerabilities on conviso platform ...".format(issues=len(differences)))
+    log_func("SCA: Fixing {issues} vulnerabilities on the Conviso Platform...".format(issues=len(differences)))
 
     for issue in differences:
         issue_id = issue['id']

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

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

conviso-cli-2.2.4/convisoappsec/version.py

@@ -1 +0,0 @@
-__version__ = '2.2.4'