Skip to content
63 changes: 45 additions & 18 deletions crates/gvm-gateway-gvmd/src/gvmd_adapter/ports/reports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl ReportPort for GvmdAdapter {

// Fetch only report metadata; embedded results are loaded below through
// the explicit result-window request.
let mut request = GetReportRequest::new(report_id);
let mut request = GetReportRequest::new(report_id.clone());
request.details = Some(false);
let parsed = self
.execute_with_session(session_token, "reports.get", request)
Expand Down Expand Up @@ -119,12 +119,15 @@ impl ReportPort for GvmdAdapter {
}

// Fetch the explicitly requested embedded-result window for this report.
let filter = paginated_filter(
Some(&format!("report_id={id}")),
None,
opts.page,
opts.per_page,
)?;
let filter = Some(
gvm_gmp::compose_report_results_filter(
&report_id,
None,
None,
GmpPagination::new(opts.page as usize, opts.per_page as usize),
)
.map_err(|error| GatewayError::InvalidInput(error.to_string()))?,
);

let results_parsed = self
.execute_with_session(
Expand All @@ -142,6 +145,7 @@ impl ReportPort for GvmdAdapter {
},
)
.await?;
ensure_report_result_scope(&results_parsed.items, id)?;
report.results = results_parsed
.items
.into_iter()
Expand Down Expand Up @@ -285,25 +289,27 @@ impl ReportPort for GvmdAdapter {
report_id: &str,
query: &ResultQuery,
) -> Result<ResultPage, GatewayError> {
// Validate that the report_id is a valid UUID
let _ = parse_entity_id(report_id)?;
let scope_id = parse_entity_id(report_id)?;

let filter_id = query
.filter_id
.as_deref()
.map(parse_entity_id)
.transpose()?;
let filter = self
.paginated_filter_resolving_filter_id(
session_token,
Some(&format!("report_id={report_id}")),
let saved_filter = self
.saved_filter_term(session_token, filter_id.as_ref())
.await?;
// Keep wire semantics in rust-gvm: its protected scope control is
// independent of the caller's boolean expression and applies to counts.
let filter = Some(
gvm_gmp::compose_report_results_filter(
&scope_id,
saved_filter.as_deref(),
query.filter_string.as_deref(),
filter_id.as_ref(),
query.page,
query.per_page,
&["report_id"],
GmpPagination::new(query.page as usize, query.per_page as usize),
)
.await?;
.map_err(|error| GatewayError::InvalidInput(error.to_string()))?,
);

let parsed = self
.execute_with_session(
Expand All @@ -321,6 +327,7 @@ impl ReportPort for GvmdAdapter {
},
)
.await?;
ensure_report_result_scope(&parsed.items, report_id)?;
let items = parsed
.items
.into_iter()
Expand Down Expand Up @@ -709,3 +716,23 @@ fn unsupported_typed_report_detail_error(command: &str, resource: &str) -> Gatew
"{resource} are not available because gvmd does not implement `{command}` on this backend version; the proxy does not emulate unsupported GMP commands"
))
}

// An endpoint-owned report identity must never be weakened by backend filtering.
// Fail the entire response rather than returning a cross-report page or quietly
// dropping rows and making pagination counts untrustworthy.
fn ensure_report_result_scope(
results: &[gvm_gmp::responses::ScanResult],
report_id: &str,
) -> Result<(), GatewayError> {
if results.iter().any(|result| {
result
.report
.as_ref()
.is_none_or(|report| !report.id.as_str().eq_ignore_ascii_case(report_id))
}) {
return Err(GatewayError::BackendUnavailable(
"backend returned results outside the requested report".into(),
));
}
Ok(())
}
4 changes: 2 additions & 2 deletions crates/gvm-gateway-gvmd/tests/gvmd_adapter_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1855,7 +1855,7 @@ async fn gvmd_adapter_direct_lists_emit_backend_pagination_filter() {
}
),
"get_results",
"filter=\"report_id=550e8400-e29b-41d4-a716-446655440000 name=Target first=11 rows=10\""
"filter=\"name=Target _and_report_id=550e8400-e29b-41d4-a716-446655440000 first=11 rows=10\""
);
assert_backend_pagination!(
adapter,
Expand Down Expand Up @@ -3966,7 +3966,7 @@ async fn gvmd_adapter_get_report_results_resolves_filter_id_into_inline_filter()
.expect("get_results command should be recorded");
let xml = String::from_utf8(command.raw_xml().to_vec()).expect("xml command");
assert!(xml.contains(
"filter=\"threat=Alarm report_id=550e8400-e29b-41d4-a716-446655440000 severity&gt;5 first=1 rows=25\""
"filter=\"threat=Alarm severity&gt;5 _and_report_id=550e8400-e29b-41d4-a716-446655440000 first=1 rows=25\""
));
assert!(!xml.contains("filter_id"));

Expand Down
Loading
Loading