From 51843230859ef39344c0b67daa9049ead87ec49c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 2 Jun 2026 23:58:38 +0900 Subject: feat(resolver): port SecurityAdvisoryPoolFilter::filter Implement the security advisory pool filter end to end, plus the remaining actionable wirings it unblocked. - Unify the PartialSecurityAdvisory|SecurityAdvisory union as the PartialOrFullSecurityAdvisory enum and make the advisory types Clone, so advisories can be collected and stored; Pool.security_removed_versions now carries the union. This also unblocks PoolOptimizer's clone of the security-removed versions. - Thread the filter result through run_security_advisory_filter/build_pool as anyhow::Result. - Introduce typed PlatformRepositoryHandle and pass platform repos as handles through determine_requirements instead of &PlatformRepository. - Wire RuleSetGenerator's is_unacceptable_fixed_or_locked_package check and UpdateCommand's non-locked installed-packages branch. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/repository/composer_repository.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/repository/composer_repository.rs') diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs index d39fd82..1f2fcbf 100644 --- a/crates/shirabe/src/repository/composer_repository.rs +++ b/crates/shirabe/src/repository/composer_repository.rs @@ -15,7 +15,7 @@ use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchAllConstraint; use shirabe_semver::constraint::SimpleConstraint; -use crate::advisory::PartialSecurityAdvisory; +use crate::advisory::{PartialOrFullSecurityAdvisory, PartialSecurityAdvisory}; use crate::cache::Cache; use crate::config::Config; use crate::downloader::TransportException; @@ -41,7 +41,7 @@ use crate::repository::RepositoryInterface; use crate::repository::RepositoryInterfaceHandle; use crate::repository::RepositoryInterfaceWeakHandle; use crate::repository::RepositorySecurityException; -use crate::repository::{PartialOrSecurityAdvisory, SecurityAdvisoryResult}; +use crate::repository::SecurityAdvisoryResult; use crate::repository::{SEARCH_FULLTEXT, SEARCH_VENDOR}; use crate::util::HttpDownloader; use crate::util::Url; @@ -1038,7 +1038,7 @@ impl ComposerRepository { }); } - let mut advisories: IndexMap> = IndexMap::new(); + let mut advisories: IndexMap> = IndexMap::new(); let mut names_found: IndexMap = IndexMap::new(); let api_url = self @@ -1062,9 +1062,9 @@ impl ComposerRepository { let create = |data: &IndexMap, name: &str, package_constraint_map: &IndexMap| - -> anyhow::Result> { + -> anyhow::Result> { let advisory = PartialSecurityAdvisory::create(name, data, &semver_parser)?; - let is_full = matches!(advisory, PartialOrSecurityAdvisory::Full(_)); + let is_full = matches!(advisory, PartialOrFullSecurityAdvisory::Full(_)); if !allow_partial_advisories && !is_full { let data_mixed = PhpMixed::Array( data.iter() @@ -1084,8 +1084,8 @@ impl ComposerRepository { .into()); } let affected_versions: &AnyConstraint = match &advisory { - PartialOrSecurityAdvisory::Partial(p) => &p.affected_versions, - PartialOrSecurityAdvisory::Full(p) => p.affected_versions(), + PartialOrFullSecurityAdvisory::Partial(p) => &p.affected_versions, + PartialOrFullSecurityAdvisory::Full(p) => p.affected_versions(), }; let constraint = package_constraint_map.get(name); if let Some(c) = constraint { @@ -1138,7 +1138,7 @@ impl ComposerRepository { names_found.insert(name.clone(), true); if !sec_advs_arr.is_empty() { - let mut entries: Vec = Vec::new(); + let mut entries: Vec = Vec::new(); for (_k, data_mixed) in sec_advs_arr.iter() { if let Some(data) = data_mixed.as_array() { let data_map: IndexMap = data @@ -1229,7 +1229,7 @@ impl ComposerRepository { None => continue, }; if !list.is_empty() { - let mut entries: Vec = Vec::new(); + let mut entries: Vec = Vec::new(); for data_mixed in list.iter() { if let Some(data) = data_mixed.as_array() { let data_map: IndexMap = data @@ -1249,7 +1249,7 @@ impl ComposerRepository { } } - let advisories_filtered: IndexMap> = advisories + let advisories_filtered: IndexMap> = advisories .into_iter() .filter(|(_, adv)| !adv.is_empty()) .collect(); -- cgit v1.3.1