From 0bb3e32c72c47c59efd28509816ec469b9702a36 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 4 May 2023 14:03:39 +0200
Subject: [PATCH] vuln2json.pl: now generates schema-compliant JSON

---
 docs/vuln2json.pl | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/docs/vuln2json.pl b/docs/vuln2json.pl
index 034968f171..b80cdff221 100755
--- a/docs/vuln2json.pl
+++ b/docs/vuln2json.pl
@@ -27,6 +27,8 @@ sub modified {
     while(<G>) {
         if(/^Date: +(.*)/) {
             $date = $1;
+            $date =~ s/(\+.*)//;
+            $date .= ".00Z";
         }
     }
     close(G);
@@ -63,7 +65,7 @@ sub scancve {
             $inc = 1;
         }
         elsif(/^------/ && ($inc == 1)) {
-            $inc = 2; 
+            $inc = 2;
         }
         elsif($inc == 2) {
             if(/^[A-Z ]+\n\z/) {
@@ -144,24 +146,28 @@ sub inclusive {
         "    \"$cve\"\n".
         "  ],\n".
         "  \"summary\": \"$name\",\n".
-        "  \"modified\": \"${modified}Z\",\n".
+        "  \"modified\": \"$modified\",\n".
         "  \"database_specific\": {\n".
+        "    \"package\": \"curl\",\n".
         "    \"URL\": \"https://curl.se/docs/$cve.html\",\n".
-        "    \"CWE\": \"$cwe\"\n".
+        "    \"CWE\": \"$cwe\",\n".
+        "    \"last_affected\": \"$last\"";
+    if($severity) {
+        push @single,
+            ",\n".
+            "    \"severity\": \"$severity\"\n";
+    }
+
+    push @single,
         "  },\n".
-        "  \"published\": \"${announce}T08:00:00Z\",\n".
+        "  \"published\": \"${announce}T08:00:00.00Z\",\n".
         "  \"affected\": [\n".
         "    {\n".
-        "      \"package\": {\n".
-        "        \"name\": \"curl\",\n".
-        "        \"purl\": \"pkg:generic/curl\"\n".
-        "      },\n".
         "      \"ranges\": [\n".
         "        {\n".
         "           \"type\": \"SEMVER\",\n".
         "           \"events\": [\n".
         "             {\"introduced\": \"$first\"},\n".
-        "             {\"last_affected\": \"$last\"},\n".
         "             {\"fixed\": \"$fixed\"}\n".
         "           ]\n".
         "        }\n".
@@ -170,15 +176,6 @@ sub inclusive {
         "      ]\n".
         "    }\n".
         "  ],\n";
-    if($severity) {
-        push @single,
-            "  \"severity\": [\n".
-            "    {\n".
-            "      \"type\": \"basic\",\n".
-            "      \"score\": \"$severity\"\n".
-            "    }\n".
-            "  ],\n";
-    }
     push @single, "  \"credits\": [\n";
     if($repby) {
         my $c = 0;