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 requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
black==22.1.0
black==22.3.0
freezegun==1.1.0
ipython==8.0.1
isort==5.10.1
Expand Down
19 changes: 19 additions & 0 deletions vulnerabilities/migrations/0004_advisory_unique_content_id.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 4.0.2 on 2022-03-29 09:38

from django.db import migrations
from django.db import models


class Migration(migrations.Migration):

dependencies = [
("vulnerabilities", "0003_alter_advisory_created_by"),
]

operations = [
migrations.AddField(
model_name="advisory",
name="unique_content_id",
field=models.CharField(blank=True, max_length=32, null=True),
),
]
26 changes: 26 additions & 0 deletions vulnerabilities/migrations/0005_auto_20220329_0938.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 4.0.2 on 2022-03-29 09:38

import hashlib
import json

from django.db import migrations


class Migration(migrations.Migration):
def md5hash(apps, schema_editor):
Advisory = apps.get_model("vulnerabilities", "Advisory")
for advisory in Advisory.objects.all():
checksum = hashlib.md5()
for field in (advisory.summary, advisory.affected_packages, advisory.references):
value = json.dumps(field, separators=(",", ":")).encode("utf-8")
checksum.update(value)
advisory.unique_content_id = checksum.hexdigest()
advisory.save()

dependencies = [
("vulnerabilities", "0004_advisory_unique_content_id"),
]

operations = [
migrations.RunPython(md5hash),
]
17 changes: 17 additions & 0 deletions vulnerabilities/migrations/0006_alter_advisory_unique_together.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 4.0.2 on 2022-03-29 09:41

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("vulnerabilities", "0005_auto_20220329_0938"),
]

operations = [
migrations.AlterUniqueTogether(
name="advisory",
unique_together={("aliases", "unique_content_id", "date_published")},
),
]
14 changes: 11 additions & 3 deletions vulnerabilities/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
# Visit https://github.com/nexB/vulnerablecode/ for support and download.

import dataclasses
import hashlib
import importlib
import json
import logging
Expand Down Expand Up @@ -326,6 +327,15 @@ class Advisory(models.Model):
into structured data
"""

def save(self, *args, **kwargs):
checksum = hashlib.md5()
for field in (self.summary, self.affected_packages, self.references):
value = json.dumps(field, separators=(",", ":")).encode("utf-8")
checksum.update(value)
self.unique_content_id = checksum.hexdigest()
super().save(*args, **kwargs)

unique_content_id = models.CharField(max_length=32, blank=True, null=True)
aliases = models.JSONField(blank=True, default=list, help_text="A list of alias strings")
summary = models.TextField(blank=True, null=True)
# we use a JSON field here to avoid creating a complete relational model for data that
Expand Down Expand Up @@ -356,9 +366,7 @@ class Advisory(models.Model):
class Meta:
unique_together = (
"aliases",
"summary",
"affected_packages",
"references",
"unique_content_id",
"date_published",
)

Expand Down
Loading