From ba8ef80cfa0064de996729ac738fbfb62d947a61 Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Mon, 18 Nov 2024 09:46:59 +0100 Subject: [PATCH] Update oval_feed_url for Ubuntu Replace outdated broken links with current feeds from https://security-metadata.canonical.com/oval/ --- products/ubuntu1604/product.yml | 2 +- products/ubuntu1804/product.yml | 1 + products/ubuntu2004/product.yml | 2 +- products/ubuntu2204/product.yml | 2 +- products/ubuntu2404/product.yml | 2 +- tests/data/product_stability/ubuntu1604.yml | 2 +- tests/data/product_stability/ubuntu1804.yml | 1 + tests/data/product_stability/ubuntu2004.yml | 2 +- tests/data/product_stability/ubuntu2204.yml | 2 +- tests/data/product_stability/ubuntu2404.yml | 3 ++- 10 files changed, 11 insertions(+), 8 deletions(-) diff --git a/products/ubuntu1604/product.yml b/products/ubuntu1604/product.yml index 2f67d0405b2..077eadea368 100644 --- a/products/ubuntu1604/product.yml +++ b/products/ubuntu1604/product.yml @@ -17,7 +17,7 @@ pkg_manager: "apt_get" pkg_manager_config_file: "/etc/apt/apt.conf" init_system: "systemd" -oval_feed_url: "https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.xenial.cve.oval.xml" +oval_feed_url: "https://security-metadata.canonical.com/oval/com.ubuntu.xenial.usn.oval.xml.bz2" chrony_conf_path: "/etc/chrony/chrony.conf" diff --git a/products/ubuntu1804/product.yml b/products/ubuntu1804/product.yml index aac4a2d8a18..5667e37fdf9 100644 --- a/products/ubuntu1804/product.yml +++ b/products/ubuntu1804/product.yml @@ -17,6 +17,7 @@ pkg_manager: "apt_get" pkg_manager_config_file: "/etc/apt/apt.conf" init_system: "systemd" +oval_feed_url: "https://security-metadata.canonical.com/oval/com.ubuntu.bionic.usn.oval.xml.bz2" chrony_conf_path: "/etc/chrony/chrony.conf" diff --git a/products/ubuntu2004/product.yml b/products/ubuntu2004/product.yml index 440185653f1..4b6ec94ba55 100644 --- a/products/ubuntu2004/product.yml +++ b/products/ubuntu2004/product.yml @@ -17,7 +17,7 @@ pkg_manager: "apt_get" pkg_manager_config_file: "/etc/apt/apt.conf" init_system: "systemd" -oval_feed_url: "https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.focal.cve.oval.xml" +oval_feed_url: "https://security-metadata.canonical.com/oval/com.ubuntu.focal.usn.oval.xml.bz2" sshd_distributed_config: "true" diff --git a/products/ubuntu2204/product.yml b/products/ubuntu2204/product.yml index 460bfd5c085..762796f4ce4 100644 --- a/products/ubuntu2204/product.yml +++ b/products/ubuntu2204/product.yml @@ -17,7 +17,7 @@ pkg_manager: "apt_get" pkg_manager_config_file: "/etc/apt/apt.conf" init_system: "systemd" -oval_feed_url: "https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.jammy.cve.oval.xml" +oval_feed_url: "https://security-metadata.canonical.com/oval/com.ubuntu.jammy.usn.oval.xml.bz2" sshd_distributed_config: "true" diff --git a/products/ubuntu2404/product.yml b/products/ubuntu2404/product.yml index 3f91ffa92dc..8de81cacbb5 100644 --- a/products/ubuntu2404/product.yml +++ b/products/ubuntu2404/product.yml @@ -18,7 +18,7 @@ pkg_manager: "apt_get" pkg_manager_config_file: "/etc/apt/apt.conf" init_system: "systemd" -oval_feed_url: "https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.jammy.cve.oval.xml" +oval_feed_url: "https://security-metadata.canonical.com/oval/com.ubuntu.noble.usn.oval.xml.bz2" sshd_distributed_config: "true" diff --git a/tests/data/product_stability/ubuntu1604.yml b/tests/data/product_stability/ubuntu1604.yml index 2344c8c9c1c..938835c6c64 100644 --- a/tests/data/product_stability/ubuntu1604.yml +++ b/tests/data/product_stability/ubuntu1604.yml @@ -32,7 +32,7 @@ init_system: systemd major_version_ordinal: 1604 nobody_gid: 65534 nobody_uid: 65534 -oval_feed_url: https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.xenial.cve.oval.xml +oval_feed_url: https://security-metadata.canonical.com/oval/com.ubuntu.xenial.usn.oval.xml.bz2 pkg_manager: apt_get pkg_manager_config_file: /etc/apt/apt.conf pkg_system: dpkg diff --git a/tests/data/product_stability/ubuntu1804.yml b/tests/data/product_stability/ubuntu1804.yml index af370ed71d9..b2cff15e15f 100644 --- a/tests/data/product_stability/ubuntu1804.yml +++ b/tests/data/product_stability/ubuntu1804.yml @@ -32,6 +32,7 @@ init_system: systemd major_version_ordinal: 1804 nobody_gid: 65534 nobody_uid: 65534 +oval_feed_url: https://security-metadata.canonical.com/oval/com.ubuntu.bionic.usn.oval.xml.bz2 pkg_manager: apt_get pkg_manager_config_file: /etc/apt/apt.conf pkg_system: dpkg diff --git a/tests/data/product_stability/ubuntu2004.yml b/tests/data/product_stability/ubuntu2004.yml index e57f894ba94..17a596d37cd 100644 --- a/tests/data/product_stability/ubuntu2004.yml +++ b/tests/data/product_stability/ubuntu2004.yml @@ -33,7 +33,7 @@ init_system: systemd major_version_ordinal: 2004 nobody_gid: 65534 nobody_uid: 65534 -oval_feed_url: https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.focal.cve.oval.xml +oval_feed_url: https://security-metadata.canonical.com/oval/com.ubuntu.focal.usn.oval.xml.bz2 pkg_manager: apt_get pkg_manager_config_file: /etc/apt/apt.conf pkg_system: dpkg diff --git a/tests/data/product_stability/ubuntu2204.yml b/tests/data/product_stability/ubuntu2204.yml index bbaec5bf6c4..e4a53f9749d 100644 --- a/tests/data/product_stability/ubuntu2204.yml +++ b/tests/data/product_stability/ubuntu2204.yml @@ -33,7 +33,7 @@ init_system: systemd major_version_ordinal: 2204 nobody_gid: 65534 nobody_uid: 65534 -oval_feed_url: https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.jammy.cve.oval.xml +oval_feed_url: https://security-metadata.canonical.com/oval/com.ubuntu.jammy.usn.oval.xml.bz2 pkg_manager: apt_get pkg_manager_config_file: /etc/apt/apt.conf pkg_system: dpkg diff --git a/tests/data/product_stability/ubuntu2404.yml b/tests/data/product_stability/ubuntu2404.yml index de279452a2c..50d4e232f1a 100644 --- a/tests/data/product_stability/ubuntu2404.yml +++ b/tests/data/product_stability/ubuntu2404.yml @@ -10,6 +10,7 @@ benchmark_id: UBUNTU_24-04 benchmark_root: ../../linux_os/guide chrony_conf_path: /etc/chrony/chrony.conf chrony_d_path: /etc/chrony/conf.d/ +components_root: ../../components cpes: - ubuntu2404: check_id: installed_OS_is_ubuntu2404 @@ -33,7 +34,7 @@ init_system: systemd major_version_ordinal: 2404 nobody_gid: 65534 nobody_uid: 65534 -oval_feed_url: https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.noble.cve.oval.xml +oval_feed_url: https://security-metadata.canonical.com/oval/com.ubuntu.noble.usn.oval.xml.bz2 pkg_manager: apt_get pkg_manager_config_file: /etc/apt/apt.conf pkg_system: dpkg