Skip to content

File permissions library dirs shall act on files when 'file_regex' is set #8420

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
vojtapolasek merged 3 commits into from
Mar 25, 2022
Merged

File permissions library dirs shall act on files when 'file_regex' is set #8420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dd56a4
When 'file_regex' is set do not operate on symlinks
yuumasato Mar 24, 2022
04027f3
Prevent breaking the paths with spaces
yuumasato Mar 24, 2022
c5feb75
Update test scenario to align with OVAL behavior
yuumasato Mar 24, 2022
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
16 changes: 0 additions & 16 deletions ...issions_within_important_dirs/file_ownership_library_dirs/tests/incorrect_symlink.fail.sh
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions ...issions_within_important_dirs/file_ownership_library_dirs/tests/incorrect_symlink.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# platform = multi_platform_sle,multi_platform_rhel,multi_platform_fedora,multi_platform_ubuntu

useradd user_test

TESTDIR="/usr/lib/"

# The check ignores this symlink and results in pass
ln -s $TESTDIR/mising_test_file $TESTDIR/faulty_symlink
chown -h user_test $TESTDIR/faulty_symlink
6 changes: 3 additions & 3 deletions shared/templates/file_groupowner/bash.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
{{% for path in FILEPATH %}}
{{%- if IS_DIRECTORY %}}
{{%- if FILE_REGEX %}}
readarray -t files < <(find {{{ path }}} {{{ FIND_RECURSE_ARGS }}} ! -gid {{{ FILEGID }}})
readarray -t files < <(find {{{ path }}} {{{ FIND_RECURSE_ARGS }}} -type f ! -gid {{{ FILEGID }}})
for file in "${files[@]}"; do
if basename $file | grep -qE '{{{ FILE_REGEX[loop.index0] }}}'; then
chgrp -h {{{ FILEGID }}} "$file"
if basename "$file" | grep -qE '{{{ FILE_REGEX[loop.index0] }}}'; then
chgrp {{{ FILEGID }}} "$file"
fi
done
{{% else %}}
Expand Down
6 changes: 3 additions & 3 deletions shared/templates/file_owner/bash.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
{{% for path in FILEPATH %}}
{{%- if IS_DIRECTORY %}}
{{%- if FILE_REGEX %}}
readarray -t files < <(find {{{ path }}} {{{ FIND_RECURSE_ARGS }}} ! -uid {{{ FILEUID }}})
readarray -t files < <(find {{{ path }}} {{{ FIND_RECURSE_ARGS }}} -type f ! -uid {{{ FILEUID }}})
for file in "${files[@]}"; do
if basename $file | grep -qE '{{{ FILE_REGEX[loop.index0] }}}'; then
chown -h {{{ FILEUID }}} "$file"
if basename "$file" | grep -qE '{{{ FILE_REGEX[loop.index0] }}}'; then
chown {{{ FILEUID }}} "$file"
fi
done
{{%- else %}}
Expand Down
4 changes: 2 additions & 2 deletions shared/templates/file_permissions/bash.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
{{% for path in FILEPATH %}}
{{%- if IS_DIRECTORY %}}
{{%- if FILE_REGEX %}}
readarray -t files < <(find {{{ path }}} {{{ FIND_RECURSE_ARGS }}})
readarray -t files < <(find {{{ path }}} {{{ FIND_RECURSE_ARGS }}} -type f)
for file in "${files[@]}"; do
if basename $file | grep -qE '{{{ FILE_REGEX[loop.index0] }}}'; then
if basename "$file" | grep -qE '{{{ FILE_REGEX[loop.index0] }}}'; then
chmod {{{ FILEMODE }}} "$file"
fi
done
Expand Down