Fix issue with ftp users (hestiacp#2403)

* Fix bug in ftp users

* Make sure to enable jail on boot 

+ Add update script to enable all users

* Fix typo

* Update v-add-user-sftp-jail

Author: jaapmarcus

bin/v-add-sys-sftp-jail

@@ -72,9 +72,8 @@ fi
 # Checking users
 shells="rssh|nologin"
 for user in $(grep "$HOMEDIR" /etc/passwd |egrep "$shells" |cut -f 1 -d:); do
-    if [ -d "$HESTIA/data/users/$user" ]; then
+    # Include all users v-add-user-sftp-jail will handle it
     $BIN/v-add-user-sftp-jail "$user" "no"
-    fi
 done
 
 # Restart ssh service

bin/v-add-user-sftp-jail

@@ -32,8 +32,8 @@ check=$(is_object_valid 'user' 'USER' "$user")
 if [ $? -ne 0 ]; then 
     user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin")
     #try to detect "owner" of the ftp_user if not found dont set it up
-    user=$(echo $user_str | cut -f6 -d : | cut -f3 -d / ) 
-    is_object_valid 'user' 'USER' "$user"
+    user_owner=$(echo $user_str | cut -f6 -d : | cut -f3 -d / ) 
+    is_object_valid 'user' 'USER' "$user_owner"
 fi 
 user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin")
 if [ -z "$user_str" ]; then

install/upgrade/versions/1.5.8.sh

@@ -21,4 +21,13 @@ upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'false'
 upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'false'
 upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
 
-chmod 700 /root/.gnupg
+echo "[ * ] Create .gnupg directory"
+chmod 700 /root/.gnupg
+
+echo "[ * ] Ensure jail is enabled for sftp or ftp users"
+shells="rssh|nologin"
+for user in $(grep "$HOMEDIR" /etc/passwd |egrep "$shells" |cut -f 1 -d:); do
+    if [ -d "$HESTIA/data/users/$user" ]; then
+    $BIN/v-add-user-sftp-jail "$user" "no"
+    fi
+done