mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

cve-check: add JSON format to summary output

Browse Source 
Create generate_json_report including all the code used to generate the JSON
manifest file.
Add to cve_save_summary_handler the ability to create the summary in JSON format.

(From OE-Core rev: 8a79c476706b25e5c707c65b4e46b6e940874bd6)

Signed-off-by: Davide Gardenal <davide.gardenal@huawei.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit f2987891d315466b7ef180ecce81d15320ce8487)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Davide Gardenal
2022-05-03 09:51:43 +02:00
committed by Richard Purdie
parent b7601c92ff
commit 645c157bef
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/cve-check.bbclass
+33 -18
View File
@@ -79,6 +79,30 @@ CVE_CHECK_LAYER_INCLUDELIST ??= ""
# set to "alphabetical" for version using single alphabetical character as increment release # set to "alphabetical" for version using single alphabetical character as increment release
CVE_VERSION_SUFFIX ??= "" CVE_VERSION_SUFFIX ??= ""
def generate_json_report(out_path, link_path):
if os.path.exists(d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH")):
import json
from oe.cve_check import cve_check_merge_jsons
bb.note("Generating JSON CVE summary")
index_file = d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH")
summary = {"version":"1", "package": []}
with open(index_file) as f:
filename = f.readline()
while filename:
with open(filename.rstrip()) as j:
data = json.load(j)
cve_check_merge_jsons(summary, data)
filename = f.readline()
with open(out_path, "w") as f:
json.dump(summary, f, indent=2)
if link_path != out_path:
if os.path.exists(os.path.realpath(link_path)):
os.remove(link_path)
os.symlink(os.path.basename(out_path), link_path)
python cve_save_summary_handler () { python cve_save_summary_handler () {
import shutil import shutil
import datetime import datetime
@@ -101,6 +125,11 @@ python cve_save_summary_handler () {
if os.path.exists(os.path.realpath(cvefile_link)): if os.path.exists(os.path.realpath(cvefile_link)):
os.remove(cvefile_link) os.remove(cvefile_link)
os.symlink(os.path.basename(cve_summary_file), cvefile_link) os.symlink(os.path.basename(cve_summary_file), cvefile_link)
json_summary_link_name = os.path.join(cvelogpath, d.getVar("CVE_CHECK_SUMMARY_FILE_NAME_JSON"))
json_summary_name = os.path.join(cvelogpath, "%s-%s.json" % (cve_summary_name, timestamp))
generate_json_report(json_summary_name, json_summary_link_name)
bb.plain("CVE report summary created at: %s" % json_summary_link_name)
} }
addhandler cve_save_summary_handler addhandler cve_save_summary_handler
@@ -175,25 +204,11 @@ python cve_check_write_rootfs_manifest () {
os.symlink(os.path.basename(manifest_name), manifest_link) os.symlink(os.path.basename(manifest_name), manifest_link)
bb.plain("Image CVE report stored in: %s" % manifest_name) bb.plain("Image CVE report stored in: %s" % manifest_name)
if os.path.exists(d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH")): link_path = os.path.join(deploy_dir, "%s.json" % link_name)
import json manifest_path = d.getVar("CVE_CHECK_MANIFEST_JSON")
bb.note("Generating JSON CVE manifest") bb.note("Generating JSON CVE manifest")
deploy_dir = d.getVar("DEPLOY_DIR_IMAGE") generate_json_report(json_summary_name, json_summary_link_name)
link_name = d.getVar("IMAGE_LINK_NAME") bb.plain("Image CVE JSON report stored in: %s" % link_path)
manifest_name = d.getVar("CVE_CHECK_MANIFEST_JSON")
index_file = d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH")
manifest = {"version":"1", "package": []}
with open(index_file) as f:
filename = f.readline()
while filename:
with open(filename.rstrip()) as j:
data = json.load(j)
cve_check_merge_jsons(manifest, data)
filename = f.readline()
with open(manifest_name, "w") as f:
json.dump(manifest, f, indent=2)
bb.plain("Image CVE report stored in: %s" % manifest_name)
} }
ROOTFS_POSTPROCESS_COMMAND:prepend = "${@'cve_check_write_rootfs_manifest; ' if d.getVar('CVE_CHECK_CREATE_MANIFEST') == '1' else ''}" ROOTFS_POSTPROCESS_COMMAND:prepend = "${@'cve_check_write_rootfs_manifest; ' if d.getVar('CVE_CHECK_CREATE_MANIFEST') == '1' else ''}"