fix parsing of commit ranges

Author: MarshalX

cycode/cli/apps/scan/commit_range_scanner.py

@@ -24,7 +24,8 @@
     get_diff_file_content,
     get_diff_file_path,
     get_pre_commit_modified_documents,
-    parse_commit_range,
+    parse_commit_range_sast,
+    parse_commit_range_sca,
 )
 from cycode.cli.files_collector.file_excluder import excluder
 from cycode.cli.files_collector.models.in_memory_zip import InMemoryZip
@@ -173,7 +174,7 @@ def _scan_commit_range_documents(
 def _scan_sca_commit_range(ctx: typer.Context, repo_path: str, commit_range: str, **_) -> None:
     scan_parameters = get_scan_parameters(ctx, (repo_path,))
 
-    from_commit_rev, to_commit_rev = parse_commit_range(commit_range, repo_path)
+    from_commit_rev, to_commit_rev = parse_commit_range_sca(commit_range, repo_path)
     from_commit_documents, to_commit_documents, _ = get_commit_range_modified_documents(
         ctx.obj['progress_bar'], ScanProgressBarSection.PREPARE_LOCAL_FILES, repo_path, from_commit_rev, to_commit_rev
     )
@@ -203,8 +204,9 @@ def _scan_secret_commit_range(
 def _scan_sast_commit_range(ctx: typer.Context, repo_path: str, commit_range: str, **_) -> None:
     scan_parameters = get_scan_parameters(ctx, (repo_path,))
 
-    from_commit_rev, to_commit_rev = parse_commit_range(commit_range, repo_path)
-    _, commit_documents, diff_documents = get_commit_range_modified_documents(
+    from_commit_rev, to_commit_rev = parse_commit_range_sast(commit_range, repo_path)
+    # we are using from_commit_documents here because of flipped mess with R=True, differences in parsing commit ranges
+    commit_documents, _, diff_documents = get_commit_range_modified_documents(
         ctx.obj['progress_bar'], ScanProgressBarSection.PREPARE_LOCAL_FILES, repo_path, from_commit_rev, to_commit_rev
     )
     commit_documents = excluder.exclude_irrelevant_documents_to_scan(consts.SAST_SCAN_TYPE, commit_documents)

cycode/cli/files_collector/commit_range_documents.py

@@ -236,13 +236,53 @@ def get_pre_commit_modified_documents(
     return git_head_documents, pre_committed_documents, diff_documents
 
 
-def parse_commit_range(commit_range: str, path: str) -> tuple[str, str]:
-    from_commit_rev = None
-    to_commit_rev = None
+def parse_commit_range_sca(commit_range: str, path: str) -> tuple[Optional[str], Optional[str]]:
+    # FIXME(MarshalX): i truly believe that this function does NOT work as expected
+    #  it does not handle cases like 'A..B' correctly
+    #  i leave it as it for SCA to not break anything
+    #  the more correct approach is implemented for SAST
+    from_commit_rev = to_commit_rev = None
 
     for commit in git_proxy.get_repo(path).iter_commits(rev=commit_range):
         if not to_commit_rev:
             to_commit_rev = commit.hexsha
         from_commit_rev = commit.hexsha
 
     return from_commit_rev, to_commit_rev
+
+
+def parse_commit_range_sast(commit_range: str, path: str) -> tuple[Optional[str], Optional[str]]:
+    """Parses a git commit range string and returns the full SHAs for the 'from' and 'to' commits.
+
+    Supports:
+    - 'from..to'
+    - 'from...to'
+    - 'commit' (interpreted as 'commit..HEAD')
+    - '..to' (interpreted as 'HEAD..to')
+    - 'from..' (interpreted as 'from..HEAD')
+    """
+    repo = git_proxy.get_repo(path)
+
+    if '...' in commit_range:
+        from_spec, to_spec = commit_range.split('...', 1)
+    elif '..' in commit_range:
+        from_spec, to_spec = commit_range.split('..', 1)
+    else:
+        # Git commands like 'git diff <commit>' compare against HEAD.
+        from_spec = commit_range
+        to_spec = 'HEAD'
+
+    # If a spec is empty (e.g., from '..master'), default it to 'HEAD'
+    if not from_spec:
+        from_spec = 'HEAD'
+    if not to_spec:
+        to_spec = 'HEAD'
+
+    try:
+        # Use rev_parse to resolve each specifier to its full commit SHA
+        from_commit_rev = repo.rev_parse(from_spec).hexsha
+        to_commit_rev = repo.rev_parse(to_spec).hexsha
+        return from_commit_rev, to_commit_rev
+    except git_proxy.get_git_command_error() as e:
+        logger.warning("Failed to parse commit range '%s'", commit_range, exc_info=e)
+        return None, None