|
2 | 2 |
|
3 | 3 | use super::adapter_signal::{AdapterBoundarySignal, adapter_boundary_signal_from_process_output}; |
4 | 4 | use super::model::{ |
5 | | - AttemptStatus, CapabilityAvailability, CapabilityAvailabilityStatus, EnvironmentBinding, |
6 | | - EvidenceId, NamespacedIdentifier, ObservedPayloadContract, PayloadSchemaBinding, |
7 | | - PermissionState, ProbeCheck, ProbeResult, ProcessExecutionContract, ProvenanceSourceKind, |
8 | | - STRUCTURED_OBSERVATION_RESULTS_V2, STRUCTURED_OBSERVATION_RESULTS_V2_SCHEMA_REF, SchemaVersion, |
9 | | - Sha256Digest, VerificationCapabilityInstance, VerificationCapabilityManifest, |
| 5 | + AdapterKind, AttemptStatus, CapabilityAvailability, CapabilityAvailabilityStatus, |
| 6 | + EnvironmentBinding, EvidenceId, NamespacedIdentifier, ObservedPayloadContract, |
| 7 | + PayloadSchemaBinding, PermissionState, ProbeCheck, ProbeResult, ProcessExecutionContract, |
| 8 | + ProvenanceSourceKind, STRUCTURED_OBSERVATION_RESULTS_V2, |
| 9 | + STRUCTURED_OBSERVATION_RESULTS_V2_SCHEMA_REF, SchemaVersion, Sha256Digest, |
| 10 | + VerificationCapabilityInstance, VerificationCapabilityManifest, |
10 | 11 | }; |
11 | 12 | use crate::canonical_json::{sha256_json_digest, sha256_prefixed_bytes}; |
12 | 13 | use crate::execution::{BoundedProcessInput, CancellationToken, run_bounded_process}; |
@@ -1058,6 +1059,9 @@ pub(crate) fn capture_manifest_adapter_environment( |
1058 | 1059 | fn manifest_adapter_environment_names( |
1059 | 1060 | manifest: &VerificationCapabilityManifest, |
1060 | 1061 | ) -> Result<Vec<String>> { |
| 1062 | + if manifest.adapter_kind != AdapterKind::Process { |
| 1063 | + return Ok(Vec::new()); |
| 1064 | + } |
1061 | 1065 | let names = manifest |
1062 | 1066 | .permissions |
1063 | 1067 | .get("environment") |
@@ -3551,6 +3555,28 @@ mod tests { |
3551 | 3555 | ); |
3552 | 3556 | } |
3553 | 3557 |
|
| 3558 | + #[test] |
| 3559 | + fn only_process_manifests_declare_forwarded_adapter_environment() { |
| 3560 | + let mut host_manifest = manifest_value("cargo", vec!["--version"], 1024); |
| 3561 | + host_manifest["adapter_kind"] = json!("host"); |
| 3562 | + host_manifest["permissions"]["environment"] = json!("Chrome extension browser client"); |
| 3563 | + let host_manifest = manifest(host_manifest); |
| 3564 | + |
| 3565 | + validate_manifest_runtime_permissions(&host_manifest).unwrap(); |
| 3566 | + let captured = capture_manifest_adapter_environment(&host_manifest).unwrap(); |
| 3567 | + assert!(captured.values.is_empty()); |
| 3568 | + assert!(captured.durable_output_redactions.is_empty()); |
| 3569 | + assert_eq!(captured.binding["names"], json!([])); |
| 3570 | + assert_eq!(captured.binding["public_names"], json!([])); |
| 3571 | + |
| 3572 | + let mut process_manifest = manifest_value("cargo", vec!["--version"], 1024); |
| 3573 | + process_manifest["permissions"]["environment"] = json!("Chrome extension browser client"); |
| 3574 | + let error = validate_manifest_runtime_permissions(&manifest(process_manifest)) |
| 3575 | + .unwrap_err() |
| 3576 | + .to_string(); |
| 3577 | + assert!(error.contains("must use read_env:"), "{error}"); |
| 3578 | + } |
| 3579 | + |
3554 | 3580 | #[cfg(unix)] |
3555 | 3581 | #[test] |
3556 | 3582 | fn registry_forwards_only_declared_adapter_environment_and_binds_value_drift() { |
|
0 commit comments