fix missing date/time

Author: serghey-rodin

bin/v-check-user-password

@@ -18,18 +18,23 @@ ip=${3-127.0.0.1}
 source $VESTA/func/main.sh
 source $VESTA/conf/vesta.conf
 
+time_n_date=$(date +'%T %F')
+time=$(echo "$time_n_date" |cut -f 1 -d \ )
+date=$(echo "$time_n_date" |cut -f 2 -d \ )
+
 
 #----------------------------------------------------------#
 #                    Verifications                         #
 #----------------------------------------------------------#
 
+
 check_args '2' "$#" 'USER PASSWORD'
 is_format_valid 'user'
 
 # Checking user
 if [ ! -d "$VESTA/data/users/$user" ] && [ "$user" != 'root' ]; then
     echo "Error: password missmatch"
-    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
@@ -39,7 +44,7 @@ is_password_valid
 # Checking empty password
 if [[ -z "$password" ]]; then
     echo "Error: password missmatch"
-    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
@@ -48,6 +53,7 @@ fi
 #                       Action                             #
 #----------------------------------------------------------#
 
+
 # Parsing user's salt
 shadow=$(grep "^$user:" /etc/shadow | cut -f 2 -d :)
 
@@ -61,7 +67,7 @@ then
         method='sha-512'
     else
         echo "Error: password missmatch"
-        echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
+        echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log
         exit 9
     fi
 else
@@ -71,23 +77,23 @@ fi
 
 if [ -z "$salt" ]; then
     echo "Error: password missmatch"
-    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
 # Generating hash
 hash=$($BIN/v-generate-password-hash $method $salt <<< $password)
 if [[ -z "$hash" ]]; then
     echo "Error: password missmatch"
-    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
 # Checking hash
 result=$(grep "^$user:$hash:" /etc/shadow 2>/dev/null)
 if [[ -z "$result" ]]; then
     echo "Error: password missmatch"
-    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
@@ -97,6 +103,6 @@ fi
 #----------------------------------------------------------#
 
 # Logging
-echo "$DATE $TIME $user $ip successfully logged in" >> $VESTA/log/auth.log
+echo "$date $time $user $ip successfully logged in" >> $VESTA/log/auth.log
 
 exit