cycode 3.24.3.dev1__py3-none-any.whl → 3.24.3.dev2__py3-none-any.whl

cycode/__init__.py

@@ -5,4 +5,4 @@ import time as _time
 # end-to-end scan duration from the moment the user actually triggered it.
 _BOOT_WALL: float = _time.time()
 
-__version__ = '3.24.3.dev1'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+__version__ = '3.24.3.dev2'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

cycode/cli/apps/scan/scan_result.py

@@ -7,7 +7,7 @@ from cycode.cli import consts
 from cycode.cli.apps.scan.aggregation_report import try_get_aggregation_report_url_if_needed
 from cycode.cli.apps.scan.detection_excluder import exclude_irrelevant_document_detections
 from cycode.cli.models import Document, DocumentDetections, LocalScanResult
-from cycode.cli.utils.path_utils import concat_unique_id, get_path_by_os, normalize_file_path
+from cycode.cli.utils.path_utils import concat_unique_id, normalize_file_path
 from cycode.cyclient.models import (
     Detection,
     DetectionSchema,
@@ -49,7 +49,7 @@ def _get_document_detections(
 
     document_detections = []
     for detections_per_file in scan_result.detections_per_file:
-        file_name = get_path_by_os(detections_per_file.file_name)
+        file_name = detections_per_file.file_name
         commit_id = detections_per_file.commit_id
 
         logger.debug(

cycode/cli/consts.py

@@ -1,7 +1,27 @@
+import sys
+from enum import Enum
+
 PROGRAM_NAME = 'cycode'
 APP_NAME = 'CycodeCLI'
 CLI_CONTEXT_SETTINGS = {'terminal_width': 10**9, 'max_content_width': 10**9, 'help_option_names': ['-h', '--help']}
 
+
+class OperatingSystem(str, Enum):
+    WINDOWS = 'windows'
+    MACOS = 'macos'
+    LINUX = 'linux'
+
+
+def _detect_operating_system() -> OperatingSystem:
+    if sys.platform == 'win32':
+        return OperatingSystem.WINDOWS
+    if sys.platform == 'darwin':
+        return OperatingSystem.MACOS
+    return OperatingSystem.LINUX
+
+
+OPERATING_SYSTEM = _detect_operating_system()
+
 PRE_COMMIT_COMMAND_SCAN_TYPE = 'pre-commit'
 PRE_COMMIT_COMMAND_SCAN_TYPE_OLD = 'pre_commit'
 PRE_RECEIVE_COMMAND_SCAN_TYPE = 'pre-receive'

cycode/cli/utils/path_utils.py

@@ -2,10 +2,12 @@ import json
 import os
 import tempfile
 from functools import cache
+from pathlib import PurePath, PurePosixPath, PureWindowsPath
 from typing import TYPE_CHECKING, AnyStr, Optional, Union
 
 import typer
 
+from cycode.cli.consts import OPERATING_SYSTEM, OperatingSystem
 from cycode.cli.logger import logger
 from cycode.cli.utils.binary_utils import is_binary_string
 
@@ -125,12 +127,29 @@ def change_filename_extension(filename: str, extension: str) -> str:
     return f'{base_name}.{extension}'
 
 
+def _to_relative_posix_parts(path: str, operating_system: OperatingSystem = OPERATING_SYSTEM) -> tuple[str, ...]:
+    """Split a path into OS-agnostic components: drop the root, keep the UNC server and share.
+
+    The archive entry name is read back by the server as ``<unique id>/<path>``, so it must use forward slashes
+    and must never start with a root. The flavor comes from the running OS rather than from the path itself, so
+    a colon in a POSIX file name is not mistaken for a drive letter.
+    """
+    pure: PurePath = PureWindowsPath(path) if operating_system is OperatingSystem.WINDOWS else PurePosixPath(path)
+    if not pure.anchor:
+        return pure.parts
+
+    # the anchor is 'C:\\', '/' or '\\\\server\\share\\': keep the names it carries, drop the drive and separators
+    anchor_parts = tuple(p for p in pure.anchor.replace('\\', '/').split('/') if p and not p.endswith(':'))
+    return anchor_parts + pure.parts[1:]
+
+
 def concat_unique_id(filename: str, unique_id: str) -> str:
-    if filename.startswith(os.sep):
-        # remove leading slash to join the path correctly
-        filename = filename[len(os.sep) :]
+    """Prefix the file name with the unique id (e.g. a commit SHA) to build the name of the archive entry.
 
-    return os.path.join(unique_id, filename)
+    The server reads the unique id back from the first path component, so the file name must become relative
+    before joining; otherwise the prefix is lost and a Windows drive letter is reported as the commit id.
+    """
+    return str(PurePosixPath(unique_id, *_to_relative_posix_parts(filename)))
 
 
 def get_path_from_context(ctx: typer.Context) -> Optional[str]:
@@ -141,8 +160,6 @@ def get_path_from_context(ctx: typer.Context) -> Optional[str]:
 
 
 def normalize_file_path(path: str) -> str:
-    if path.startswith('/'):
-        return path[1:]
-    if path.startswith('./'):
-        return path[2:]
-    return path
+    """Make a path comparable with the file name the server reports back: no drive, no root, forward slashes."""
+    parts = _to_relative_posix_parts(path)
+    return str(PurePosixPath(*parts)) if parts else ''

{cycode-3.24.3.dev1.dist-info → cycode-3.24.3.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cycode
-Version: 3.24.3.dev1
+Version: 3.24.3.dev2
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 License-Expression: MIT
 License-File: LICENCE

{cycode-3.24.3.dev1.dist-info → cycode-3.24.3.dev2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cycode/__init__.py,sha256=wtCAJfg1G9S77BjTZnEOGdvsx7uh8NyJbPhKu69su18,396
+cycode/__init__.py,sha256=HK6TLsMHRMhqe6vN-erC38DYM3L6-4xpzMznXT18zCk,396
 cycode/__main__.py,sha256=Z3bD5yrA7yPvAChcADQrqCaZd0ChGI1gdiwALwbWJ6U,104
 cycode/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/app.py,sha256=AlR2durAEbsa47PDfIj7JtMvJDWA_Dq6wPtVuMJYSCs,10250
@@ -89,7 +89,7 @@ cycode/cli/apps/scan/scan_ci/ci_integrations.py,sha256=3ZUv1uLsHC13KTNQ4erQKKDXA
 cycode/cli/apps/scan/scan_ci/scan_ci_command.py,sha256=37I6YTs5UWYtbnDe1EeYZnhV1twFTDUrniZ4Sf2_6Kk,562
 cycode/cli/apps/scan/scan_command.py,sha256=_XN1Pz21-rRFKYxN-Bn_iDtEd1zE4drcSfSa1b4b5Us,7988
 cycode/cli/apps/scan/scan_parameters.py,sha256=F7SCTuTR_iGfztvwapVJjjq9mXhuQv9EvcaX-YyiILI,1481
-cycode/cli/apps/scan/scan_result.py,sha256=13gmFugcQ_ksgpImhiLOfuQ1bEp0gcJhTiszl6dBy14,9167
+cycode/cli/apps/scan/scan_result.py,sha256=pnepGlmsJEl9jRFCsQzyBvlwpZYvi5PzkCAfvaLZeL0,9135
 cycode/cli/apps/status/__init__.py,sha256=uxfkEBafO7Da0mPc1fZhwoO0RTtyXp2a5T3LJTZxubU,371
 cycode/cli/apps/status/get_cli_status.py,sha256=1UAVyKPpYk2S8nQYshKD1x5xgWR-hCTchLChxNU0JVA,2577
 cycode/cli/apps/status/models.py,sha256=2SBpJlh_MNCPxv8aXMV5D4GfK6-G-XB0GlMFZ3Nep_o,1907
@@ -98,7 +98,7 @@ cycode/cli/apps/status/version_command.py,sha256=c6Iko_rmZo9T_kQSd3HUloBi40Qv7cj
 cycode/cli/cli_types.py,sha256=Xqf2eSx3yUvFoQG29ObUZ3QLVBhtZ4mkqxf_cJXpntU,3406
 cycode/cli/config.py,sha256=Op-lX_neanJtvPvoOEx4ByBdveh5ygElIga1FdSHhOI,299
 cycode/cli/console.py,sha256=vp-DHwlkwpwdsPyfwGdjsPF-6-Bi3f8W7G-W_YXCMH8,1914
-cycode/cli/consts.py,sha256=UnYIqdoYbfSBP64UTwNhVzhyNdJA0N-0-dOgOR3eI98,10754
+cycode/cli/consts.py,sha256=jI1M2PolPIIodJMphQYrTbzCOrjO3umjb6R92h1Ntww,11163
 cycode/cli/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/exceptions/custom_exceptions.py,sha256=ko1A5vw6s5Q1OVtQirjWV_3igTL1_Y5bzvT39WPOB2U,4913
 cycode/cli/exceptions/handle_ai_remediation_errors.py,sha256=mA70upSYXK3rL_fmanzKYeUzLENhpXdkW8k3aIHrKzU,785
@@ -183,7 +183,7 @@ cycode/cli/utils/git_proxy.py,sha256=FPHMBiyLFK9X9vKYpKySRKJH6Dc9Cb3nO241Q95dASE
 cycode/cli/utils/host_info.py,sha256=Clln3qCJR00rw6HndD0bAIv329n_bOEx42TKW6FqXFQ,6379
 cycode/cli/utils/ignore_utils.py,sha256=cODqhnOHA2kRo8rMY0YcmcKkmXNPOC9UTCmFu62RRqE,15567
 cycode/cli/utils/jwt_utils.py,sha256=EGI-0CKhCGY8hIcZ9b9diq9hqtOUf8Ha8ukeVJIf974,818
-cycode/cli/utils/path_utils.py,sha256=zc48CSU7hxqjSgfH6h5M1B0kIcKW44BOJrUa_6z-mAo,4317
+cycode/cli/utils/path_utils.py,sha256=YlAUz2seaKT25ggqcnAjxqQd1oUlXTn1LIebBOht4nQ,5699
 cycode/cli/utils/progress_bar.py,sha256=bKBWHHdZsVkdDdWMJLfgLGR0cBYeB44P_DpRM8pvWqU,9528
 cycode/cli/utils/scan_batch.py,sha256=5xKGVDVqoRxdKhuZkK11x4QrNqKmU20Q83E_fy8Nndk,5188
 cycode/cli/utils/scan_utils.py,sha256=_VkZ7maLVST6J8dsqDsKYWQj2EVfqI3iPPsA1QJOGEU,1259
@@ -217,8 +217,8 @@ cycode/cyclient/report_client.py,sha256=Scq30NeJPzgXv0hPLO1U05AdE9i_2iu6cIrSKpEJ
 cycode/cyclient/scan_client.py,sha256=DqAZ7u6Z_cvw9A9RlLkAQUgLRwPCCAsUq5U9umt4F7Y,16955
 cycode/cyclient/scan_config_base.py,sha256=mXsPZGYCtp85rv5GIige40yQZXuRcEKUW-VQJ0vgFzk,1201
 cycode/logger.py,sha256=EfZGRK6VC5rE_LAjIcRrHFiQCueylCDXoG6bvGkrIME,2111
-cycode-3.24.3.dev1.dist-info/METADATA,sha256=A9vzVVmsboZ4zKuuDIw4JT2uc7tj9yzLZyZcP5_Lpb8,94757
-cycode-3.24.3.dev1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-cycode-3.24.3.dev1.dist-info/entry_points.txt,sha256=iDcVJM8ByLElVgvBgtYxDjw1kT7O8Mo0LcWZIT5L3Ig,45
-cycode-3.24.3.dev1.dist-info/licenses/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
-cycode-3.24.3.dev1.dist-info/RECORD,,
+cycode-3.24.3.dev2.dist-info/METADATA,sha256=v_UoGBhf9pWwpmMaE8u9wNCX07CnnGT9XgQA2Hbq2BM,94757
+cycode-3.24.3.dev2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+cycode-3.24.3.dev2.dist-info/entry_points.txt,sha256=iDcVJM8ByLElVgvBgtYxDjw1kT7O8Mo0LcWZIT5L3Ig,45
+cycode-3.24.3.dev2.dist-info/licenses/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
+cycode-3.24.3.dev2.dist-info/RECORD,,