NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support/scripts/pkg-stats: add is_actual_package() and rework has_valid_infra()

Browse Source 
has_valid_infra() is incorrectly named; it probably should be named
is_actual_package(), and has_valid_infra() would be changed to
actually represent having an actual infra.

This resolves packages reporting as having no valid package infra and
cleans up reporting cases of CPE and CVEs where there isn't a valid version
or package definition outside Buildroot

Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Matthew Weber <matthew.weber@collins.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Matthew Weber 2021-05-18 21:46:37 -05:00 committed by Yann E. MORIN
parent 9b83bb1382
commit 9368f3f23d
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
support/scripts/pkg-stats
View File

@ -131,7 +131,15 @@ class Package:
@property
def has_valid_infra(self):
if self.infras is None:
return False
return len(self.infras) > 0
@property
def is_actual_package(self):
try:
if not self.has_valid_infra:
return False
if self.infras[0][1] == 'virtual':
return False
except IndexError:
@ -159,7 +167,7 @@ class Package:
"""
Fills in the .status['license'] and .status['license-files'] fields
"""
if not self.has_valid_infra:
if not self.is_actual_package:
self.status['license'] = ("na", "no valid package infra")
self.status['license-files'] = ("na", "no valid package infra")
return
@ -177,7 +185,7 @@ class Package:
"""
Fills in the .status['hash'] field
"""
if not self.has_valid_infra:
if not self.is_actual_package:
self.status['hash'] = ("na", "no valid package infra")
self.status['hash-license'] = ("na", "no valid package infra")
return
@ -192,7 +200,7 @@ class Package:
"""
Fills in the .patch_count, .patch_files and .status['patches'] fields
"""
if not self.has_valid_infra:
if not self.is_actual_package:
self.status['patches'] = ("na", "no valid package infra")
return
@ -220,7 +228,7 @@ class Package:
Fills in the .cpeid field
"""
var = self.pkgvar()
if not self.has_valid_infra:
if not self.is_actual_package:
self.status['cpe'] = ("na", "no valid package infra")
return
@ -551,13 +559,13 @@ async def check_package_latest_version(packages):
package, as known by release-monitoring.org
"""
for pkg in [p for p in packages if not p.has_valid_infra]:
for pkg in [p for p in packages if not p.is_actual_package]:
pkg.status['version'] = ("na", "no valid package infra")
tasks = []
connector = aiohttp.TCPConnector(limit_per_host=5)
async with aiohttp.ClientSession(connector=connector, trust_env=True) as sess:
packages = [p for p in packages if p.has_valid_infra]
packages = [p for p in packages if p.is_actual_package]
for pkg in packages:
tasks.append(asyncio.ensure_future(check_package_latest_version_get(sess, pkg, len(packages))))
await asyncio.wait(tasks)
@ -578,7 +586,7 @@ def check_package_cves(nvd_path, packages):
cpe_product_pkgs = defaultdict(list)
for pkg in packages:
if not pkg.has_valid_infra:
if not pkg.is_actual_package:
pkg.status['cve'] = ("na", "no valid package infra")
continue
if not pkg.current_version: