Remove vulcode creation option

Signed-off-by: Shivam Sandbhor <[email protected]>

Author: sbs2001

vulnerabilities/import_runner.py

@@ -98,7 +98,7 @@ def __init__(self, importer: models.Importer, batch_size: int):
         self.importer = importer
         self.batch_size = batch_size
 
-    def run(self, create_vulcodes=True, cutoff_date: datetime.datetime = None) -> None:
+    def run(self, cutoff_date: datetime.datetime = None) -> None:
         """
         Create a data source for the given importer and store the data retrieved in the database.
 
@@ -112,7 +112,7 @@ def run(self, create_vulcodes=True, cutoff_date: datetime.datetime = None) -> No
         logger.info(f"Starting import for {self.importer.name}.")
         data_source = self.importer.make_data_source(self.batch_size, cutoff_date=cutoff_date)
         with data_source:
-            process_advisories(data_source, create_vulcodes)
+            process_advisories(data_source)
         self.importer.last_run = datetime.datetime.now(tz=datetime.timezone.utc)
         self.importer.data_source_cfg = dataclasses.asdict(data_source.config)
         self.importer.save()
@@ -133,24 +133,25 @@ def get_vuln_pkg_refs(vulnerability, package):
     )
 
 
-def process_advisories(data_source: DataSource, create_vulcodes) -> None:
+def process_advisories(data_source: DataSource) -> None:
     bulk_create_vuln_refs = set()
     bulk_create_vuln_pkg_refs = set()
     # Treat updated_advisories and added_advisories as same. Eventually
     # we want to  refactor all data sources to  provide advisories via a
     # single method.
-    vulcoid = datetime.datetime.now()
+    vulcoid_timestamp = datetime.datetime.now()
     advisory_batches = chain(data_source.updated_advisories(), data_source.added_advisories())
     for batch in advisory_batches:
         for advisory in batch:
             try:
 
-                if not advisory.identifier and not create_vulcodes:
-                    continue
-
                 if not advisory.identifier:
-                    advisory.identifier = "VULCOID-" + vulcoid.strftime("%Y-%m-%d-%H:%M:%S")
-                    vulcoid += datetime.timedelta(seconds=1)
+                    advisory.identifier = "VULCOID-" + vulcoid_timestamp.strftime(
+                        "%Y-%m-%d-%H:%M:%S"
+                    )
+                    vulcoid_timestamp = max(
+                        vulcoid_timestamp + datetime.timedelta(seconds=1), datetime.datetime.now()
+                    )
 
                 vuln, vuln_created = _get_or_create_vulnerability(advisory)
                 for vuln_ref in advisory.vuln_references:

vulnerabilities/importer_yielder.py

@@ -61,16 +61,16 @@
             'debian_tracker_url': 'https://security-tracker.debian.org/tracker/data/json'
         },
     },
-    # {
-    #     'name': 'safetydb',
-    #     'license': 'cc-by-nc-4.0',
-    #     'last_run': None,
-    #     'data_source': 'SafetyDbDataSource',
-    #     'data_source_cfg': {
-    #         'url': 'https://raw.githubusercontent.com/pyupio/safety-db/master/data/insecure_full.json',  # nopep8
-    #         'etags': {}
-    #     },
-    # },
+    {
+        'name': 'safetydb',
+        'license': 'cc-by-nc-4.0',
+        'last_run': None,
+        'data_source': 'SafetyDbDataSource',
+        'data_source_cfg': {
+            'url': 'https://raw.githubusercontent.com/pyupio/safety-db/master/data/insecure_full.json',  # nopep8
+            'etags': {}
+        },
+    },
     {
         'name': 'npm',
         'license': 'mit',

vulnerabilities/management/commands/import.py

@@ -56,12 +56,6 @@ def add_arguments(self, parser):
             "--batch_size", help="The batch size to be used for bulk inserting data"
         )
 
-        parser.add_argument(
-            "--cv",
-            action="store_true",
-            help="This will import and assign id's to vulnerabilities without any identifiers",
-        )
-
     def handle(self, *args, **options):
         # load_importers() seeds the DB with Importers
         load_importers()
@@ -72,8 +66,6 @@ def handle(self, *args, **options):
         if options["batch_size"]:
             self.batch_size = options["batch_size"]
 
-        self.create_vulcodes = options["cv"]
-
         if options["all"]:
             self._import_data(Importer.objects.all(), options["cutoff_date"])
             return
@@ -111,9 +103,7 @@ def _import_data(self, importers, cutoff_date):
         for importer in importers:
             self.stdout.write(f"Importing data from {importer.name}")
             batch_size = int(getattr(self, "batch_size", 10))
-            ImportRunner(importer, batch_size).run(
-                cutoff_date=cutoff_date, create_vulcodes=self.create_vulcodes
-            )
+            ImportRunner(importer, batch_size).run(cutoff_date=cutoff_date)
             self.stdout.write(
                 self.style.SUCCESS(f"Successfully imported data from {importer.name}")
             )