cycode 3.3.1.dev7__py3-none-any.whl → 3.4.1.dev1__py3-none-any.whl

cycode/__init__.py

@@ -1 +1 @@
-__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

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/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.dist-info → cycode-3.4.1.dev1.dist-info}/METADATA

@@ -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.3.1.dev7.dist-info → cycode-3.4.1.dev1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cycode/__init__.py,sha256=ImFOtHznRUv7IT8EmFAu4DFAoTlxjgIEFEp8SpHasJY,114
+cycode/__init__.py,sha256=HWAqYQIqXsU8dr6XKgVSEsxYrQI2FqUg4lUgGzscTQc,114
 cycode/__main__.py,sha256=Z3bD5yrA7yPvAChcADQrqCaZd0ChGI1gdiwALwbWJ6U,104
 cycode/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/app.py,sha256=UC5A5TKIvlxOYKERfJykN8apTT0VyMY5pUjRh_LM-dw,6098
@@ -44,14 +44,14 @@ cycode/cli/apps/scan/pre_commit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 cycode/cli/apps/scan/pre_commit/pre_commit_command.py,sha256=bnOITHRmXXgmXQhXKbUqulf4s_Kcvq3x96eMPg7H7-Q,550
 cycode/cli/apps/scan/pre_receive/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/apps/scan/pre_receive/pre_receive_command.py,sha256=A4XJV0BIZB7KYVhkCzxvbDkujMGqv7bHai3j-juUq84,2528
-cycode/cli/apps/scan/remote_url_resolver.py,sha256=w8z_Iwr8Mc4PA82H_PPuAX2rXRMC0A9WtyWIVSxlTqA,4072
+cycode/cli/apps/scan/remote_url_resolver.py,sha256=EzHgV7XaJ3TedY35vDrFVGN7qjpaNl8lnYRNSRs3fvQ,5155
 cycode/cli/apps/scan/repository/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/apps/scan/repository/repository_command.py,sha256=YwN8kut3PCw7ZYKIwPu1Ll0SluyygiURjdF8ArUxAXk,2926
 cycode/cli/apps/scan/scan_ci/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/apps/scan/scan_ci/ci_integrations.py,sha256=3ZUv1uLsHC13KTNQ4erQKKDXAkmaSm5jow2Utwr4mCw,1634
 cycode/cli/apps/scan/scan_ci/scan_ci_command.py,sha256=-Eq1FCeO_7Y85oYhBnZurt_wz64WWSA8Zbbm1Y4qLJY,638
 cycode/cli/apps/scan/scan_command.py,sha256=jqG4Qnqz9ITk3EygUNh8dsDmSQle4QEpsZO6hcZ_5qg,7032
-cycode/cli/apps/scan/scan_parameters.py,sha256=VWucE0PZ2nuSTaNrOpdm8WkX7dkJ7dpp8GkYCA0ub5Y,1484
+cycode/cli/apps/scan/scan_parameters.py,sha256=PWZ5tbv19tABwV-yV1J_3ZNCLEmC3W0raGuWD6Nw3jg,1178
 cycode/cli/apps/scan/scan_result.py,sha256=05RFtFgdKDi5_ekzWqRhxlRSu2JduBixm4JkgGhMcW8,8497
 cycode/cli/apps/status/__init__.py,sha256=uxfkEBafO7Da0mPc1fZhwoO0RTtyXp2a5T3LJTZxubU,371
 cycode/cli/apps/status/get_cli_status.py,sha256=qAuDdtWTCMI8ChYrQzgeJI31v8dDu-aEirMN8rThafk,2166
@@ -157,8 +157,8 @@ cycode/cyclient/report_client.py,sha256=h12pz3vWCwDF73BhqFX7iDSxBgQDFwkiGh3hmul2
 cycode/cyclient/scan_client.py,sha256=nQJyt34Bne8UAQNj9OHSgvoCfI1EJFKNaEeeGPnrKcg,12471
 cycode/cyclient/scan_config_base.py,sha256=mXsPZGYCtp85rv5GIige40yQZXuRcEKUW-VQJ0vgFzk,1201
 cycode/logger.py,sha256=xAzpkWLZhixO4egRcYn4HXM9lIfx5wHdpkHxNc5jrX8,2225
-cycode-3.3.1.dev7.dist-info/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
-cycode-3.3.1.dev7.dist-info/METADATA,sha256=MhOr4IcjvMUxWMnWt3iIN53OZ_fX5fQUgzD_kwQSw2Y,71912
-cycode-3.3.1.dev7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cycode-3.3.1.dev7.dist-info/entry_points.txt,sha256=iDcVJM8ByLElVgvBgtYxDjw1kT7O8Mo0LcWZIT5L3Ig,45
-cycode-3.3.1.dev7.dist-info/RECORD,,
+cycode-3.4.1.dev1.dist-info/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
+cycode-3.4.1.dev1.dist-info/METADATA,sha256=vbx4oqra28NcFB1JSKKG7L6lz1UR3nP_PzxaxbFlvAg,71912
+cycode-3.4.1.dev1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cycode-3.4.1.dev1.dist-info/entry_points.txt,sha256=iDcVJM8ByLElVgvBgtYxDjw1kT7O8Mo0LcWZIT5L3Ig,45
+cycode-3.4.1.dev1.dist-info/RECORD,,