Skip to content

Support DEB822 apt source format in apt_sources_list_official #14855

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

Merged
jan-cerny merged 2 commits into from
Jul 8, 2026
Merged

Support DEB822 apt source format in apt_sources_list_official #14855

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
ffa86a7
Support DEB822 apt source format in apt_sources_list_official
rrskris Jul 6, 2026
75a8695
Accept HTTPS mirrors and pin bookworm test scenarios to Debian 12
rrskris Jul 7, 2026
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
40 changes: 34 additions & 6 deletions linux_os/guide/services/apt/apt_sources_list_official/oval/debian11.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,54 @@
<definition class="compliance" id="apt_sources_list_official" version="1">
{{{ oval_metadata("Official distribution repositories contain up-to-date distribution security and functional patches.", rule_title=rule_title) }}}
<criteria comment="Match sources.list distribution repositories usage" operator="AND">
<criterion comment="Check /etc/apt/sources(.d/.+).list file for base" test_ref="test_apt_sources_list_base_official" />
<criterion comment="Check /etc/apt/sources(.d/.+).list file for security" test_ref="test_apt_sources_list_security_official" />
<criteria comment="Check base repository, one-line or DEB822 format" operator="OR">
<criterion comment="Check /etc/apt/sources(.list.d/.+).list file for base, one-line format" test_ref="test_apt_sources_list_base_official" />
<criterion comment="Check /etc/apt/sources(.list.d/.+).sources file for base, DEB822 format" test_ref="test_apt_sources_list_base_official_deb822" />
</criteria>
<criteria comment="Check security repository, one-line or DEB822 format" operator="OR">
<criterion comment="Check /etc/apt/sources(.list.d/.+).list file for security, one-line format" test_ref="test_apt_sources_list_security_official" />
<criterion comment="Check /etc/apt/sources(.list.d/.+).sources file for security, DEB822 format" test_ref="test_apt_sources_list_security_official_deb822" />
</criteria>
</criteria>
</definition>
<ind:textfilecontent54_test check="all" check_existence="at_least_one_exists" comment="Checks usage of official distribution base repositories"
id="test_apt_sources_list_base_official" version="1">
<ind:object object_ref="obj_apt_sources_list_base_official" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_apt_sources_list_base_official" version="1">
<ind:filepath operation="pattern match">^/etc/apt/sources(.d\/[a-zA-Z0-9]+){0,1}.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+http://[a-z\.]+\.debian\.org/debian[/]?[\s]+bullseye[\s]+main</ind:pattern>
<ind:filepath operation="pattern match">^/etc/apt/sources(\.list\.d/[a-zA-Z0-9._-]+)?\.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+https?://[a-z\.]+\.debian\.org/debian[/]?[\s]+bullseye[\s]+main</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_test check="all" check_existence="at_least_one_exists" comment="Checks usage of official distribution security repositories"
id="test_apt_sources_list_security_official" version="1">
<ind:object object_ref="obj_apt_sources_list_security_official" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_apt_sources_list_security_official" version="1">
<ind:filepath operation="pattern match">^/etc/apt/sources(.d\/[a-zA-Z0-9]+){0,1}.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+http://security\.debian\.org/debian-security[/]?[\s]+bullseye-security[\s]+main</ind:pattern>
<ind:filepath operation="pattern match">^/etc/apt/sources(\.list\.d/[a-zA-Z0-9._-]+)?\.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+https?://security\.debian\.org/debian-security[/]?[\s]+bullseye-security[\s]+main</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>

