From patchwork Fri Mar 15 00:20:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoann Congal X-Patchwork-Id: 40992 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 F2532C54E6E for ; Fri, 15 Mar 2024 00:21:26 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web11.8847.1710462078265071902 for ; Thu, 14 Mar 2024 17:21:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile-fr.20230601.gappssmtp.com header.s=20230601 header.b=me2OIQ/c; spf=pass (domain: smile.fr, ip: 209.85.128.46, mailfrom: yoann.congal@smile.fr) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-413fea12b50so4040835e9.0 for ; Thu, 14 Mar 2024 17:21:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1710462076; x=1711066876; 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=dKaDkxtR9cOYPzsas+it4ICxNHE30PaV9zqWZnXRc5w=; b=me2OIQ/cT4ilFgXfRvDTrMjIh+D37u/qT4PfJV8o2ljDG+A9npdwExi6zZNjCHlt8d Vi8Rb8jxXX5DNMMWUNQQ6r0HqN71JomYTMFxkZJ9xRhoQvJX6BofEpJ+rDieEKYFNMOi O2y2XmB3VAO/JMYbYNbdXtZr2WlCEM0Lzw4/LYyUHgrl2gUw2WbYrSo/OHp7C1OB8HJe RSLnS2okxdB9RHbYvpTG2xb9qWOz5M2aMVkqOiJmwPKVlL7FMyrtSinSPzY2n+E7jhhp yRqy+raWVMFgvJoEcuNLltyjURs9iU9mnde8SqLw1e3BRPV64vGoCTqmlGOZ0wMyvX8q LShQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710462076; x=1711066876; 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=dKaDkxtR9cOYPzsas+it4ICxNHE30PaV9zqWZnXRc5w=; b=v45ysxYtJdTAm1ZGlbVhvEOaFMfZsd21ByyMnN4vfWdiFoB9Vbp1kSH1chM3+1v7+Z e7VbctG2GkN0l7R/VwdPoIzfDmF/Vi7brQC9chGUGoe6xZCwJpEX+rxVgLKOseSaenQ4 9qdRjm1ia1zqmTASOnjZo7yxO12Nv1+U0kudHPyUNLD1QVxKnJai/1nnwlsYV7qIcgqe Zkjd9EAINxW3ONubd65oFf+WQKPmNRXaE2LDfyam2EPEWdpSfLTnYOBppmlFnDQGWMns nAh0JhLInjJvRbDbt4ZPxoUsOgB3BDocHUvK9asTraepIJpR88zng8EI8g8qJSUyZN6L 4Bzw== X-Gm-Message-State: AOJu0Yytg6PUnVnTxwL9yPv45dDJcVRyXNI6qw7stKeUpyo4CbiQNlId 2ctaY5lT9nuazSSRNNBe3lIHQjUBY0lgkCJMl5vFbUslmtVHscZgn6iJV0evn0ioel05Z4ou7Ij zDog= X-Google-Smtp-Source: AGHT+IENqpNZdCgjxApAvVkwa8KjqVm80Il22HsB0X/n3C9bmLkAWl21/zQMWD94S2q3G2EQ0i3ISA== X-Received: by 2002:a05:600c:a50:b0:413:3160:841d with SMTP id c16-20020a05600c0a5000b004133160841dmr1371980wmq.8.1710462075768; Thu, 14 Mar 2024 17:21:15 -0700 (PDT) Received: from P-ASN-ECS-830T8C3.numericable.fr ([89.159.1.53]) by smtp.gmail.com with ESMTPSA id bs17-20020a056000071100b0033d9f0dcb35sm1868053wrb.87.2024.03.14.17.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 17:21:15 -0700 (PDT) From: Yoann Congal To: openembedded-core@lists.openembedded.org Cc: Yoann Congal Subject: [PATCH 1/4] cve-update-nvd2-native: Remove duplicated CVE_CHECK_DB_FILE definition Date: Fri, 15 Mar 2024 01:20:17 +0100 Message-Id: <20240315002020.2194310-2-yoann.congal@smile.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240315002020.2194310-1-yoann.congal@smile.fr> References: <20240315002020.2194310-1-yoann.congal@smile.fr> 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 ; Fri, 15 Mar 2024 00:21:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/197118 CVE_CHECK_DB_FILE is already defined in cve-check.bbclass which is always inherited in cve-update-nvd2-native (There is a check line 40). Remove it to avoid confusion. Otherwise, this should not change anything. Signed-off-by: Yoann Congal --- meta/recipes-core/meta/cve-update-nvd2-native.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index d565887498..8bdb4a4b46 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -37,8 +37,6 @@ CVE_DB_UPDATE_ATTEMPTS ?= "5" CVE_DB_TEMP_FILE ?= "${CVE_CHECK_DB_DIR}/temp_nvdcve_2.db" -CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvdcve_2.db" - python () { if not bb.data.inherits_class("cve-check", d): raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") From patchwork Fri Mar 15 00:20:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoann Congal X-Patchwork-Id: 40993 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 F2470C54E5D for ; Fri, 15 Mar 2024 00:21:26 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.groups.io with SMTP id smtpd.web11.8848.1710462079443395813 for ; Thu, 14 Mar 2024 17:21:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile-fr.20230601.gappssmtp.com header.s=20230601 header.b=hjKVPrVS; spf=pass (domain: smile.fr, ip: 209.85.128.43, mailfrom: yoann.congal@smile.fr) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-41400a9844aso233685e9.0 for ; Thu, 14 Mar 2024 17:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1710462077; x=1711066877; 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=qdmbUoH6aTIs0FGI9obSngTkUcfMHLg92/AL4YQ2PfI=; b=hjKVPrVSTQ9wrpqbBJzhw5zjK0sY9bq55NzAzrpS9mXq2KfsoP0bfGEvV1EsvQ9p2f AJFkkr4vY+J2G9ZDrgMhyUx5gPC6Kpj65zTxnr8GZ2VFqjV2uNZdNi+7QcYEw/CTZaRT Q4/pztUfD7WKMNawGeWACLun6/6GSv95SkH4rLgwA9fx/tFrAd65PN3EAm4Atk6bniW0 1YUrvTKD+gec1ZdKHpUF0PRj3BMHoEVXujcoEM15KlAYczRygw89Oc4yC9nKYMqQAdGx xoIqhyXbqHQH0UxyqK0Z7zVDYS04tSSHSA/vMK0X9k4ibqFkl5gs11RhtCXTA+Gd5UQX wwTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710462077; x=1711066877; 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=qdmbUoH6aTIs0FGI9obSngTkUcfMHLg92/AL4YQ2PfI=; b=Q+wCfXY46WpaKps/p6MEW5FuhXB0jZfQeYyADcOLNAGJ08gPW8XJ0pKUAkmYeKI1Qp p1EmEKjWsZoXzUHHbtYJCVmKZNH3XIA/020MUZ4rGJ3kiRLF7eZ2BnpNsAC+QUQzhDrt PwqAm9a7VBPSsVpk9k3eV3Q1kP0Xk2qMsYmDQblLr/tBMl1vdenJ6LGHN73v/liRO5kU GTXKaQnAjvyxLWWWOIlvxrvvE4Q5+22Rp613xxwMB6kUK/MSYAou/pgTvzbmwQ1yLuZp 1suannp7R0jb1qqPTdGnJvz9agSrhPitwXiRDB+xGtWAkFgm4Uigbxz58DYClhEq6t/p rVRw== X-Gm-Message-State: AOJu0Yyg0UFhRVWx1ny+H3D2FtBBt7XSi4SwGN3lFfuGe9RSzGmtcjYH WcWdNXnitruEigV1WFqrL6LtCFFFGGzF1e9aHkZfGdaNJqVS1X0ujskT6gBkshGPdDwbCSH72Jv 8Ozc= X-Google-Smtp-Source: AGHT+IHou8AYNxw5FuaOCKJBhXOI86ZzqvVMehkznHuDYrB/bhQLM1WEQTtBwd3Ukr1ub+H3AicT2g== X-Received: by 2002:adf:f0c5:0:b0:33e:bf21:13cd with SMTP id x5-20020adff0c5000000b0033ebf2113cdmr4774012wro.1.1710462077183; Thu, 14 Mar 2024 17:21:17 -0700 (PDT) Received: from P-ASN-ECS-830T8C3.numericable.fr ([89.159.1.53]) by smtp.gmail.com with ESMTPSA id bs17-20020a056000071100b0033d9f0dcb35sm1868053wrb.87.2024.03.14.17.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 17:21:16 -0700 (PDT) From: Yoann Congal To: openembedded-core@lists.openembedded.org Cc: Yoann Congal Subject: [PATCH 2/4] cve-update-nvd2-native: nvd_request_next: Improve comment Date: Fri, 15 Mar 2024 01:20:18 +0100 Message-Id: <20240315002020.2194310-3-yoann.congal@smile.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240315002020.2194310-1-yoann.congal@smile.fr> References: <20240315002020.2194310-1-yoann.congal@smile.fr> 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 ; Fri, 15 Mar 2024 00:21:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/197119 Add a URL to the doc of the API used in the function. ... and fix a small typo dabase -> database Signed-off-by: Yoann Congal --- meta/recipes-core/meta/cve-update-nvd2-native.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index 8bdb4a4b46..5bba2219d6 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -123,7 +123,8 @@ def nvd_request_wait(attempt, min_wait): def nvd_request_next(url, attempts, api_key, args, min_wait): """ - Request next part of the NVD dabase + Request next part of the NVD database + NVD API documentation: https://nvd.nist.gov/developers/vulnerabilities """ import urllib.request From patchwork Fri Mar 15 00:20:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoann Congal X-Patchwork-Id: 40994 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 140CCC54E71 for ; Fri, 15 Mar 2024 00:21:27 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web11.8849.1710462079974056844 for ; Thu, 14 Mar 2024 17:21:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile-fr.20230601.gappssmtp.com header.s=20230601 header.b=eHmNIqhs; spf=pass (domain: smile.fr, ip: 209.85.128.47, mailfrom: yoann.congal@smile.fr) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-413f4cb646dso6814665e9.1 for ; Thu, 14 Mar 2024 17:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1710462077; x=1711066877; 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=1ooaNeqNbx7A3+LWkcQ7IVvtV9i2qbMpF2nDLVwTDEY=; b=eHmNIqhsaDGCNJMUIGSLx+FemDTsFFZ8WOOJDrGW3a599DRCamii3KOZ6Bkba9rJus PqB6kDNJkYpa8866Q0oZUuu5RcYayTC3eUftozjX3mOeY20Z910QCZC0fErTlflwD1W0 OQ+BI7DQQryMwAO4TkUt6FeCRYicgfRqoXv8OrMiPf/qTmdTgSpisYZ75f4ScDNDPIqH pHWKeIyCegPPxLNOMzr+n7hSqySuKTR+mQWXj/nzAwtIRxmVZq/a/l35LXSfdzMdOci3 vGg0Gu9NCcOvrzi/SOiZGmptqvH6SIuOXEFldNzTreHyiWnlRC/1D+WQVKdtp1pWLLAZ 7LBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710462077; x=1711066877; 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=1ooaNeqNbx7A3+LWkcQ7IVvtV9i2qbMpF2nDLVwTDEY=; b=mIGRwEosNSmx4LVSvcw7IuF3YxxItfbiHXE4nWf/apJHwu3I2jdvuE5wFAw596jPci 1w6vOz5W4sQHokXDPG0d1HmX0mjz9qyyASTFPQFELIhN3ITr/P9IzEQ1Pns711SGHC0s LvDBLYMw5CjJm3bglPpNXDmeXbZJ9KvYOvnquea7XR7HxcEi9YHmkvjxX2Rr8lRDhG+p iCQAY2CKJDU/ot6/nOhvu7doogkC4kJpU5Af+S3svCSrKF67N8/qQDUS+9UHs58SD9hB 0Zu1EJ3dNn+veBL458gRbZd1+Qjdiq2Stj4nMbBa0jYLTpjm/fAXK93Yw84naekdte9Y C5AA== X-Gm-Message-State: AOJu0YwUndKjMurK0mTHTvvllGK6ReXWxTpbWaAlzSPysDaTdqnNPgpf s8DGEFBrPpZ3k8li9j9PDH0pO4W2FNfPuX4unysx1DPUKAy0zBq9Efw17svyOaiL9nGg28PRSeW k2tU= X-Google-Smtp-Source: AGHT+IEJj5ilfuFs8OkbSzsXoOjAFBrqMJ0CegUTfANdeEB+eyAeLf40jpwFcZGNLBw3C0/3W9tgBw== X-Received: by 2002:a05:600c:5187:b0:413:f1d7:ee0c with SMTP id fa7-20020a05600c518700b00413f1d7ee0cmr2193309wmb.6.1710462077545; Thu, 14 Mar 2024 17:21:17 -0700 (PDT) Received: from P-ASN-ECS-830T8C3.numericable.fr ([89.159.1.53]) by smtp.gmail.com with ESMTPSA id bs17-20020a056000071100b0033d9f0dcb35sm1868053wrb.87.2024.03.14.17.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 17:21:17 -0700 (PDT) From: Yoann Congal To: openembedded-core@lists.openembedded.org Cc: Yoann Congal Subject: [PATCH 3/4] cve-update-nvd2-native: Fix CVE configuration update Date: Fri, 15 Mar 2024 01:20:19 +0100 Message-Id: <20240315002020.2194310-4-yoann.congal@smile.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240315002020.2194310-1-yoann.congal@smile.fr> References: <20240315002020.2194310-1-yoann.congal@smile.fr> 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 ; Fri, 15 Mar 2024 00:21:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/197120 When a CVE is created, it often has no precise version information and this is stored as "-" (matching any version). After an update, version information is added. The previous "-" must be removed, otherwise, the CVE is still "Unpatched" for cve-check. Signed-off-by: Yoann Congal --- meta/recipes-core/meta/cve-update-nvd2-native.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index 5bba2219d6..4b8d01fe84 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -357,6 +357,10 @@ def update_db(conn, elt): [cveId, cveDesc, cvssv2, cvssv3, date, accessVector, vectorString]).close() try: + # Remove any pre-existing CVE configuration. Even for partial database + # update, those will be repopulated. This ensures that old + # configuration is not kept for an updated CVE. + conn.execute("delete from PRODUCTS where ID = ?", [cveId]).close() for config in elt['cve']['configurations']: # This is suboptimal as it doesn't handle AND/OR and negate, but is better than nothing for node in config["nodes"]: From patchwork Fri Mar 15 00:20:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoann Congal X-Patchwork-Id: 40991 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 E5402C54E69 for ; Fri, 15 Mar 2024 00:21:26 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web10.8885.1710462081065114288 for ; Thu, 14 Mar 2024 17:21:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile-fr.20230601.gappssmtp.com header.s=20230601 header.b=ondHmeMG; spf=pass (domain: smile.fr, ip: 209.85.128.49, mailfrom: yoann.congal@smile.fr) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-413feb32096so2269505e9.0 for ; Thu, 14 Mar 2024 17:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1710462079; x=1711066879; 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=R1iXvUEfYdtOFrZ4nSXikcEbnoezGI/wavJuQd4qO7w=; b=ondHmeMGEHMfwLdxEq9hnN2PJ3Q1I4W/b8mEdjC7NhKB2rTXquYxL4R4tVgQApB/Pn 8ZlKWzbPssUVnZZ1jHXfgupwrDXZNymQuz545zlR8rIeX77miVdy+lsBugpekGGnlgiN rJhw3vNe/RnYbpwmylDtWDD90LN3OhtUdwShNgf6tuF7MV3oYbW99q9yha/fE5N/pEj5 2irU3ZurwK3+P83Zdn4jKNDh5HkNTOxApOLppqwBa5zlhJdN/r+8lPzqaIRXvp3ik/DN NNGvqZpd8iw57df7o3fcM3yaT1NsyMrNiRw7ZKAEX3Cut1uirXZFjdptnhh2I00e19mj tjpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710462079; x=1711066879; 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=R1iXvUEfYdtOFrZ4nSXikcEbnoezGI/wavJuQd4qO7w=; b=Ii+SQ+UCP7FpeR/3moX+yoI7Pfouo1IXgDdE2n/M1lXq32x8vtkkI6fhXYoLByJZam u7f7wyuY1s8nlXYcvKkswqghvUD4vi+CbzZqdOV/epmG8jRgjWzXgy55YYjmHzoRauFM u8KJwh7kzfK2TXQxxPkuYCug0fveladqxw53L18x2s2uLdltEqkonXPgjhPdt3NMShM/ jrmfCGgOxBXRe9nFNnnBmdIRkt+IWeQ8boH/CUZJEpzhAkf+Y2GOtFEZKBNMSwZFN1ue I0RS5jVJhuSJZmRCBx39UEa8CCJElYgL8WKF2ewcJDlufBE2R9OJt/8VyeymWtDlibL0 0zwQ== X-Gm-Message-State: AOJu0Yzkh5bIDgeSCsUxQCzQ1QFXi86QjqH7pmq3Wlkf9vsypYeH/C+E tKLtQUxjk5nGcio5xS+4M/6hCITC3wRt7In6xqiwg4cd9VO4Nfiswog8V8/2ErRGaqbTrr5LKmi Fm3Y= X-Google-Smtp-Source: AGHT+IHsfUtUkah6dbXU1EtrxYFudmI0iTwEKHvYeirzCiNiwlBhH1cFIRp6ETzrTCoRbj8T06QPKQ== X-Received: by 2002:a05:600c:450c:b0:412:e8f5:c368 with SMTP id t12-20020a05600c450c00b00412e8f5c368mr4026487wmo.8.1710462079004; Thu, 14 Mar 2024 17:21:19 -0700 (PDT) Received: from P-ASN-ECS-830T8C3.numericable.fr ([89.159.1.53]) by smtp.gmail.com with ESMTPSA id bs17-20020a056000071100b0033d9f0dcb35sm1868053wrb.87.2024.03.14.17.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 17:21:17 -0700 (PDT) From: Yoann Congal To: openembedded-core@lists.openembedded.org Cc: Yoann Congal Subject: [PATCH 4/4] cve-update-nvd2-native: Remove rejected CVE from database Date: Fri, 15 Mar 2024 01:20:20 +0100 Message-Id: <20240315002020.2194310-5-yoann.congal@smile.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240315002020.2194310-1-yoann.congal@smile.fr> References: <20240315002020.2194310-1-yoann.congal@smile.fr> 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 ; Fri, 15 Mar 2024 00:21:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/197121 When a CVE is updated to be rejected, matching database entries must be removed. Otherwise: * an incremental update is not equivalent the to an initial download. * rejected CVEs might still appear as Unpatched in cve-check. Signed-off-by: Yoann Congal --- meta/recipes-core/meta/cve-update-nvd2-native.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index 4b8d01fe84..1901641965 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -324,6 +324,10 @@ def update_db(conn, elt): vectorString = None cveId = elt['cve']['id'] if elt['cve']['vulnStatus'] == "Rejected": + c = conn.cursor() + c.execute("delete from PRODUCTS where ID = ?;", [cveId]) + c.execute("delete from NVD where ID = ?;", [cveId]) + c.close() return cveDesc = "" for desc in elt['cve']['descriptions']: