Merge ubuntu-cve-tracker:cve_oval_adding_packages_filter into ubuntu-cve-tracker:master

[Leonidas S. Barbosa]

Adding --packages support for CVE oval

Adds a new option --packages so the CVE oval can be generate do a subset of packages given in that option.

[Eduardo Barretto (ebarretto)]

A few things need fixing, please check comments below.

review: Needs Fixing

557092f... by Leonidas S. Barbosa on 2021-10-05

Merge branch 'cve_oval_adding_packages_filter' of git+ssh://git.launchpad.net/ubuntu-cve-tracker into cve_oval_adding_packages_filter

15a115d... by Leonidas S. Barbosa on 2021-10-05

Adding pkg filter to cve-oval

[Eduardo Barretto (ebarretto)]

LGTM

review: Approve

[Eduardo Barretto (ebarretto)]

This was merged in b063f55049
Closing this PR.

diff --git a/scripts/generate-oval b/scripts/generate-oval
index f3746a1..9cd1055 100755
--- a/scripts/generate-oval
+++ b/scripts/generate-oval
@@ -142,6 +142,9 @@ def main():
                         help='if passed specifics a USN for the oval_usn generator')
     parser.add_argument('--usn-oval-release', default=None, type=str,
                         help='specifies a release to generate the oval usn')
+    parser.add_argument('--packages', nargs='+', action='store', default=None,
+                        help='generates oval for specific packages. Only for'+
+                        ' CVE OVAL')
 
     args = parser.parse_args()
     pathnames = args.pathname or default_cves_to_process
@@ -209,8 +212,12 @@ def main():
     files.sort()
 
     files_count = len(files)
+    pkg_filter = None
+    if args.packages:
+        pkg_filter = args.packages
+
     for i_file, filepath in enumerate(files):
-        cve_data = parse_cve_file(filepath, cache)
+        cve_data = parse_cve_file(filepath, cache, pkg_filter)
 
         # skip CVEs without packages for supported releases
         if not cve_data['packages']:
@@ -338,7 +345,7 @@ def ignore_source_package(source):
     return False
 
 
-def parse_cve_file(filepath, cache):
+def parse_cve_file(filepath, cache, pkg_filter=None):
     """ parse CVE data file into a dictionary """
 
     cve_header_data = {
@@ -419,6 +426,9 @@ def parse_cve_file(filepath, cache):
             key = keys[0]
             if len(keys) == 2:
                 package = keys[1]
+                if pkg_filter:
+                    if package not in pkg_filter:
+                        continue
                 current_package = package
             else:
                 package = current_package