Skip to content

Commit 96b6b56

Browse files
authored
Prevent users rename directories in /home/user/web/ folder (hestiacp#3211)
* Prevent users rename directories in /home/user/web/ folder * Create /home/user/web/domain folder as root * Add check if domain exists * Improve chmod
1 parent 13aa7fe commit 96b6b56

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

bin/v-add-user

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ if [ -n "$WEB_SYSTEM" ]; then
107107
mkdir $HOMEDIR/$user/conf/web $HOMEDIR/$user/web $HOMEDIR/$user/tmp
108108
chmod 751 $HOMEDIR/$user/conf/web
109109
chmod 700 $HOMEDIR/$user/tmp
110-
chown $user:$user $HOMEDIR/$user/web $HOMEDIR/$user/tmp
110+
chown $user:$user $HOMEDIR/$user/tmp
111+
chown root:$user $HOMEDIR/$user/web/
111112
fi
112113

113114
if [ -n "$MAIL_SYSTEM" ]; then

bin/v-add-web-domain

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ source_conf "$USER_DATA/user.conf"
9797
[[ -e "$HOMEDIR/$user/web/$domain" ]] && check_result "$E_EXISTS" "Web domain folder for $domain should not exist"
9898

9999
# Creating domain directories
100-
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain"
100+
mkdir $HOMEDIR/$user/web/$domain
101+
chown $user:$user $HOMEDIR/$user/web/$domain
101102
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/public_html"
102103
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/document_errors"
103104
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/cgi-bin"

func/rebuild.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ rebuild_user_conf() {
150150
chmod 751 $HOMEDIR/$user/conf/web
151151
chmod 751 $HOMEDIR/$user/web
152152
chmod 771 $HOMEDIR/$user/tmp
153-
chown --no-dereference $user:$user $HOMEDIR/$user/web
153+
chown --no-dereference $root:$user $HOMEDIR/$user/web
154154
if [ "$create_user" = "yes" ]; then
155155
$BIN/v-rebuild-web-domains $user $restart
156156
fi
@@ -251,7 +251,10 @@ rebuild_web_domain_conf() {
251251
$BIN/v-delete-fs-directory "$user" "$HOMEDIR/$user/web/$domain/document_errors"
252252
fi
253253

254-
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain"
254+
if [ ! -d $HOMEDIR/$user/web/$domain ]; then
255+
mkdir $HOMEDIR/$user/web/$domain
256+
fi
257+
chown --no-dereference $user:$user $HOMEDIR/$user/web/$domain
255258
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/public_html"
256259
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/document_errors"
257260
$BIN/v-add-fs-directory "$user" "$HOMEDIR/$user/web/$domain/cgi-bin"

0 commit comments

Comments
 (0)