Git-Mirrors/security-misc
1
0
Fork 0
mirror of https://github.com/Kicksecure/security-misc.git synced 2025-01-08 10:27:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix delimiter parsing

Browse Source
This commit is contained in:
Patrick Schleizer 2024-07-24 12:07:26 -04:00
parent a16dd8474b
commit 10c73b326f
No known key found for this signature in database
GPG Key ID: CB8D50BB77BB3C48
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr/bin/permission-hardener
View File

@ -73,7 +73,7 @@ add_nosuid_statoverride_entry() {
while IFS="" read -r -d "" line; do while IFS="" read -r -d "" line; do
counter_actual="$((counter_actual + 1))" counter_actual="$((counter_actual + 1))"
local arr file_name file_name_from_stat existing_mode existing_owner existing_group stat_output local arr file_name file_name_from_stat existing_mode existing_owner existing_group stat_output stat_output_newlined
file_name="${line}" file_name="${line}"
@ -82,10 +82,9 @@ add_nosuid_statoverride_entry() {
continue continue
fi fi
## Delimiter at the end to avoid the last field to be interpreted as having a newline. stat_output=$(stat -c "%n${delimiter}%a${delimiter}%U${delimiter}%G${delimiter}" "${line}")
stat_output=$(stat -c "%n${delimiter}%a${delimiter}%U${delimiter}%G${delimiter}%" "${line}") stat_output_newlined=$(printf '%s\n' "${stat_output//${delimiter}/$'\n'}")
readarray -t arr <<< "${stat_output_newlined}"
readarray -d "${delimiter}" -t arr <<< "${stat_output}"
if test "${#arr[@]}" = 0; then if test "${#arr[@]}" = 0; then
log error "Line is empty. Stat output: '${stat_output}', line: '${line}'" >&2 log error "Line is empty. Stat output: '${stat_output}', line: '${line}'" >&2
@ -381,15 +380,16 @@ set_file_perms() {
mode_for_grep="${mode_from_config:1}" mode_for_grep="${mode_from_config:1}"
fi fi
local stat_output local stat_output stat_output_newlined
stat_output="" stat_output=""
if ! stat_output=$(stat -c "%n${delimiter}%a${delimiter}%U${delimiter}%G${delimiter}%" "${fso_without_trailing_slash}"); then if ! stat_output=$(stat -c "%n${delimiter}%a${delimiter}%U${delimiter}%G${delimiter}" "${fso_without_trailing_slash}"); then
log error "Failed to run 'stat' on file: '${fso_without_trailing_slash}'!" >&2 log error "Failed to run 'stat' on file: '${fso_without_trailing_slash}'!" >&2
continue continue
fi fi
stat_output_newlined=$(printf '%s\n' "${stat_output//${delimiter}/$'\n'}")
local arr file_name file_name_from_stat existing_mode existing_owner existing_group local arr file_name file_name_from_stat existing_mode existing_owner existing_group
readarray -d "${delimiter}" -t arr <<< "${stat_output}" readarray -t arr <<< "${stat_output_newlined}"
file_name="${fso_without_trailing_slash}" file_name="${fso_without_trailing_slash}"
if test "${#arr[@]}" = 0; then if test "${#arr[@]}" = 0; then