From cbbe971b6b31815ae5d70333c0477a2cfe52e4ea Mon Sep 17 00:00:00 2001 From: Paul Roche Date: Thu, 23 Nov 2023 16:08:30 -0800 Subject: [PATCH 1/3] enable sshd_distributed_config for ubuntu2204 --- products/ubuntu2204/product.yml | 1 + tests/data/product_stability/ubuntu2204.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/products/ubuntu2204/product.yml b/products/ubuntu2204/product.yml index dcb02f217f3..51aace52859 100644 --- a/products/ubuntu2204/product.yml +++ b/products/ubuntu2204/product.yml @@ -19,6 +19,7 @@ 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" +sshd_distributed_config: "true" aide_bin_path: "/usr/bin/aide" aide_conf_path: "/etc/aide/aide.conf" diff --git a/tests/data/product_stability/ubuntu2204.yml b/tests/data/product_stability/ubuntu2204.yml index ff8cb4a7118..5c70a5419c7 100644 --- a/tests/data/product_stability/ubuntu2204.yml +++ b/tests/data/product_stability/ubuntu2204.yml @@ -83,7 +83,7 @@ reference_uris: pcidss4: https://docs-prv.pcisecuritystandards.org/PCI%20DSS/Standard/PCI-DSS-v4_0.pdf stigid: https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux stigref: https://public.cyber.mil/stigs/srg-stig-tools/ -sshd_distributed_config: 'false' +sshd_distributed_config: 'true' sysctl_remediate_drop_in_file: 'false' type: platform uid_min: 1000 From e03f2544f46d9dee40e2be4970815d47af71b271 Mon Sep 17 00:00:00 2001 From: Paul Roche Date: Fri, 24 Nov 2023 10:44:46 -0800 Subject: [PATCH 2/3] enable sshd_distributed_config for ubuntu2004 --- products/ubuntu2004/product.yml | 1 + tests/data/product_stability/ubuntu2004.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/products/ubuntu2004/product.yml b/products/ubuntu2004/product.yml index e0d2eefa1fa..2b08e05cbd3 100644 --- a/products/ubuntu2004/product.yml +++ b/products/ubuntu2004/product.yml @@ -19,6 +19,7 @@ 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" +sshd_distributed_config: "true" aide_bin_path: "/usr/bin/aide.wrapper" aide_conf_path: "/etc/aide/aide.conf" diff --git a/tests/data/product_stability/ubuntu2004.yml b/tests/data/product_stability/ubuntu2004.yml index a3cbe0bf55d..40863e541d3 100644 --- a/tests/data/product_stability/ubuntu2004.yml +++ b/tests/data/product_stability/ubuntu2004.yml @@ -81,7 +81,7 @@ reference_uris: pcidss4: https://docs-prv.pcisecuritystandards.org/PCI%20DSS/Standard/PCI-DSS-v4_0.pdf stigid: https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux stigref: https://public.cyber.mil/stigs/srg-stig-tools/ -sshd_distributed_config: 'false' +sshd_distributed_config: 'true' sysctl_remediate_drop_in_file: 'false' type: platform uid_min: 1000 From 7ba5686bc6bdd98c5570f84b5e04222dc1481aab Mon Sep 17 00:00:00 2001 From: Paul Roche Date: Fri, 24 Nov 2023 10:45:15 -0800 Subject: [PATCH 3/3] add multi_platform_ubuntu to sshd_lineinfile/tests --- .../sshd_lineinfile/tests/correct_value_directory.pass.sh | 2 +- .../sshd_lineinfile/tests/duplicated_param_directory.pass.sh | 2 +- .../sshd_lineinfile/tests/param_conflict_directory.fail.sh | 2 +- .../tests/param_conflict_file_with_directory.fail.sh | 2 +- .../sshd_lineinfile/tests/wrong_value_directory.fail.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shared/templates/sshd_lineinfile/tests/correct_value_directory.pass.sh b/shared/templates/sshd_lineinfile/tests/correct_value_directory.pass.sh index c739dc1b980..e6670ac60c3 100644 --- a/shared/templates/sshd_lineinfile/tests/correct_value_directory.pass.sh +++ b/shared/templates/sshd_lineinfile/tests/correct_value_directory.pass.sh @@ -1,6 +1,6 @@ #!/bin/bash -# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9 +# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9,multi_platform_ubuntu source common.sh diff --git a/shared/templates/sshd_lineinfile/tests/duplicated_param_directory.pass.sh b/shared/templates/sshd_lineinfile/tests/duplicated_param_directory.pass.sh index 3d6dcd275f0..e699c2c2d94 100644 --- a/shared/templates/sshd_lineinfile/tests/duplicated_param_directory.pass.sh +++ b/shared/templates/sshd_lineinfile/tests/duplicated_param_directory.pass.sh @@ -1,6 +1,6 @@ #!/bin/bash -# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9 +# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9,multi_platform_ubuntu mkdir -p /etc/ssh/sshd_config.d touch /etc/ssh/sshd_config.d/nothing diff --git a/shared/templates/sshd_lineinfile/tests/param_conflict_directory.fail.sh b/shared/templates/sshd_lineinfile/tests/param_conflict_directory.fail.sh index 1e32fc1db41..003ec694ff0 100644 --- a/shared/templates/sshd_lineinfile/tests/param_conflict_directory.fail.sh +++ b/shared/templates/sshd_lineinfile/tests/param_conflict_directory.fail.sh @@ -1,6 +1,6 @@ #!/bin/bash -# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9 +# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9,multi_platform_ubuntu SSHD_PARAM={{{ PARAMETER }}} SSHD_VAL={{{ VALUE }}} diff --git a/shared/templates/sshd_lineinfile/tests/param_conflict_file_with_directory.fail.sh b/shared/templates/sshd_lineinfile/tests/param_conflict_file_with_directory.fail.sh index a8f4bc7a34a..bf899ed1e59 100644 --- a/shared/templates/sshd_lineinfile/tests/param_conflict_file_with_directory.fail.sh +++ b/shared/templates/sshd_lineinfile/tests/param_conflict_file_with_directory.fail.sh @@ -1,6 +1,6 @@ #!/bin/bash -# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9 +# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9,multi_platform_ubuntu SSHD_PARAM={{{ PARAMETER }}} SSHD_VAL={{{ VALUE }}} diff --git a/shared/templates/sshd_lineinfile/tests/wrong_value_directory.fail.sh b/shared/templates/sshd_lineinfile/tests/wrong_value_directory.fail.sh index b11645c3833..50655fa4640 100644 --- a/shared/templates/sshd_lineinfile/tests/wrong_value_directory.fail.sh +++ b/shared/templates/sshd_lineinfile/tests/wrong_value_directory.fail.sh @@ -1,6 +1,6 @@ #!/bin/bash -# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9 +# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 9,multi_platform_ubuntu SSHD_PARAM={{{ PARAMETER }}} SSHD_VAL="bad_val"