From 32fbc253a92352376ff301ad9504ef39add726c4 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <skid@vestacp.com>
Date: Thu, 18 Oct 2018 14:20:14 +0300
Subject: [PATCH] Additional argument check for remote hosts

---
 bin/v-add-backup-host | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/v-add-backup-host b/bin/v-add-backup-host
index 327703a7..b21880c5 100755
--- a/bin/v-add-backup-host
+++ b/bin/v-add-backup-host
@@ -38,8 +38,8 @@ EOF
 sftpc() {
     expect -f "-" <<EOF "$@"
         set count 0
-        spawn /usr/bin/sftp -o StrictHostKeyChecking=no -o \
-            Port=$port $user@$host
+        spawn "/usr/bin/sftp -o StrictHostKeyChecking=no -o \
+            Port=$port '$user@$host'"
         expect {
             "password:" {
                 send "$password\r"
@@ -94,12 +94,14 @@ EOF
 
 if [ "$type" != 'local' ];then
     check_args '4' "$#" "TYPE HOST USERNAME PASSWORD [PATH] [PORT]"
-    is_format_valid 'host'
+    is_format_valid 'user' 'host'
     is_password_valid
     if [ "$type" = 'sftp' ]; then
         which expect >/dev/null 2>&1
         check_result $? "expect command not found"  $E_NOTEXIST
     fi
+    host "$host" >/dev/null 2>&1
+    check_result $? "host connection failed" "$E_CONNECT"
 fi