Skip to content

Commit 0aed60f

Browse files
committed
Fix debian9 compat: setpriv is missing --init-groups on debian9
Added a function that handles dropping priv when running cli commands as a normal Hestia user
1 parent d46c4cc commit 0aed60f

21 files changed

+64
-50
lines changed

bin/v-add-fs-archive

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ for src in $*; do
5252
src=$(echo "$src"| sed -e "s|/home/$user/||")
5353

5454
# Creating tar.gz archive
55-
setpriv --init-groups --reuid "$user" --regid "$user" -- tar -rf "${archive/.gz/}" -C /home/$user $src >/dev/null 2>&1
55+
user_exec tar -rf "${archive/.gz/}" -C /home/$user $src >/dev/null 2>&1
5656
if [ "$?" -ne 0 ]; then
5757
echo "Error: archive $archive was not created"
5858
exit 3
@@ -63,7 +63,7 @@ done
6363

6464
# Checking gzip
6565
if [[ "$archive" =~ \.gz$ ]]; then
66-
setpriv --init-groups --reuid "$user" --regid "$user" -- gzip "${archive/.gz/}" >/dev/null 2>&1
66+
user_exec gzip "${archive/.gz/}" >/dev/null 2>&1
6767
if [ "$?" -ne 0 ]; then
6868
echo "Error: archive $archive was not gziped"
6969
exit 3

bin/v-add-fs-directory

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
3333
fi
3434

3535
# Adding directory
36-
setpriv --init-groups --reuid "$user" --regid "$user" -- mkdir -p "$dst_dir" >/dev/null 2>&1
36+
user_exec mkdir -p "$dst_dir" >/dev/null 2>&1
3737
if [ $? -ne 0 ]; then
3838
echo "Error: directory $dst_dir was not created"
3939
exit 3

bin/v-add-fs-file

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
3333
fi
3434

3535
# Creating file
36-
setpriv --init-groups --reuid "$user" --regid "$user" -- touch "$dst_file" >/dev/null 2>&1
36+
user_exec touch "$dst_file" >/dev/null 2>&1
3737
if [ $? -ne 0 ]; then
3838
echo "Error: file $dst_file was not created"
3939
exit 3

bin/v-add-web-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ln -f -s /var/log/$WEB_SYSTEM/domains/$domain.*log \
8383
$HOMEDIR/$user/web/$domain/logs/
8484

8585
# Adding domain skeleton
86-
setpriv --init-groups --reuid "$user" --regid "$user" -- cp -r $WEBTPL/skel/* "$HOMEDIR/$user/web/$domain/" >/dev/null 2>&1
86+
user_exec cp -r $WEBTPL/skel/* "$HOMEDIR/$user/web/$domain/" >/dev/null 2>&1
8787
for file in $(find "$HOMEDIR/$user/web/$domain/" -type f); do
8888
sed -i "s/%domain%/$domain/g" $file
8989
done

bin/v-change-fs-file-permission

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
4040
fi
4141

4242
# Changing file permissions
43-
setpriv --init-groups --reuid "$user" --regid "$user" -- chmod -R $permissions "$src_file" >/dev/null 2>&1
43+
user_exec chmod -R $permissions "$src_file" >/dev/null 2>&1
4444
if [ $? -ne 0 ]; then
4545
echo "Error: access permission on $src_file was not changed"
4646
exit 3

bin/v-check-fs-permission

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if [ ! -z "$src" ]; then
3535
fi
3636

3737
# Checking if file has readable permission
38-
setpriv --init-groups --reuid "$user" --regid "$user" -- ls "$src" > /dev/null 2>&1
38+
user_exec ls "$src" > /dev/null 2>&1
3939
if [ $? -ne 0 ]; then
4040
echo "Error: can't read $src"
4141
exit 1

bin/v-copy-fs-directory

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
4747
fi
4848

4949
# Copying directory
50-
setpriv --init-groups --reuid "$user" --regid "$user" -- cp -rf "$src_dir" "$dst_dir" >/dev/null 2>&1
50+
user_exec cp -rf "$src_dir" "$dst_dir" >/dev/null 2>&1
5151
if [ $? -ne 0 ]; then
5252
echo "Error: directory $src_dir was not copied"
5353
exit 3

bin/v-copy-fs-file

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
4747
fi
4848

4949
# Copying file
50-
setpriv --init-groups --reuid "$user" --regid "$user" -- cp "$src_file" "$dst_file" >/dev/null 2>&1
50+
user_exec cp "$src_file" "$dst_file" >/dev/null 2>&1
5151
if [ $? -ne 0 ]; then
5252
echo "Error: file $src_file was not copied"
5353
exit 3

bin/v-delete-fs-directory

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
3434
fi
3535

3636
# Deleting directory
37-
setpriv --init-groups --reuid "$user" --regid "$user" -- rm -rf "$dst_dir" # >/dev/null 2>&1
37+
user_exec rm -rf "$dst_dir" # >/dev/null 2>&1
3838
if [ $? -ne 0 ]; then
3939
echo "Error: directory $dst_dir was not deleted"
4040
exit 3

bin/v-delete-fs-file

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
3434
fi
3535

3636
# Deleting file
37-
setpriv --init-groups --reuid "$user" --regid "$user" -- rm -f "$dst_file" >/dev/null 2>&1
37+
user_exec rm -f "$dst_file" >/dev/null 2>&1
3838
if [ $? -ne 0 ]; then
3939
echo "Error: file $dst_file was not deleted"
4040
exit 3

0 commit comments

Comments
 (0)