Fix umask bash and Ansible

[Xeicker]

Description:

• Updated sed regexes in rules accounts_umask_etc_profile & accounts_umask_interactive_users

Rationale:

• In accounts_umask_etc_profile the sed command would modify also commented lines
• In accounts_umask_interactive_users the umask ocurrences that have leading spaces were being ignored

Review Hints:

• For accounts_umask_interactive_users I added a automatus test
• For accounts_umask_etc_profile I tested in this way:
  Whith existing regex:

$ cat file.txt 
# umask 777 This shouldn't be touched
# umask 000
umask 022
   umask 026 # This shouldn't be touched either
$ file=file.txt;var_accounts_user_umask=077; grep -qE '^[^#]*umask' "$file" && sed -i "s/umask.*/umask $var_accounts_user_umask/g" "$file"
$ cat file.txt 
# umask 077
# umask 077
umask 077
   umask 077

Whith new regex:

cat file.txt 
# umask 777 This shouldn't be touched
# umask 000
umask 022
   umask 026 # This shouldn't be touched either
$ file=file.txt;var_accounts_user_umask=077; grep -qE '^[^#]*umask' "$file" && sed -i -E "s/^(\s*umask\s*)[0-7]+/\1$var_accounts_user_umask/g" "$file"
$ # umask 777 This shouldn't be touched
# umask 000
umask 077
   umask 077 # This shouldn't be touched either

[openshift-ci]

Hi @Xeicker. Thanks for your PR.

I'm waiting for a ComplianceAsCode member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[github-actions]

Start a new ephemeral environment with changes proposed in this pull request:

rhel8 (from CTF) Environment (using Fedora as testing environment)

Fedora Testing Environment

Oracle Linux 8 Environment

[github-actions]

This datastream diff is auto generated by the check Compare DS/Generate Diff

Click here to see the full diff

bash remediation for rule 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile' differs.
--- xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile
+++ xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile
@@ -5,7 +5,7 @@
 readarray -t profile_files < <(find /etc/profile.d/ -type f -name '*.sh' -or -name 'sh.local')
 
 for file in "${profile_files[@]}" /etc/profile; do
-  grep -qE '^[^#]*umask' "$file" && sed -i "s/umask.*/umask $var_accounts_user_umask/g" "$file"
+  grep -qE '^[^#]*umask' "$file" && sed -i -E "s/^(\s*umask\s*)[0-7]+/\1$var_accounts_user_umask/g" "$file"
 done
 
 if ! grep -qrE '^[^#]*umask' /etc/profile*; then

bash remediation for rule 'xccdf_org.ssgproject.content_rule_accounts_umask_interactive_users' differs.
--- xccdf_org.ssgproject.content_rule_accounts_umask_interactive_users
+++ xccdf_org.ssgproject.content_rule_accounts_umask_interactive_users
@@ -2,7 +2,7 @@
 while IFS= read -r dir; do
     while IFS= read -r -d '' file; do
         if [ "$(basename $file)" != ".bash_history" ]; then
-            sed -i 's/^\([\s]*umask\s*\)/#\1/g' "$file"
+            sed -i 's/^\(\s*umask\s*\)/#\1/g' "$file"
         fi
     done <   <(find $dir -maxdepth 1 -type f -name ".*" -print0)
 done <   <(awk -F':' '{ if ($3 >= 1000 && $3 != 65534) print $6}' /etc/passwd)

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_accounts_umask_interactive_users' differs.
--- xccdf_org.ssgproject.content_rule_accounts_umask_interactive_users
+++ xccdf_org.ssgproject.content_rule_accounts_umask_interactive_users
@@ -5,7 +5,7 @@
       for dir in $(awk -F':' '{ if ($3 >= 1000 && $3 != 65534) print $6}' /etc/passwd); do
         for file in $(find $dir -maxdepth 1 -type f -name ".*"); do
           if [ "$(basename $file)" != ".bash_history" ]; then
-            sed -i 's/^\([\s]*umask\s*\)/#\1/g' $file
+            sed -i 's/^\(\s*umask\s*\)/#\1/g' $file
           fi
         done
       done

[codeclimate]

Code Climate has analyzed commit cb18170 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 53.8% (0.0% change).

View more on Code Climate.

[marcusburghardt]

Thanks