cycode 2.2.1.dev2__py3-none-any.whl → 2.2.1.dev3__py3-none-any.whl

cycode/__init__.py

@@ -1 +1 @@
-__version__ = '2.2.1.dev2'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+__version__ = '2.2.1.dev3'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

cycode/cli/commands/scan/code_scanner.py

@@ -301,6 +301,7 @@ def scan_documents(
     if not scan_parameters:
         scan_parameters = get_default_scan_parameters(context)
 
+    scan_type = context.obj['scan_type']
     progress_bar = context.obj['progress_bar']
 
     if not documents_to_scan:
@@ -318,13 +319,13 @@ def scan_documents(
         context, is_git_diff, is_commit_range, scan_parameters
     )
     errors, local_scan_results = run_parallel_batched_scan(
-        scan_batch_thread_func, documents_to_scan, progress_bar=progress_bar
+        scan_batch_thread_func, scan_type, documents_to_scan, progress_bar=progress_bar
     )
 
     if len(local_scan_results) > 1:
         # if we used more than one batch, we need to fetch aggregate report url
         aggregation_report_url = _try_get_aggregation_report_url_if_needed(
-            scan_parameters, context.obj['client'], context.obj['scan_type']
+            scan_parameters, context.obj['client'], scan_type
         )
         set_aggregation_report_url(context, aggregation_report_url)
 

cycode/cli/commands/scan/scan_command.py

@@ -3,6 +3,7 @@ from typing import List
 
 import click
 
+from cycode.cli import consts
 from cycode.cli.commands.scan.commit_history.commit_history_command import commit_history_command
 from cycode.cli.commands.scan.path.path_command import path_command
 from cycode.cli.commands.scan.pre_commit.pre_commit_command import pre_commit_command
@@ -34,7 +35,7 @@ from cycode.cli.utils.get_api_client import get_scan_cycode_client
 @click.option(
     '--scan-type',
     '-t',
-    default='secret',
+    default=consts.SECRET_SCAN_TYPE,
     help='Specify the type of scan you wish to execute (the default is Secrets).',
     type=click.Choice(config['scans']['supported_scans']),
 )

cycode/cli/consts.py

@@ -136,14 +136,16 @@ EXCLUSIONS_BY_CVE_SECTION_NAME = 'cves'
 # 5MB in bytes (in decimal)
 FILE_MAX_SIZE_LIMIT_IN_BYTES = 5000000
 
-# 20MB in bytes (in binary)
-ZIP_MAX_SIZE_LIMIT_IN_BYTES = 20971520
-# 200MB in bytes (in binary)
-SCA_ZIP_MAX_SIZE_LIMIT_IN_BYTES = 209715200
+DEFAULT_ZIP_MAX_SIZE_LIMIT_IN_BYTES = 20 * 1024 * 1024
+ZIP_MAX_SIZE_LIMIT_IN_BYTES = {
+    SCA_SCAN_TYPE: 200 * 1024 * 1024,
+    SAST_SCAN_TYPE: 50 * 1024 * 1024,
+}
 
 # scan in batches
-SCAN_BATCH_MAX_SIZE_IN_BYTES = 9 * 1024 * 1024
-SCAN_BATCH_MAX_FILES_COUNT = 1000
+DEFAULT_SCAN_BATCH_MAX_SIZE_IN_BYTES = 9 * 1024 * 1024
+SCAN_BATCH_MAX_SIZE_IN_BYTES = {SAST_SCAN_TYPE: 50 * 1024 * 1024}
+DEFAULT_SCAN_BATCH_MAX_FILES_COUNT = 1000
 # if we increase this values, the server doesn't allow connecting (ConnectionError)
 SCAN_BATCH_MAX_PARALLEL_SCANS = 5
 SCAN_BATCH_SCANS_PER_CPU = 1

cycode/cli/files_collector/zip_documents.py

@@ -10,12 +10,9 @@ from cycode.cyclient import logger
 
 
 def _validate_zip_file_size(scan_type: str, zip_file_size: int) -> None:
-    if scan_type == consts.SCA_SCAN_TYPE:
-        if zip_file_size > consts.SCA_ZIP_MAX_SIZE_LIMIT_IN_BYTES:
-            raise custom_exceptions.ZipTooLargeError(consts.SCA_ZIP_MAX_SIZE_LIMIT_IN_BYTES)
-    else:
-        if zip_file_size > consts.ZIP_MAX_SIZE_LIMIT_IN_BYTES:
-            raise custom_exceptions.ZipTooLargeError(consts.ZIP_MAX_SIZE_LIMIT_IN_BYTES)
+    max_size_limit = consts.ZIP_MAX_SIZE_LIMIT_IN_BYTES.get(scan_type, consts.DEFAULT_ZIP_MAX_SIZE_LIMIT_IN_BYTES)
+    if zip_file_size > max_size_limit:
+        raise custom_exceptions.ZipTooLargeError(max_size_limit)
 
 
 def zip_documents(scan_type: str, documents: List[Document], zip_file: Optional[InMemoryZip] = None) -> InMemoryZip:

cycode/cli/utils/scan_batch.py

@@ -2,12 +2,7 @@ import os
 from multiprocessing.pool import ThreadPool
 from typing import TYPE_CHECKING, Callable, Dict, List, Tuple
 
-from cycode.cli.consts import (
-    SCAN_BATCH_MAX_FILES_COUNT,
-    SCAN_BATCH_MAX_PARALLEL_SCANS,
-    SCAN_BATCH_MAX_SIZE_IN_BYTES,
-    SCAN_BATCH_SCANS_PER_CPU,
-)
+from cycode.cli import consts
 from cycode.cli.models import Document
 from cycode.cli.utils.progress_bar import ScanProgressBarSection
 
@@ -18,8 +13,8 @@ if TYPE_CHECKING:
 
 def split_documents_into_batches(
     documents: List[Document],
-    max_size_mb: int = SCAN_BATCH_MAX_SIZE_IN_BYTES,
-    max_files_count: int = SCAN_BATCH_MAX_FILES_COUNT,
+    max_size: int = consts.DEFAULT_SCAN_BATCH_MAX_SIZE_IN_BYTES,
+    max_files_count: int = consts.DEFAULT_SCAN_BATCH_MAX_FILES_COUNT,
 ) -> List[List[Document]]:
     batches = []
 
@@ -28,7 +23,7 @@ def split_documents_into_batches(
     for document in documents:
         document_size = len(document.content.encode('UTF-8'))
 
-        if (current_size + document_size > max_size_mb) or (len(current_batch) >= max_files_count):
+        if (current_size + document_size > max_size) or (len(current_batch) >= max_files_count):
             batches.append(current_batch)
 
             current_batch = [document]
@@ -45,17 +40,18 @@ def split_documents_into_batches(
 
 def _get_threads_count() -> int:
     cpu_count = os.cpu_count() or 1
-    return min(cpu_count * SCAN_BATCH_SCANS_PER_CPU, SCAN_BATCH_MAX_PARALLEL_SCANS)
+    return min(cpu_count * consts.SCAN_BATCH_SCANS_PER_CPU, consts.SCAN_BATCH_MAX_PARALLEL_SCANS)
 
 
 def run_parallel_batched_scan(
     scan_function: Callable[[List[Document]], Tuple[str, 'CliError', 'LocalScanResult']],
+    scan_type: str,
     documents: List[Document],
     progress_bar: 'BaseProgressBar',
-    max_size_mb: int = SCAN_BATCH_MAX_SIZE_IN_BYTES,
-    max_files_count: int = SCAN_BATCH_MAX_FILES_COUNT,
 ) -> Tuple[Dict[str, 'CliError'], List['LocalScanResult']]:
-    batches = split_documents_into_batches(documents, max_size_mb, max_files_count)
+    max_size = consts.SCAN_BATCH_MAX_SIZE_IN_BYTES.get(scan_type, consts.DEFAULT_SCAN_BATCH_MAX_SIZE_IN_BYTES)
+    batches = split_documents_into_batches(documents, max_size)
+
     progress_bar.set_section_length(ScanProgressBarSection.SCAN, len(batches))  # * 3
     # TODO(MarshalX): we should multiply the count of batches in SCAN section because each batch has 3 steps:
     # 1. scan creation

cycode/cyclient/scan_client.py

@@ -328,11 +328,11 @@ class ScanClient:
     @staticmethod
     def get_service_name(scan_type: str) -> Optional[str]:
         # TODO(MarshalX): get_service_name should be removed from ScanClient? Because it exists in ScanConfig
-        if scan_type == 'secret':
+        if scan_type == consts.SECRET_SCAN_TYPE:
             return 'secret'
-        if scan_type == 'iac':
+        if scan_type == consts.INFRA_CONFIGURATION_SCAN_TYPE:
             return 'iac'
-        if scan_type == 'sca' or scan_type == 'sast':
+        if scan_type == consts.SCA_SCAN_TYPE or scan_type == consts.SAST_SCAN_TYPE:
             return 'scans'
 
         return None

cycode/cyclient/scan_config_base.py

@@ -9,9 +9,9 @@ class ScanConfigBase(ABC):
 
     @staticmethod
     def get_async_scan_type(scan_type: str) -> str:
-        if scan_type == 'secret':
+        if scan_type == consts.SECRET_SCAN_TYPE:
             return 'Secrets'
-        if scan_type == 'iac':
+        if scan_type == consts.INFRA_CONFIGURATION_SCAN_TYPE:
             return 'InfraConfiguration'
 
         return scan_type.upper()
@@ -31,9 +31,9 @@ class DevScanConfig(ScanConfigBase):
     def get_service_name(self, scan_type: str, should_use_scan_service: bool = False) -> str:
         if should_use_scan_service:
             return '5004'
-        if scan_type == 'secret':
+        if scan_type == consts.SECRET_SCAN_TYPE:
             return '5025'
-        if scan_type == 'iac':
+        if scan_type == consts.INFRA_CONFIGURATION_SCAN_TYPE:
             return '5026'
 
         # sca and sast
@@ -47,9 +47,9 @@ class DefaultScanConfig(ScanConfigBase):
     def get_service_name(self, scan_type: str, should_use_scan_service: bool = False) -> str:
         if should_use_scan_service:
             return 'scans'
-        if scan_type == 'secret':
+        if scan_type == consts.SECRET_SCAN_TYPE:
             return 'secret'
-        if scan_type == 'iac':
+        if scan_type == consts.INFRA_CONFIGURATION_SCAN_TYPE:
             return 'iac'
 
         # sca and sast

{cycode-2.2.1.dev2.dist-info → cycode-2.2.1.dev3.dist-info}/METADATA

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

{cycode-2.2.1.dev2.dist-info → cycode-2.2.1.dev3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cycode/__init__.py,sha256=bSr8UX24Qhqyb8DkxP-yP2BBgUKJ6SDz2M8-bLdnePw,114
+cycode/__init__.py,sha256=vpHVIjFbUE0HZ1vNee8RWTjIDx4aPXE7TjY-L3UxHpw,114
 cycode/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/commands/ai_remediation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,7 +23,7 @@ cycode/cli/commands/report/sbom/repository_url/repository_url_command.py,sha256=
 cycode/cli/commands/report/sbom/sbom_command.py,sha256=akjbxFcArXW6tnGBXJWTpPjMr28pNmJZGLD7UxKeW6Y,2431
 cycode/cli/commands/report/sbom/sbom_report_file.py,sha256=fr3HMSr6lppeI3OgYADDWlWD8ij2edN1gmpUOPmeTN0,1533
 cycode/cli/commands/scan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cycode/cli/commands/scan/code_scanner.py,sha256=lqK9s8D9uQgmuZwMY-tZf_gvkAbYz7-zNjL69bnChl8,40546
+cycode/cli/commands/scan/code_scanner.py,sha256=3y9Wna6cB97_iLFW6jc7FIfY7d58paKi-BFPgMkm7Ww,40583
 cycode/cli/commands/scan/commit_history/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/commands/scan/commit_history/commit_history_command.py,sha256=Yr1MAcrTYvYxdjAFBuvovWs3B5wBFv-N4lZRox_gXDE,1062
 cycode/cli/commands/scan/path/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,7 +37,7 @@ cycode/cli/commands/scan/repository/repository_command.py,sha256=xH6PPXweenHOll7
 cycode/cli/commands/scan/scan_ci/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/commands/scan/scan_ci/ci_integrations.py,sha256=bbttv1pI8C2jQWtvt_mzypFEVi2iTI9TV0xfeIgrs5M,1588
 cycode/cli/commands/scan/scan_ci/scan_ci_command.py,sha256=wTjNt06gWgNoehg1ueHf9eAXseGE8pUb6wL1_vrIU5w,622
-cycode/cli/commands/scan/scan_command.py,sha256=R4MbHrW6Evpikeg3W0r9kUtZUTUGffFkE0B2WeiutJA,5170
+cycode/cli/commands/scan/scan_command.py,sha256=mLyksWNm40nJiP6iV8yNwFfpstx3uN5r3Tr53tfkDjs,5215
 cycode/cli/commands/status/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/commands/status/status_command.py,sha256=DlIHHLv7CgmlXd6Kn9p26VF0TfRUmhGKLFc3FUEPQOo,4295
 cycode/cli/commands/version/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,7 +45,7 @@ cycode/cli/commands/version/version_checker.py,sha256=fuT_REPWh_eQW7OTBETgdeXMa5
 cycode/cli/commands/version/version_command.py,sha256=CdLccqFoK3_yE13H7QUpxjsEZltke1emN-_qHHpnghU,555
 cycode/cli/config.py,sha256=JR_-uZdWVV-AaffRqTbDH0V7O4KLGNKn50v3huuPlts,466
 cycode/cli/config.yaml,sha256=SBs5VNdaY9BVbRlwgnTF_j53GBbjJVwwBj9qx_qvrds,463
-cycode/cli/consts.py,sha256=XyqiqjjDsHCDQpmSCgXcAlT8MEj2LcJZygxVqLaRLh0,6878
+cycode/cli/consts.py,sha256=Tqzme0tesEEWOd30fJgSwmpIo-ITb9tHXhc_xrpIoDA,6985
 cycode/cli/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/exceptions/common.py,sha256=Si_e8bn_VfsnCww_eN1czF9iBPbQZxS8L8Oy4YoA0cA,954
 cycode/cli/exceptions/custom_exceptions.py,sha256=7HiXUoh0lnIP7yUwO-lv1p9AXiMU2bIJdlUvu9H6CKY,3466
@@ -77,7 +77,7 @@ cycode/cli/files_collector/sca/sbt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 cycode/cli/files_collector/sca/sbt/restore_sbt_dependencies.py,sha256=hlRoQWEFbap2UYiVdK6HOeWi0Zn3l2Az2A4yWdnnyI0,923
 cycode/cli/files_collector/sca/sca_code_scanner.py,sha256=E5cIBdjwrL2Exy7U6r9HiZX-ex86QeX7LCkDK2km2Sc,7145
 cycode/cli/files_collector/walk_ignore.py,sha256=y9gI91F2AIborQb03QcwedBIhzi6r4sKuYLBACqaw3k,1459
-cycode/cli/files_collector/zip_documents.py,sha256=64ovgvzG7399bPWIg_g0T3KebSuFpRXZaxBTeNdJ17k,1873
+cycode/cli/files_collector/zip_documents.py,sha256=Trmref-dBdxNUd6deNobkNj2VI_9Gcu5lGkw1DGWwg8,1728
 cycode/cli/main.py,sha256=TWZxfs7nu-zSm1YU4H801T_u16xeV3S-gZcb4gSSD24,387
 cycode/cli/models.py,sha256=yxJJsHO-VBVeomVupD8ho_KyUEX-T0n61b23YF6_AMw,2363
 cycode/cli/printers/__init__.py,sha256=ALwAXSZy2lNXWC3NfCIxf8K0F6eFrbZa9PLZwPINi5E,93
@@ -106,7 +106,7 @@ cycode/cli/utils/ignore_utils.py,sha256=zQqRS_SmuFZfTwmRGnYJHd9lIolYoGDgSAiAIZmr
 cycode/cli/utils/jwt_utils.py,sha256=M7UxRHQQ1xsWxg0b1Lo85eQxhnhfgBJB4xpe1Y_JZZs,544
 cycode/cli/utils/path_utils.py,sha256=TqyH-kZxEQHa6rVygr8yBy0fbXSwNu34-ifIKM4n-os,3114
 cycode/cli/utils/progress_bar.py,sha256=OMG_JF5xIScDvqeOuHcEr6kPcYR1D8n9hzD64uq_-EI,9884
-cycode/cli/utils/scan_batch.py,sha256=4zLbnuZ7c-jM-KZCgCKVVXQEhWYWYaTNWOUqL9VLJDY,2794
+cycode/cli/utils/scan_batch.py,sha256=TXEkujV6wqaLyC_FNNtc5LYp-ogFIAxc2kqt1yAB4Tw,2701
 cycode/cli/utils/scan_utils.py,sha256=d3Cysjagh0RRbIXNmt0rQfgDTtZBJKO9TLntC6CuPbQ,334
 cycode/cli/utils/shell_executor.py,sha256=jmD8El3wzkLaGwf3iHjbfFhd6Z9MOs9F7sLuIP9MiKg,935
 cycode/cli/utils/string_utils.py,sha256=W4TMXOQP_PpAfOYemWkUK1TeW_TkQDBCHeTeL0Olcsk,2034
@@ -125,10 +125,10 @@ cycode/cyclient/cycode_token_based_client.py,sha256=tD_HWgkz0VDcU4AQsPxHxGTwfQ8K
 cycode/cyclient/headers.py,sha256=5KnigR9_1ifxW63z1iYgETfjD3D1v85jkth3oc2fERM,1434
 cycode/cyclient/models.py,sha256=iUrTtQrIvls1kgtOadCa8QPzsvh8_kj2eZIX73FIIpk,14354
 cycode/cyclient/report_client.py,sha256=sNLOm64oaONz-TUBs6fpFfbb7RfxALPS6YBqadMo2-8,3971
-cycode/cyclient/scan_client.py,sha256=BvoMiwgPImvdyp3n6qKwqGtWxjPkeb1JvBd3QphGkz0,14696
-cycode/cyclient/scan_config_base.py,sha256=sM69JOIt6Y0zFT-kp0KXSBjG8ViKl2Y2y6Fh95-57io,1642
-cycode-2.2.1.dev2.dist-info/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
-cycode-2.2.1.dev2.dist-info/METADATA,sha256=gUjfwkOG3GsNBovL0RYliolaPOFF0QVnSr0N1C3eOT4,45725
-cycode-2.2.1.dev2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cycode-2.2.1.dev2.dist-info/entry_points.txt,sha256=GKZlS6LtUdABDPd7-o9bwNSI5gYQnyA3qGrFFQKt3Vc,51
-cycode-2.2.1.dev2.dist-info/RECORD,,
+cycode/cyclient/scan_client.py,sha256=kgtGsxW-7Y_7hlS1ZY0O5xcRm8i3PvRp84PgEWlhD_0,14772
+cycode/cyclient/scan_config_base.py,sha256=JqoC8C8164IuFrhJe540bPWf6_iQOZ2SJXGud72COwo,1780
+cycode-2.2.1.dev3.dist-info/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
+cycode-2.2.1.dev3.dist-info/METADATA,sha256=JF5gXu-j65pl0IjE45PWg-qKh688TB0Ud4VMxiqjCFo,45725
+cycode-2.2.1.dev3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cycode-2.2.1.dev3.dist-info/entry_points.txt,sha256=GKZlS6LtUdABDPd7-o9bwNSI5gYQnyA3qGrFFQKt3Vc,51
+cycode-2.2.1.dev3.dist-info/RECORD,,