diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-07 11:20:23 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-07 11:20:23 +0900 |
| commit | 54af47e286d0fb601e2e60aeb19002f6b7937574 (patch) | |
| tree | 844c1ac44baefbdac7469d5ce9dfaa73b1e919d2 /crates/shirabe/src/repository/package_repository.rs | |
| parent | 3a6e69596d4f45ba1c50c6e932004e2160799d0c (diff) | |
| download | php-shirabe-54af47e286d0fb601e2e60aeb19002f6b7937574.tar.gz php-shirabe-54af47e286d0fb601e2e60aeb19002f6b7937574.tar.zst php-shirabe-54af47e286d0fb601e2e60aeb19002f6b7937574.zip | |
feat(shirabe): resolve advisory instanceof TODOs via AnySecurityAdvisory
Add an Ignored variant to the advisory enum (renamed to AnySecurityAdvisory)
so the PHP three-class hierarchy PartialSecurityAdvisory -> SecurityAdvisory
-> IgnoredSecurityAdvisory maps one-to-one onto enum variants.
Replace the hard-coded auditor downcasts with as_security_advisory()
(PHP `instanceof SecurityAdvisory`, true for both full and ignored) and
as_ignored(), implementing severity/cve/source ignore filtering, the
toIgnoredAdvisory conversion, and the table/plain row output faithfully.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/repository/package_repository.rs')
| -rw-r--r-- | crates/shirabe/src/repository/package_repository.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crates/shirabe/src/repository/package_repository.rs b/crates/shirabe/src/repository/package_repository.rs index c264eaf..273cde0 100644 --- a/crates/shirabe/src/repository/package_repository.rs +++ b/crates/shirabe/src/repository/package_repository.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Repository/PackageRepository.php use crate::advisory::SecurityAdvisory; -use crate::advisory::{PartialOrFullSecurityAdvisory, PartialSecurityAdvisory}; +use crate::advisory::{AnySecurityAdvisory, PartialSecurityAdvisory}; use crate::package::loader::ArrayLoader; use crate::package::loader::ValidatingArrayLoader; use crate::package::version::VersionParser; @@ -93,7 +93,7 @@ impl AdvisoryProviderInterface for PackageRepository { ) -> anyhow::Result<SecurityAdvisoryResult> { let parser = VersionParser::new(); - let mut advisories: IndexMap<String, Vec<PartialOrFullSecurityAdvisory>> = IndexMap::new(); + let mut advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); for (package_name, package_advisories) in &self.security_advisories { let Some(package_constraint) = package_constraint_map.get(package_name) else { continue; @@ -103,7 +103,7 @@ impl AdvisoryProviderInterface for PackageRepository { PhpMixed::List(list) => list, _ => continue, }; - let mut items: Vec<PartialOrFullSecurityAdvisory> = Vec::new(); + let mut items: Vec<AnySecurityAdvisory> = Vec::new(); for data in list { let data_map: IndexMap<String, PhpMixed> = match data.as_ref() { PhpMixed::Array(m) => m.iter().map(|(k, v)| (k.clone(), *v.clone())).collect(), @@ -114,8 +114,7 @@ impl AdvisoryProviderInterface for PackageRepository { Ok(a) => a, Err(_) => continue, }; - if !allow_partial_advisories - && matches!(advisory, PartialOrFullSecurityAdvisory::Partial(_)) + if !allow_partial_advisories && matches!(advisory, AnySecurityAdvisory::Partial(_)) { return Err(anyhow::anyhow!(RuntimeException { message: format!( @@ -138,7 +137,7 @@ impl AdvisoryProviderInterface for PackageRepository { } let names_found: Vec<String> = advisories.keys().cloned().collect(); - let advisories: IndexMap<String, Vec<PartialOrFullSecurityAdvisory>> = advisories + let advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = advisories .into_iter() .filter(|(_, adv)| !adv.is_empty()) .collect(); |
