Merge branch 'main' into scan_request_try2

semgrep · Dec 9, 2024 · 7b2f734 · 7b2f734
2 parents 7e19674 + 37314fd
commit 7b2f734
Show file tree

Hide file tree

Showing 7 changed files with 160 additions and 3 deletions.
diff --git a/semgrep_output_v1.atd b/semgrep_output_v1.atd
@@ -100,6 +100,8 @@ type uuid = string wrap <ocaml module="ATD_string_wrap.Uuidm">
 (* RFC 3339 format *)
 type datetime = string wrap <ocaml module="ATD_string_wrap.Datetime">
 
+type match_based_id = string wrap
+
 (*****************************************************************************)
 (* Versioning *)
 (*****************************************************************************)
@@ -1624,12 +1626,15 @@ type parsing_stats = {
   num_bytes: int;
 }
 
+
 (* Response by the backend to the CLI to the POST /complete *)
 type ci_scan_complete_response <ocaml attr="deriving show"> = {
    success: bool;
    ~app_block_override: bool;
    (* only when app_block_override is true *)
    ~app_block_reason: string;
+   (* match_based_ids of findings that semgrep-app determined should cause the scan to block *)
+   ~app_blocking_match_based_ids : match_based_id list;
 }
 
 (* ----------------------------- *)

diff --git a/semgrep_output_v1.jsonschema b/semgrep_output_v1.jsonschema
diff --git a/semgrep_output_v1.proto b/semgrep_output_v1.proto
diff --git a/semgrep_output_v1.py b/semgrep_output_v1.py
diff --git a/semgrep_output_v1.ts b/semgrep_output_v1.ts
diff --git a/semgrep_output_v1_j.ml b/semgrep_output_v1_j.ml
diff --git a/semgrep_output_v1_j.mli b/semgrep_output_v1_j.mli