feat(domain): implement suggested fix version for packages

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sysdig-lsp"
-version = "0.7.2"
+version = "0.7.3"
 edition = "2024"
 authors = [ "Sysdig Inc." ]
 readme = "README.md"

src/app/markdown/markdown_fixable_package_table.rs

@@ -57,10 +57,7 @@ impl From<&ScanResult> for FixablePackageTable {
                         name: p.name().to_string(),
                         package_type: p.package_type().to_string(),
                         version: p.version().to_string(),
-                        suggested_fix: p
-                            .vulnerabilities()
-                            .iter()
-                            .find_map(|v| v.fix_version().map(|s| s.to_string())),
+                        suggested_fix: p.suggested_fix_version().map(|v| v.to_string()),
                         vulnerabilities: vulns,
                         exploits,
                     }
@@ -98,10 +95,7 @@ impl From<&Arc<Layer>> for FixablePackageTable {
                         name: p.name().to_string(),
                         package_type: p.package_type().to_string(),
                         version: p.version().to_string(),
-                        suggested_fix: p
-                            .vulnerabilities()
-                            .iter()
-                            .find_map(|v| v.fix_version().map(|s| s.to_string())),
+                        suggested_fix: p.suggested_fix_version().map(|v| v.to_string()),
                         vulnerabilities: vulns,
                         exploits,
                     }

src/domain/scanresult/package.rs

@@ -1,17 +1,19 @@
 use crate::domain::scanresult::accepted_risk::AcceptedRisk;
 use crate::domain::scanresult::layer::Layer;
 use crate::domain::scanresult::package_type::PackageType;
+use crate::domain::scanresult::severity::Severity;
 use crate::domain::scanresult::vulnerability::Vulnerability;
 use crate::domain::scanresult::weak_hash::WeakHash;
-use std::collections::HashSet;
+use semver::Version;
+use std::collections::{HashMap, HashSet};
 use std::fmt::Debug;
 use std::hash::{Hash, Hasher};
 use std::sync::{Arc, RwLock};
 
 pub struct Package {
     package_type: PackageType,
     name: String,
-    version: String,
+    version: Version,
     path: String,
     found_in_layer: Arc<Layer>,
     vulnerabilities: RwLock<HashSet<WeakHash<Vulnerability>>>,
@@ -34,7 +36,7 @@ impl Package {
     pub(in crate::domain::scanresult) fn new(
         package_type: PackageType,
         name: String,
-        version: String,
+        version: Version,
         path: String,
         found_in_layer: Arc<Layer>,
     ) -> Self {
@@ -57,7 +59,7 @@ impl Package {
         &self.name
     }
 
-    pub fn version(&self) -> &str {
+    pub fn version(&self) -> &Version {
         &self.version
     }
 
@@ -108,6 +110,69 @@ impl Package {
             .filter_map(|r| r.0.upgrade())
             .collect()
     }
+
+    pub fn suggested_fix_version(&self) -> Option<Version> {
+        let vulnerabilities = self.vulnerabilities();
+        if vulnerabilities.is_empty() {
+            return None;
+        }
+
+        let candidate_versions: Vec<Version> = vulnerabilities
+            .iter()
+            .filter_map(|vuln| vuln.fix_version().cloned())
+            .collect::<HashSet<_>>()
+            .into_iter()
+            .collect();
+
+        if candidate_versions.is_empty() {
+            return None;
+        }
+
+        let severity_order = [
+            Severity::Critical,
+            Severity::High,
+            Severity::Medium,
+            Severity::Low,
+            Severity::Negligible,
+            Severity::Unknown,
+        ];
+
+        let mut scores: HashMap<Version, HashMap<Severity, usize>> = HashMap::new();
+
+        for candidate in &candidate_versions {
+            let mut score: HashMap<Severity, usize> = HashMap::new();
+            for severity in &severity_order {
+                score.insert(*severity, 0);
+            }
+            for vuln in &vulnerabilities {
+                if let Some(fix_version) = vuln.fix_version()
+                    && fix_version == candidate
+                {
+                    *score.entry(vuln.severity()).or_insert(0) += 1;
+                }
+            }
+            scores.insert(candidate.clone(), score);
+        }
+
+        let mut sorted_candidates = candidate_versions;
+        sorted_candidates.sort_by(|a, b| {
+            let score_a = scores.get(a).unwrap();
+            let score_b = scores.get(b).unwrap();
+
+            for severity in &severity_order {
+                let count_a = score_a.get(severity).unwrap();
+                let count_b = score_b.get(severity).unwrap();
+                if count_a != count_b {
+                    return count_b.cmp(count_a); // Higher count is better
+                }
+            }
+
+            // If scores are identical, lower version is better
+            a.cmp(b)
+        });
+
+        sorted_candidates.first().cloned()
+    }
 }
 
 impl PartialEq for Package {
@@ -143,3 +208,105 @@ impl Clone for Package {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::domain::scanresult::layer::Layer;
+    use crate::domain::scanresult::package_type::PackageType;
+    use crate::domain::scanresult::severity::Severity;
+    use crate::domain::scanresult::vulnerability::Vulnerability;
+    use chrono::NaiveDate;
+    use rstest::{fixture, rstest};
+    use semver::Version;
+    use std::sync::Arc;
+
+    #[fixture]
+    fn layer() -> Arc<Layer> {
+        Arc::new(Layer::new(
+            "a_digest".to_string(),
+            0,
+            None,
+            "a_command".to_string(),
+        ))
+    }
+
+    #[fixture]
+    fn package(#[default("")] version: &str, layer: Arc<Layer>) -> Arc<Package> {
+        Arc::new(Package::new(
+            PackageType::Os,
+            "a_name".to_string(),
+            Version::parse(version).unwrap(),
+            "a_path".to_string(),
+            layer,
+        ))
+    }
+
+    fn a_vulnerability(
+        cve: &str,
+        severity: Severity,
+        fix_version: Option<&str>,
+    ) -> Arc<Vulnerability> {
+        Arc::new(Vulnerability::new(
+            cve.to_string(),
+            severity,
+            NaiveDate::from_ymd_opt(2023, 1, 1).unwrap(),
+            None,
+            false,
+            fix_version.map(|v| Version::parse(v).unwrap()),
+        ))
+    }
+
+    #[rstest]
+    #[case("is_none_when_no_vulnerabilities", "1.0.0", vec![], None)]
+    #[case("is_none_when_no_fixable_vulnerabilities", "1.0.0", vec![a_vulnerability("CVE-1", Severity::High, None)], None)]
+    #[case("returns_only_available_fix", "1.0.0", vec![a_vulnerability("CVE-1", Severity::High, Some("1.0.1"))], Some("1.0.1"))]
+    #[case("chooses_version_with_more_critical_fixes", "1.0.0", vec![
+        a_vulnerability("CVE-1", Severity::Critical, Some("1.0.1")),
+        a_vulnerability("CVE-2", Severity::Critical, Some("1.0.2")),
+        a_vulnerability("CVE-3", Severity::High, Some("1.0.2")),
+    ], Some("1.0.2"))]
+    #[case("chooses_version_with_more_high_fixes_when_criticals_tied", "1.0.0", vec![
+        a_vulnerability("CVE-1", Severity::Critical, Some("1.0.1")),
+        a_vulnerability("CVE-5", Severity::Medium, Some("1.0.1")),
+        a_vulnerability("CVE-2", Severity::Critical, Some("1.0.2")),
+        a_vulnerability("CVE-3", Severity::High, Some("1.0.2")),
+        a_vulnerability("CVE-4", Severity::High, Some("1.0.2")),
+    ], Some("1.0.2"))]
+    #[case("chooses_lower_version_when_counts_are_tied", "1.0.0", vec![
+        a_vulnerability("CVE-1", Severity::Critical, Some("1.0.1")),
+        a_vulnerability("CVE-3", Severity::High, Some("1.0.1")),
+        a_vulnerability("CVE-2", Severity::Critical, Some("1.0.2")),
+        a_vulnerability("CVE-4", Severity::High, Some("1.0.2")),
+    ], Some("1.0.1"))]
+    #[case("handles_complex_scenario", "2.8.1", vec![
+        a_vulnerability("CVE-2022-25857", Severity::High, Some("2.8.2")),
+        a_vulnerability("CVE-2022-39253", Severity::High, Some("2.8.2")),
+        a_vulnerability("CVE-2022-0536", Severity::Medium, Some("2.8.2")),
+        a_vulnerability("CVE-2022-41724", Severity::Medium, Some("2.8.2")),
+        a_vulnerability("CVE-2022-41725", Severity::Medium, Some("2.8.2")),
+
+        a_vulnerability("CVE-2021-33574", Severity::Critical, Some("2.9.0")),
+        a_vulnerability("CVE-2022-25857", Severity::High, Some("2.9.0")),
+        a_vulnerability("CVE-2022-39253", Severity::High, Some("2.9.0")),
+        a_vulnerability("CVE-2022-0536", Severity::Medium, Some("2.9.0")),
+        a_vulnerability("CVE-2022-41724", Severity::Medium, Some("2.9.0")),
+        a_vulnerability("CVE-2022-41725", Severity::Medium, Some("2.9.0")),
+    ], Some("2.9.0"))]
+    fn test_suggested_fix_version(
+        #[case] _description: &str,
+        #[case] version: &str,
+        #[with(version)] package: Arc<Package>,
+        #[case] vulnerabilities: Vec<Arc<Vulnerability>>,
+        #[case] expected_fix: Option<&str>,
+    ) {
+        assert_eq!(package.version(), &Version::parse(version).unwrap());
+
+        for vuln in &vulnerabilities {
+            package.add_vulnerability_found(vuln.clone());
+        }
+
+        let expected = expected_fix.map(|v| Version::parse(v).unwrap());
+        assert_eq!(package.suggested_fix_version(), expected);
+    }
+}

src/domain/scanresult/scan_result.rs

