diff --git a/vulnerabilitylookup/vulnerabilitylookup.py b/vulnerabilitylookup/vulnerabilitylookup.py index 650b0830..4cce6d0c 100644 --- a/vulnerabilitylookup/vulnerabilitylookup.py +++ b/vulnerabilitylookup/vulnerabilitylookup.py @@ -89,7 +89,7 @@ def get_vulnerability(self, vulnerability_id: str, vuln = json.loads(_vuln) if with_meta: if meta := self.get_vulnerability_meta(_vid): - vuln['meta'] = meta + vuln['vulnerability-lookup:meta'] = meta return vuln def get_sources(self) -> set[str]: diff --git a/website/web/api/v1/vulnerability.py b/website/web/api/v1/vulnerability.py index 1ebd500a..f32816e7 100644 --- a/website/web/api/v1/vulnerability.py +++ b/website/web/api/v1/vulnerability.py @@ -110,11 +110,11 @@ def get(self, vulnerability_id: str) -> dict[str, Any] | None: ) if with_linked: - to_return["linked"] = vulnerabilitylookup.get_linked_vulnerabilities(vulnerability_id) # type: ignore[index] + to_return["vulnerability-lookup:linked"] = vulnerabilitylookup.get_linked_vulnerabilities(vulnerability_id) # type: ignore[index] if with_comments: - to_return["comments"] = [elem.to_dict() for elem in Comment.query.filter(Comment.vulnerability.ilike(vulnerability_id)).all()] # type: ignore[index] + to_return["vulnerability-lookup:comments"] = [elem.to_dict() for elem in Comment.query.filter(Comment.vulnerability.ilike(vulnerability_id)).all()] # type: ignore[index] if with_bundles: - to_return["bundles"] = [ # type: ignore[index] + to_return["vulnerability-lookup:bundles"] = [ # type: ignore[index] elem.to_dict() for elem in Bundle.query.filter( func.lower(cast(Bundle.related_vulnerabilities, String)).contains( @@ -123,7 +123,7 @@ def get(self, vulnerability_id: str) -> dict[str, Any] | None: ).all() ] if with_sightings: - to_return["sightings"] = [elem.to_dict() for elem in Sighting.query.filter(Sighting.vulnerability.ilike(vulnerability_id)).all()] # type: ignore[index] + to_return["vulnerability-lookup:sightings"] = [elem.to_dict() for elem in Sighting.query.filter(Sighting.vulnerability.ilike(vulnerability_id)).all()] # type: ignore[index] return to_return diff --git a/website/web/templates/vulnerability_templates.html b/website/web/templates/vulnerability_templates.html index 668e9dad..cac1e47b 100644 --- a/website/web/templates/vulnerability_templates.html +++ b/website/web/templates/vulnerability_templates.html @@ -99,8 +99,8 @@
Vulnerability from {{source}}

{{vulnerability_data['cve']['descriptions'][0]['value']}}

- {%if 'cisa_known_exploited' in vulnerability_data['meta']%} - {{ cisa_known_exploited_view(vulnerability_data['meta']['cisa_known_exploited']) }} + {%if 'cisa_known_exploited' in vulnerability_data['vulnerability-lookup:meta']%} + {{ cisa_known_exploited_view(vulnerability_data['vulnerability-lookup:meta']['cisa_known_exploited']) }} {%endif%} Show details on source website {{ collapse_raw(source, vulnerability_id, vulnerability_data) }} @@ -181,7 +181,7 @@
Severity ?
- {% set data = vulnerability_data['meta']['nvd'] | str_to_obj %} + {% set data = vulnerability_data['vulnerability-lookup:meta']['nvd'] | str_to_obj %} {% if 'metrics' in data['cve'] %} {% if 'cvssMetricV31' in data['cve']['metrics'] %} {% set version = 'cvssV3_1' %} @@ -225,11 +225,11 @@
Summary
{{vulnerability_data['containers']['cna']['title']}}
{% endif %} - {% if 'meta' in vulnerability_data and 'nvd' in vulnerability_data['meta'] %} + {% if 'vulnerability-lookup:meta' in vulnerability_data and 'nvd' in vulnerability_data['vulnerability-lookup:meta'] %}
References
- {% set data = vulnerability_data['meta']['nvd'] | str_to_obj %} + {% set data = vulnerability_data['vulnerability-lookup:meta']['nvd'] | str_to_obj %} @@ -355,8 +355,8 @@
- {% if 'cisa_known_exploited' in vulnerability_data['meta'] %} - {{ cisa_known_exploited_view(vulnerability_data['meta']['cisa_known_exploited']) }} + {% if 'cisa_known_exploited' in vulnerability_data['vulnerability-lookup:meta'] %} + {{ cisa_known_exploited_view(vulnerability_data['vulnerability-lookup:meta']['cisa_known_exploited']) }} {% endif %} {% endif %} Show details on NVD website @@ -389,8 +389,8 @@
{% else %}

{{vulnerability_data['containers']['cna']['descriptions'][0]['value']}}

{%endif%} - {%if 'cisa_known_exploited' in vulnerability_data['meta']%} - {{ cisa_known_exploited_view(vulnerability_data['meta']['cisa_known_exploited']) }} + {%if 'cisa_known_exploited' in vulnerability_data['vulnerability-lookup:meta']%} + {{ cisa_known_exploited_view(vulnerability_data['vulnerability-lookup:meta']['cisa_known_exploited']) }} {%endif%} {%endif%} {{ collapse_raw(source, vulnerability_id, vulnerability_data) }}