From patchwork Tue Dec 24 10:25:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marta Rybczynska X-Patchwork-Id: 54658 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1C35E77188 for ; Tue, 24 Dec 2024 10:26:22 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.31181.1735035981060033914 for ; Tue, 24 Dec 2024 02:26:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Yrh4eSxu; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: rybczynska@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4361e89b6daso33906175e9.3 for ; Tue, 24 Dec 2024 02:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735035979; x=1735640779; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=22MGEjVUnib3qBnu3OtOlTLrtmi4xoabRXyk8/fmWaw=; b=Yrh4eSxuqY8F2wLNooDuN/8X48R7o7ap8fpthztvQ/rRP4rLtAblAtY3PWTzRqDzgH iv7MVIn+ZL90OonqGEWMl6aKiL99+DcjXME9gy9+WCq/6r6JbKsf616SjUHlBemTKOvi lbLD/qz5J/JkN0qAKcSgTIsonC6ZuEPCal3Rl45VvJg8ZXF6HuvxphWeeRPrfBAtBMd+ 5J+TXzptP1XeTQ1MA6cGuoh9dxhtaPPlbnwptuopbkW6SfdiDF4jg6UFPdDIVLxVFWho HYRYHy7xZi6X1BEhfMZoWXImDPD1vDtd7JaOfkWenhnDXPZmFfeyrCOwbNJLgaEt5p+w Z5+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735035979; x=1735640779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=22MGEjVUnib3qBnu3OtOlTLrtmi4xoabRXyk8/fmWaw=; b=tu05bsoqV48KXzy4B9PMt8cwCL53gmHLOSSB67S48ElTKQX84hFi9Wp7c0hI3sAVb9 +4J1yA/D1k7tOZPMgjCGNTIMmCTXXkRsvDXTxLMlgzOXTTkNgTkId0+C/Ai3Pl6KvU22 rM0JGYhZntlCGmKEAPliaWQiiICbwvSENxi2YrEL89x5jklbfKyprbbIhhXzQhEgZAXi cJM0AsbA/CC77/TUqg5Aj3OR9J75E/SAehdfQALGRDzsUOmUa4YRQ1bsrhNnzAyAbc0h TQVDZbvzv5zlOPbs2UfYlZ63huLKLsX1cXpe/Y+5qTP5zN80JZIBLAFeYzHRp/R23eP1 4b6A== X-Gm-Message-State: AOJu0Yylg3z/71QJmQht/nHdaAwU3fAT04YSkCPdswNxQRbUTP3AHpQQ ivdP1N5DhsSnG0YE7VYxL3UV2bDVH4CCi/SlfrnhNccGUh8dFfAKuQk2vA== X-Gm-Gg: ASbGnctAXf9dX+P9ChlFwaK29iDpYhu6vGVezR84MOUsVNXcVL3CMQLYIdByoliOfXj dldYc4pB2Olb4XxeIe2Gx+02cXfseFCjQsFAWNvWqeanJe4O9jK1lwsc2b5SMXm5yzBNn6yzryZ vBfyrJ+vBgLiS+S6WvHt8bAr3C7UaocIVaUzP/J4IWWFB6keZAg7qzTAvyTmc1wKvXEgGrPw0W+ X3BNVUUO5yrbngvW0GWAdr4bL5oxWoBN3c8ks9sIe5NZO/P+G4k3K41Cwsr4Sb8V+LtsJd0jN+7 88U= X-Google-Smtp-Source: AGHT+IGsBuft0O6EgppYXqLg9QiN0fiDbU0EYI6rbaG1tb1790dd9NgJLQp9QhxtXRmXrv6ex8Iz/g== X-Received: by 2002:adf:890a:0:b0:38a:2b34:e13e with SMTP id ffacd0b85a97d-38a31b89e0emr3782155f8f.18.1735035978510; Tue, 24 Dec 2024 02:26:18 -0800 (PST) Received: from localhost.localdomain ([80.215.86.162]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c8334aasm13788030f8f.41.2024.12.24.02.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2024 02:26:17 -0800 (PST) From: Marta Rybczynska X-Google-Original-From: Marta Rybczynska To: openembedded-core@lists.openembedded.org Cc: Marta Rybczynska Subject: [PATCH v2][OE-core 1/4] cve-update-db-native: restore Date: Tue, 24 Dec 2024 11:25:36 +0100 Message-ID: <20241224102557.9300-2-marta.rybczynska@ygreky.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241224102557.9300-1-marta.rybczynska@ygreky.com> References: <20241224102557.9300-1-marta.rybczynska@ygreky.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 24 Dec 2024 10:26:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209062 Restore cve-update-db from kirkstone Use cve-update-db-native.bb from OE 8c10f4a4dc12f65212576e6e568fa4369014aaa0 Signed-off-by: Marta Rybczynska --- .../recipes-core/meta/cve-update-db-native.bb | 291 ++++++++++++++++++ 1 file changed, 291 insertions(+) create mode 100644 meta/recipes-core/meta/cve-update-db-native.bb diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb new file mode 100644 index 0000000000..e042e67b09 --- /dev/null +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -0,0 +1,291 @@ +SUMMARY = "Updates the NVD CVE database" +LICENSE = "MIT" + +INHIBIT_DEFAULT_DEPS = "1" + +inherit native + +deltask do_unpack +deltask do_patch +deltask do_configure +deltask do_compile +deltask do_install +deltask do_populate_sysroot + +NVDCVE_URL ?= "https://nvd.nist.gov/feeds/json/cve/1.1/nvdcve-1.1-" +# CVE database update interval, in seconds. By default: once a day (24*60*60). +# Use 0 to force the update +# Use a negative value to skip the update +CVE_DB_UPDATE_INTERVAL ?= "86400" + +# Timeout for blocking socket operations, such as the connection attempt. +CVE_SOCKET_TIMEOUT ?= "60" + +CVE_DB_TEMP_FILE ?= "${CVE_CHECK_DB_DIR}/temp_nvdcve_1.1.db" + +python () { + if not bb.data.inherits_class("cve-check", d): + raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") +} + +python do_fetch() { + """ + Update NVD database with json data feed + """ + import bb.utils + import bb.progress + import shutil + + bb.utils.export_proxies(d) + + db_file = d.getVar("CVE_CHECK_DB_FILE") + db_dir = os.path.dirname(db_file) + db_tmp_file = d.getVar("CVE_DB_TEMP_FILE") + + cleanup_db_download(db_file, db_tmp_file) + + # The NVD database changes once a day, so no need to update more frequently + # Allow the user to force-update + try: + import time + update_interval = int(d.getVar("CVE_DB_UPDATE_INTERVAL")) + if update_interval < 0: + bb.note("CVE database update skipped") + return + if time.time() - os.path.getmtime(db_file) < update_interval: + bb.debug(2, "Recently updated, skipping") + return + + except OSError: + pass + + bb.utils.mkdirhier(db_dir) + if os.path.exists(db_file): + shutil.copy2(db_file, db_tmp_file) + + if update_db_file(db_tmp_file, d) == True: + # Update downloaded correctly, can swap files + shutil.move(db_tmp_file, db_file) + else: + # Update failed, do not modify the database + bb.note("CVE database update failed") + os.remove(db_tmp_file) +} + +do_fetch[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}" +do_fetch[file-checksums] = "" +do_fetch[vardeps] = "" + +def cleanup_db_download(db_file, db_tmp_file): + """ + Cleanup the download space from possible failed downloads + """ + + # Clean up the updates done on the main file + # Remove it only if a journal file exists - it means a complete re-download + if os.path.exists("{0}-journal".format(db_file)): + # If a journal is present the last update might have been interrupted. In that case, + # just wipe any leftovers and force the DB to be recreated. + os.remove("{0}-journal".format(db_file)) + + if os.path.exists(db_file): + os.remove(db_file) + + # Clean-up the temporary file downloads, we can remove both journal + # and the temporary database + if os.path.exists("{0}-journal".format(db_tmp_file)): + # If a journal is present the last update might have been interrupted. In that case, + # just wipe any leftovers and force the DB to be recreated. + os.remove("{0}-journal".format(db_tmp_file)) + + if os.path.exists(db_tmp_file): + os.remove(db_tmp_file) + +def update_db_file(db_tmp_file, d): + """ + Update the given database file + """ + import bb.utils, bb.progress + from datetime import date + import urllib, gzip, sqlite3 + + YEAR_START = 2002 + cve_socket_timeout = int(d.getVar("CVE_SOCKET_TIMEOUT")) + + # Connect to database + conn = sqlite3.connect(db_tmp_file) + initialize_db(conn) + + with bb.progress.ProgressHandler(d) as ph, open(os.path.join(d.getVar("TMPDIR"), 'cve_check'), 'a') as cve_f: + total_years = date.today().year + 1 - YEAR_START + for i, year in enumerate(range(YEAR_START, date.today().year + 1)): + bb.debug(2, "Updating %d" % year) + ph.update((float(i + 1) / total_years) * 100) + year_url = (d.getVar('NVDCVE_URL')) + str(year) + meta_url = year_url + ".meta" + json_url = year_url + ".json.gz" + + # Retrieve meta last modified date + try: + response = urllib.request.urlopen(meta_url, timeout=cve_socket_timeout) + except urllib.error.URLError as e: + cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n') + bb.warn("Failed to fetch CVE data (%s)" % e) + import socket + result = socket.getaddrinfo("nvd.nist.gov", 443, proto=socket.IPPROTO_TCP) + bb.warn("Host IPs are %s" % (", ".join(t[4][0] for t in result))) + return False + + if response: + for l in response.read().decode("utf-8").splitlines(): + key, value = l.split(":", 1) + if key == "lastModifiedDate": + last_modified = value + break + else: + bb.warn("Cannot parse CVE metadata, update failed") + return False + + # Compare with current db last modified date + cursor = conn.execute("select DATE from META where YEAR = ?", (year,)) + meta = cursor.fetchone() + cursor.close() + + if not meta or meta[0] != last_modified: + bb.debug(2, "Updating entries") + # Clear products table entries corresponding to current year + conn.execute("delete from PRODUCTS where ID like ?", ('CVE-%d%%' % year,)).close() + + # Update db with current year json file + try: + response = urllib.request.urlopen(json_url, timeout=cve_socket_timeout) + if response: + update_db(conn, gzip.decompress(response.read()).decode('utf-8')) + conn.execute("insert or replace into META values (?, ?)", [year, last_modified]).close() + except urllib.error.URLError as e: + cve_f.write('Warning: CVE db update error, CVE data is outdated.\n\n') + bb.warn("Cannot parse CVE data (%s), update failed" % e.reason) + return False + else: + bb.debug(2, "Already up to date (last modified %s)" % last_modified) + # Update success, set the date to cve_check file. + if year == date.today().year: + cve_f.write('CVE database update : %s\n\n' % date.today()) + + conn.commit() + conn.close() + return True + +def initialize_db(conn): + with conn: + c = conn.cursor() + + c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)") + + c.execute("CREATE TABLE IF NOT EXISTS NVD (ID TEXT UNIQUE, SUMMARY TEXT, \ + SCOREV2 TEXT, SCOREV3 TEXT, MODIFIED INTEGER, VECTOR TEXT)") + + c.execute("CREATE TABLE IF NOT EXISTS PRODUCTS (ID TEXT, \ + VENDOR TEXT, PRODUCT TEXT, VERSION_START TEXT, OPERATOR_START TEXT, \ + VERSION_END TEXT, OPERATOR_END TEXT)") + c.execute("CREATE INDEX IF NOT EXISTS PRODUCT_ID_IDX on PRODUCTS(ID);") + + c.close() + +def parse_node_and_insert(conn, node, cveId): + # Parse children node if needed + for child in node.get('children', ()): + parse_node_and_insert(conn, child, cveId) + + def cpe_generator(): + for cpe in node.get('cpe_match', ()): + if not cpe['vulnerable']: + return + cpe23 = cpe.get('cpe23Uri') + if not cpe23: + return + cpe23 = cpe23.split(':') + if len(cpe23) < 6: + return + vendor = cpe23[3] + product = cpe23[4] + version = cpe23[5] + + if cpe23[6] == '*' or cpe23[6] == '-': + version_suffix = "" + else: + version_suffix = "_" + cpe23[6] + + if version != '*' and version != '-': + # Version is defined, this is a '=' match + yield [cveId, vendor, product, version + version_suffix, '=', '', ''] + elif version == '-': + # no version information is available + yield [cveId, vendor, product, version, '', '', ''] + else: + # Parse start version, end version and operators + op_start = '' + op_end = '' + v_start = '' + v_end = '' + + if 'versionStartIncluding' in cpe: + op_start = '>=' + v_start = cpe['versionStartIncluding'] + + if 'versionStartExcluding' in cpe: + op_start = '>' + v_start = cpe['versionStartExcluding'] + + if 'versionEndIncluding' in cpe: + op_end = '<=' + v_end = cpe['versionEndIncluding'] + + if 'versionEndExcluding' in cpe: + op_end = '<' + v_end = cpe['versionEndExcluding'] + + if op_start or op_end or v_start or v_end: + yield [cveId, vendor, product, v_start, op_start, v_end, op_end] + else: + # This is no version information, expressed differently. + # Save processing by representing as -. + yield [cveId, vendor, product, '-', '', '', ''] + + conn.executemany("insert into PRODUCTS values (?, ?, ?, ?, ?, ?, ?)", cpe_generator()).close() + +def update_db(conn, jsondata): + import json + root = json.loads(jsondata) + + for elt in root['CVE_Items']: + if not elt['impact']: + continue + + accessVector = None + cveId = elt['cve']['CVE_data_meta']['ID'] + cveDesc = elt['cve']['description']['description_data'][0]['value'] + date = elt['lastModifiedDate'] + try: + accessVector = elt['impact']['baseMetricV2']['cvssV2']['accessVector'] + cvssv2 = elt['impact']['baseMetricV2']['cvssV2']['baseScore'] + except KeyError: + cvssv2 = 0.0 + try: + accessVector = accessVector or elt['impact']['baseMetricV3']['cvssV3']['attackVector'] + cvssv3 = elt['impact']['baseMetricV3']['cvssV3']['baseScore'] + except KeyError: + accessVector = accessVector or "UNKNOWN" + cvssv3 = 0.0 + + conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?)", + [cveId, cveDesc, cvssv2, cvssv3, date, accessVector]).close() + + configurations = elt['configurations']['nodes'] + for config in configurations: + parse_node_and_insert(conn, config, cveId) + + +do_fetch[nostamp] = "1" + +EXCLUDE_FROM_WORLD = "1" From patchwork Tue Dec 24 10:25:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marta Rybczynska X-Patchwork-Id: 54659 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB9BAE77188 for ; Tue, 24 Dec 2024 10:26:32 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.web10.31291.1735035984420554431 for ; Tue, 24 Dec 2024 02:26:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bXJR9xyy; spf=pass (domain: gmail.com, ip: 209.85.221.48, mailfrom: rybczynska@gmail.com) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-385e87b25f0so3894426f8f.0 for ; Tue, 24 Dec 2024 02:26:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735035982; x=1735640782; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qPUAHgbmxRJowWnByWQMHPf8LTBKwM52UjbDKXf9zKs=; b=bXJR9xyyg968hlSIONt4fk8xDTXUFv+5msTrUyNncZcAEelRQijIZh8+2oxFT6Hy2T 3YuMSANe/XEkBzaiIKKWPsxHNXXSCSuUfB0D3JXeeiIju0JbKqF1ENXTzQZ7pmwuYw74 uz0adD4Hr5wF1paC9DlmiGd5zbWiN4XVpqQeknEDll868fGXxc3Cj51MTZpFIBs0yrw2 NTmNV6iJHKliqtpAu0KO1Di8xhRkLmVJPEVzm3hsLjsouWzn+c7SXok+bconvC6nGGQK qgm5furBa5wgObKcyb482E6tchHLwtvwq71YXqFHL9RU4Tggv3OQAdywW5BRkHpNSemb oqqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735035982; x=1735640782; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qPUAHgbmxRJowWnByWQMHPf8LTBKwM52UjbDKXf9zKs=; b=PN1wnT6feKCRiT27ncIAf93Zrt5JXKHCtz9EXWnmFDRlzXGULUZ/2xmSqPs1oiq1oD wxhTG0fBYtzhXsbkTxym7h0/Mbakm/+M+P7zZWwrXCOXbcJUzZ5Wfww3F1Ir/PEIuht6 aLskrTQkvo6uRJo2qWcsL3SFc68HHu7Z9e4petBcQPnn/71T73oVRpJaRdjhm9dA0WIk B2JncTt6Xrgdb8qfCqZcIfRq+m8MatdStaZvU0sr8AwQGDQSVh9rw/Sn0nyIhTrKedEn iu4vn0SVkib30cCYCHvn0s87xOsY2unvaxNSIy/TVjNAYx3bnwWGlmiHbxJUZDHQGyNj bMZg== X-Gm-Message-State: AOJu0Yxzfad6cv/xrD7m0XbDHZnZnQ4waIyJ7XyvFkCK1Wh1opEQ0mVj r9YMJFR5kdxpVlAxqtj3LQMPwjjqHHpLGO20N13WPq4JHpnzpTL9QYZ40w== X-Gm-Gg: ASbGncuqUExH/3lCvtLNDb9e1+txJTr6ctt0n8b3OnwcYqVi4g5xe0IBSPYI+WkD6PF jfD6YyEWjFqM+n+7hs8i6Vm0CRcn0jfUJIThnjMBK/0DpKhovGrHPS1DsdYy+0tgcmaVU4/q1sQ LZM4aDAUgJhvCebf+11ugNAZja1Y8lWpA2cXWwUzDBcAUxxzc5w1CmbS1YtSWJLtyk+JkERq5wK 4C1yKNJlwfeADJ9MueL1n8bzMI1BboIFWnT2fiqkNwn4OP9PgQe9os+v+vD/wu6Fah3swAY54ye nII= X-Google-Smtp-Source: AGHT+IFIgGDr8y6OXic4v2x6obsHWF65Dm36gW0itHC2rypTT4Av2z6cH2rro593qFKRACi78FvKVA== X-Received: by 2002:a5d:6485:0:b0:386:3711:ffa9 with SMTP id ffacd0b85a97d-38a1a233376mr16080155f8f.16.1735035982354; Tue, 24 Dec 2024 02:26:22 -0800 (PST) Received: from localhost.localdomain ([80.215.86.162]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c8334aasm13788030f8f.41.2024.12.24.02.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2024 02:26:21 -0800 (PST) From: Marta Rybczynska X-Google-Original-From: Marta Rybczynska To: openembedded-core@lists.openembedded.org Cc: Marta Rybczynska Subject: [PATCH v2][OE-core 2/4] cve-update-db-native: update structure Date: Tue, 24 Dec 2024 11:25:37 +0100 Message-ID: <20241224102557.9300-3-marta.rybczynska@ygreky.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241224102557.9300-1-marta.rybczynska@ygreky.com> References: <20241224102557.9300-1-marta.rybczynska@ygreky.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 24 Dec 2024 10:26:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209063 Update the database structure and tasks to fit the current YP master. This means: - add the unpack task - update the database structure (CVSS, vector string) However, the old feed does not include CVSS4 Signed-off-by: Marta Rybczynska --- .../recipes-core/meta/cve-update-db-native.bb | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index e042e67b09..f16e79ff58 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -5,7 +5,6 @@ INHIBIT_DEFAULT_DEPS = "1" inherit native -deltask do_unpack deltask do_patch deltask do_configure deltask do_compile @@ -21,6 +20,9 @@ CVE_DB_UPDATE_INTERVAL ?= "86400" # Timeout for blocking socket operations, such as the connection attempt. CVE_SOCKET_TIMEOUT ?= "60" +CVE_CHECK_DB_DLDIR_FILE ?= "${DL_DIR}/CVE_CHECK2/${CVE_CHECK_DB_FILENAME}" +CVE_CHECK_DB_DLDIR_LOCK ?= "${CVE_CHECK_DB_DLDIR_FILE}.lock" + CVE_DB_TEMP_FILE ?= "${CVE_CHECK_DB_DIR}/temp_nvdcve_1.1.db" python () { @@ -38,7 +40,7 @@ python do_fetch() { bb.utils.export_proxies(d) - db_file = d.getVar("CVE_CHECK_DB_FILE") + db_file = d.getVar("CVE_CHECK_DB_DLDIR_FILE") db_dir = os.path.dirname(db_file) db_tmp_file = d.getVar("CVE_DB_TEMP_FILE") @@ -72,10 +74,16 @@ python do_fetch() { os.remove(db_tmp_file) } -do_fetch[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}" +do_fetch[lockfiles] += "${CVE_CHECK_DB_DLDIR_LOCK}" do_fetch[file-checksums] = "" do_fetch[vardeps] = "" +python do_unpack() { + import shutil + shutil.copyfile(d.getVar("CVE_CHECK_DB_DLDIR_FILE"), d.getVar("CVE_CHECK_DB_FILE")) +} +do_unpack[lockfiles] += "${CVE_CHECK_DB_DLDIR_LOCK} ${CVE_CHECK_DB_FILE_LOCK}" + def cleanup_db_download(db_file, db_tmp_file): """ Cleanup the download space from possible failed downloads @@ -183,7 +191,7 @@ def initialize_db(conn): c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)") c.execute("CREATE TABLE IF NOT EXISTS NVD (ID TEXT UNIQUE, SUMMARY TEXT, \ - SCOREV2 TEXT, SCOREV3 TEXT, MODIFIED INTEGER, VECTOR TEXT)") + SCOREV2 TEXT, SCOREV3 TEXT, SCOREV4 TEXT, MODIFIED INTEGER, VECTOR TEXT, VECTORSTRING TEXT)") c.execute("CREATE TABLE IF NOT EXISTS PRODUCTS (ID TEXT, \ VENDOR TEXT, PRODUCT TEXT, VERSION_START TEXT, OPERATOR_START TEXT, \ @@ -263,23 +271,29 @@ def update_db(conn, jsondata): continue accessVector = None + vectorString = None + cvssv2 = 0.0 + cvssv3 = 0.0 + cvssv4 = 0.0 cveId = elt['cve']['CVE_data_meta']['ID'] cveDesc = elt['cve']['description']['description_data'][0]['value'] date = elt['lastModifiedDate'] try: accessVector = elt['impact']['baseMetricV2']['cvssV2']['accessVector'] + vectorString = elt['impact']['baseMetricV2']['cvssV2']['vectorString'] cvssv2 = elt['impact']['baseMetricV2']['cvssV2']['baseScore'] except KeyError: cvssv2 = 0.0 try: accessVector = accessVector or elt['impact']['baseMetricV3']['cvssV3']['attackVector'] + vectorString = vectorString or elt['impact']['baseMetricV3']['cvssV3']['vectorString'] cvssv3 = elt['impact']['baseMetricV3']['cvssV3']['baseScore'] except KeyError: accessVector = accessVector or "UNKNOWN" cvssv3 = 0.0 - conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?)", - [cveId, cveDesc, cvssv2, cvssv3, date, accessVector]).close() + conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?, ?, ?)", + [cveId, cveDesc, cvssv2, cvssv3, cvssv4, date, accessVector, vectorString]).close() configurations = elt['configurations']['nodes'] for config in configurations: From patchwork Tue Dec 24 10:25:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marta Rybczynska X-Patchwork-Id: 54660 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB9ECE7718D for ; Tue, 24 Dec 2024 10:26:32 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web10.31293.1735035987670974444 for ; Tue, 24 Dec 2024 02:26:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aaQvKyJb; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: rybczynska@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-385f06d0c8eso2794193f8f.0 for ; Tue, 24 Dec 2024 02:26:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735035985; x=1735640785; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WueF30C+PWOTbexapza/hnoThXm3J6jt+zV9/jq2oqU=; b=aaQvKyJbnEC8jnUidcQUb53dYUbRgLrMMBKOZjljLdeYDbfTcS1yLmKFFnWq59L2c4 cEzMgqAzd8C1RjNqUrs+dtcrWiwNyJlixrcIY7JjAJYVSlePAuA1R6ewhTWRoasq5u5Z rqX3R77ko3/nTi2A5jVost9YDndyUhj3e+Myj+LaaV17v2j309HLNaf5oq/EoFRr0mi9 RaJL2Ko07l85nx6jKgerdvPFyvOa1jThaGYhiGNuzL93YL/zpDFUd0Kcinl+YJ7v29FR MsfXrqj3IPgqkikmCBSE23hDCKMyNA/qOnWk4tT1LP7mEwuX2ClOzh3mC/7HbplaugKC pqJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735035985; x=1735640785; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WueF30C+PWOTbexapza/hnoThXm3J6jt+zV9/jq2oqU=; b=gJTWa/5ZSU3vT+X6NgTxybBVKxjbI6f0M5R1fjgbuWtOoWVfNBiW36VkbDm1D26loB 7VfoXfo1ByH44xiZqXOi5Ft1IXQsygxfobIUcujmA37D79AWXqHHXPy5D6N8CTySAwby 2MLip0CXEb5Rl+ChGD1Rq+Umex+8NCNc6AGVytSfqM+numm1CeDGCdEWAscD1lH6vMSt YGt15rw8dvS0X7O/cS4UVZ9dbeoMPKZFUBd6un5geNZSOb/MhYtacgTna7WH6SKntdNW W6aT/1rC5M6whaHXywcw8CnQrxpD4WCFDp6U072Il7LR3Sab4f6VoPxy/nJdBbNCt+x2 lfMQ== X-Gm-Message-State: AOJu0Yw9TNdWk0BzQwlnUwfqJKq3wrSbAEeSZgOexs0kua9CYZZq372w C/lg6ahAA9CDjJIMdwJRDFUfwGiRB/3+DYa791ETMroONSRIQ94upo/j3g== X-Gm-Gg: ASbGncvictpBO5L8CCV4GezjzYYdSi1rC3vyS5oCuCu61qiJMU4nrupGVImeO7WAQ7k gD2FVx6WQyyVnLrL9aU/kyGzV0fyS+r1In0t3ItWnSGqmbJedZv7lDvr0QWfBEa5eCSmh56zRgO U0TR+MFRNMrmpBiSZwejwAA2FnZMEPSAg5IdFjkG275YJSuDSBMB0C2AAAj2pcq4nNukTxlblt9 pM81otqFNEze0BvtYN34uBtjNtuuedbVTi4BGAv4wkaLxnaej5sHMTymRWc42dgWmV82FHZc760 KJk= X-Google-Smtp-Source: AGHT+IHD/G2ygb8ozt7YtC+Gh7weffBjSgrxwbZ+MPidRC2F1wu08ON3tsZdHuA6fMrO3VwhEC1K8w== X-Received: by 2002:a05:6000:4010:b0:382:51ae:7569 with SMTP id ffacd0b85a97d-38a221fae45mr13879243f8f.18.1735035985414; Tue, 24 Dec 2024 02:26:25 -0800 (PST) Received: from localhost.localdomain ([80.215.86.162]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c8334aasm13788030f8f.41.2024.12.24.02.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2024 02:26:24 -0800 (PST) From: Marta Rybczynska X-Google-Original-From: Marta Rybczynska To: openembedded-core@lists.openembedded.org Cc: Marta Rybczynska Subject: [PATCH v2][OE-core 3/4] cve-update-db-native: add the fkie source Date: Tue, 24 Dec 2024 11:25:38 +0100 Message-ID: <20241224102557.9300-4-marta.rybczynska@ygreky.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241224102557.9300-1-marta.rybczynska@ygreky.com> References: <20241224102557.9300-1-marta.rybczynska@ygreky.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 24 Dec 2024 10:26:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209064 Add support for FKIE-CAD reconstruction of NVD feed from https://github.com/fkie-cad/nvd-json-data-feeds We download this feed directly from github releases. Signed-off-by: Marta Rybczynska --- .../recipes-core/meta/cve-update-db-native.bb | 126 ++++++++++++++++-- 1 file changed, 113 insertions(+), 13 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index f16e79ff58..b889c9e6a7 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -12,6 +12,8 @@ deltask do_install deltask do_populate_sysroot NVDCVE_URL ?= "https://nvd.nist.gov/feeds/json/cve/1.1/nvdcve-1.1-" +FKIE_URL ?= "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download/CVE-" + # CVE database update interval, in seconds. By default: once a day (24*60*60). # Use 0 to force the update # Use a negative value to skip the update @@ -109,6 +111,30 @@ def cleanup_db_download(db_file, db_tmp_file): if os.path.exists(db_tmp_file): os.remove(db_tmp_file) +def db_file_names(d, year, is_nvd): + if is_nvd: + year_url = d.getVar('NVDCVE_URL') + str(year) + meta_url = year_url + ".meta" + json_url = year_url + ".json.gz" + return json_url, meta_url + year_url = d.getVar('FKIE_URL') + str(year) + meta_url = year_url + ".meta" + json_url = year_url + ".json.xz" + return json_url, meta_url + +def host_db_name(d, is_nvd): + if is_nvd: + return "nvd.nist.gov" + return "github.com" + +def db_decompress(d, data, is_nvd): + import gzip, lzma + + if is_nvd: + return gzip.decompress(data).decode('utf-8') + # otherwise + return lzma.decompress(data) + def update_db_file(db_tmp_file, d): """ Update the given database file @@ -119,6 +145,7 @@ def update_db_file(db_tmp_file, d): YEAR_START = 2002 cve_socket_timeout = int(d.getVar("CVE_SOCKET_TIMEOUT")) + is_nvd = d.getVar("NVD_DB_VERSION") == "NVD1" # Connect to database conn = sqlite3.connect(db_tmp_file) @@ -129,9 +156,7 @@ def update_db_file(db_tmp_file, d): for i, year in enumerate(range(YEAR_START, date.today().year + 1)): bb.debug(2, "Updating %d" % year) ph.update((float(i + 1) / total_years) * 100) - year_url = (d.getVar('NVDCVE_URL')) + str(year) - meta_url = year_url + ".meta" - json_url = year_url + ".json.gz" + json_url, meta_url = db_file_names(d, year, is_nvd) # Retrieve meta last modified date try: @@ -140,7 +165,7 @@ def update_db_file(db_tmp_file, d): cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n') bb.warn("Failed to fetch CVE data (%s)" % e) import socket - result = socket.getaddrinfo("nvd.nist.gov", 443, proto=socket.IPPROTO_TCP) + result = socket.getaddrinfo(host_db_name(d, is_nvd), 443, proto=socket.IPPROTO_TCP) bb.warn("Host IPs are %s" % (", ".join(t[4][0] for t in result))) return False @@ -168,7 +193,7 @@ def update_db_file(db_tmp_file, d): try: response = urllib.request.urlopen(json_url, timeout=cve_socket_timeout) if response: - update_db(conn, gzip.decompress(response.read()).decode('utf-8')) + update_db(d, conn, db_decompress(d, response.read(), is_nvd)) conn.execute("insert or replace into META values (?, ?)", [year, last_modified]).close() except urllib.error.URLError as e: cve_f.write('Warning: CVE db update error, CVE data is outdated.\n\n') @@ -200,16 +225,22 @@ def initialize_db(conn): c.close() -def parse_node_and_insert(conn, node, cveId): +def parse_node_and_insert(conn, node, cveId, is_nvd): # Parse children node if needed for child in node.get('children', ()): - parse_node_and_insert(conn, child, cveId) + parse_node_and_insert(conn, child, cveId, is_nvd) + + def cpe_generator(is_nvd): + match_string = "cpeMatch" + cpe_string = 'criteria' + if is_nvd: + match_string = "cpe_match" + cpe_string = 'cpe23Uri' - def cpe_generator(): - for cpe in node.get('cpe_match', ()): + for cpe in node.get(match_string, ()): if not cpe['vulnerable']: return - cpe23 = cpe.get('cpe23Uri') + cpe23 = cpe.get(cpe_string) if not cpe23: return cpe23 = cpe23.split(':') @@ -260,9 +291,9 @@ def parse_node_and_insert(conn, node, cveId): # Save processing by representing as -. yield [cveId, vendor, product, '-', '', '', ''] - conn.executemany("insert into PRODUCTS values (?, ?, ?, ?, ?, ?, ?)", cpe_generator()).close() + conn.executemany("insert into PRODUCTS values (?, ?, ?, ?, ?, ?, ?)", cpe_generator(is_nvd)).close() -def update_db(conn, jsondata): +def update_db_nvdjson(conn, jsondata): import json root = json.loads(jsondata) @@ -297,8 +328,77 @@ def update_db(conn, jsondata): configurations = elt['configurations']['nodes'] for config in configurations: - parse_node_and_insert(conn, config, cveId) + parse_node_and_insert(conn, config, cveId, True) + +def update_db_fkie(conn, jsondata): + import json + root = json.loads(jsondata) + + for elt in root['cve_items']: + if not 'vulnStatus' in elt or elt['vulnStatus'] == 'Rejected': + continue + + if not 'configurations' in elt: + continue + + accessVector = None + vectorString = None + cvssv2 = 0.0 + cvssv3 = 0.0 + cvssv4 = 0.0 + cveId = elt['id'] + cveDesc = elt['descriptions'][0]['value'] + date = elt['lastModified'] + try: + for m in elt['metrics']['cvssMetricV2']: + if m['type'] == 'Primary': + accessVector = m['cvssData']['accessVector'] + vectorString = m['cvssData']['vectorString'] + cvssv2 = m['cvssData']['baseScore'] + except KeyError: + cvssv2 = 0.0 + try: + for m in elt['metrics']['cvssMetricV30']: + if m['type'] == 'Primary': + accessVector = m['cvssData']['accessVector'] + vectorString = m['cvssData']['vectorString'] + cvssv3 = m['cvssData']['baseScore'] + except KeyError: + accessVector = accessVector or "UNKNOWN" + cvssv3 = 0.0 + try: + for m in elt['metrics']['cvssMetricV31']: + if m['type'] == 'Primary': + accessVector = m['cvssData']['accessVector'] + vectorString = m['cvssData']['vectorString'] + cvssv3 = m['cvssData']['baseScore'] + except KeyError: + accessVector = accessVector or "UNKNOWN" + cvssv3 = 0.0 + try: + for m in elt['metrics']['cvssMetricV40']: + if m['type'] == 'Primary': + accessVector = m['cvssData']['accessVector'] + vectorString = m['cvssData']['vectorString'] + cvssv4 = m['cvssData']['baseScore'] + except KeyError: + accessVector = accessVector or "UNKNOWN" + cvssv4 = 0.0 + conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?, ?, ?)", + [cveId, cveDesc, cvssv2, cvssv3, cvssv4, date, accessVector, vectorString]).close() + + for config in elt['configurations']: + # This is suboptimal as it doesn't handle AND/OR and negate, but is better than nothing + for node in config["nodes"]: + parse_node_and_insert(conn, node, cveId, False) + + +def update_db(d, conn, jsondata): + if (d.getVar("NVD_DB_VERSION") == "FKIE"): + return update_db_fkie(conn, jsondata) + else: + return update_db_nvdjson(conn, jsondata) do_fetch[nostamp] = "1" From patchwork Tue Dec 24 10:25:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marta Rybczynska X-Patchwork-Id: 54661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D904AE77188 for ; Tue, 24 Dec 2024 10:26:42 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.31184.1735035993548473108 for ; Tue, 24 Dec 2024 02:26:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=biridPJE; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: rybczynska@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-436249df846so34284655e9.3 for ; Tue, 24 Dec 2024 02:26:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735035991; x=1735640791; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fKyM9mEsxzmevPHxXCPAkND/BZKVTRw9k+/As2XO6TI=; b=biridPJEBtWxzXRpZIm558Acyul6h9PJD/pgwqEioTzaFW8uleicZBHmZ3Z9smedrn 8kxVb7Ei3c0V1QSfgaQJGJNRWGmMgNoRzuJPqIzcI7gXKvcyZisuYSFBpq8Lo9+OyV3t XwloAKLWwkFztg/Hfdq7CDttbu+eJp03r0evxL8nmfWdJRO4JWnXu3M64/PX2jCSUnZ1 QTJlAItJRdv/eG1R5x3LTierc8rS6fgBJ9GaXMPcLcBOFQ2TC9b8lRxoaDJ4MAe6bKIa DJEnXvRuh5LaPlUXQjaM8qgb7zYx9hXWU0QBJZZyXa72n56eXHIiIER7TMBthFRLAoT8 +4uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735035991; x=1735640791; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fKyM9mEsxzmevPHxXCPAkND/BZKVTRw9k+/As2XO6TI=; b=UNS1O3aJVFY3SMg0OmY2sOiTeXe5VInPPrAyRrFsYk5u+aoPv+rhM34n/Cb6Pjmy39 6dE1g1AvrnMwZ9jPfq8kDNIKFhyyvz47CTjD8E693D/ZFljUZuj6y72nTtEJ7WPYkZYq KdZ3Yt4Vx+b15dr/QOSrsrd6bo97QEFxzPaojW70CQ8YHfwzrVbZ1Ei/umQUw0bYlXdH ohiVACyQnGPJECT9EfPq9PcEULNsxPHhrLlCcFfPMRSeQ3a7vnNpTW1mvTEG558+U/RT MY2xxgGOLNQ4y0tByLNeZA8wLREr573rr0p7aqBQzZ5UjEu7raUejQEhvIKd1l9B/Hw0 S/Qw== X-Gm-Message-State: AOJu0YxbZJV32UBiJdAVgGuUumjH3STn2XC64dWxxJHbmBa72FYFLrbb J0yAzmebW6sBCM2UM4IS5CNyVNK4Sz9x4IUwBvXIJAmUb7dIlB9iyCmsBQ== X-Gm-Gg: ASbGncsMJdH7Ed6GI+BZj1II7AswM81JT2sTGZEKmMsQq7H+QtK5tl29pBZ2uF8Yinq 5y8dNZdkP8hX3otWcSeIIxcDNwewzq/BOr5JLoRakM4tixPmohymTqmIiMfyBkz7Jh8n7VSpxZz bmdXPsFxcyRO3o2HaXlTkqi+CxktCLPQzEWQWzC8x1AMD8YSMOoitx2z0bFkO4MXpqPM7IaH4yj CMdzAEVmpQcz0c6hdp6MWzqTMgNI/osyeIo3tnMy91fQB3JO2Idsg2Q3szjtXmhu2nYsO4f7OmO vJ4= X-Google-Smtp-Source: AGHT+IEOYu2lDkk5kq53irsNh7QeVonCu6jCOnVV1MPyvbbRf45H4oUkIC2WNhqKuV437TXQx1zUEw== X-Received: by 2002:a5d:5e09:0:b0:386:1cd3:8a0e with SMTP id ffacd0b85a97d-38a22406ddemr16270011f8f.48.1735035991327; Tue, 24 Dec 2024 02:26:31 -0800 (PST) Received: from localhost.localdomain ([80.215.86.162]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c8334aasm13788030f8f.41.2024.12.24.02.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2024 02:26:30 -0800 (PST) From: Marta Rybczynska X-Google-Original-From: Marta Rybczynska To: openembedded-core@lists.openembedded.org Cc: Marta Rybczynska Subject: [PATCH v2][OE-core 4/4] cve-check: allow feed choice Date: Tue, 24 Dec 2024 11:25:39 +0100 Message-ID: <20241224102557.9300-5-marta.rybczynska@ygreky.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241224102557.9300-1-marta.rybczynska@ygreky.com> References: <20241224102557.9300-1-marta.rybczynska@ygreky.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 24 Dec 2024 10:26:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209065 Allow choice of one of three feeds and update task dependencies accordingly. All feeds contain data from NVD. Set the NVD_DB_VERSION variable to choose feed: NVD2 (default) - the NVD feed with API version 2 NVD1 - the NVD JSON feed (deprecated) FKIE - the FKIE-CAD feed reconstruction Signed-off-by: Marta Rybczynska --- meta/classes/cve-check.bbclass | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 6e10dd915a..4bd9af4abf 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -31,7 +31,11 @@ CVE_PRODUCT ??= "${BPN}" CVE_VERSION ??= "${PV}" -CVE_CHECK_DB_FILENAME ?= "nvdcve_2-2.db" +# Possible database sources: NVD1, NVD2, FKIE +NVD_DB_VERSION ?= "NVD2" + +CVE_CHECK_DB_FILENAME ?= "${@'nvdcve_2-2.db' if d.getVar('NVD_DB_VERSION') == 'NVD2' else 'nvdcve_1-3.db'}" +CVE_CHECK_DB_FETCHER ?= "${@'cve-update-nvd2-native' if d.getVar('NVD_DB_VERSION') == 'NVD2' else 'cve-update-db-native'}" CVE_CHECK_DB_DIR ?= "${STAGING_DIR}/CVE_CHECK" CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/${CVE_CHECK_DB_FILENAME}" CVE_CHECK_DB_FILE_LOCK ?= "${CVE_CHECK_DB_FILE}.lock" @@ -114,6 +118,11 @@ python () { d.setVarFlag("CVE_STATUS", cve, d.getVarFlag(cve_status_group, "status")) else: bb.warn("CVE_STATUS_GROUPS contains undefined variable %s" % cve_status_group) + + nvd_database_type = d.getVar("NVD_DB_VERSION") + if nvd_database_type not in ("NVD", "NVD2", "FKIE"): + d.setVar("NVD_DB_VERSION", "NVD2") + bb.warn("Malformed NVD_DB_VERSION, resetting to NVD2") } def generate_json_report(d, out_path, link_path): @@ -182,7 +191,7 @@ python do_cve_check () { } addtask cve_check before do_build -do_cve_check[depends] = "cve-update-nvd2-native:do_unpack" +do_cve_check[depends] = "${CVE_CHECK_DB_FETCHER}:do_unpack" do_cve_check[nostamp] = "1" python cve_check_cleanup () {