Use full microsecond in VULCOID

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

Author: sbs2001

vulnerabilities/models.py

@@ -46,9 +46,9 @@ class Vulnerability(models.Model):
         max_length=50,
         help_text="Unique vulnerability_id for a vulnerability: this is either a published CVE id"
         " (as in CVE-2020-7965) if it exists. Otherwise this is a VulnerableCode-assigned VULCOID"
-        " (as in VULCOID-2021-01-23-15-12). When a vulnerability CVE is assigned later we replace"
-        " this with the CVE and keep the 'old' VULCOID in the 'old_vulnerability_id' field to "
-        "support redirection to the CVE id.",
+        " (as in VULCOID-20210222-1315-16461541). When a vulnerability CVE is assigned later we"
+        " replace this with the CVE and keep the 'old' VULCOID in the 'old_vulnerability_id'"
+        " field to support redirection to the CVE id.",
         unique=True,
     )
     old_vulnerability_id = models.CharField(
@@ -72,7 +72,7 @@ def save(self, *args, **kwargs):
     def generate_vulcoid(timestamp=None):
         if not timestamp:
             timestamp = datetime.now()
-        timestamp = timestamp.strftime("%Y%m%d-%H%M-%S%f")[:-4]
+        timestamp = timestamp.strftime("%Y%m%d-%H%M-%S%f")
         return f"VULCOID-{timestamp}"
 
     @property

vulnerabilities/tests/test_models.py

@@ -34,13 +34,14 @@ class TestVulnerabilityModel(TestCase):
 
     def test_generate_vulcoid_given_timestamp_object(self):
         timestamp_object = datetime(2021, 1, 1, 11, 12, 13, 2000)
-        expected_vulcoid = "VULCOID-20210101-1112-1300"
+        expected_vulcoid = "VULCOID-20210101-1112-13002000"
         found_vulcoid = models.Vulnerability.generate_vulcoid(timestamp_object)
+        print(found_vulcoid)
         assert expected_vulcoid == found_vulcoid
 
     def test_generate_vulcoid(self):
-        expected_vulcoid = "VULCOID-20210101-1112-1300"
-        with freeze_time("2021-01-01 11:12:13.0000"):
+        expected_vulcoid = "VULCOID-20210101-1112-13000000"
+        with freeze_time("2021-01-01 11:12:13.000000"):
             found_vulcoid = models.Vulnerability.generate_vulcoid()
         assert expected_vulcoid == found_vulcoid
 
@@ -52,11 +53,11 @@ def test_vulnerability_save_with_vulnerability_id(self):
     @pytest.mark.django_db
     def test_vulnerability_save_without_vulnerability_id(self):
         assert models.Vulnerability.objects.filter(
-            vulnerability_id="VULCOID-20210101-1112-1300"
+            vulnerability_id="VULCOID-20210101-1112-13000000"
             ).count() == 0
 
-        with freeze_time("2021-01-01 11:12:13.0000"):
+        with freeze_time("2021-01-01 11:12:13.000000"):
             models.Vulnerability(vulnerability_id="").save()
             assert models.Vulnerability.objects.filter(
-                vulnerability_id="VULCOID-20210101-1112-1300"
+                vulnerability_id="VULCOID-20210101-1112-13000000"
                 ).count() == 1