conviso-cli 2.1.9.dev0__tar.gz → 2.1.11__tar.gz

{conviso-cli-2.1.9.dev0 → conviso-cli-2.1.11}/PKG-INFO

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

{conviso-cli-2.1.9.dev0 → conviso-cli-2.1.11}/conviso_cli.egg-info/PKG-INFO

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

{conviso-cli-2.1.9.dev0 → conviso-cli-2.1.11}/convisoappsec/flowcli/ast/entrypoint.py

@@ -132,49 +132,6 @@ def perform_vulnerabilities_service(context) -> None:
         raise click.ClickException(str(err)) from err
 
 
-def validate_git_repo(context):
-    """
-    Validates the repository to ensure that it will not lose the git history reference.
-
-    Args:
-        context (<class 'click.core.Context'>)
-
-    Returns:
-        context object
-    """
-    repository_dir = context.params['repository_dir']
-    previous_commit = context.params['previous_commit']
-
-    repo = git.Repo(repository_dir)
-    commits = list(repo.iter_commits())
-
-    if not commits:
-        # No commits in the repository, just return
-        click.echo("No commits found in the repository.")
-        return
-
-    previous_commit_is_in_commits = any(commit.hexsha == previous_commit for commit in commits)
-
-    if previous_commit_is_in_commits:
-        return
-
-    merge_commits = [commit for commit in commits if len(commit.parents) > 1]
-
-    if merge_commits:
-        last_merge_commit = merge_commits[-1]
-        first_parent_commit = last_merge_commit.parents[0]
-        context.params['previous_commit'] = first_parent_commit.hexsha
-    else:
-        if len(commits) > 1:
-            second_latest_commit = commits[1]
-            context.params['previous_commit'] = second_latest_commit.hexsha
-        else:
-            # Only one commit in the repository, use that as the previous commit.
-            context.params['previous_commit'] = commits[0].hexsha
-
-    return
-
-
 def perform_deploy(context):
     """Setup and runs the "deploy create with values" command.
 
@@ -197,7 +154,6 @@ def perform_deploy(context):
     context.params = parse_params(context.params, values.params)
     try:
         LOGGER.info("Creating new deploy ...")
-        #validate_git_repo(context)
         created_deploy = values.invoke(context)
 
         if created_deploy:
@@ -283,7 +239,10 @@ def run(context, create_context, **kwargs):
     """ AST - Application Security Testing. Unifies deploy issue, SAST and SCA analyses.  """
     try:
         prepared_context = RequirementsVerifier.prepare_context(clone(context), from_ast=True)
-        prepared_context.obj.deploy = perform_deploy(clone(prepared_context))
+        try:
+            prepared_context.obj.deploy = perform_deploy(clone(prepared_context))
+        except:
+            return
         perform_sast(clone(prepared_context))
         perform_sca(clone(prepared_context))
         perform_iac(clone(prepared_context))

{conviso-cli-2.1.9.dev0 → conviso-cli-2.1.11}/convisoappsec/flowcli/deploy/create/with_/values.py

@@ -1,4 +1,5 @@
 import click
+import git
 # TODO: refactoring. all deploy create share some behavior
 from convisoappsec.flow.util import project_metrics
 from convisoappsec.flowcli.context import pass_flow_context
@@ -89,6 +90,18 @@ def values(
             except api.DeployNotFoundException:
                 previous_commit = git_adapter.empty_repository_tree_commit
 
+            # validating if the commit exists in the repository before creating any deploy.
+            if previous_commit != '4b825dc642cb6eb9a060e54bf8d69288fbee4904':
+                try:
+                    git_adapter._repo.commit(previous_commit)
+                except (git.exc.BadName, ValueError):
+                    LOGGER.info(
+                        "\033[91mWARNING\033[0m: Last commit to compare {commit} not found at git history. AST won´t "
+                        "execute this time. Please avoid usage of git functions that rewrites the history suchlike "
+                        "ammend and rebase.".format(commit=previous_commit)
+                    )
+                    raise git.exc.GitError
+
         if previous_commit == current_commit:
             LOGGER.info(
                 create_context.output_formatter.format(latest_deploy)

{conviso-cli-2.1.9.dev0 → conviso-cli-2.1.11}/convisoappsec/flowcli/sca/run.py

@@ -207,6 +207,7 @@ def deploy_results_to_conviso_beta(conviso_api, results_filepaths, asset_id):
             for issue in issues:
                 description = issue.get("description")
                 hash_issue = issue.get('hash_issue', [])
+                cves = next(([item] for item in issue.get("cve", []) if item.startswith("CVE")), [])
 
                 if not description:
                     description = ""
@@ -223,7 +224,7 @@ def deploy_results_to_conviso_beta(conviso_api, results_filepaths, asset_id):
                     file_name=issue.get("path"),
                     affected_version=issue.get("version"),
                     package=issue.get("component"),
-                    cve=issue.get("cve", []),
+                    cve=cves,
                     original_issue_id_from_tool=hash_issue
                 )
 

conviso-cli-2.1.11/convisoappsec/version.py

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

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

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