Apply allowlist to source conversion (#3208)

* Apply allowlist to source conversion

* Remove vestigial lifetime

* Remove redundant clone

Author: ranweiler

src/agent/coverage/examples/record.rs

@@ -89,7 +89,7 @@ fn main() -> Result<()> {
     } else {
         let cmd = command(&args.command, None);
         let recorded = CoverageRecorder::new(cmd)
-            .allowlist(allowlist)
+            .allowlist(allowlist.clone())
             .loader(loader)
             .timeout(timeout)
             .record()?;
@@ -103,8 +103,8 @@ fn main() -> Result<()> {
 
     match args.output {
         OutputFormat::ModOff => dump_modoff(&coverage)?,
-        OutputFormat::Source => dump_source_line(&coverage)?,
-        OutputFormat::Cobertura => dump_cobertura(&coverage)?,
+        OutputFormat::Source => dump_source_line(&coverage, allowlist.source_files)?,
+        OutputFormat::Cobertura => dump_cobertura(&coverage, allowlist.source_files)?,
     }
 
     Ok(())
@@ -160,8 +160,8 @@ fn dump_modoff(coverage: &BinaryCoverage) -> Result<()> {
     Ok(())
 }
 
-fn dump_source_line(binary: &BinaryCoverage) -> Result<()> {
-    let source = coverage::source::binary_to_source_coverage(binary)?;
+fn dump_source_line(binary: &BinaryCoverage, allowlist: AllowList) -> Result<()> {
+    let source = coverage::source::binary_to_source_coverage(binary, allowlist)?;
 
     for (path, file) in &source.files {
         for (line, count) in &file.lines {
@@ -172,8 +172,8 @@ fn dump_source_line(binary: &BinaryCoverage) -> Result<()> {
     Ok(())
 }
 
-fn dump_cobertura(binary: &BinaryCoverage) -> Result<()> {
-    let source = coverage::source::binary_to_source_coverage(binary)?;
+fn dump_cobertura(binary: &BinaryCoverage, allowlist: AllowList) -> Result<()> {
+    let source = coverage::source::binary_to_source_coverage(binary, allowlist)?;
     let cobertura: CoberturaCoverage = source.into();
 
     println!("{}", cobertura.to_string()?);

src/agent/coverage/src/source.rs

@@ -12,6 +12,7 @@ use debuggable_module::loader::Loader;
 use debuggable_module::path::FilePath;
 use debuggable_module::{Module, Offset};
 
+use crate::allowlist::AllowList;
 use crate::binary::BinaryCoverage;
 
 pub use crate::binary::Count;
@@ -48,12 +49,16 @@ impl From<Line> for u32 {
     }
 }
 
-pub fn binary_to_source_coverage(binary: &BinaryCoverage) -> Result<SourceCoverage> {
+pub fn binary_to_source_coverage(
+    binary: &BinaryCoverage,
+    allowlist: impl Into<Option<AllowList>>,
+) -> Result<SourceCoverage> {
     use std::collections::btree_map::Entry;
 
     use symbolic::debuginfo::Object;
     use symbolic::symcache::{SymCache, SymCacheConverter};
 
+    let allowlist = allowlist.into().unwrap_or_default();
     let loader = Loader::new();
 
     let mut source = SourceCoverage::default();
@@ -100,6 +105,11 @@ pub fn binary_to_source_coverage(binary: &BinaryCoverage) -> Result<SourceCovera
                         };
 
                         if let Some(file) = location.file() {
+                            // Only include relevant inlinees.
+                            if !allowlist.is_allowed(&file.full_path()) {
+                                continue;
+                            }
+
                             let file_path = FilePath::new(file.full_path())?;
 
                             // We have a hit.

src/agent/onefuzz-task/src/tasks/coverage/generic.rs

@@ -449,10 +449,11 @@ impl<'a> TaskContext<'a> {
 
     async fn source_coverage(&self) -> Result<SourceCoverage> {
         // Must be owned due to `spawn_blocking()` lifetimes.
+        let allowlist = self.allowlist.clone();
         let binary = self.coverage.clone();
 
         // Conversion to source coverage heavy on blocking I/O.
-        spawn_blocking(move || binary_to_source_coverage(&binary)).await?
+        spawn_blocking(move || binary_to_source_coverage(&binary, allowlist.source_files)).await?
     }
 }