Skip to content
Merged
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
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = ontolocy
version = 0.9.2
version = 0.9.3
author = Ontolocy
description = A Python package for modeling cybersecurity data in a Neo4j graph database.
long_description = file: README.md
Expand Down
37 changes: 22 additions & 15 deletions src/ontolocy/tools/nvd.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,26 +160,33 @@ def _parse(self, input_data, private_namespace=None, ctx=None) -> tuple:

cve_to_cpe_df = pd.DataFrame(cve_to_cpe)

rel_dfs[CVERelatesToCPE.__relationshiptype__] = {
"src_df": cve_to_cpe_df[["source"]].copy(),
"tgt_df": cve_to_cpe_df[["target"]].copy(),
"props_df": cve_to_cpe_df.drop(columns=["source", "target"]).copy(),
}
if not cve_to_cpe_df.empty:

rel_dfs[CVERelatesToCWE.__relationshiptype__] = {
"src_df": pd.DataFrame(cve_to_cwe)[["source"]],
"tgt_df": pd.DataFrame(cve_to_cwe)[["target"]],
}
rel_dfs[CVERelatesToCPE.__relationshiptype__] = {
"src_df": cve_to_cpe_df[["source"]].copy(),
"tgt_df": cve_to_cpe_df[["target"]].copy(),
"props_df": cve_to_cpe_df.drop(columns=["source", "target"]).copy(),
}

cve_to_cwe_df = pd.DataFrame(cve_to_cwe)

if not cve_to_cwe_df.empty:
rel_dfs[CVERelatesToCWE.__relationshiptype__] = {
"src_df": cve_to_cwe_df[["source"]],
"tgt_df": cve_to_cwe_df[["target"]],
}

cvss_df = pd.DataFrame(cvss_rels)

rel_dfs[OrganisationAssignedCVSSToCVE.__relationshiptype__] = {
"src_df": cvss_df[["source"]].copy(),
"tgt_df": cvss_df[["target"]].copy(),
"props_df": cvss_df.drop(columns=["source", "target"]).copy(),
}
if not cvss_df.empty:

rel_dfs[OrganisationAssignedCVSSToCVE.__relationshiptype__] = {
"src_df": cvss_df[["source"]].copy(),
"tgt_df": cvss_df[["target"]].copy(),
"props_df": cvss_df.drop(columns=["source", "target"]).copy(),
}

return node_dfs, rel_dfs
return node_dfs, rel_dfs


class NVDCVEOntolocyClient(OntolocyClient):
Expand Down