Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/data enhancement spike #417

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/vunnel/providers/nvd/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import os
from typing import TYPE_CHECKING, Any

import orjson

from .api import NvdAPI

if TYPE_CHECKING:
Expand Down Expand Up @@ -79,5 +81,22 @@ def _download_updates(self, last_updated: datetime.datetime) -> Generator[tuple[
def _unwrap_records(self, response: dict[str, Any]) -> Generator[tuple[str, dict[str, Any]], Any, None]:
for vuln in response["vulnerabilities"]:
cve_id = vuln["cve"]["id"]
overrides = self._get_ovverides_for_id(cve_id)
if "cve" in vuln:
vuln["cve"].update(overrides)
year = cve_id.split("-")[1]
yield os.path.join(year, cve_id), vuln

def _get_ovverides_for_id(self, vuln_id: str) -> dict[str, Any]:
override_path = os.path.join("transforms", "nvd", f"{vuln_id}.json".lower())
changes = {}
try:
with open(override_path) as f:
j = orjson.loads(f.read())
if "comment" in j:
self.logger.info(f"Applying changes to {vuln_id} because of {j['comment']}")
if "changes" in j:
changes = j["changes"]
except FileNotFoundError:
pass
return changes
73 changes: 73 additions & 0 deletions transforms/github/GHSA-prp9-9gxw-38j8.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could also be in GHSA's graphQL or rest API format.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From Josh: But whatever we do, we should only record changes, not all the data. Otherwise it's too hard to read what we changed.

"schema_version": "1.4.0",
"id": "GHSA-prp9-9gxw-38j8",
"modified": "2023-01-29T05:06:34Z",
"published": "2022-05-24T19:05:32Z",
"aliases": [
"CVE-2020-9493"
],
"summary": "Apache Chainsaw deserialization flaw",
"details": "A deserialization flaw was found in Apache Chainsaw versions prior to 2.1.0 which could lead to malicious code execution.",
"severity": [
{
"type": "CVSS_V3",
"score": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H"
}
],
"affected": [
{
"package": {
"ecosystem": "Maven",
"name": "log4j:apache-chainsaw"
},
"ranges": [
{
"type": "ECOSYSTEM",
"events": [
{
"introduced": "0"
},
{
"fixed": "2.1.0"
}
]
}
]
}
],
"references": [
{
"type": "ADVISORY",
"url": "https://nvd.nist.gov/vuln/detail/CVE-2020-9493"
},
{
"type": "PACKAGE",
"url": "https://github.com/apache/logging-chainsaw"
},
{
"type": "WEB",
"url": "https://lists.apache.org/thread.html/r50d389c613ba6062a26aa57e163c09bfee4ff2d95d67331d75265b83@%3Cannounce.apache.org%3E"
},
{
"type": "WEB",
"url": "https://www.openwall.com/lists/oss-security/2021/06/16/1"
},
{
"type": "WEB",
"url": "http://www.openwall.com/lists/oss-security/2021/06/16/1"
},
{
"type": "WEB",
"url": "http://www.openwall.com/lists/oss-security/2022/01/18/5"
}
],
"database_specific": {
"cwe_ids": [
"CWE-502"
],
"severity": "CRITICAL",
"github_reviewed": false,
"github_reviewed_at": null,
"nvd_published_at": "2021-06-16T08:15:00Z"
}
}
8 changes: 8 additions & 0 deletions transforms/github/changes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# pretend the following PRs were merged
include-prs:
- https://github.com/github/advisory-database/pull/2630
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From Josh: This probably isn't needed; if we need to update GitHub's data, it's probably because they refused an update, not because they're being slow. And this really solves the "being slow" problem rather than the "we have a change they don't want" problem.


# assuming the following GHSAs were reviewed, even if they
# are not returned by the API
assume-reviewed:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From Josh: This mechanism probably isn't needed. If we're going to include an unreviewed GHSA, we're going to have to change it anyway. So just have a mechanism for changing fetched GHSA data, and assume any changed GHSA should be included in our output, regardless of whether GHSA has reviewed it.

- GHSA-some-asdf
64 changes: 64 additions & 0 deletions transforms/nvd/CVE-2017-8806.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"comment": "upstream has incorrect CPEs; change configurations array to be correct",
"changes": {
"configurations": [
{
"operator": "AND",
"nodes": [
{
"operator": "OR",
"negate": false,
"cpeMatch": [
{
"vulnerable": true,
"criteria": "cpe:2.3:a:postgresql:postgresql:-:*:*:*:*:debian:*:*",
"matchCriteriaId": "0C9B105E-91CA-4D33-B60B-6CF6BFFEEB55"
},
{
"vulnerable": true,
"criteria": "cpe:2.3:a:postgresql:postgresql:-:*:*:*:*:ubuntu:*:*",
"matchCriteriaId": "297620F7-BBB5-43EC-B792-1DE5097052AC"
}
]
},
{
"operator": "OR",
"negate": false,
"cpeMatch": [
{
"vulnerable": false,
"criteria": "cpe:2.3:o:canonical:ubuntu_linux:14.04:*:*:*:lts:*:*:*",
"matchCriteriaId": "B5A6F2F3-4894-4392-8296-3B8DD2679084"
},
{
"vulnerable": false,
"criteria": "cpe:2.3:o:canonical:ubuntu_linux:16.04:*:*:*:lts:*:*:*",
"matchCriteriaId": "F7016A2A-8365-4F1A-89A2-7A19F2BCAE5B"
},
{
"vulnerable": false,
"criteria": "cpe:2.3:o:canonical:ubuntu_linux:17.04:*:*:*:*:*:*:*",
"matchCriteriaId": "588D4F37-0A56-47A4-B710-4D5F3D214FB9"
},
{
"vulnerable": false,
"criteria": "cpe:2.3:o:canonical:ubuntu_linux:17.10:*:*:*:*:*:*:*",
"matchCriteriaId": "9070C9D8-A14A-467F-8253-33B966C16886"
},
{
"vulnerable": false,
"criteria": "cpe:2.3:o:debian:debian_linux:8.0:*:*:*:*:*:*:*",
"matchCriteriaId": "C11E6FB0-C8C0-4527-9AA0-CB9B316F8F43"
},
{
"vulnerable": false,
"criteria": "cpe:2.3:o:debian:debian_linux:9.0:*:*:*:*:*:*:*",
"matchCriteriaId": "DEECE5FC-CACF-4496-A3E7-164736409252"
}
]
}
]
}
]
}
}
Loading