Merge ~emitorino/ubuntu-cve-tracker:updates_to_scripts_to_support_metrics into ubuntu-cve-tracker:master

[Emilia Torino]

-cve_lib.py:
  * support for optionally loading ignored and retired cves on load_table()
  * checking if release is in map before inspecting if pkg is in release on is_parter()
  * adding new get_all_cve_list() to get the list of active, embargoed, retired and ignored cves (get_cve_list() returns active and embargoed, get_cve_list_and_retired() returns get_cve_list() + ignored so there was none returning retired ones)

To support inspecting CVEs files for the purpose of the new metrics, we need to extend the current cve_lib to also laod cves from ingored and retired directories.

[Eduardo Barretto (ebarretto)]

lgtm

review: Approve

[Spyros Seimenis (sespiros)]

lgtm

review: Approve

[Paulo Flabiano Smorigo (pfsmorigo)]

LGTM

review: Approve

diff --git a/scripts/cve_lib.py b/scripts/cve_lib.py
index 1f9034e..e850011 100755
--- a/scripts/cve_lib.py
+++ b/scripts/cve_lib.py
@@ -1547,6 +1547,13 @@ def get_cve_list_and_retired():
     return (cves + rcves, uems, rcves)
 
 
+def get_all_cve_list():
+    cves, uems, rcves = get_cve_list_and_retired()
+    icves = [elem for elem in os.listdir(ignored_dir)
+             if re.match('^CVE-\d+-(\d|N)+$', elem)]
+    return (cves + icves, uems, rcves, icves)
+
+
 def contextual_priority(cveinfo, pkg=None, rel=None):
     '''Return the priority based on release, then package, then global'''
     if pkg:
@@ -1988,7 +1995,7 @@ def load_all(cves, uems, rcves=[]):
 #  pkgfamily = rename linux-source-* packages to "linux", or "xen-*" to "xen"
 #  packages = list of packages to pay attention to
 #  debug = bool, display debug information
-def load_table(cves, uems, opt=None):
+def load_table(cves, uems, opt=None, rcves=[], icves=[]):
     table = dict()
     priority = dict()
     listcves = []
@@ -2000,6 +2007,10 @@ def load_table(cves, uems, opt=None):
         cvedir = active_dir
         if cve in uems:
             cvedir = embargoed_dir
+        elif cve in rcves:
+            cvedir = retired_dir
+        elif cve in icves:
+            cvedir = ignored_dir
         cvefile = os.path.join(cvedir, cve)
         info = load_cve(cvefile)
         cveinfo[cve] = info
@@ -2128,7 +2139,7 @@ def any_supported(map, pkg, releases, cvedata):
 
 
 def is_partner(map, pkg, rel):
-    if pkg in map[rel] and map[rel][pkg]['section'] == 'partner':
+    if rel in map and pkg in map[rel] and map[rel][pkg]['section'] == 'partner':
         return True
     return False