Skip to content

Commit 0b23e63

Browse files
authored
Chown /home/user to user:user after v-delete-user-sftp (hestiacp#2413)
* Chown /home/user to user:user after v-delete-user-sftp When SFTP is enabled /home/user ownership to allow for jail. However permissions are not reset when disabled * Add test if ownership changes after changing ssh access
1 parent 04a6c5c commit 0b23e63

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

bin/v-delete-user-sftp-jail

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ done
6060
users=$(IFS=',';echo "${new_users[*]// /|}";IFS=$' \t\n')
6161
sed -i "s/$ssh_users/$users/g" /etc/ssh/sshd_config
6262

63-
63+
# chown permissions back to user:user
64+
if [ -d "/home/$user" ]; then
65+
chown $user:$user /home/$user
66+
fi
6467
#----------------------------------------------------------#
6568
# Hestia #
6669
#----------------------------------------------------------#
@@ -70,6 +73,6 @@ service ssh restart > /dev/null 2>&1
7073
service sshd restart > /dev/null 2>&1
7174

7275
# Logging
73-
#log_event "$OK" "$ARGUMENTS"
76+
log_event "$OK" "$ARGUMENTS"
7477

7578
exit

test/test.bats

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,9 @@ function check_ip_not_banned(){
348348
run v-change-user-shell $user bash
349349
assert_success
350350
refute_output
351+
352+
run stat -c '%U' /home/$user
353+
assert_output --partial "$user"
351354
}
352355

353356
@test "Change user invalid shell" {
@@ -356,6 +359,16 @@ function check_ip_not_banned(){
356359
assert_output --partial 'shell bashinvalid is not valid'
357360
}
358361

362+
@test "Change user nologin" {
363+
run v-change-user-shell $user nologin
364+
assert_success
365+
refute_output
366+
367+
run stat -c '%U' /home/$user
368+
assert_output --partial 'root'
369+
}
370+
371+
359372
@test "Change user default ns" {
360373
run v-change-user-ns $user ns0.com ns1.com ns2.com ns3.com
361374
assert_success

0 commit comments

Comments
 (0)