cycode 3.7.1.dev1__tar.gz → 3.7.2.dev1__tar.gz

{cycode-3.7.1.dev1 → cycode-3.7.2.dev1}/PKG-INFO

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

cycode-3.7.2.dev1/cycode/__init__.py

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

{cycode-3.7.1.dev1 → cycode-3.7.2.dev1}/cycode/cli/apps/scan/pre_receive/pre_receive_command.py

@@ -47,7 +47,9 @@ def pre_receive_command(
         timeout = configuration_manager.get_pre_receive_command_timeout(command_scan_type)
         with TimeoutAfter(timeout):
             branch_update_details = parse_pre_receive_input()
-            commit_range = calculate_pre_receive_commit_range(branch_update_details)
+            commit_range = calculate_pre_receive_commit_range(
+                repo_path=os.getcwd(), branch_update_details=branch_update_details
+            )
             if not commit_range:
                 logger.info(
                     'No new commits found for pushed branch, %s',

{cycode-3.7.1.dev1 → cycode-3.7.2.dev1}/cycode/cli/files_collector/commit_range_documents.py

@@ -104,19 +104,27 @@ def collect_commit_range_diff_documents(
     return commit_documents_to_scan
 
 
-def calculate_pre_receive_commit_range(branch_update_details: str) -> Optional[str]:
+def calculate_pre_receive_commit_range(repo_path: str, branch_update_details: str) -> Optional[str]:
     end_commit = _get_end_commit_from_branch_update_details(branch_update_details)
 
     # branch is deleted, no need to perform scan
     if end_commit == consts.EMPTY_COMMIT_SHA:
         return None
 
-    start_commit = _get_oldest_unupdated_commit_for_branch(end_commit)
+    repo = git_proxy.get_repo(repo_path)
+    start_commit = _get_oldest_unupdated_commit_for_branch(repo, end_commit)
 
     # no new commit to update found
     if not start_commit:
         return None
 
+    # If the oldest not-yet-updated commit has no parent (root commit or orphaned history),
+    # using '~1' will fail. In that case, scan from the end commit, which effectively
+    # includes the entire history reachable from it (which is exactly what we need here).
+
+    if not bool(repo.commit(start_commit).parents):
+        return f'{end_commit}'
+
     return f'{start_commit}~1...{end_commit}'
 
 
@@ -126,10 +134,10 @@ def _get_end_commit_from_branch_update_details(update_details: str) -> str:
     return end_commit
 
 
-def _get_oldest_unupdated_commit_for_branch(commit: str) -> Optional[str]:
+def _get_oldest_unupdated_commit_for_branch(repo: 'Repo', commit: str) -> Optional[str]:
     # get a list of commits by chronological order that are not in the remote repository yet
     # more info about rev-list command: https://git-scm.com/docs/git-rev-list
-    repo = git_proxy.get_repo(os.getcwd())
+
     not_updated_commits = repo.git.rev_list(commit, '--topo-order', '--reverse', '--not', '--all')
 
     commits = not_updated_commits.splitlines()
@@ -199,8 +207,7 @@ def parse_pre_receive_input() -> str:
 
     :return: First branch update details (input's first line)
     """
-    # FIXME(MarshalX): this blocks main thread forever if called outside of pre-receive hook
-    pre_receive_input = sys.stdin.read().strip()
+    pre_receive_input = _read_hook_input_from_stdin()
     if not pre_receive_input:
         raise ValueError(
             'Pre receive input was not found. Make sure that you are using this command only in pre-receive hook'
@@ -222,7 +229,7 @@ def parse_pre_push_input() -> str:
 
     :return: First, push update details (input's first line)
     """  # noqa: E501
-    pre_push_input = sys.stdin.read().strip()
+    pre_push_input = _read_hook_input_from_stdin()
     if not pre_push_input:
         raise ValueError(
             'Pre push input was not found. Make sure that you are using this command only in pre-push hook'
@@ -232,6 +239,19 @@ def parse_pre_push_input() -> str:
     return pre_push_input.splitlines()[0]
 
 
+def _read_hook_input_from_stdin() -> str:
+    """Read input from stdin when called from a hook.
+
+    If called manually from the command line, return an empty string so it doesn't block the main thread.
+
+    Returns:
+        Input from stdin
+    """
+    if sys.stdin.isatty():
+        return ''
+    return sys.stdin.read().strip()
+
+
 def _get_default_branches_for_merge_base(repo: 'Repo') -> list[str]:
     """Get a list of default branches to try for merge base calculation.
 

{cycode-3.7.1.dev1 → cycode-3.7.2.dev1}/pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.14",
 ]
 dynamic = ["dependencies"]
-version = "3.7.1.dev1"
+version = "3.7.2.dev1"
 
 [project.scripts]
 cycode = "cycode.cli.app:app"

cycode-3.7.1.dev1/cycode/__init__.py

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