Merge pull request #12533 from a-skr/bugfix/12409

Fix file path inconsistencies in accounts_umask_etc_bashrc

Dockerfiles/test_suite-debian12

@@ -11,7 +11,7 @@ ARG ADDITIONAL_PACKAGES
 RUN true \
         && apt update \
 	&& apt install -y openssh-server python3 openscap-scanner \
-	   $ADDITIONAL_PACKAGES \
+	   python3-apt $ADDITIONAL_PACKAGES \
         && true
 
 RUN true \

Dockerfiles/test_suite-ubuntu2204

@@ -13,7 +13,7 @@ RUN true \
         && apt update \
 	&& apt install -y cmake g++ libacl1-dev libblkid-dev libbz2-dev libcap-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev \
         libgconf2-dev libgcrypt20-dev libldap2-dev libpcre2-dev libperl-dev librpm-dev libselinux1-dev libxml2-dev libxml-parser-perl \
-        libxmlsec1-dev libxmlsec1-openssl libxml-xpath-perl libxslt1-dev libyaml-dev openssh-server python3-dev swig wget \
+        libxmlsec1-dev libxmlsec1-openssl libxml-xpath-perl libxslt1-dev libyaml-dev openssh-server python3-dev python3-apt swig wget \
 	   $ADDITIONAL_PACKAGES \
         && true
 

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/ansible/shared.yml

@@ -5,7 +5,7 @@
 # disruption = low
 {{{ ansible_instantiate_variables("var_accounts_user_umask") }}}
 
-{{% if 'sle' in product or 'ubuntu' in product %}}
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
 {{% set etc_bash_rc = "/etc/bash.bashrc" %}}
 {{% else %}}
 {{% set etc_bash_rc = "/etc/bashrc" %}}

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/bash/shared.sh

@@ -2,7 +2,7 @@
 
 {{{ bash_instantiate_variables("var_accounts_user_umask") }}}
 
-{{% if 'sle' in product or 'ubuntu' in product %}}
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
 {{% set etc_bash_rc = "/etc/bash.bashrc" %}}
 {{% else %}}
 {{% set etc_bash_rc = "/etc/bashrc" %}}

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/oval/shared.xml

@@ -1,4 +1,4 @@
-{{% if 'sle' in product or 'ubuntu' in product %}}
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
 {{% set etc_bash_rc = "/etc/bash.bashrc" %}}
 {{% else %}}
 {{% set etc_bash_rc = "/etc/bashrc" %}}

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/rule.yml

@@ -3,7 +3,7 @@ documentation_complete: true
 
 title: 'Ensure the Default Bash Umask is Set Correctly'
 
-{{% if 'sle' in product %}}
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
 {{% set etc_bash_rc = "/etc/bash.bashrc" %}}
 {{% else %}}
 {{% set etc_bash_rc = "/etc/bashrc" %}}

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/missing.fail.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # packages = bash
 
-{{% if 'sle' in product or 'ubuntu' in product %}}
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
 etc_bash_rc="/etc/bash.bashrc"
 {{% else %}}
 etc_bash_rc="/etc/bashrc"

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/ospp_cis_correct.pass.sh

@@ -2,7 +2,7 @@
 # profiles = xccdf_org.ssgproject.content_profile_cis, xccdf_org.ssgproject.content_profile_ospp
 # packages = bash
 
-{{% if 'sle' in product or 'ubuntu' in product %}}
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
 etc_bash_rc="/etc/bash.bashrc"
 {{% else %}}
 etc_bash_rc="/etc/bashrc"

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/super_compliant.pass.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # packages = bash
 
-{{% if 'sle' in product or 'ubuntu' in product %}}
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
 etc_bash_rc="/etc/bash.bashrc"
 {{% else %}}
 etc_bash_rc="/etc/bashrc"

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/wrong.fail.sh

@@ -1,6 +1,13 @@
 #!/bin/bash
 # packages = bash
 
-sed -i '/umask/d' /etc/bashrc
-echo "umask 000" >> /etc/bashrc
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
+etc_bash_rc="/etc/bash.bashrc"
+{{% else %}}
+etc_bash_rc="/etc/bashrc"
+{{% endif %}}
+
+
+sed -i '/umask/d' $etc_bash_rc
+echo "umask 000" >> $etc_bash_rc
 umask 000

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/wrong_and_mangled_and_not_at_the_begining_of_line.fail.sh

@@ -3,6 +3,12 @@
 
 # This TS is a regression test for https://github.com/ComplianceAsCode/content/issues/11937
 
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
+etc_bash_rc="/etc/bash.bashrc"
+{{% else %}}
+etc_bash_rc="/etc/bashrc"
+{{% endif %}}
+
 sed -i '/umask/d' /etc/bashrc
-echo "    [ \`umask\` -eq 0 ] && umask 027022" >> /etc/bashrc
+echo "    [ \`umask\` -eq 0 ] && umask 027022" >> $etc_bash_rc
 umask 000

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/wrong_and_not_at_the_begining_of_line.fail.sh

@@ -1,6 +1,13 @@
 #!/bin/bash
 # packages = bash
 
-sed -i '/umask/d' /etc/bashrc
-echo "    [ \`umask\` -eq 0 ] && umask 022" >> /etc/bashrc
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
+etc_bash_rc="/etc/bash.bashrc"
+{{% else %}}
+etc_bash_rc="/etc/bashrc"
+{{% endif %}}
+
+
+sed -i '/umask/d' $etc_bash_rc
+echo "    [ \`umask\` -eq 0 ] && umask 022" >> $etc_bash_rc
 umask 000

linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/wrong_multiple.fail.sh

@@ -1,8 +1,15 @@
 #!/bin/bash
 # packages = bash
 
-sed -i '/umask/d' /etc/bashrc
-echo "umask 000" >> /etc/bashrc
-echo "umask 000" >> /etc/bashrc
-echo "umask 000" >> /etc/bashrc
+{{% if 'sle' in product or 'ubuntu' in product or 'debian' in product %}}
+etc_bash_rc="/etc/bash.bashrc"
+{{% else %}}
+etc_bash_rc="/etc/bashrc"
+{{% endif %}}
+
+
+sed -i '/umask/d' $etc_bash_rc
+echo "umask 000" >> $etc_bash_rc
+echo "umask 000" >> $etc_bash_rc
+echo "umask 000" >> $etc_bash_rc
 umask 000