Merge ~litios/ubuntu-cve-tracker:refactor/expand-handling into ubuntu-cve-tracker:master

[David Fernandez Gonzalez]

Current OVAL only allows handling expansion of release for ESM releases.

This PR addresses this issue by introducing an exception list of not-to-merge releases, so we can apply the general case for any other releases.

------

Tested with esm-apps/jammy fips-updates/bionic, this PR does not introduce any OVAL output changes.

[Eduardo Barretto (ebarretto)]

CI failure is happening on check-cves, because of enigmail on noble. Totally unrelated to this commit.

lgtm, thanks!

review: Approve

diff --git a/scripts/oval_lib.py b/scripts/oval_lib.py
index 2eece06..17650ee 100755
--- a/scripts/oval_lib.py
+++ b/scripts/oval_lib.py
@@ -217,7 +217,7 @@ class CVEPkgRelEntry:
 
         # TODO fix for CVE Generator
 
-        if expand == False and 'esm' in release:
+        if not OvalGenerator._expand_release(release, expand):
             release = release_codename
 
         # break out status code and detail
@@ -510,6 +510,8 @@ class OvalGenerator:
     supported_oval_elements = ('definition', 'test', 'object', 'state', 'variable')
     generator_version = '2'
     oval_schema_version = '5.11.1'
+    always_expand = [r'fips.*\/.*']
+
     def __init__(self, type, releases, cve_paths, packages, progress, pkg_cache, fixed_only=True, cve_cache=None, outdir='./', oval_format='dpkg', expand=False) -> None:
         self.releases = releases
         self.output_dir = outdir
@@ -553,13 +555,21 @@ class OvalGenerator:
         self.definition_step = 1 * 10 ** 5
         self.criterion_step = 10
         self.output_filepath = ''
-        if self.expand == False and 'esm' in self.release:
+        if not self._expand_release(self.release, self.expand):
             self.output_filepath = \
                 '{0}com.ubuntu.{1}.{2}.oval.xml'.format('oci.' if self.oval_format == 'oci' else '', self.release_codename, self.generator_type)
         else:
             self.output_filepath = \
                 '{0}com.ubuntu.{1}.{2}.oval.xml'.format('oci.' if self.oval_format == 'oci' else '', self.release.replace('/', '_'), self.generator_type)
 
+    @staticmethod
+    def _expand_release(release, expand) -> bool:
+        if expand: return True
+
+        for pattern in OvalGenerator.always_expand:
+            if re.match(pattern, release): return True
+
+        return False
 
     def _add_structure(self, root) -> None:
         structure = {}