cycode 1.4.1.dev10__tar.gz → 1.4.1.dev12__tar.gz

{cycode-1.4.1.dev10 → cycode-1.4.1.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycode
-Version: 1.4.1.dev10
+Version: 1.4.1.dev12
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 Home-page: https://github.com/cycodehq/cycode-cli
 License: MIT

cycode-1.4.1.dev12/cycode/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.4.1.dev12'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

{cycode-1.4.1.dev10 → cycode-1.4.1.dev12}/cycode/cli/code_scanner.py

@@ -546,13 +546,13 @@ def perform_scan(
     is_commit_range: bool,
     scan_parameters: dict,
 ) -> ZippedFileScanResult:
+    if scan_type in (consts.SCA_SCAN_TYPE, consts.SAST_SCAN_TYPE):
+        return perform_scan_async(cycode_client, zipped_documents, scan_type, scan_parameters)
+
     if is_commit_range:
         return cycode_client.commit_range_zipped_file_scan(scan_type, zipped_documents, scan_id)
 
-    if scan_type == consts.INFRA_CONFIGURATION_SCAN_TYPE:
-        return cycode_client.zipped_file_scan(scan_type, zipped_documents, scan_id, scan_parameters, is_git_diff)
-
-    return perform_scan_async(cycode_client, zipped_documents, scan_type, scan_parameters)
+    return cycode_client.zipped_file_scan(scan_type, zipped_documents, scan_id, scan_parameters, is_git_diff)
 
 
 def perform_scan_async(
@@ -1025,10 +1025,6 @@ def _map_detections_per_file(detections: List[dict]) -> List[DetectionsPerFile]:
 def _get_file_name_from_detection(detection: dict) -> str:
     if detection['category'] == 'SAST':
         return detection['detection_details']['file_path']
-    if detection['category'] == 'SecretDetection':
-        file_path = detection['detection_details']['file_path']
-        file_name = detection['detection_details']['file_name']
-        return os.path.join(file_path, file_name)
 
     return detection['detection_details']['file_name']
 

{cycode-1.4.1.dev10 → cycode-1.4.1.dev12}/cycode/cli/printers/tables/sca_table_printer.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Dict, List
 import click
 
 from cycode.cli.consts import LICENSE_COMPLIANCE_POLICY_ID, PACKAGE_VULNERABILITY_POLICY_ID
-from cycode.cli.models import Detection
+from cycode.cli.models import Detection, Severity
 from cycode.cli.printers.tables.table import Table
 from cycode.cli.printers.tables.table_models import ColumnInfoBuilder, ColumnWidths
 from cycode.cli.printers.tables.table_printer_base import TablePrinterBase
@@ -19,21 +19,21 @@ column_builder = ColumnInfoBuilder()
 # Building must have strict order. Represents the order of the columns in the table (from left to right)
 SEVERITY_COLUMN = column_builder.build(name='Severity')
 REPOSITORY_COLUMN = column_builder.build(name='Repository')
-
-FILE_PATH_COLUMN = column_builder.build(name='File Path')
+CODE_PROJECT_COLUMN = column_builder.build(name='Code Project')  # File path to manifest file
 ECOSYSTEM_COLUMN = column_builder.build(name='Ecosystem')
-DEPENDENCY_NAME_COLUMN = column_builder.build(name='Dependency Name')
-DIRECT_DEPENDENCY_COLUMN = column_builder.build(name='Direct Dependency')
-DEVELOPMENT_DEPENDENCY_COLUMN = column_builder.build(name='Development Dependency')
-DEPENDENCY_PATHS_COLUMN = column_builder.build(name='Dependency Paths')
-
+PACKAGE_COLUMN = column_builder.build(name='Package')
 CVE_COLUMNS = column_builder.build(name='CVE')
+DEPENDENCY_PATHS_COLUMN = column_builder.build(name='Dependency Paths')
 UPGRADE_COLUMN = column_builder.build(name='Upgrade')
 LICENSE_COLUMN = column_builder.build(name='License')
+DIRECT_DEPENDENCY_COLUMN = column_builder.build(name='Direct Dependency')
+DEVELOPMENT_DEPENDENCY_COLUMN = column_builder.build(name='Development Dependency')
+
 
 COLUMN_WIDTHS_CONFIG: ColumnWidths = {
     REPOSITORY_COLUMN: 2,
-    FILE_PATH_COLUMN: 3,
+    CODE_PROJECT_COLUMN: 2,
+    PACKAGE_COLUMN: 3,
     CVE_COLUMNS: 5,
     UPGRADE_COLUMN: 3,
     LICENSE_COLUMN: 2,
@@ -47,7 +47,7 @@ class ScaTablePrinter(TablePrinterBase):
             table = self._get_table(policy_id)
             table.set_cols_width(COLUMN_WIDTHS_CONFIG)
 
-            for detection in detections:
+            for detection in self._sort_and_group_detections(detections):
                 self._enrich_table_with_values(table, detection)
 
             self._print_summary_issues(len(detections), self._get_title(policy_id))
@@ -64,6 +64,52 @@ class ScaTablePrinter(TablePrinterBase):
 
         return 'Unknown'
 
+    @staticmethod
+    def __group_by(detections: List[Detection], details_field_name: str) -> Dict[str, List[Detection]]:
+        grouped = defaultdict(list)
+        for detection in detections:
+            grouped[detection.detection_details.get(details_field_name)].append(detection)
+        return grouped
+
+    @staticmethod
+    def __severity_sort_key(detection: Detection) -> int:
+        severity = detection.detection_details.get('advisory_severity')
+        return Severity.try_get_value(severity)
+
+    def _sort_detections_by_severity(self, detections: List[Detection]) -> List[Detection]:
+        return sorted(detections, key=self.__severity_sort_key, reverse=True)
+
+    @staticmethod
+    def __package_sort_key(detection: Detection) -> int:
+        return detection.detection_details.get('package_name')
+
+    def _sort_detections_by_package(self, detections: List[Detection]) -> List[Detection]:
+        return sorted(detections, key=self.__package_sort_key)
+
+    def _sort_and_group_detections(self, detections: List[Detection]) -> List[Detection]:
+        """Sort detections by severity and group by repository, code project and package name.
+
+        Note:
+            Code Project is path to manifest file.
+
+            Grouping by code projects also groups by ecosystem.
+            Because manifest files are unique per ecosystem.
+        """
+        result = []
+
+        # we sort detections by package name to make persist output order
+        sorted_detections = self._sort_detections_by_package(detections)
+
+        grouped_by_repository = self.__group_by(sorted_detections, 'repository_name')
+        for repository_group in grouped_by_repository.values():
+            grouped_by_code_project = self.__group_by(repository_group, 'file_name')
+            for code_project_group in grouped_by_code_project.values():
+                grouped_by_package = self.__group_by(code_project_group, 'package_name')
+                for package_group in grouped_by_package.values():
+                    result.extend(self._sort_detections_by_severity(package_group))
+
+        return result
+
     def _get_table(self, policy_id: str) -> Table:
         table = Table()
 
@@ -77,9 +123,9 @@ class ScaTablePrinter(TablePrinterBase):
         if self._is_git_repository():
             table.add(REPOSITORY_COLUMN)
 
-        table.add(FILE_PATH_COLUMN)
+        table.add(CODE_PROJECT_COLUMN)
         table.add(ECOSYSTEM_COLUMN)
-        table.add(DEPENDENCY_NAME_COLUMN)
+        table.add(PACKAGE_COLUMN)
         table.add(DIRECT_DEPENDENCY_COLUMN)
         table.add(DEVELOPMENT_DEPENDENCY_COLUMN)
         table.add(DEPENDENCY_PATHS_COLUMN)
@@ -93,9 +139,9 @@ class ScaTablePrinter(TablePrinterBase):
         table.set(SEVERITY_COLUMN, detection_details.get('advisory_severity'))
         table.set(REPOSITORY_COLUMN, detection_details.get('repository_name'))
 
-        table.set(FILE_PATH_COLUMN, detection_details.get('file_name'))
+        table.set(CODE_PROJECT_COLUMN, detection_details.get('file_name'))
         table.set(ECOSYSTEM_COLUMN, detection_details.get('ecosystem'))
-        table.set(DEPENDENCY_NAME_COLUMN, detection_details.get('package_name'))
+        table.set(PACKAGE_COLUMN, detection_details.get('package_name'))
         table.set(DIRECT_DEPENDENCY_COLUMN, detection_details.get('is_direct_dependency_str'))
         table.set(DEVELOPMENT_DEPENDENCY_COLUMN, detection_details.get('is_dev_dependency_str'))
 

{cycode-1.4.1.dev10 → cycode-1.4.1.dev12}/cycode/cyclient/scan_config_base.py

@@ -16,10 +16,8 @@ class ScanConfigBase(ABC):
         return scan_type.upper()
 
     @staticmethod
-    def get_async_entity_type(scan_type: str) -> str:
-        if scan_type == 'secret':
-            return 'zippedfile'
-
+    def get_async_entity_type(_: str) -> str:
+        # we are migrating to "zippedfile" entity type. will be used later
         return 'repository'
 
     @abstractmethod

{cycode-1.4.1.dev10 → cycode-1.4.1.dev12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycode"
-version = "1.4.1.dev10" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+version = "1.4.1.dev12" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
 description = "Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning."
 keywords=["secret-scan", "cycode", "devops", "token", "secret", "security", "cycode", "code"]
 authors = ["Cycode <support@cycode.com>"]

cycode-1.4.1.dev10/cycode/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.4.1.dev10'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag