Rebase and resolve confilcts

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

vulnerabilities/import_runner.py

@@ -132,7 +132,7 @@ def process_advisories(data_source: DataSource) -> None:
                     for score in vuln_ref.severities:
                         models.VulnerabilitySeverity.objects.update_or_create(
                             vulnerability=vuln,
-                            scoring_system=score.system.vulnerability_id,
+                            scoring_system=score.system.identifier,
                             reference=ref,
                             defaults={"value": str(score.value)},
                         )

vulnerabilities/importers/apache_kafka.py

@@ -82,7 +82,7 @@ def to_advisory(self, advisory_page):
 
             advisories.append(
                 Advisory(
-                    cve_id=cve_id,
+                    vulnerability_id=cve_id,
                     summary=cve_description_paragraph.text,
                     impacted_package_urls=affected_packages,
                     resolved_package_urls=fixed_packages,

vulnerabilities/importers/suse_scores.py

@@ -80,7 +80,7 @@ def to_advisory(score_data):
 
             advisories.append(
                 Advisory(
-                    cve_id=cve_id,
+                    vulnerability_id=cve_id,
                     summary="",
                     impacted_package_urls=[],
                     vuln_references=[

vulnerabilities/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2021-02-11 15:51
+# Generated by Django 3.0.7 on 2021-02-18 06:13
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
@@ -91,7 +91,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('value', models.CharField(help_text='Example: 9.0, Important, High', max_length=50)),
-                ('scoring_system', models.CharField(choices=[('cvssv2', 'CVSSv2 Base Score'), ('cvssv2_vector', 'CVSSv2 Vector'), ('cvssv3', 'CVSSv3 Base Score'), ('cvssv3_vector', 'CVSSv3 Vector'), ('rhbs', 'RedHat Bugzilla severity'), ('rhas', 'RedHat Aggregate severity')], help_text='vulnerability_id for the scoring system used. Available choices are: cvssv2 is vulnerability_id for CVSSv2 Base Score system, cvssv2_vector is vulnerability_id for CVSSv2 Vector system, cvssv3 is vulnerability_id for CVSSv3 Base Score system, cvssv3_vector is vulnerability_id for CVSSv3 Vector system, rhbs is vulnerability_id for RedHat Bugzilla severity system, rhas is vulnerability_id for RedHat Aggregate severity system ', max_length=50)),
+                ('scoring_system', models.CharField(choices=[('cvssv2', 'CVSSv2 Base Score'), ('cvssv2_vector', 'CVSSv2 Vector'), ('cvssv3', 'CVSSv3 Base Score'), ('cvssv3_vector', 'CVSSv3 Vector'), ('cvssv3.1', 'CVSSv3.1 Base Score'), ('cvssv3.1_vector', 'CVSSv3.1 Vector'), ('rhbs', 'RedHat Bugzilla severity'), ('rhas', 'RedHat Aggregate severity'), ('avgs', 'Archlinux Vulnerability Group Severity')], help_text='vulnerability_id for the scoring system used. Available choices are: cvssv2 is vulnerability_id for CVSSv2 Base Score system, cvssv2_vector is vulnerability_id for CVSSv2 Vector system, cvssv3 is vulnerability_id for CVSSv3 Base Score system, cvssv3_vector is vulnerability_id for CVSSv3 Vector system, cvssv3.1 is vulnerability_id for CVSSv3.1 Base Score system, cvssv3.1_vector is vulnerability_id for CVSSv3.1 Vector system, rhbs is vulnerability_id for RedHat Bugzilla severity system, rhas is vulnerability_id for RedHat Aggregate severity system, avgs is vulnerability_id for Archlinux Vulnerability Group Severity system ', max_length=50)),
                 ('reference', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vulnerabilities.VulnerabilityReference')),
                 ('vulnerability', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vulnerabilities.Vulnerability')),
             ],

vulnerabilities/models.py

@@ -240,16 +240,16 @@ def __str__(self):
 
 class VulnerabilitySeverity(models.Model):
 
-    scoring_system_choices = ((system.vulnerability_id, system.name) for system in scoring_systems.values())  # nopep8
+    scoring_system_choices = ((system.identifier, system.name) for system in scoring_systems.values())  # nopep8
     vulnerability = models.ForeignKey(Vulnerability, on_delete=models.CASCADE)
     value = models.CharField(max_length=50, help_text="Example: 9.0, Important, High")
     scoring_system = models.CharField(
         max_length=50,
         choices=scoring_system_choices,
-        help_text="vulnerability_id for the scoring system used. Available choices are: {} ".format(
+        help_text="identifier for the scoring system used. Available choices are: {} ".format(
                   ", ".join(
                         [
-                            f"{ss.vulnerability_id} is vulnerability_id for {ss.name} system"
+                            f"{ss.identifier} is vulnerability_id for {ss.name} system"
                             for ss in scoring_systems.values()
                         ]
                     ))

vulnerabilities/severity_systems.py

@@ -4,8 +4,8 @@
 @dataclasses.dataclass
 class ScoringSystem:
 
-    # a short vulnerability_id for the scoring system.
-    vulnerability_id: str
+    # a short identifier for the scoring system.
+    identifier: str
     # a name which represents the scoring system such as `RedHat bug severity`.
     # This is for human understanding
     name: str
@@ -25,25 +25,25 @@ def as_score(self, value):
 
 scoring_systems = {
     "cvssv2": ScoringSystem(
-        vulnerability_id="cvssv2",
+        identifier="cvssv2",
         name="CVSSv2 Base Score",
         url="https://www.first.org/cvss/v2/",
         notes="cvssv2 base score",
     ),
     "cvssv2_vector": ScoringSystem(
-        vulnerability_id="cvssv2_vector",
+        identifier="cvssv2_vector",
         name="CVSSv2 Vector",
         url="https://www.first.org/cvss/v2/",
         notes="cvssv2 vector, used to get additional info about nature and severity of vulnerability",  # nopep8
     ),
     "cvssv3": ScoringSystem(
-        vulnerability_id="cvssv3",
+        identifier="cvssv3",
         name="CVSSv3 Base Score",
         url="https://www.first.org/cvss/v3-0/",
         notes="cvssv3 base score",
     ),
     "cvssv3_vector": ScoringSystem(
-        vulnerability_id="cvssv3_vector",
+        identifier="cvssv3_vector",
         name="CVSSv3 Vector",
         url="https://www.first.org/cvss/v3-0/",
         notes="cvssv3 vector, used to get additional info about nature and severity of vulnerability",  # nopep8
@@ -61,12 +61,12 @@ def as_score(self, value):
         notes="cvssv3.1 vector, used to get additional info about nature and severity of vulnerability",  # nopep8
     ),
     "rhbs": ScoringSystem(
-        vulnerability_id="rhbs",
+        identifier="rhbs",
         name="RedHat Bugzilla severity",
         url="https://bugzilla.redhat.com/page.cgi?id=fields.html#bug_severity",
     ),
     "rhas": ScoringSystem(
-        vulnerability_id="rhas",
+        identifier="rhas",
         name="RedHat Aggregate severity",
         url="https://access.redhat.com/security/updates/classification/",
     ),

vulnerabilities/tests/test_apache_kafka.py

@@ -93,7 +93,7 @@ def test_to_advisory(self):
                         reference_id="CVE-2018-17196",
                     ),
                 ],
-                cve_id="CVE-2018-17196",
+                vulnerability_id="CVE-2018-17196",
             )
         ]
         with open(TEST_DATA) as f:

vulnerabilities/tests/test_suse_scores.py

@@ -86,7 +86,7 @@ def test_to_advisory(self):
                         ],
                     )
                 ],
-                cve_id="CVE-2004-0230",
+                vulnerability_id="CVE-2004-0230",
             ),
             Advisory(
                 summary="",
@@ -118,7 +118,7 @@ def test_to_advisory(self):
                         ],
                     )
                 ],
-                cve_id="CVE-2003-1605",
+                vulnerability_id="CVE-2003-1605",
             ),
         ]