Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 36 additions & 19 deletions crates/uv/src/commands/project/audit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,38 +186,55 @@ pub(crate) async fn audit(

// TODO: validate the sets of requested extras/groups against the lockfile?

// Build the list of auditable packages, skipping workspace members. Workspace members are
// local by definition and have no meaningful external package identity to look up in a vuln
// service. We also skip packages without a version, since we can't query for them.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could build them to query that info, but it doesn't make much sense to query source trees overall

//
// This mirrors the logic in `TreeDisplay::new`: for single-member workspaces, `lock.members()`
// is empty and the root package (source at path "") is the implicit member.
let workspace_root_name = lock.root().map(uv_resolver::Package::name);
let auditable: Vec<_> = lock
.packages()
.iter()
.filter(|p| {
if lock.members().is_empty() {
// Single-member workspace: skip the implicit root.
workspace_root_name != Some(p.name())
} else {
!lock.members().contains(p.name())
}
})
.filter_map(|p| {
let Some(version) = p.version() else {
trace!(
"Skipping audit for {} because it has no version information",
p.name()
);
return None;
};
Some((p.name(), version))
})
.collect();

// Perform the audit.
// TODO: Use `client_builder` to produce an HTTP client through our normal process here.
let service = osv::Osv::default();
trace!(
"Auditing {n} dependencies against OSV",
n = lock.packages().len()
);
trace!("Auditing {n} dependencies against OSV", n = auditable.len());

let reporter = AuditReporter::from(printer).with_length(lock.packages().len() as u64);
let reporter = AuditReporter::from(printer).with_length(auditable.len() as u64);

let mut all_findings = vec![];
for package in lock.packages() {
let Some(version) = package.version() else {
trace!(
"Skipping audit for {} because it has no version information",
package.name()
);
reporter.on_audit_progress();
continue;
};

reporter.on_audit_package(package.name(), version);

let dependency = Dependency::new(package.name().clone(), version.clone());
for (name, version) in &auditable {
reporter.on_audit_package(name, version);
let dependency = Dependency::new((*name).clone(), (*version).clone());
all_findings.extend(service.query(&dependency).await?);
}

reporter.on_audit_complete();

let display = AuditResults {
printer,
npackages: lock.packages().len(),
npackages: auditable.len(),
findings: all_findings,
};
display.render()?;
Expand Down
4 changes: 0 additions & 4 deletions crates/uv/src/commands/reporters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -774,10 +774,6 @@ impl AuditReporter {
self
}

pub(crate) fn on_audit_progress(&self) {
self.progress.inc(1);
}

pub(crate) fn on_audit_package(&self, name: &PackageName, version: &Version) {
self.progress.set_message(format!("{name} v{version}"));
self.progress.inc(1);
Expand Down
Loading