sftp chroot hotfixes

Author: serghey-rodin

bin/v-add-user-sftp-jail

@@ -22,7 +22,7 @@ source $VESTA/conf/vesta.conf
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'USER'
-validate_format 'user'
+is_format_valid 'user'
 if [ -z "$SFTPJAIL_KEY" ]; then
     exit
 fi
@@ -51,7 +51,7 @@ fi
 usermod -a -G sftp-only $user
 
 # Mouting home directory
-if [ -z "$(mount |grep $home)" ]; then
+if [ -z "$(mount |grep /chroot/$user/$home)" ]; then
     mount -o bind $home /chroot/$user/$home/
 fi
 
@@ -61,6 +61,6 @@ fi
 #----------------------------------------------------------#
 
 # Logging
-#log_event "$OK" "$EVENT"
+log_event "$OK" "$ARGUMENTS"
 
 exit

bin/v-delete-user

@@ -27,7 +27,7 @@ source $VESTA/conf/vesta.conf
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'USER'
-validate_format 'user'
+is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 if [ "$user" = 'admin' ]; then
@@ -89,6 +89,11 @@ fi
 sed -i "/ $user$/d" $VESTA/data/queue/disk.pipe
 sed -i "/ $user$/d" $VESTA/data/queue/traffic.pipe
 
+# Deleting sftp jail
+if [ ! -z "$SFTPJAIL_KEY" ]; then
+    $BIN/v-delete-user-sftp-jail $user
+fi
+
 # Deleting system user
 /usr/sbin/userdel -f $user >> /dev/null 2>&1
 
@@ -122,6 +127,6 @@ fi
 
 # Logging
 log_history "deleted system user $user" '' 'admin'
-log_event "$OK" "$EVENT"
+log_event "$OK" "$ARGUMENTS"
 
 exit