限制 Gradle 漏洞报告累计资源并补齐协议验收证据

Author: loong10k

crates/codeguard-cli/src/gradle_dependency_check_probe.rs

@@ -289,7 +289,15 @@ pub fn observe(selected: &Request, cancelled: &AtomicBool) -> Value {
     };
     report["ownership_report_sha256"] = json!(digest(&ownership_bytes));
     let mut reports = Vec::new();
+    let mut budget = crate::gradle_owasp_report_budget::GradleOwaspReportBudget::default();
     for owner in ownership {
+        if cancelled.load(Ordering::Relaxed) || codeguard_runtime::sigint_cancellation_requested() {
+            fail!("request_cancelled");
+        }
+        if Instant::now() >= request.deadline {
+            fail!("request_deadline_exceeded");
+        }
+
         // 原输出不能来自选定输入，且逐级物理路径不得通过符号链接逃逸私有副本。
         if snapshot
             .files()
@@ -304,7 +312,21 @@ pub fn observe(selected: &Request, cancelled: &AtomicBool) -> Value {
         if !canonical.starts_with(&project) || canonical != path {
             fail!("gradle_owasp_report_scope_invalid");
         }
-        let Ok(bytes) = read_bounded_regular_file(&path, 8 * 1024 * 1024) else {
+        let limit = budget.remaining_input().min(8 * 1024 * 1024);
+        if limit == 0 {
+            fail!("gradle_owasp_report_budget_exceeded");
+        }
+        if fs::symlink_metadata(&path)
+            .ok()
+            .is_some_and(|metadata| metadata.len() > limit as u64)
+        {
+            fail!(if limit < 8 * 1024 * 1024 {
+                "gradle_owasp_report_budget_exceeded"
+            } else {
+                "gradle_owasp_report_unavailable"
+            });
+        }
+        let Ok(bytes) = read_bounded_regular_file(&path, limit as u64) else {
             fail!("gradle_owasp_report_unavailable");
         };
         let Ok(parsed) = parse_owasp_dependency_check_json(&bytes) else {
@@ -313,8 +335,31 @@ pub fn observe(selected: &Request, cancelled: &AtomicBool) -> Value {
         if parsed.engine_version != "12.1.0" || parsed.project_name != owner.report_project_name {
             fail!("gradle_owasp_native_report_attribution_unresolved");
         }
-        let advisories=parsed.advisories.iter().map(|item|json!({"source":item.source,"advisory_id":item.advisory_id,"score":item.score,"package_ids":item.package_ids,"dependency_sha256":item.dependency_sha256,"suppressed_by_native_tool":item.suppressed_by_native_tool})).collect::<Vec<_>>();
-        reports.push(json!({"project_path":owner.project_path,"task_path":owner.task_path,"implementation":owner.implementation,"report_path":owner.report_path,"report_sha256":digest(&bytes),"engine_version":parsed.engine_version,"project_name":parsed.project_name,"report_date":parsed.report_date,"data_sources":parsed.data_sources,"dependency_count":parsed.dependency_count,"advisories":advisories}));
+        if let Err(reason) = budget.reserve_input(bytes.len(), parsed.advisories.len()) {
+            fail!(reason);
+        }
+        let mut row = json!({"project_path":owner.project_path,"task_path":owner.task_path,"implementation":owner.implementation,"report_path":owner.report_path,"report_sha256":digest(&bytes),"engine_version":parsed.engine_version,"project_name":parsed.project_name,"report_date":parsed.report_date,"data_sources":parsed.data_sources,"dependency_count":parsed.dependency_count,"advisories":[]});
+        if let Err(reason) = budget.reserve_feedback(&row) {
+            fail!(reason);
+        }
+        let mut advisories = Vec::new();
+        for item in parsed.advisories {
+            if cancelled.load(Ordering::Relaxed)
+                || codeguard_runtime::sigint_cancellation_requested()
+            {
+                fail!("request_cancelled");
+            }
+            if Instant::now() >= request.deadline {
+                fail!("request_deadline_exceeded");
+            }
+            let value = json!({"source":item.source,"advisory_id":item.advisory_id,"score":item.score,"package_ids":item.package_ids,"dependency_sha256":item.dependency_sha256,"suppressed_by_native_tool":item.suppressed_by_native_tool});
+            if let Err(reason) = budget.reserve_feedback(&value) {
+                fail!(reason);
+            }
+            advisories.push(value);
+        }
+        row["advisories"] = json!(advisories);
+        reports.push(row);
     }
     if cancelled.load(Ordering::Relaxed) || codeguard_runtime::sigint_cancellation_requested() {
         fail!("request_cancelled");
@@ -410,5 +455,5 @@ fn private_scratch() -> Result<Scratch, ()> {
 
 /// 构造缺前置的观察；不表示原生执行或漏洞清洁。
 pub fn missing_prerequisites() -> Value {
-    json!({"schema_version":"0.1.0","report_type":"gradle_dependency_check_probe","checker_id":"java.gradle.dependency_check","native_status":"incomplete","reason":"prerequisites_missing","init_scripts_sha256":digest(format!("{MODEL_SCRIPT}\n{OWASP_SCRIPT}").as_bytes()),"dependency_cache_sha256":null,"model_report_sha256":null,"ownership_report_sha256":null,"source_snapshot_sha256":null,"gradle_bundle_sha256":null,"java_entry_sha256":null,"jdk_release_sha256":null,"task_paths":[],"native_exit_code":null,"native_stdout_sha256":null,"native_stderr_sha256":null,"reports":[],"database_freshness_verified":false,"dependency_attribution_verified":false,"coverage_proven":false,"authority":"local_unverified","delivery_decision":"not_evaluated"})
+    json!({"schema_version":"0.2.0","report_type":"gradle_dependency_check_probe","checker_id":"java.gradle.dependency_check","native_status":"incomplete","reason":"prerequisites_missing","init_scripts_sha256":digest(format!("{MODEL_SCRIPT}\n{OWASP_SCRIPT}").as_bytes()),"dependency_cache_sha256":null,"model_report_sha256":null,"ownership_report_sha256":null,"source_snapshot_sha256":null,"gradle_bundle_sha256":null,"java_entry_sha256":null,"jdk_release_sha256":null,"task_paths":[],"native_exit_code":null,"native_stdout_sha256":null,"native_stderr_sha256":null,"reports":[],"database_freshness_verified":false,"dependency_attribution_verified":false,"coverage_proven":false,"authority":"local_unverified","delivery_decision":"not_evaluated"})
 }

crates/codeguard-cli/src/gradle_owasp_report_budget.rs

@@ -0,0 +1,67 @@
+use serde_json::Value;
+
+const MAX_INPUT_BYTES: usize = 16 * 1024 * 1024;
+const MAX_ADVISORIES: usize = 1000;
+const MAX_FEEDBACK_BYTES: usize = 2 * 1024 * 1024;
+const EXCEEDED: &str = "gradle_owasp_report_budget_exceeded";
+
+/// 单次Gradle执行的累计报告预算；防止多任务及重复包标识扩大内存和反馈。
+#[derive(Default)]
+pub(crate) struct GradleOwaspReportBudget {
+    input_bytes: usize,
+    advisories: usize,
+    feedback_bytes: usize,
+}
+impl GradleOwaspReportBudget {
+    /// 返回剩余输入字节预算，调用方仍须限制单份报告为8MiB。
+    pub(crate) fn remaining_input(&self) -> usize {
+        MAX_INPUT_BYTES - self.input_bytes
+    }
+    /// 登记实际读取字节与原生漏洞数；溢出时拒绝整轮观察，不静默截断。
+    pub(crate) fn reserve_input(
+        &mut self,
+        bytes: usize,
+        advisories: usize,
+    ) -> Result<(), &'static str> {
+        let bytes = self
+            .input_bytes
+            .checked_add(bytes)
+            .filter(|value| *value <= MAX_INPUT_BYTES)
+            .ok_or(EXCEEDED)?;
+        let advisories = self
+            .advisories
+            .checked_add(advisories)
+            .filter(|value| *value <= MAX_ADVISORIES)
+            .ok_or(EXCEEDED)?;
+        self.input_bytes = bytes;
+        self.advisories = advisories;
+        Ok(())
+    }
+    /// 在保留单项反馈前登记序列化字节，计入数组分隔符的保守开销。
+    pub(crate) fn reserve_feedback(&mut self, value: &Value) -> Result<(), &'static str> {
+        let length = serde_json::to_vec(value).map_err(|_| EXCEEDED)?.len();
+        self.feedback_bytes = self
+            .feedback_bytes
+            .checked_add(length)
+            .and_then(|value| value.checked_add(2))
+            .filter(|value| *value <= MAX_FEEDBACK_BYTES)
+            .ok_or(EXCEEDED)?;
+        Ok(())
+    }
+}
+#[cfg(test)]
+mod tests {
+    use super::{GradleOwaspReportBudget, MAX_INPUT_BYTES, MAX_ADVISORIES};
+    #[test]
+    fn exact_input_boundary_and_overflow_do_not_wrap_or_erase_budget() {
+        let mut budget = GradleOwaspReportBudget::default();
+        budget
+            .reserve_input(MAX_INPUT_BYTES, MAX_ADVISORIES)
+            .unwrap();
+        assert_eq!(budget.remaining_input(), 0);
+        assert!(budget.reserve_input(1, 0).is_err());
+        assert!(budget.reserve_input(0, 1).is_err());
+        assert!(budget.reserve_input(usize::MAX, 0).is_err());
+        assert_eq!(budget.remaining_input(), 0);
+    }
+}

crates/codeguard-cli/src/java_gradle_cve_command.rs

@@ -64,12 +64,14 @@ pub fn run(args: &[String]) -> ExitCode {
         task_paths: options.tasks.clone(),
     };
     let native = observe(&request, &AtomicBool::new(false));
-    let next_action = if native["native_status"] == "reports_observed_unverified" {
+    let next_action = if native["reason"] == "gradle_owasp_report_budget_exceeded" {
+        "累计报告或反馈超出预算；保留完整任务清单，将原任务分批执行并汇总所有分批结果。不得删除检查义务、降低规则或把未读取报告当作无漏洞；超大单任务需要独立的大报告处理方案，当前交付仍未评估"
+    } else if native["native_status"] == "reports_observed_unverified" {
         "按原任务报告调查活动与原生抑制的漏洞，核对真实依赖归属和漏洞库时效；使用相同工具、输入、原任务复检。空报告不能证明无漏洞，当前持久任务与可信关闭未接线"
     } else {
         "读取原生reason恢复已有Gradle/JDK、原OWASP任务、原JSON配置和选定输入；缺插件或漏洞库属于环境阻塞，不修改无关源码。恢复后使用相同原任务复检"
     };
-    let report = json!({"schema_version":"0.1.0","report_type":"java_gradle_cve_feedback","operation":"cve","language":"java","mode":"gradle","selected_inputs":options.files,"requested_task_paths":options.tasks,"budget":budget_record(timeout,source),"native":native,"next_action":next_action,"task_sync":"not_integrated","authority":"local_unverified","delivery_decision":"not_evaluated"});
+    let report = json!({"schema_version":"0.2.0","report_type":"java_gradle_cve_feedback","operation":"cve","language":"java","mode":"gradle","selected_inputs":options.files,"requested_task_paths":options.tasks,"budget":budget_record(timeout,source),"native":native,"next_action":next_action,"task_sync":"not_integrated","authority":"local_unverified","delivery_decision":"not_evaluated"});
     if options.json {
         println!("{report}");
     } else {

crates/codeguard-cli/src/lib.rs

@@ -523,3 +523,6 @@ pub mod java_gradle_cve_command;
 
 #[cfg(unix)]
 mod gradle_module_cache;
+
+#[cfg(unix)]
+mod gradle_owasp_report_budget;

crates/codeguard-cli/tests/gradle_dependency_check_probe.rs

@@ -535,3 +535,93 @@ fn public_sigint_returns_cancelled_feedback_without_quality_acceptance() {
         fs::write(path, serde_json::to_vec_pretty(&feedback).unwrap()).unwrap();
     }
 }
+
+fn multi_report_fixture(native_reports: &[Value]) -> (Fixture, Request) {
+    let mut native_model = model();
+    native_model["projects"][0]["tasks"] = json!([]);
+    let mut owner = ownership();
+    owner["tasks"] = json!([]);
+    let mut writes = String::new();
+    let mut tasks = Vec::new();
+    for (index, native_report) in native_reports.iter().enumerate() {
+        let task = format!(":scan{index}");
+        let path = format!("build/scan{index}/dependency-check-report.json");
+        native_model["projects"][0]["tasks"].as_array_mut().unwrap().push(json!({"name":format!("scan{index}"),"implementation":"org.owasp.dependencycheck.gradle.tasks.Analyze","enabled":true}));
+        owner["tasks"].as_array_mut().unwrap().push(json!({"project_path":":","task_path":task,"implementation":"org.owasp.dependencycheck.gradle.tasks.Analyze","report_project_name":"root project 'sample'","report_path":path}));
+        writes +=
+            &format!("mkdir -p build/scan{index}\ncat > {path} <<'JSON'\n{native_report}\nJSON\n");
+        tasks.push(task);
+    }
+    let fixture = Fixture::new(&script(
+        &native_model,
+        &owner,
+        &report(),
+        &(writes + "exit 0"),
+    ));
+    let mut request = fixture.request();
+    request.task_paths = tasks;
+    (fixture, request)
+}
+
+#[test]
+fn aggregate_report_bytes_and_advisories_cannot_escape_per_file_limits() {
+    for (name, native_reports) in [
+        ("bytes", {
+            let mut sample = report();
+            sample["padding"] = "x".repeat(6 * 1024 * 1024).into();
+            vec![sample; 3]
+        }),
+        ("advisories", {
+            let mut sample = report();
+            sample["dependencies"][0]["suppressedVulnerabilities"] = json!([]);
+            sample["dependencies"][0]["vulnerabilities"] = json!(
+                (0..501)
+                    .map(|index| json!({"source":"NVD","name":format!("CVE-2020-{index:04}")}))
+                    .collect::<Vec<_>>()
+            );
+            vec![sample; 2]
+        }),
+    ] {
+        let (_fixture, request) = multi_report_fixture(&native_reports);
+        let out = observe(&request, &AtomicBool::new(false));
+        assert_eq!(out["native_status"], "incomplete", "{name}: {out}");
+        assert_eq!(out["reason"], "gradle_owasp_report_budget_exceeded");
+        assert!(out["reports"].as_array().unwrap().is_empty());
+        assert_no_acceptance(&out);
+    }
+}
+
+#[test]
+fn repeated_package_ids_cannot_expand_feedback_beyond_aggregate_budget() {
+    let mut sample = report();
+    sample["dependencies"][0]["packages"] = json!(
+        (0..32)
+            .map(|index| json!({"id":format!("pkg:maven/{index}/{}@1","x".repeat(480))}))
+            .collect::<Vec<_>>()
+    );
+    sample["dependencies"][0]["suppressedVulnerabilities"] = json!([]);
+    sample["dependencies"][0]["vulnerabilities"] = json!(
+        (0..200)
+            .map(|index| json!({"source":"NVD","name":format!("CVE-2020-{index:04}")}))
+            .collect::<Vec<_>>()
+    );
+    let (_fixture, request) = multi_report_fixture(&[sample]);
+    let out = observe(&request, &AtomicBool::new(false));
+    assert_eq!(out["reason"], "gradle_owasp_report_budget_exceeded");
+    assert_no_acceptance(&out);
+}
+
+#[test]
+fn below_budget_multiple_reports_keep_every_task_and_suppressed_observation() {
+    let (_fixture, request) = multi_report_fixture(&[report(), report()]);
+    let out = observe(&request, &AtomicBool::new(false));
+    assert_eq!(out["native_status"], "reports_observed_unverified");
+    let reports = out["reports"].as_array().unwrap();
+    assert_eq!(reports.len(), 2);
+    for (index, row) in reports.iter().enumerate() {
+        assert_eq!(row["task_path"], format!(":scan{index}"));
+        assert_eq!(row["advisories"].as_array().unwrap().len(), 2);
+        assert_eq!(row["advisories"][1]["suppressed_by_native_tool"], true);
+    }
+    assert_no_acceptance(&out);
+}

docs/Codeguard-Gradle-Vulnerability-Checks.md

@@ -38,7 +38,7 @@ Only supported module/resource/metadata subtrees under an explicitly selected ex
 
 ## Dialogue report
 
-`java_gradle_cve_feedback`0.1 wraps `gradle_dependency_check_probe`0.1 with original task requests, selected inputs, budget, native status/blockers, report digests and per-task advisories. Active and native-suppressed advisories are retained. Suppression does not mean resolution; package identifiers are not automatically attributed to the actual dependency graph.
+`java_gradle_cve_feedback`0.2 wraps `gradle_dependency_check_probe`0.2 with original task requests, selected inputs, budget, native status/blockers, report digests and per-task advisories. Active and native-suppressed advisories are retained. Suppression does not mean resolution; package identifiers are not automatically attributed to the actual dependency graph.
 
 ```json
 {
@@ -62,3 +62,5 @@ Controlled tests cover active/suppressed advisories, empty reports, exits0/1, co
 See [acceptance](../tests/acceptance/gradle-dependency-check-probe.md). `introduce-rust-codeguard-cli` remains the sole specification source; parent tasks stay open.
 
 Native interface sources: [v12.1.0 AbstractAnalyze](https://github.com/dependency-check/dependency-check-gradle/blob/v12.1.0/src/main/groovy/org/owasp/dependencycheck/gradle/tasks/AbstractAnalyze.groovy), [ConfiguredTask](https://github.com/dependency-check/dependency-check-gradle/blob/v12.1.0/src/main/groovy/org/owasp/dependencycheck/gradle/tasks/ConfiguredTask.groovy).
+
+Aggregate limits are16MiB report input,1000 advisory observations and2MiB serialized report feedback. Cancellation/deadlines are checked between reads and feedback records, including repeated package expansion. Exhaustion stays incomplete; no silent truncation or vulnerability-free verdict. Preserve all obligations when batching original tasks; oversized single tasks need a separate large-report design. Historical0.1 protocols/evidence stay unchanged;0.2 rejects downgrades. See [aggregate budget acceptance](../tests/acceptance/gradle-owasp-aggregate-budget.md).

docs/Codeguard-Gradle-Vulnerability-Checks.zh_CN.md

@@ -40,7 +40,7 @@ flowchart TD
 
 ## 对话报告
 
-公开协议 `java_gradle_cve_feedback` 0.1包裹独立 `gradle_dependency_check_probe` 0.1。报告包括原请求任务、选定输入、预算来源、原生状态及阻塞、逐任务报告摘要和漏洞观察。活动及原生抑制项都保留；不把抑制等同于漏洞消失，不将包标识直接认定为项目真实依赖。
+公开协议 `java_gradle_cve_feedback` 0.2包裹独立 `gradle_dependency_check_probe` 0.2。报告包括原请求任务、选定输入、预算来源、原生状态及阻塞、逐任务报告摘要和漏洞观察。活动及原生抑制项都保留；不把抑制等同于漏洞消失，不将包标识直接认定为项目真实依赖。
 
 ```json
 {
@@ -66,3 +66,5 @@ flowchart TD
 详情：[局部验收](../tests/acceptance/gradle-dependency-check-probe.md)。唯一规格事实源仍为 `introduce-rust-codeguard-cli`，父任务不勾选。
 
 原生接口依据：[v12.1.0 AbstractAnalyze](https://github.com/dependency-check/dependency-check-gradle/blob/v12.1.0/src/main/groovy/org/owasp/dependencycheck/gradle/tasks/AbstractAnalyze.groovy)、[ConfiguredTask](https://github.com/dependency-check/dependency-check-gradle/blob/v12.1.0/src/main/groovy/org/owasp/dependencycheck/gradle/tasks/ConfiguredTask.groovy)。
+
+整轮累计报告输入上限16MiB、漏洞观察1000条、报告反馈2MiB；读报告及构造反馈时再次检查取消/截止时间。重复包标识放大也计入预算。超限为具体未完成，不静默截断或判为无漏洞；保留完整任务清单分批复检，超大单任务仍需独立大报告方案。历史0.1协议及证据保持原样，新0.2协议拒绝降级。见[累计预算验收](../tests/acceptance/gradle-owasp-aggregate-budget.md)。

openspec/changes/introduce-rust-codeguard-cli/specs/native-tool-adapters/spec.md

@@ -943,3 +943,7 @@ Model capture, original task execution and report ownership observation SHALL sh
 #### Scenario: An existing Gradle dependency cache enables offline original plugin resolution
 - **WHEN** --gradle-module-cache explicitly selects an existing caches/modules-2 directory
 - **THEN** Rust SHALL take a bounded immutable dependency-cache snapshot into the private Gradle user directory, reject user configuration and symlink escapes, preserve the cache digest and reject source-cache changes; it SHALL NOT modify or implicitly select the user's Gradle home or install plugin dependencies
+
+#### Scenario: Individually bounded native reports exceed aggregate resource limits
+- **WHEN** multiple selected OWASP tasks exceed16MiB cumulative report input,1000 cumulative advisory observations or2MiB serialized report feedback, including repeated package identifiers expanding small inputs
+- **THEN** the application service SHALL stop bounded aggregation with a concrete incomplete budget observation, SHALL NOT silently truncate reports or issue an empty-clean verdict, and SHALL check cancellation/deadline between report reads and feedback records