cycode 3.3.1.dev7__tar.gz → 3.4.1.dev1__tar.gz

{cycode-3.3.1.dev7 → cycode-3.4.1.dev1}/PKG-INFO

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

cycode-3.4.1.dev1/cycode/__init__.py

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

{cycode-3.3.1.dev7 → cycode-3.4.1.dev1}/cycode/cli/apps/scan/remote_url_resolver.py

@@ -99,17 +99,46 @@ def _try_to_get_plastic_remote_url(path: str) -> Optional[str]:
 
 def _try_get_git_remote_url(path: str) -> Optional[str]:
     try:
-        remote_url = git_proxy.get_repo(path).remotes[0].config_reader.get('url')
-        logger.debug('Found Git remote URL, %s', {'remote_url': remote_url, 'path': path})
+        repo = git_proxy.get_repo(path, search_parent_directories=True)
+        remote_url = repo.remotes[0].config_reader.get('url')
+        logger.debug('Found Git remote URL, %s', {'remote_url': remote_url, 'repo_path': repo.working_dir})
         return remote_url
-    except Exception:
-        logger.debug('Failed to get Git remote URL. Probably not a Git repository')
+    except Exception as e:
+        logger.debug('Failed to get Git remote URL. Probably not a Git repository', exc_info=e)
         return None
 
 
-def try_get_any_remote_url(path: str) -> Optional[str]:
+def _try_get_any_remote_url(path: str) -> Optional[str]:
     remote_url = _try_get_git_remote_url(path)
     if not remote_url:
         remote_url = _try_to_get_plastic_remote_url(path)
 
     return remote_url
+
+
+def get_remote_url_scan_parameter(paths: tuple[str, ...]) -> Optional[str]:
+    remote_urls = set()
+    for path in paths:
+        # FIXME(MarshalX): perf issue. This looping will produce:
+        #  - len(paths) Git subprocess calls in the worst case
+        #  - len(paths)*2 Plastic SCM subprocess calls
+        remote_url = _try_get_any_remote_url(path)
+        if remote_url:
+            remote_urls.add(remote_url)
+
+    if len(remote_urls) == 1:
+        # we are resolving remote_url only if all paths belong to the same repo (identical remote URLs),
+        # otherwise, the behavior is undefined
+        remote_url = remote_urls.pop()
+
+        logger.debug(
+            'Single remote URL found. Scan will be associated with organization, %s', {'remote_url': remote_url}
+        )
+        return remote_url
+
+    logger.debug(
+        'Multiple different remote URLs found. Scan will not be associated with organization, %s',
+        {'remote_urls': remote_urls},
+    )
+
+    return None

{cycode-3.3.1.dev7 → cycode-3.4.1.dev1}/cycode/cli/apps/scan/scan_parameters.py

@@ -1,9 +1,8 @@
-import os
 from typing import Optional
 
 import typer
 
-from cycode.cli.apps.scan.remote_url_resolver import try_get_any_remote_url
+from cycode.cli.apps.scan.remote_url_resolver import get_remote_url_scan_parameter
 from cycode.cli.utils.scan_utils import generate_unique_scan_id
 from cycode.logger import get_logger
 
@@ -29,18 +28,9 @@ def get_scan_parameters(ctx: typer.Context, paths: Optional[tuple[str, ...]] = N
 
     scan_parameters['paths'] = paths
 
-    if len(paths) != 1:
-        logger.debug('Multiple paths provided, going to ignore remote url')
-        return scan_parameters
-
-    if not os.path.isdir(paths[0]):
-        logger.debug('Path is not a directory, going to ignore remote url')
-        return scan_parameters
-
-    remote_url = try_get_any_remote_url(paths[0])
-    if remote_url:
-        # TODO(MarshalX): remove hardcode in context
-        ctx.obj['remote_url'] = remote_url
-        scan_parameters['remote_url'] = remote_url
+    remote_url = get_remote_url_scan_parameter(paths)
+    # TODO(MarshalX): remove hardcode in context
+    ctx.obj['remote_url'] = remote_url
+    scan_parameters['remote_url'] = remote_url
 
     return scan_parameters

{cycode-3.3.1.dev7 → cycode-3.4.1.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycode"
-version = "3.3.1.dev7" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+version = "3.4.1.dev1" # 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-3.3.1.dev7/cycode/__init__.py

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