Skip to content

Improve import time #478

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 12, 2021
Merged

Improve import time #478

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4918e65
Improve import time
Hritik14 Jun 11, 2021
e354f9a
Remove unnecessary try-catch
Hritik14 Jun 12, 2021
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
61 changes: 28 additions & 33 deletions vulnerabilities/import_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from typing import Tuple

from django.core import serializers
from django.db import transaction

from vulnerabilities import models
from vulnerabilities.data_source import Advisory, DataSource
Expand Down Expand Up @@ -110,6 +111,7 @@ def get_vuln_pkg_refs(vulnerability, package):
)


@transaction.atomic
def process_advisories(data_source: DataSource) -> None:
bulk_create_vuln_pkg_refs = set()
# Treat updated_advisories and added_advisories as same. Eventually
Expand All @@ -118,46 +120,39 @@ def process_advisories(data_source: DataSource) -> None:
advisory_batches = chain(data_source.updated_advisories(), data_source.added_advisories())
for batch in advisory_batches:
for advisory in batch:
try:
vuln, vuln_created = _get_or_create_vulnerability(advisory)
for vuln_ref in advisory.references:
ref, _ = models.VulnerabilityReference.objects.get_or_create(
vulnerability=vuln, reference_id=vuln_ref.reference_id, url=vuln_ref.url
)

for score in vuln_ref.severities:
models.VulnerabilitySeverity.objects.update_or_create(
vulnerability=vuln,
scoring_system=score.system.identifier,
reference=ref,
defaults={"value": str(score.value)},
)

for aff_pkg_with_patched_pkg in advisory.affected_packages:
vulnerable_package, _ = _get_or_create_package(
aff_pkg_with_patched_pkg.vulnerable_package
)
patched_package = None
if aff_pkg_with_patched_pkg.patched_package:
patched_package, _ = _get_or_create_package(
aff_pkg_with_patched_pkg.patched_package
)
vuln, vuln_created = _get_or_create_vulnerability(advisory)
for vuln_ref in advisory.references:
ref, _ = models.VulnerabilityReference.objects.get_or_create(
vulnerability=vuln, reference_id=vuln_ref.reference_id, url=vuln_ref.url
)

prv, _ = models.PackageRelatedVulnerability.objects.get_or_create(
for score in vuln_ref.severities:
models.VulnerabilitySeverity.objects.update_or_create(
vulnerability=vuln,
package=vulnerable_package,
scoring_system=score.system.identifier,
reference=ref,
defaults={"value": str(score.value)},
)

if patched_package:
prv.patched_package = patched_package
prv.save()
for aff_pkg_with_patched_pkg in advisory.affected_packages:
vulnerable_package, _ = _get_or_create_package(
aff_pkg_with_patched_pkg.vulnerable_package
)
patched_package = None
if aff_pkg_with_patched_pkg.patched_package:
patched_package, _ = _get_or_create_package(
aff_pkg_with_patched_pkg.patched_package
)

except Exception:
# TODO: store error but continue
logger.error(
f"Failed to process advisory: {advisory!r}:\n" + traceback.format_exc()
prv, _ = models.PackageRelatedVulnerability.objects.get_or_create(
vulnerability=vuln,
package=vulnerable_package,
)

if patched_package:
prv.patched_package = patched_package
prv.save()

models.PackageRelatedVulnerability.objects.bulk_create(
[i.to_model_object() for i in bulk_create_vuln_pkg_refs]
)
Expand Down