Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update oval_feed_url for Ubuntu #12617

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Update oval_feed_url for Ubuntu #12617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba8ef80
Update oval_feed_url for Ubuntu
mpurg Nov 18, 2024
ca52b77
Fix hardcoded value for testing oval references
mpurg Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-scripts/verify_references.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def is_remote_feed(href):
href.startswith("security-data-oval-v2-") or \
href.startswith("security-data-oval-com.redhat.rhsa-") or \
href.startswith("security-oval-com.oracle") or \
href.startswith("-ubuntu-security-oval-com.ubuntu") or \
href.startswith("oval-com.ubuntu") or \
href.startswith("pub-projects-security-oval-suse") or \
href.startswith('security-oval-oval-definitions-bookworm')

Expand Down
2 changes: 1 addition & 1 deletion products/ubuntu1604/product.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions products/ubuntu1804/product.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion products/ubuntu2004/product.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion products/ubuntu2204/product.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion products/ubuntu2404/product.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion tests/data/product_stability/ubuntu1604.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/data/product_stability/ubuntu1804.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/data/product_stability/ubuntu2004.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/data/product_stability/ubuntu2204.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/data/product_stability/ubuntu2404.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading