From 54af47e286d0fb601e2e60aeb19002f6b7937574 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 7 Jun 2026 11:20:23 +0900 Subject: 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) --- .../shirabe/src/advisory/any_security_advisory.rs | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 crates/shirabe/src/advisory/any_security_advisory.rs (limited to 'crates/shirabe/src/advisory/any_security_advisory.rs') diff --git a/crates/shirabe/src/advisory/any_security_advisory.rs b/crates/shirabe/src/advisory/any_security_advisory.rs new file mode 100644 index 0000000..c48df33 --- /dev/null +++ b/crates/shirabe/src/advisory/any_security_advisory.rs @@ -0,0 +1,52 @@ +use crate::advisory::IgnoredSecurityAdvisory; +use crate::advisory::PartialSecurityAdvisory; +use crate::advisory::SecurityAdvisory; +use shirabe_semver::constraint::AnyConstraint; + +#[derive(Debug, Clone)] +pub enum AnySecurityAdvisory { + Partial(PartialSecurityAdvisory), + Full(SecurityAdvisory), + Ignored(IgnoredSecurityAdvisory), +} + +impl AnySecurityAdvisory { + pub fn advisory_id(&self) -> &str { + match self { + AnySecurityAdvisory::Partial(p) => &p.advisory_id, + AnySecurityAdvisory::Full(s) => s.advisory_id(), + AnySecurityAdvisory::Ignored(i) => i.as_security_advisory().advisory_id(), + } + } + + pub fn package_name(&self) -> &str { + match self { + AnySecurityAdvisory::Partial(p) => &p.package_name, + AnySecurityAdvisory::Full(s) => s.package_name(), + AnySecurityAdvisory::Ignored(i) => i.as_security_advisory().package_name(), + } + } + + pub fn affected_versions(&self) -> &AnyConstraint { + match self { + AnySecurityAdvisory::Partial(p) => &p.affected_versions, + AnySecurityAdvisory::Full(s) => s.affected_versions(), + AnySecurityAdvisory::Ignored(i) => i.as_security_advisory().affected_versions(), + } + } + + pub fn as_security_advisory(&self) -> Option<&SecurityAdvisory> { + match self { + AnySecurityAdvisory::Partial(_) => None, + AnySecurityAdvisory::Full(s) => Some(s), + AnySecurityAdvisory::Ignored(i) => Some(i.as_security_advisory()), + } + } + + pub fn as_ignored(&self) -> Option<&IgnoredSecurityAdvisory> { + match self { + AnySecurityAdvisory::Ignored(i) => Some(i), + _ => None, + } + } +} -- cgit v1.3.1