Merge ~alexmurray/ubuntu-cve-tracker:fix-lp-2028915-by-moving-priority-reason-checking-to-check-syntax into ubuntu-cve-tracker:master

[Alex Murray]

Quick change to move priority reason checking out of cve_lib and into check-syntax as per https://bugs.launchpad.net/ubuntu-cve-tracker/+bug/2028915

[Eduardo Barretto (ebarretto)]

Should we revive and rebase this PR?

[Alex Murray (alexmurray)]

I have rebased this on current master but I suspect it will be redundant now that we are redoing all the work to rebase priority checking on NVD CVSS as per https://code.launchpad.net/~emitorino/ubuntu-cve-tracker/+git/ubuntu-cve-tracker/+merge/459935

Unmerged commits

c0ceaff... by Alex Murray on 2023-07-28

scripts: move priority reason checking to check-syntax (LP: #2028915)

Signed-off-by: Alex Murray <email address hidden>

	unit-tests:0 (build)
	check-cves:0 (build)

1 → 2 of 2 results

First • Previous • Next • Last

diff --git a/scripts/check-syntax b/scripts/check-syntax
index 3d7ee58..ba0aab7 100755
--- a/scripts/check-syntax
+++ b/scripts/check-syntax
@@ -52,6 +52,9 @@ required_fields = [
     'Ubuntu-Description',
 ]
 
+PRIORITY_REASON_REQUIRED = ["low", "high", "critical"]
+PRIORITY_REASON_DATE_START = "2023-07-11"
+
 def CVEs_from_CNA():
     """Returns a dict of CVEs assigned from the README in the embargoed cna
     directory, using a space and text after CVE-NNNN-NNNN as indicator of
@@ -442,6 +445,17 @@ def check_cve(cve):
         )
         cve_okay = False
 
+    if data["PublicDate"] > PRIORITY_REASON_DATE_START and \
+       data["Priority"][0] in PRIORITY_REASON_REQUIRED and not data["Priority"][1]:
+        filename = srcmap["Priority"][0]
+        linenum = srcmap["Priority"][1]
+        print(
+            "%s: %d: needs a reason for being '%s'"
+            % (filename, linenum, data["Priority"][0]),
+            file=sys.stderr,
+        )
+        cve_okay = False
+
     supported = []
     for pkg in sorted(data["pkgs"].keys()):
         # Verify have required releases for each package
diff --git a/scripts/cve_lib.py b/scripts/cve_lib.py
index a4690dd..4081ca0 100755
--- a/scripts/cve_lib.py
+++ b/scripts/cve_lib.py
@@ -64,8 +64,6 @@ else:
     boilerplates_dir = "boilerplates"
 
 PRODUCT_UBUNTU = "ubuntu"
-PRIORITY_REASON_REQUIRED = ["low", "high", "critical"]
-PRIORITY_REASON_DATE_START = "2023-07-11"
 
 # common to all scripts
 # these get populated by the contents of subprojects defined below
@@ -2403,11 +2401,6 @@ def load_cve(cve, strict=False, srcmap=None):
         data['PublicDate'] = data['CRD']
         srcmap['PublicDate'] = srcmap['CRD']
 
-    if data["PublicDate"] > PRIORITY_REASON_DATE_START and \
-            data["Priority"][0] in PRIORITY_REASON_REQUIRED and not priority_reason:
-        linenum = srcmap["Priority"][1]
-        msg += "%s: %d: needs a reason for being '%s'\n" % (cve, linenum, data["Priority"][0])
-        code = EXIT_FAIL
     for item in priority_reason:
         field = 'Priority' if not item else 'Priority_' + item
         data[field][1] = ' '.join(priority_reason[item])