update

emo-crab · Dec 6, 2023 · 5650652 · 5650652
1 parent 5087de1
commit 5650652
Show file tree

Hide file tree

Showing 33 changed files with 449 additions and 368 deletions.
diff --git a/.github/workflows/fly.yml b/.github/workflows/fly.yml
@@ -1,8 +1,8 @@
 name: Fly Deploy
 on:
   push:
-    branches:
-      - main
+    tags:
+      - "v*"
 jobs:
   deploy:
     name: Deploy app

diff --git a/.gitignore b/.gitignore
@@ -13,8 +13,9 @@ Cargo.lock
 *.xml.gz
 *.json.gz
 *.xml.zip
-/helper/examples/nvdcve/data-feeds.html
+/helper/examples/nvdcve/
 /.env
 /nvd-server/nvd-er.mwb.bak
 /nvd-server/dist/
 /dist/
+/helper/examples/nvdcwe/
diff --git a/README.md b/README.md
@@ -3,10 +3,10 @@
 - A collection of lib for working with [National Vulnerability Database](https://nvd.nist.gov/).
 
 ## CVE
-![CVE列表](doc/cve.png)
+![CVE列表](docs/cve.png)
 
 ## Details
-![CVE详情](doc/details.png)
+![CVE详情](docs/details.png)
 
 ## Libraries
 

diff --git a/cve/src/api/mod.rs b/cve/src/api/mod.rs
@@ -29,6 +29,7 @@ pub enum VulnStatus {
   #[serde(rename = "Undergoing Analysis")]
   UndergoingAnalysis,
   Rejected,
+  Received,
 }
 
 #[cfg(test)]

diff --git a/cvss/src/severity.rs b/cvss/src/severity.rs
@@ -103,7 +103,7 @@ pub enum SeverityTypeV2 {
 
 impl Display for SeverityTypeV2 {
   fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    write!(f, "S:{}", self.as_str())
+    write!(f, "{}", self.as_str())
   }
 }
 

diff --git a/cwe/src/structured_text.rs b/cwe/src/structured_text.rs
@@ -26,6 +26,11 @@ pub enum StructuredTextType {
     #[serde(rename(deserialize = "$value"), default)]
     children: Vec<Box<StructuredTextType>>,
   },
+  #[serde(rename(deserialize = "sup"))]
+  Sup {
+    #[serde(rename(deserialize = "$value"), default)]
+    children: Vec<Box<StructuredTextType>>,
+  },
   #[serde(rename(deserialize = "b"))]
   XhtmlB {
     #[serde(rename(deserialize = "$value"), default)]

diff --git a/doc/cve.png → docs/cve.png b/doc/cve.png → docs/cve.png
diff --git a/doc/details.png → docs/details.png b/doc/details.png → docs/details.png
diff --git a/helper/examples/cpe-api-example.rs b/helper/examples/cpe-api-example.rs
@@ -1,5 +1,5 @@
-use nvd_api::ApiVersion;
 use nvd_api::v2::products::{CpeMatchParameters, CpeParameters};
+use nvd_api::ApiVersion;
 // https://cwe.mitre.org/data/downloads.html
 // curl -s -k https://cwe.mitre.org/data/downloads.html |grep  -Eo '(/[^"]*\.xml.zip)'|xargs -I % wget -c https://cwe.mitre.org%
 #[tokio::main]

diff --git a/helper/examples/cve-api-example.rs b/helper/examples/cve-api-example.rs
@@ -1,5 +1,5 @@
-use nvd_api::ApiVersion;
 use nvd_api::v2::vulnerabilities::{CveHistoryParameters, CveParameters};
+use nvd_api::ApiVersion;
 // https://cwe.mitre.org/data/downloads.html
 // curl -s -k https://cwe.mitre.org/data/downloads.html |grep  -Eo '(/[^"]*\.xml.zip)'|xargs -I % wget -c https://cwe.mitre.org%
 #[tokio::main]

diff --git a/helper/src/bin/api_to_db.rs b/helper/src/bin/api_to_db.rs
diff --git a/helper/src/bin/cpe_match.rs b/helper/src/bin/cpe_match.rs
diff --git a/helper/src/bin/cpe_to_db.rs b/helper/src/bin/cpe_to_db.rs