conviso-cli 2.1.5.dev9__tar.gz → 2.1.5.dev10__tar.gz

{conviso-cli-2.1.5.dev9 → conviso-cli-2.1.5.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.1.5.dev9
+Version: 2.1.5.dev10
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com

{conviso-cli-2.1.5.dev9 → conviso-cli-2.1.5.dev10}/conviso_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.1.5.dev9
+Version: 2.1.5.dev10
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com

{conviso-cli-2.1.5.dev9 → conviso-cli-2.1.5.dev10}/convisoappsec/flowcli/sast/run.py

@@ -81,25 +81,25 @@ def perform_sastbox_scan(
     token = conviso_rest_api.docker_registry.get_sast_token()
 
     if not sastbox_skip_login:
-        logger("Checking SASTBox authorization...")
+        logger("Checking SAST authorization...")
         sastbox.login(token)
 
     pull_progress_bar = click.progressbar(
         length=sastbox.size,
-        label="Performing SASTBox download...",
+        label="Performing SAST download...",
     )
 
     with pull_progress_bar as progressbar:
         for downloaded_chunk in sastbox.pull():
             progressbar.update(downloaded_chunk)
 
-    logger("Starting SASTBox scandiff...")
+    logger("Starting SAST scandiff...")
 
     reports = sastbox.run_scan_diff(
         repository_dir, end_commit, start_commit, log=logger, token=token
     )
 
-    logger("SASTBox scandiff done")
+    logger("SAST scandiff done")
 
     results_filepaths = []
     for r in reports:
@@ -116,7 +116,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 SASTBox reports to Conviso Platform"
+        results_filepaths, label="Sending SAST reports to Conviso Platform"
     )
 
     with results_context as reports:
@@ -200,7 +200,7 @@ def deploy_results_to_conviso_beta(
     converted_results = [import_sarif.entrypoint.perform_command(flow_context, file_path, internal=True)]
 
     results_context = click.progressbar(
-        converted_results, label="Sending SASTBox reports to Conviso Platform"
+        converted_results, label="Sending SAST reports to Conviso Platform"
     )
 
     duplicated_issues = 0

{conviso-cli-2.1.5.dev9 → conviso-cli-2.1.5.dev10}/convisoappsec/sast/sastbox.py

@@ -17,8 +17,8 @@ class SASTBox(object):
     REPOSITORY_NAME = 'sastbox_v2'
     DEFAULT_TAG = 'unstable'
     CONTAINER_CODE_DIR = bitbucket or '/code'
-    CONTAINER_REPORTS_DIR = CONTAINER_CODE_DIR
-    WORKSPACE_REPORT_PATH = [CONTAINER_CODE_DIR]
+    CONTAINER_REPORTS_DIR = '/tmp'
+    WORKSPACE_REPORT_PATH = CONTAINER_CODE_DIR
     JSON_REPORT_PATTERN = 'output.sarif'
     SUCCESS_EXIT_CODE = 1
     USER_ENV_VAR = "USER"
@@ -95,21 +95,19 @@ class SASTBox(object):
             'SASTBOX_REPORTS_DIR': self.CONTAINER_REPORTS_DIR,
             'SASTBOX_REPORT_PATTERN': self.JSON_REPORT_PATTERN,
             'SASTBOX_CODE_DIR': self.CONTAINER_CODE_DIR,
-            'REGISTRY_PASSWORD': token,
-            'REGISTRY_URL': self.REGISTRY,
-            'REGISTRY_USERNAME': 'AWS'
         }
 
         command = (
-            ''' -c {code_dir} -a -o {report} --diff={previous_commit},{current_commit}'''.format(
+            ''' ruby manager/sastbox_cli.rb -c {code_dir} -a -o {report} --diff={previous_commit},{current_commit} && \
+            cp $(find $SASTBOX_REPORT_PATTERN) $SASTBOX_REPORTS_DIR'''.format(
                 code_dir=self.CONTAINER_CODE_DIR, previous_commit=previous_commit, current_commit=current_commit,
-                report='output.sarif')
+                report='/tmp/output.sarif')
         )
 
         create_args = {
             'image': self.image,
-            'entrypoint': ['ruby', 'manager/sastbox_cli.rb'],
-            'command': command,
+            'entrypoint': ['sh', '-c'],
+            'command': [command],
             'tty': True,
             'detach': True,
             'environment': environment,

conviso-cli-2.1.5.dev10/convisoappsec/version.py

@@ -0,0 +1 @@
+__version__ = '2.1.5-dev.10'

conviso-cli-2.1.5.dev9/convisoappsec/version.py

@@ -1 +0,0 @@
-__version__ = '2.1.5-dev.9'