Check if an user already as sftp chroot was wrong (hestiacp#2223)

* Check if an user already as sftp chroot was wrong

Causing new users to be not create as chroot

* remove echo

* Prevent new tests fails because users hasn't been delete propperly

Author: jaapmarcus

bin/v-add-user-sftp-jail

@@ -30,23 +30,21 @@ source_conf "$HESTIA/conf/hestia.conf"
 
 check_args '1' "$#" 'USER'
 is_format_valid 'user'
+# Limit to only Hestia user(s)
+is_object_valid 'user' 'USER' "$user"
 user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin")
 if [ -z "$user_str" ]; then
     exit
 fi
 
-# Do not create chroot for syslog user
-if [ $user = "syslog" ]; then
-    exit
-fi
 
 # Get current users and split into array
 ssh_users=$(grep -A1 "^# Hestia SFTP Chroot" /etc/ssh/sshd_config | sed -n 2p | sed 's/Match User //')
 IFS=',' read -r -a users <<< "$ssh_users"
 
 match_string="$ssh_users,"
 # Check if jail exist
-if [[ ! "$match_string" =~ ,$user, ]]; then
+if [[ "$match_string" =~ ,$user, ]]; then
     if [[ -d /home/$user && -z "$(find /home/$user -user root -print -prune -o -prune)" ]]; then
        chown root:root /home/$user
     fi

test/test.bats

@@ -1326,7 +1326,8 @@ function check_ip_not_banned(){
     run v-add-web-domain $user2 $subdomain
     assert_success
     refute_output
-
+}
+@test "Allow Users: Delete user2" {
     run v-delete-user $user2
     assert_success
     refute_output