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

cannot use NULL inside a bash variable

Browse Source 
use custom delimiter instead
This commit is contained in:
Patrick Schleizer 2024-07-24 11:45:13 -04:00
parent 4a5312b3a9
commit cda0d26af7
No known key found for this signature in database
GPG Key ID: CB8D50BB77BB3C48
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr/bin/permission-hardener
View File

@ -12,6 +12,7 @@ exit_code=0
store_dir="/var/lib/permission-hardener" store_dir="/var/lib/permission-hardener"
dpkg_admindir_parameter_existing_mode="--admindir ${store_dir}/existing_mode" dpkg_admindir_parameter_existing_mode="--admindir ${store_dir}/existing_mode"
dpkg_admindir_parameter_new_mode="--admindir ${store_dir}/new_mode" dpkg_admindir_parameter_new_mode="--admindir ${store_dir}/new_mode"
delimiter="#permission-hardener-delimiter#"
log_level=notice log_level=notice
# shellcheck disable=SC1091 # shellcheck disable=SC1091
@ -81,11 +82,11 @@ add_nosuid_statoverride_entry() {
continue continue
fi fi
## Capture the stat output with fields separated by NUL characters.
## Delimiter at the end to avoid the last field to be interpreted as having a newline. ## Delimiter at the end to avoid the last field to be interpreted as having a newline.
stat_output=$(stat -c '%n\0%a\0%U\0%G\0%' "${line}") stat_output=$(stat -c "%n${delimiter}%a${delimiter}%U${delimiter}%G${delimiter}%" "${line}")
stat_output_simple=$(stat -c '%n %a %U %G' "${line}")
readarray -d '\0' -t arr <<< "${stat_output}" 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
@ -382,13 +383,13 @@ set_file_perms() {
local stat_output local stat_output
stat_output="" stat_output=""
if ! stat_output="$(stat -c '%n\0%a\0%U\0%G\0%' "${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
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 '\0' -t arr <<< "${stat_output}" readarray -d "${delimiter}" -t arr <<< "${stat_output}"
file_name="${fso_without_trailing_slash}" file_name="${fso_without_trailing_slash}"
if test "${#arr[@]}" = 0; then if test "${#arr[@]}" = 0; then