mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-17 04:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

cve-update-db-native: clean up JSON fetching

Browse Source 
Currently the code fetches the compressed JSON, writes it to a temporary file,
uncompresses that with gzip and passes the fake file object to update_db().

Instead, uncompress the gzip'd data in memory and pass the JSON directly to
update_db().

(From OE-Core rev: 9422745979256c442f533770203f62ec071c18fb)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2019-07-19 21:33:19 +01:00
committed by Richard Purdie
parent 297605eec0
commit 82b5ed6acf
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
meta/recipes-core/meta/cve-update-db-native.bb
View File

@@ -67,25 +67,20 @@ python do_populate_cve_db() {
meta = c.fetchone()
if not meta or meta[0] != last_modified:
# Clear products table entries corresponding to current year
cve_year = 'CVE-' + str(year) + '%'
c.execute("delete from PRODUCTS where ID like ?", (cve_year,))
c.execute("delete from PRODUCTS where ID like ?", ('CVE-%d%%' % year,))
# Update db with current year json file
req = urllib.request.Request(json_url)
if proxy:
req.set_proxy(proxy, 'https')
try:
with urllib.request.urlopen(req, timeout=1) as r, \
open(json_tmpfile, 'wb') as tmpfile:
shutil.copyfileobj(r, tmpfile)
except:
req = urllib.request.Request(json_url)
if proxy:
req.set_proxy(proxy, 'https')
with urllib.request.urlopen(req) as r:
update_db(c, gzip.decompress(r.read()))
c.execute("insert or replace into META values (?, ?)", [year, last_modified])
except urllib.error.URLError as e:
cve_f.write('Warning: CVE db update error, CVE data is outdated.\n\n')
break
with gzip.open(json_tmpfile, 'rt') as jsonfile:
update_db(c, jsonfile)
c.execute("insert or replace into META values (?, ?)",
[year, last_modified])
bb.warn("Cannot parse CVE data (%s), update failed" % e.reason)
return
# Update success, set the date to cve_check file.
if year == date.today().year:
@@ -148,9 +143,9 @@ def parse_node_and_insert(c, node, cveId):
c.executemany("insert into PRODUCTS values (?, ?, ?, ?, ?, ?, ?)", cpe_generator())
def update_db(c, json_filename):
def update_db(c, jsondata):
import json
root = json.load(json_filename)
root = json.loads(jsondata)
for elt in root['CVE_Items']:
if not elt['impact']: