Zero functional changes, just moving cvss support into another

crate to make room for adding CVSS4 support.
trustification · Mar 19, 2024 · 541816c · 541816c
1 parent 4c41495
commit 541816c
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 57 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,7 @@ members = [
   "common",
   "common/auth",
   "common/infrastructure",
+  "cvss",
   "modules/importer",
   "entity",
   "importer",

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -5,6 +5,7 @@ edition = "2021"
 
 [dependencies]
 trustify-migration = { path = "../migration" }
+trustify-cvss = { path = "../cvss" }
 
 anyhow = "1.0.72"
 clap = { version = "4", features = ["derive", "env"] }
@@ -14,7 +15,7 @@ log = "0.4.19"
 native-tls = "0.2"
 packageurl = "0.3.0"
 pem = "3"
-postgresql_embedded = { version = "0.6.2", features = ["blocking", "bundled", "tokio" ] }
+postgresql_embedded = { version = "0.6.2", features = ["blocking", "bundled", "tokio"] }
 reqwest = { version = "0.11", features = ["native-tls"] }
 utoipa = "4"
 sea-orm = { version = "0.12", features = ["sea-query-binder", "sqlx-postgres", "runtime-tokio-rustls", "macros"] }

diff --git a/common/src/lib.rs b/common/src/lib.rs
@@ -11,5 +11,3 @@ pub mod purl;
 pub mod reqwest;
 pub mod sbom;
 pub mod tls;
-
-pub mod cvss3;
diff --git a/cvss/Cargo.toml b/cvss/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "trustify-cvss"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = { version = "1.0.183", features = ["derive"] }
+thiserror = "1"
+
+[dev-dependencies]
+test-log = { version = "0.2.15", features = ["env_logger", "trace"] }
+tokio = { version = "1.30.0", features = ["full"] }
diff --git a/common/src/cvss3.rs → cvss/src/cvss3.rs b/common/src/cvss3.rs → cvss/src/cvss3.rs
diff --git a/cvss/src/lib.rs b/cvss/src/lib.rs
@@ -0,0 +1 @@
+pub mod cvss3;
diff --git a/entity/Cargo.toml b/entity/Cargo.toml
@@ -4,11 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-sea-orm = { version = "0.12", features = [ "sqlx-postgres", "runtime-tokio-rustls", "macros", "with-json" ] }
+sea-orm = { version = "0.12", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros", "with-json"] }
 serde_json = "1"
 time = "0.3"
 tokio = { version = "1.30.0", features = ["full"] }
-trustify-common = { path = "../common"}
+trustify-common = { path = "../common" }
+trustify-cvss = { path = "../cvss" }
 
 [dev-dependencies]
 anyhow = "1.0.72"
diff --git a/entity/src/cvss3.rs b/entity/src/cvss3.rs
@@ -1,6 +1,6 @@
 use crate::advisory;
 use sea_orm::entity::prelude::*;
-use trustify_common::cvss3::Cvss3Base;
+use trustify_cvss::cvss3::Cvss3Base;
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "cvss3")]
@@ -67,7 +67,7 @@ pub enum AttackVector {
     Physical,
 }
 
