Nemcio/VestaCP
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2026-03-05 19:51:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix missing date/time

Browse Source
This commit is contained in:
Serghey Rodin
2016-07-18 22:14:56 +03:00
parent 3c009479c0
commit be604d86b4
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/v-check-user-password
View File

@@ -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,7 +77,7 @@ 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
@@ -79,7 +85,7 @@ fi
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
@@ -87,7 +93,7 @@ fi
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