@@ -14,6 +14,7 @@ use crate::domain::scanresult::severity::Severity;
 use crate::domain::scanresult::vulnerability::Vulnerability;
 use chrono::{DateTime, NaiveDate, Utc};
 use itertools::Itertools;
+use semver::Version;
 use std::collections::HashMap;
 use std::sync::Arc;
 
@@ -109,14 +110,14 @@ impl ScanResult {
         &mut self,
         package_type: PackageType,
         name: String,
-        version: String,
+        version: Version,
         path: String,
         found_in_layer: Arc<Layer>,
     ) -> Arc<Package> {
         let a_package = Arc::new(Package::new(
             package_type,
             name.clone(),
-            version.clone(),
+            version,
             path.clone(),
             found_in_layer.clone(),
         ));
@@ -140,7 +141,7 @@ impl ScanResult {
         disclosure_date: NaiveDate,
         solution_date: Option<NaiveDate>,
         exploitable: bool,
-        fix_version: Option<String>,
+        fix_version: Option<Version>,
     ) -> Arc<Vulnerability> {
         self.vulnerabilities
             .entry(cve.clone())
@@ -313,7 +314,7 @@ mod tests {
         let package = scan_result.add_package(
             PackageType::Os,
             "musl".to_string(),
-            "1.2.3".to_string(),
+            Version::parse("1.2.3").unwrap(),
             "/lib/ld-musl-x86_64.so.1".to_string(),
             layer.clone(),
         );
@@ -336,7 +337,7 @@ mod tests {
             Utc::now().naive_utc().date(),
             None,
             false,
-            Some("1.2.4".to_string()),
+            Some(Version::parse("1.2.4").unwrap()),
         );
 
         assert_eq!(scan_result.vulnerabilities().len(), 1);
@@ -357,7 +358,7 @@ mod tests {
         let package = scan_result.add_package(
             PackageType::Os,
             "musl".to_string(),
-            "1.2.3".to_string(),
+            Version::parse("1.2.3").unwrap(),
             "/lib/ld-musl-x86_64.so.1".to_string(),
             layer.clone(),
         );
@@ -367,7 +368,7 @@ mod tests {
             Utc::now().naive_utc().date(),
             None,
             false,
-            Some("1.2.4".to_string()),
+            Some(Version::parse("1.2.4").unwrap()),
         );
 
         package.add_vulnerability_found(vuln.clone());
@@ -462,7 +463,7 @@ mod tests {
             Utc::now().naive_utc().date(),
             None,
             false,
-            Some("1.2.4".to_string()),
+            Some(Version::parse("1.2.4").unwrap()),
         );
 
         vuln.add_accepted_risk(risk.clone());
@@ -488,7 +489,7 @@ mod tests {
         let package = scan_result.add_package(
             PackageType::Os,
             "musl".to_string(),
-            "1.2.3".to_string(),
+            Version::parse("1.2.3").unwrap(),
             "/lib/ld-musl-x86_64.so.1".to_string(),
             layer.clone(),
         );
@@ -571,13 +572,13 @@ mod tests {
         let package = scan_result.add_package(
             PackageType::Os,
             "musl".to_string(),
-            "1.2.3".to_string(),
+            Version::parse("1.2.3").unwrap(),
             "/path".to_string(),
             layer.clone(),
         );
         assert_eq!(package.package_type(), &PackageType::Os);
         assert_eq!(package.name(), "musl");
-        assert_eq!(package.version(), "1.2.3");
+        assert_eq!(package.version(), &Version::parse("1.2.3").unwrap());
         assert_eq!(package.path(), "/path");
         assert!(format!("{:?}", package).contains("musl"));
         assert_eq!(package.clone(), package);
@@ -589,15 +590,15 @@ mod tests {
             now.naive_utc().date(),
             Some(now.naive_utc().date()),
             true,
-            Some("1.2.4".to_string()),
+            Some(Version::parse("1.2.4").unwrap()),
         );
         assert_eq!(vuln.cve(), "CVE-1");
         assert_eq!(vuln.severity(), Severity::High);
         assert_eq!(vuln.disclosure_date(), now.naive_utc().date());
         assert_eq!(vuln.solution_date(), Some(now.naive_utc().date()));
         assert!(vuln.exploitable());
         assert!(vuln.fixable());
-        assert_eq!(vuln.fix_version(), Some("1.2.4"));
+        assert_eq!(vuln.fix_version(), Some(&Version::parse("1.2.4").unwrap()));
         assert!(format!("{:?}", vuln).contains("CVE-1"));
 
         // AcceptedRisk
@@ -672,14 +673,14 @@ mod tests {
         let pkg = scan_result.add_package(
             PackageType::Os,
             "pkg".to_string(),
-            "1.0".to_string(),
+            Version::parse("1.0.0").unwrap(),
             "/path".to_string(),
             layer.clone(),
         );
         let pkg2 = scan_result.add_package(
             PackageType::Os,
             "pkg".to_string(),
-            "1.0".to_string(),
+            Version::parse("1.0.0").unwrap(),
             "/path".to_string(),
             layer.clone(),
         );