-impl From<AttackVector> for trustify_common::cvss3::AttackVector {
+impl From<AttackVector> for trustify_cvss::cvss3::AttackVector {
     fn from(value: AttackVector) -> Self {
         match value {
             AttackVector::Network => Self::Network,
@@ -78,13 +78,13 @@ impl From<AttackVector> for trustify_common::cvss3::AttackVector {
     }
 }
 
-impl From<trustify_common::cvss3::AttackVector> for AttackVector {
-    fn from(value: trustify_common::cvss3::AttackVector) -> Self {
+impl From<trustify_cvss::cvss3::AttackVector> for AttackVector {
+    fn from(value: trustify_cvss::cvss3::AttackVector) -> Self {
         match value {
-            trustify_common::cvss3::AttackVector::Network => Self::Network,
-            trustify_common::cvss3::AttackVector::Adjacent => Self::Adjacent,
-            trustify_common::cvss3::AttackVector::Local => Self::Local,
-            trustify_common::cvss3::AttackVector::Physical => Self::Physical,
+            trustify_cvss::cvss3::AttackVector::Network => Self::Network,
+            trustify_cvss::cvss3::AttackVector::Adjacent => Self::Adjacent,
+            trustify_cvss::cvss3::AttackVector::Local => Self::Local,
+            trustify_cvss::cvss3::AttackVector::Physical => Self::Physical,
         }
     }
 }
@@ -98,7 +98,7 @@ pub enum AttackComplexity {
     High,
 }
 
-impl From<AttackComplexity> for trustify_common::cvss3::AttackComplexity {
+impl From<AttackComplexity> for trustify_cvss::cvss3::AttackComplexity {
     fn from(value: AttackComplexity) -> Self {
         match value {
             AttackComplexity::Low => Self::Low,
@@ -107,11 +107,11 @@ impl From<AttackComplexity> for trustify_common::cvss3::AttackComplexity {
     }
 }
 
-impl From<trustify_common::cvss3::AttackComplexity> for AttackComplexity {
-    fn from(value: trustify_common::cvss3::AttackComplexity) -> Self {
+impl From<trustify_cvss::cvss3::AttackComplexity> for AttackComplexity {
+    fn from(value: trustify_cvss::cvss3::AttackComplexity) -> Self {
         match value {
-            trustify_common::cvss3::AttackComplexity::Low => Self::Low,
-            trustify_common::cvss3::AttackComplexity::High => Self::High,
+            trustify_cvss::cvss3::AttackComplexity::Low => Self::Low,
+            trustify_cvss::cvss3::AttackComplexity::High => Self::High,
         }
     }
 }
@@ -127,7 +127,7 @@ pub enum PrivilegesRequired {
     High,
 }
 
-impl From<PrivilegesRequired> for trustify_common::cvss3::PrivilegesRequired {
+impl From<PrivilegesRequired> for trustify_cvss::cvss3::PrivilegesRequired {
     fn from(value: PrivilegesRequired) -> Self {
         match value {
             PrivilegesRequired::None => Self::None,
@@ -137,12 +137,12 @@ impl From<PrivilegesRequired> for trustify_common::cvss3::PrivilegesRequired {
     }
 }
 
-impl From<trustify_common::cvss3::PrivilegesRequired> for PrivilegesRequired {
-    fn from(value: trustify_common::cvss3::PrivilegesRequired) -> Self {
+impl From<trustify_cvss::cvss3::PrivilegesRequired> for PrivilegesRequired {
+    fn from(value: trustify_cvss::cvss3::PrivilegesRequired) -> Self {
         match value {
-            trustify_common::cvss3::PrivilegesRequired::None => Self::None,
-            trustify_common::cvss3::PrivilegesRequired::Low => Self::Low,
-            trustify_common::cvss3::PrivilegesRequired::High => Self::High,
+            trustify_cvss::cvss3::PrivilegesRequired::None => Self::None,
+            trustify_cvss::cvss3::PrivilegesRequired::Low => Self::Low,
+            trustify_cvss::cvss3::PrivilegesRequired::High => Self::High,
         }
     }
 }
@@ -156,7 +156,7 @@ pub enum UserInteraction {
     Required,
 }
 
-impl From<UserInteraction> for trustify_common::cvss3::UserInteraction {
+impl From<UserInteraction> for trustify_cvss::cvss3::UserInteraction {
     fn from(value: UserInteraction) -> Self {
         match value {
             UserInteraction::None => Self::None,
@@ -165,11 +165,11 @@ impl From<UserInteraction> for trustify_common::cvss3::UserInteraction {
     }
 }
 
-impl From<trustify_common::cvss3::UserInteraction> for UserInteraction {
-    fn from(value: trustify_common::cvss3::UserInteraction) -> Self {
+impl From<trustify_cvss::cvss3::UserInteraction> for UserInteraction {
+    fn from(value: trustify_cvss::cvss3::UserInteraction) -> Self {
         match value {
-            trustify_common::cvss3::UserInteraction::None => Self::None,
-            trustify_common::cvss3::UserInteraction::Required => Self::Required,
+            trustify_cvss::cvss3::UserInteraction::None => Self::None,
+            trustify_cvss::cvss3::UserInteraction::Required => Self::Required,
         }
     }
 }
@@ -183,7 +183,7 @@ pub enum Scope {
     Changed,
 }
 
-impl From<Scope> for trustify_common::cvss3::Scope {
+impl From<Scope> for trustify_cvss::cvss3::Scope {
     fn from(value: Scope) -> Self {
         match value {
             Scope::Unchanged => Self::Unchanged,
@@ -192,11 +192,11 @@ impl From<Scope> for trustify_common::cvss3::Scope {
     }
 }
 
-impl From<trustify_common::cvss3::Scope> for Scope {
-    fn from(value: trustify_common::cvss3::Scope) -> Self {
+impl From<trustify_cvss::cvss3::Scope> for Scope {
+    fn from(value: trustify_cvss::cvss3::Scope) -> Self {
         match value {
-            trustify_common::cvss3::Scope::Unchanged => Self::Unchanged,
-            trustify_common::cvss3::Scope::Changed => Self::Changed,
+            trustify_cvss::cvss3::Scope::Unchanged => Self::Unchanged,
+            trustify_cvss::cvss3::Scope::Changed => Self::Changed,
         }
     }
 }
@@ -212,7 +212,7 @@ pub enum Confidentiality {
     High,
 }
 
-impl From<Confidentiality> for trustify_common::cvss3::Confidentiality {
+impl From<Confidentiality> for trustify_cvss::cvss3::Confidentiality {
     fn from(value: Confidentiality) -> Self {
         match value {
             Confidentiality::None => Self::None,
@@ -222,12 +222,12 @@ impl From<Confidentiality> for trustify_common::cvss3::Confidentiality {
     }
 }
 
-impl From<trustify_common::cvss3::Confidentiality> for Confidentiality {
-    fn from(value: trustify_common::cvss3::Confidentiality) -> Self {
+impl From<trustify_cvss::cvss3::Confidentiality> for Confidentiality {
+    fn from(value: trustify_cvss::cvss3::Confidentiality) -> Self {
         match value {
-            trustify_common::cvss3::Confidentiality::None => Self::None,
-            trustify_common::cvss3::Confidentiality::Low => Self::Low,
-            trustify_common::cvss3::Confidentiality::High => Self::High,
+            trustify_cvss::cvss3::Confidentiality::None => Self::None,
+            trustify_cvss::cvss3::Confidentiality::Low => Self::Low,
+            trustify_cvss::cvss3::Confidentiality::High => Self::High,
         }
     }
 }
@@ -243,7 +243,7 @@ pub enum Integrity {
     High,
 }
 
-impl From<Integrity> for trustify_common::cvss3::Integrity {
+impl From<Integrity> for trustify_cvss::cvss3::Integrity {
     fn from(value: Integrity) -> Self {
         match value {
             Integrity::None => Self::None,
@@ -253,12 +253,12 @@ impl From<Integrity> for trustify_common::cvss3::Integrity {
     }
 }
 
-impl From<trustify_common::cvss3::Integrity> for Integrity {
-    fn from(value: trustify_common::cvss3::Integrity) -> Self {
+impl From<trustify_cvss::cvss3::Integrity> for Integrity {
+    fn from(value: trustify_cvss::cvss3::Integrity) -> Self {
         match value {
-            trustify_common::cvss3::Integrity::None => Self::None,
-            trustify_common::cvss3::Integrity::Low => Self::Low,
-            trustify_common::cvss3::Integrity::High => Self::High,
+            trustify_cvss::cvss3::Integrity::None => Self::None,
+            trustify_cvss::cvss3::Integrity::Low => Self::Low,
+            trustify_cvss::cvss3::Integrity::High => Self::High,
         }
     }
 }
@@ -274,7 +274,7 @@ pub enum Availability {
     High,
 }
 
-impl From<Availability> for trustify_common::cvss3::Availability {
+impl From<Availability> for trustify_cvss::cvss3::Availability {
     fn from(value: Availability) -> Self {
         match value {
             Availability::None => Self::None,
@@ -284,12 +284,12 @@ impl From<Availability> for trustify_common::cvss3::Availability {
     }
 }
 
-impl From<trustify_common::cvss3::Availability> for Availability {
-    fn from(value: trustify_common::cvss3::Availability) -> Self {
+impl From<trustify_cvss::cvss3::Availability> for Availability {
+    fn from(value: trustify_cvss::cvss3::Availability) -> Self {
         match value {
-            trustify_common::cvss3::Availability::None => Self::None,
-            trustify_common::cvss3::Availability::Low => Self::Low,
-            trustify_common::cvss3::Availability::High => Self::High,
+            trustify_cvss::cvss3::Availability::None => Self::None,
+            trustify_cvss::cvss3::Availability::Low => Self::Low,
+            trustify_cvss::cvss3::Availability::High => Self::High,
         }
     }
 }
diff --git a/graph/Cargo.toml b/graph/Cargo.toml
@@ -6,11 +6,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-trustify-entity = { path = "../entity"}
+trustify-entity = { path = "../entity" }
 trustify-common = { path = "../common" }
 trustify-migration = { path = "../migration" }
+trustify-cvss = { path = "../cvss" }
 
-sea-orm = { version = "0.12", features = [ "sea-query-binder", "sqlx-postgres", "runtime-tokio-rustls", "macros", "debug-print" ] }
+sea-orm = { version = "0.12", features = ["sea-query-binder", "sqlx-postgres", "runtime-tokio-rustls", "macros", "debug-print"] }
 sea-query = "0.30.0"
 sea-orm-migration = "0.12.2"
 tokio = { version = "1.30.0", features = ["full"] }
@@ -26,7 +27,7 @@ csaf = "0.5"
 async-trait = "0.1.74"
 lenient_semver = "0.4.2"
 cpe = "0.1.3"
-postgresql_embedded = { version = "0.6.2", features = ["blocking", "bundled", "tokio" ] }
+postgresql_embedded = { version = "0.6.2", features = ["blocking", "bundled", "tokio"] }
 tempfile = "3"
 
 

diff --git a/graph/src/graph/advisory/mod.rs b/graph/src/graph/advisory/mod.rs
@@ -11,9 +11,9 @@ use std::cmp::min;
 use std::collections::HashMap;
 use std::fmt::{Debug, Formatter};
 use trustify_common::advisory::{AdvisoryVulnerabilityAssertions, Assertion};
-use trustify_common::cvss3::Cvss3Base;
 use trustify_common::db::Transactional;
 use trustify_common::purl::Purl;
+use trustify_cvss::cvss3::Cvss3Base;
 use trustify_entity as entity;
 
 pub mod advisory_vulnerability;

diff --git a/ingestors/Cargo.toml b/ingestors/Cargo.toml
@@ -8,6 +8,7 @@ publish = false
 trustify-common = { path = "../common"}
 trustify-graph = { path = "../graph"}
 trustify-entity = { path = "../entity" }
+trustify-cvss = { path = "../cvss" }
 
 serde = { version = "1.0.183", features = ["derive"] }
 serde_json = "1.0.114"

diff --git a/ingestors/src/advisory/osv/loader.rs b/ingestors/src/advisory/osv/loader.rs
@@ -8,7 +8,7 @@ use crate::advisory::osv::schema::SeverityType;
 use crate::advisory::osv::schema::{Event, Package, Vulnerability};
 use crate::hashing::HashingRead;
 use crate::Error;
-use trustify_common::cvss3::Cvss3Base;
+use trustify_cvss::cvss3::Cvss3Base;
 
 pub struct OsvLoader<'g> {
     graph: &'g Graph,