<ind:textfilecontent54_test check="at least one" check_existence="at_least_one_exists" comment="Checks usage of official distribution base repositories, DEB822 format"
id="test_apt_sources_list_base_official_deb822" version="1">
<ind:object object_ref="obj_apt_sources_deb822_official" />
<ind:state state_ref="state_apt_sources_deb822_base" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_test check="at least one" check_existence="at_least_one_exists" comment="Checks usage of official distribution security repositories, DEB822 format"
id="test_apt_sources_list_security_official_deb822" version="1">
<ind:object object_ref="obj_apt_sources_deb822_official" />
<ind:state state_ref="state_apt_sources_deb822_security" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_apt_sources_deb822_official" version="1">
<ind:filepath operation="pattern match">^/etc/apt/sources(\.list\.d/[a-zA-Z0-9._-]+)?\.sources$</ind:filepath>
<ind:pattern operation="pattern match">Types:[^\n]*\n(?:(?!Types:)[^\n]*\n?)*</ind:pattern>
<ind:instance datatype="int" operation="greater than or equal">1</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_state id="state_apt_sources_deb822_base" version="1">
<ind:text operation="pattern match">^(?=[\s\S]*\nURIs:\s*https?://[a-z.]*\.debian\.org/debian/?(?=\s|$))(?=[\s\S]*\nSuites:[^\n]*\bbullseye(?=\s|$))(?=[\s\S]*\nComponents:[^\n]*\bmain(?=\s|$))Types:\s*deb(?=\s|$)</ind:text>
</ind:textfilecontent54_state>
<ind:textfilecontent54_state id="state_apt_sources_deb822_security" version="1">
<ind:text operation="pattern match">^(?=[\s\S]*\nURIs:\s*https?://[a-z.]*\.debian\.org/debian-security/?(?=\s|$))(?=[\s\S]*\nSuites:[^\n]*\bbullseye-security(?=\s|$))(?=[\s\S]*\nComponents:[^\n]*\bmain(?=\s|$))Types:\s*deb(?=\s|$)</ind:text>
</ind:textfilecontent54_state>
</def-group>
40 changes: 34 additions & 6 deletions linux_os/guide/services/apt/apt_sources_list_official/oval/debian12.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,54 @@
<definition class="compliance" id="apt_sources_list_official" version="1">
{{{ oval_metadata("Official distribution repositories contain up-to-date distribution security and functional patches.", rule_title=rule_title) }}}
<criteria comment="Match sources.list distribution repositories usage" operator="AND">
<criterion comment="Check /etc/apt/sources(.d/.+).list file for base" test_ref="test_apt_sources_list_base_official" />
<criterion comment="Check /etc/apt/sources(.d/.+).list file for security" test_ref="test_apt_sources_list_security_official" />
<criteria comment="Check base repository, one-line or DEB822 format" operator="OR">
<criterion comment="Check /etc/apt/sources(.list.d/.+).list file for base, one-line format" test_ref="test_apt_sources_list_base_official" />
<criterion comment="Check /etc/apt/sources(.list.d/.+).sources file for base, DEB822 format" test_ref="test_apt_sources_list_base_official_deb822" />
</criteria>
<criteria comment="Check security repository, one-line or DEB822 format" operator="OR">
<criterion comment="Check /etc/apt/sources(.list.d/.+).list file for security, one-line format" test_ref="test_apt_sources_list_security_official" />
<criterion comment="Check /etc/apt/sources(.list.d/.+).sources file for security, DEB822 format" test_ref="test_apt_sources_list_security_official_deb822" />
</criteria>
</criteria>
</definition>
<ind:textfilecontent54_test check="all" check_existence="at_least_one_exists" comment="Checks usage of official distribution base repositories"
id="test_apt_sources_list_base_official" version="1">
<ind:object object_ref="obj_apt_sources_list_base_official" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_apt_sources_list_base_official" version="1">
<ind:filepath operation="pattern match">^/etc/apt/sources(.d\/[a-zA-Z0-9]+){0,1}.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+http://[a-z\.]+\.debian\.org/debian[/]?[\s]+bookworm[\s]+main</ind:pattern>
<ind:filepath operation="pattern match">^/etc/apt/sources(\.list\.d/[a-zA-Z0-9._-]+)?\.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+https?://[a-z\.]+\.debian\.org/debian[/]?[\s]+bookworm[\s]+main</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_test check="all" check_existence="at_least_one_exists" comment="Checks usage of official distribution security repositories"
id="test_apt_sources_list_security_official" version="1">
<ind:object object_ref="obj_apt_sources_list_security_official" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_apt_sources_list_security_official" version="1">
<ind:filepath operation="pattern match">^/etc/apt/sources(.d\/[a-zA-Z0-9]+){0,1}.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+http://security\.debian\.org/debian-security[/]?[\s]+bookworm-security[\s]+main</ind:pattern>
<ind:filepath operation="pattern match">^/etc/apt/sources(\.list\.d/[a-zA-Z0-9._-]+)?\.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+https?://security\.debian\.org/debian-security[/]?[\s]+bookworm-security[\s]+main</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>

<ind:textfilecontent54_test check="at least one" check_existence="at_least_one_exists" comment="Checks usage of official distribution base repositories, DEB822 format"
id="test_apt_sources_list_base_official_deb822" version="1">
<ind:object object_ref="obj_apt_sources_deb822_official" />
<ind:state state_ref="state_apt_sources_deb822_base" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_test check="at least one" check_existence="at_least_one_exists" comment="Checks usage of official distribution security repositories, DEB822 format"
id="test_apt_sources_list_security_official_deb822" version="1">
<ind:object object_ref="obj_apt_sources_deb822_official" />
<ind:state state_ref="state_apt_sources_deb822_security" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_apt_sources_deb822_official" version="1">
<ind:filepath operation="pattern match">^/etc/apt/sources(\.list\.d/[a-zA-Z0-9._-]+)?\.sources$</ind:filepath>
<ind:pattern operation="pattern match">Types:[^\n]*\n(?:(?!Types:)[^\n]*\n?)*</ind:pattern>
<ind:instance datatype="int" operation="greater than or equal">1</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_state id="state_apt_sources_deb822_base" version="1">
<ind:text operation="pattern match">^(?=[\s\S]*\nURIs:\s*https?://[a-z.]*\.debian\.org/debian/?(?=\s|$))(?=[\s\S]*\nSuites:[^\n]*\bbookworm(?=\s|$))(?=[\s\S]*\nComponents:[^\n]*\bmain(?=\s|$))Types:\s*deb(?=\s|$)</ind:text>
</ind:textfilecontent54_state>
<ind:textfilecontent54_state id="state_apt_sources_deb822_security" version="1">
<ind:text operation="pattern match">^(?=[\s\S]*\nURIs:\s*https?://[a-z.]*\.debian\.org/debian-security/?(?=\s|$))(?=[\s\S]*\nSuites:[^\n]*\bbookworm-security(?=\s|$))(?=[\s\S]*\nComponents:[^\n]*\bmain(?=\s|$))Types:\s*deb(?=\s|$)</ind:text>
</ind:textfilecontent54_state>
</def-group>
42 changes: 35 additions & 7 deletions linux_os/guide/services/apt/apt_sources_list_official/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,55 @@
<def-group>
<definition class="compliance" id="apt_sources_list_official" version="1">
{{{ oval_metadata("Official distribution repositories contain up-to-date distribution security and functional patches.", rule_title=rule_title) }}}
<criteria comment="Match sources.list distribution repositories usage" operator="AND">
<criterion comment="Check /etc/apt/sources(.d/.+).list file for base" test_ref="test_apt_sources_list_base_official" />
<criterion comment="Check /etc/apt/sources(.d/.+).list file for security" test_ref="test_apt_sources_list_security_official" />
<criteria comment="Match sources.list distribution repositories usage" operator="AND">
<criteria comment="Check base repository, one-line or DEB822 format" operator="OR">
<criterion comment="Check /etc/apt/sources(.list.d/.+).list file for base, one-line format" test_ref="test_apt_sources_list_base_official" />
<criterion comment="Check /etc/apt/sources(.list.d/.+).sources file for base, DEB822 format" test_ref="test_apt_sources_list_base_official_deb822" />
</criteria>
<criteria comment="Check security repository, one-line or DEB822 format" operator="OR">
<criterion comment="Check /etc/apt/sources(.list.d/.+).list file for security, one-line format" test_ref="test_apt_sources_list_security_official" />
<criterion comment="Check /etc/apt/sources(.list.d/.+).sources file for security, DEB822 format" test_ref="test_apt_sources_list_security_official_deb822" />
</criteria>
</criteria>
</definition>
<ind:textfilecontent54_test check="all" check_existence="at_least_one_exists" comment="Checks usage of official distribution base repositories"
id="test_apt_sources_list_base_official" version="1">
<ind:object object_ref="obj_apt_sources_list_base_official" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_apt_sources_list_base_official" version="1">
<ind:filepath operation="pattern match">^/etc/apt/sources(.d\/[a-zA-Z0-9]+){0,1}.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+http://[a-z\.]+\.debian\.org/debian[\s]+[a-z]+[\s]+main</ind:pattern>
<ind:filepath operation="pattern match">^/etc/apt/sources(\.list\.d/[a-zA-Z0-9._-]+)?\.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+https?://[a-z\.]+\.debian\.org/debian[\s]+[a-z]+[\s]+main</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_test check="all" check_existence="at_least_one_exists" comment="Checks usage of official distribution security repositories"
id="test_apt_sources_list_security_official" version="1">
<ind:object object_ref="obj_apt_sources_list_security_official" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_apt_sources_list_security_official" version="1">
<ind:filepath operation="pattern match">^/etc/apt/sources(.d\/[a-zA-Z0-9]+){0,1}.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+http://security\.debian\.org/debian-security[\s]+[a-z]+/updates[\s]+main</ind:pattern>
<ind:filepath operation="pattern match">^/etc/apt/sources(\.list\.d/[a-zA-Z0-9._-]+)?\.list$</ind:filepath>
<ind:pattern operation="pattern match">^deb[\s]+https?://security\.debian\.org/debian-security[\s]+[a-z]+/updates[\s]+main</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>

<ind:textfilecontent54_test check="at least one" check_existence="at_least_one_exists" comment="Checks usage of official distribution base repositories, DEB822 format"
id="test_apt_sources_list_base_official_deb822" version="1">
<ind:object object_ref="obj_apt_sources_deb822_official" />
<ind:state state_ref="state_apt_sources_deb822_base" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_test check="at least one" check_existence="at_least_one_exists" comment="Checks usage of official distribution security repositories, DEB822 format"
id="test_apt_sources_list_security_official_deb822" version="1">
<ind:object object_ref="obj_apt_sources_deb822_official" />
<ind:state state_ref="state_apt_sources_deb822_security" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_apt_sources_deb822_official" version="1">
<ind:filepath operation="pattern match">^/etc/apt/sources(\.list\.d/[a-zA-Z0-9._-]+)?\.sources$</ind:filepath>
<ind:pattern operation="pattern match">Types:[^\n]*\n(?:(?!Types:)[^\n]*\n?)*</ind:pattern>
<ind:instance datatype="int" operation="greater than or equal">1</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_state id="state_apt_sources_deb822_base" version="1">
<ind:text operation="pattern match">^(?=[\s\S]*\nURIs:\s*https?://[a-z.]*\.debian\.org/debian/?(?=\s|$))(?=[\s\S]*\nSuites:[^\n]*\b[a-z]+(?=\s|$))(?=[\s\S]*\nComponents:[^\n]*\bmain(?=\s|$))Types:\s*deb(?=\s|$)</ind:text>
</ind:textfilecontent54_state>
<ind:textfilecontent54_state id="state_apt_sources_deb822_security" version="1">
<ind:text operation="pattern match">^(?=[\s\S]*\nURIs:\s*https?://[a-z.]*\.debian\.org/debian-security/?(?=\s|$))(?=[\s\S]*\nSuites:[^\n]*\b[a-z]+-security(?=\s|$))(?=[\s\S]*\nComponents:[^\n]*\bmain(?=\s|$))Types:\s*deb(?=\s|$)</ind:text>
</ind:textfilecontent54_state>
</def-group>
20 changes: 20 additions & 0 deletions linux_os/guide/services/apt/apt_sources_list_official/tests/correct_deb822_combined.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash
# platform = Debian 12
# remediation = none

mkdir -p /etc/apt/sources.list.d
rm -f /etc/apt/sources.list /etc/apt/sources.list.d/*

cat > /etc/apt/sources.list.d/debian.sources << 'EOF'
Types: deb
URIs: http://deb.debian.org/debian
Suites: bookworm bookworm-updates
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

Types: deb
URIs: http://deb.debian.org/debian-security
Suites: bookworm-security
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
EOF
20 changes: 20 additions & 0 deletions linux_os/guide/services/apt/apt_sources_list_official/tests/correct_deb822_https.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash
# platform = Debian 12
# remediation = none

mkdir -p /etc/apt/sources.list.d
rm -f /etc/apt/sources.list /etc/apt/sources.list.d/*

cat > /etc/apt/sources.list.d/debian.sources << 'EOF'
Types: deb
URIs: https://deb.debian.org/debian
Suites: bookworm bookworm-updates
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

Types: deb
URIs: https://deb.debian.org/debian-security
Suites: bookworm-security
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
EOF
22 changes: 22 additions & 0 deletions .../guide/services/apt/apt_sources_list_official/tests/correct_deb822_separate_files.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash
# platform = Debian 12
# remediation = none

mkdir -p /etc/apt/sources.list.d
rm -f /etc/apt/sources.list /etc/apt/sources.list.d/*

cat > /etc/apt/sources.list.d/debian.sources << 'EOF'
Types: deb
URIs: http://deb.debian.org/debian
Suites: bookworm
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
EOF

cat > /etc/apt/sources.list.d/debian-security.sources << 'EOF'
Types: deb
URIs: http://deb.debian.org/debian-security
Suites: bookworm-security
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
EOF
11 changes: 11 additions & 0 deletions .../guide/services/apt/apt_sources_list_official/tests/correct_legacy_sources_list_d.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash
# platform = Debian 12
# remediation = none

mkdir -p /etc/apt/sources.list.d
rm -f /etc/apt/sources.list /etc/apt/sources.list.d/*

cat > /etc/apt/sources.list.d/debian.list << 'EOF'
deb http://deb.debian.org/debian bookworm main
deb http://security.debian.org/debian-security bookworm-security main
EOF
14 changes: 14 additions & 0 deletions ...s/guide/services/apt/apt_sources_list_official/tests/wrong_deb822_thirdparty_only.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
# platform = multi_platform_debian
# remediation = none

mkdir -p /etc/apt/sources.list.d
rm -f /etc/apt/sources.list /etc/apt/sources.list.d/*

cat > /etc/apt/sources.list.d/example.sources << 'EOF'
Types: deb
URIs: https://packages.example.com/debian
Suites: stable
Components: main
Signed-By: /usr/share/keyrings/example.gpg
EOF
7 changes: 7 additions & 0 deletions linux_os/guide/services/apt/apt_sources_list_official/tests/wrong_missing.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
# platform = multi_platform_debian
# remediation = none

mkdir -p /etc/apt/sources.list.d
rm -f /etc/apt/sources.list /etc/apt/sources.list.d/*
touch /etc/apt/sources.list
Loading