Merge ~litios/ubuntu-cve-tracker:cleanup/generics into ubuntu-cve-tracker:master

[David Fernandez Gonzalez]

Generics was a feature to support a specific customer case.
This customer project has been migrated from UCT.
We shouldn't need this anymore.

b6245b5... by David Fernandez Gonzalez on 2023-11-28

Remove 'generics' feature

Generics was a feature to support a specific customer case.
This customer project has been migrated from UCT.
We shouldn't need this anymore.

Signed-off-by: David Fernandez Gonzalez <email address hidden>

[Emilia Torino (emitorino)]

Just minor comment otherwise LGTM!

review: Approve

[David Fernandez Gonzalez (litios)]

Thanks for checking! :)

diff --git a/scripts/active_edit b/scripts/active_edit
index 2b46b07..dc49bc5 100755
--- a/scripts/active_edit
+++ b/scripts/active_edit
@@ -91,11 +91,10 @@ def _add_pkg(p, fp, fixed, parent, embargoed):
             fixed_in_release_version = fixed[p][2]
     for rel in ['upstream'] + cve_lib.release_sort(list(source.keys())):
         aliases = source_map.get_aliases_of_ubuntu_package(source, p, rel)
-        pkgs_from_generic = source_map.get_packages_from_generic_name(source, p, rel)
         # determine default state but override this if pkg_db has a
         # better one
         state = "needs-triage"
-        if not pkg_in_rel(p, rel) and not aliases and not pkgs_from_generic:
+        if not pkg_in_rel(p, rel) and not aliases:
             # package doesn't exist in this release - see if it wants a
             # DNE entry
             if release_wants_dne(rel):
@@ -135,8 +134,6 @@ def _add_pkg(p, fp, fixed, parent, embargoed):
             pkgs_to_add = [p]
             if aliases:
                 pkgs_to_add = aliases
-            elif pkgs_from_generic:
-                pkgs_to_add = pkgs_from_generic
 
             # If the subproject doesn't require cve triage,
             # we shouldn't add any entries to the CVE
@@ -154,8 +151,7 @@ def add_pkg(p, fp, fixed, parent, embargoed):
     add = False
     for r in source.keys():
         aliases = source_map.get_all_aliases(source, r)
-        pkgs_from_generic = source_map.get_packages_from_generic_name(source, p, r)
-        add |= p in source[r] or p in aliases or len(pkgs_from_generic) > 0
+        add |= p in source[r] or p in aliases
     if add:
         _add_pkg(p, fp, fixed, parent, embargoed)
 
diff --git a/scripts/check-cves b/scripts/check-cves
index 198d90b..4c9461e 100755
--- a/scripts/check-cves
+++ b/scripts/check-cves
@@ -933,13 +933,6 @@ class CVEHandler(xml.sax.handler.ContentHandler):
                             external_subprojects.setdefault(subproject, set()).add(hint)
                     elif hint in aliases:
                         external_subprojects.setdefault(subproject, set()).add(hint)
-                    else:
-                        pkgs = source_map.get_packages_from_generic_name(source, hint, subproject)
-                        for pkg in pkgs:
-                            if 'aliases' in source[subproject][pkg]:
-                                external_subprojects.setdefault(subproject, set()).add(','.join(source[subproject][pkg]['aliases']))
-                            else:
-                                external_subprojects.setdefault(subproject, set()).add(hint)
 
         return external_subprojects
 
diff --git a/scripts/check-syntax b/scripts/check-syntax
index 734aa04..ca2c509 100755
--- a/scripts/check-syntax
+++ b/scripts/check-syntax
@@ -139,16 +139,6 @@ def get_pkgs_from_aliases(sources, aliases, pkg, rel):
     aliases[rel][pkg] = source_map.get_aliases_of_ubuntu_package(sources, pkg, rel)
     return aliases[rel][pkg]
 
-def get_pkgs_from_generic(sources, generics, pkg, rel):
-    if rel in generics:
-        if pkg in generics[rel]:
-            return generics[rel][pkg]
-    else:
-        generics[rel] = {}
-
-    generics[rel][pkg] = source_map.get_packages_from_generic_name(sources, pkg, rel)
-    return generics[rel][pkg]
-
 def subprocess_setup():
     # Python installs a SIGPIPE handler by default. This is usually not what
     # non-Python subprocesses expect.
@@ -391,7 +381,6 @@ if len(cna_cves_set) > 0 and all_files:
               % (cna_cves_set[cve][0], cna_cves_set[cve][1], cve))
 
 aliases_cache = {}
-generics_cache = {}
 
 def check_cve(cve):
     if re.match(r"EMB-", cve):
@@ -475,23 +464,23 @@ def check_cve(cve):
                     continue
 
             if rel in source:
-                skip_aliases_generics = False
+                skip_aliases = False
                 if not 'soss' in rel:
                     _, series = cve_lib.product_series(rel)
                     # If the series is not listed in the original CVE,
                     # we won't create the CVE in the subproject.
                     if not is_active(cve) and series not in listed_series:
-                        skip_aliases_generics = True
+                        skip_aliases = True
 
                     # We are not adding CVEs in ignored.
                     if "ignored/" in cvepath:
-                        skip_aliases_generics = True
+                        skip_aliases = True
 
-                if not skip_aliases_generics:
-                    aliases_or_generics = False
+                if not skip_aliases:
+                    aliases = False
                     pkgs_from_aliases = get_pkgs_from_aliases(source, aliases_cache, pkg, rel)
                     if pkgs_from_aliases:
-                        aliases_or_generics = True
+                        aliases = True
                         aliases_releases.add(rel)
 
                         for pkg_alias in pkgs_from_aliases:
@@ -505,26 +494,10 @@ def check_cve(cve):
                                     file=sys.stderr,
                                 )
                                 cve_okay = False
-                                
-                    pkgs_from_generic = get_pkgs_from_generic(source, generics_cache, pkg, rel)
-                    if pkgs_from_generic:
-                        aliases_or_generics = True
-                        aliases_releases.add(rel)
-                        for curr_pkg in pkgs_from_generic:
-                            if curr_pkg not in data["pkgs"].keys():
-                                filename = srcmap["pkgs"][pkg][nearby_rel][0]
-                                linenum = srcmap["pkgs"][pkg][nearby_rel][1]
-                                print(
-                                    "%s: %d: %s missing release '%s'"
-                                    # put the error on a line near where this entry should go
-                                    % (filename, linenum, curr_pkg, rel),
-                                    file=sys.stderr,
-                                )
-                                cve_okay = False
 
-                    # This package-release uses aliases or generic names,
+                    # This package-release uses aliases,
                     # it shouldn't be listed
-                    if aliases_or_generics:
+                    if aliases:
                         if rel in listed_releases and pkg \
                             not in pkgs_from_aliases:
                             filename = srcmap["pkgs"][pkg][nearby_rel][0]
diff --git a/scripts/source_map.py b/scripts/source_map.py
index 9f3c66b..48c22f4 100755
--- a/scripts/source_map.py
+++ b/scripts/source_map.py
@@ -416,16 +416,6 @@ def get_aliases_of_ubuntu_package(sources, pkg_name, rel):
                 aliases.append(pkg)
     return aliases
 
-def get_packages_from_generic_name(sources, generic_name, rel):
-    pkgs = []
-    if not rel in sources:
-        return pkgs
-
-    for pkg in sources[rel]:
-        if 'generic_name' in sources[rel][pkg] and sources[rel][pkg]['generic_name'] == generic_name:
-            pkgs.append(pkg)
-    return pkgs
-
 def load_subprojects_lists(releases=None):
     map = dict()
 
@@ -486,18 +476,13 @@ def load_subprojects_lists(releases=None):
                     else:
                         map[rel][pkg]['section'] = 'main'
 
-                    if '|' in pkg:
-                        main_package_name = pkg.split('|')[0]
-                        map[rel][pkg]['generic_name'] = main_package_name
-
             if 'aliases' in details:
                 with open(details['aliases'], 'r') as file:
                     aliases = yaml.safe_load(file)
 
                     for pkg in aliases:
                         for src_pkg in map[rel]:
-                            if pkg == src_pkg or \
-                                ('generic_name' in map[rel][src_pkg] and pkg == map[rel][src_pkg]['generic_name']):
+                            if pkg == src_pkg:
                                 map[rel][src_pkg]['aliases'] = aliases[pkg]
                             #else:
                             #    print("WARN: pkg %s found in aliases but not in supported list for %s. Skipping" % (pkg, rel))