github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 13:24:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix missing date/time

Browse source
This commit is contained in:
Serghey Rodin 2016-07-18 22:14:56 +03:00
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/func/main.sh
source $VESTA/conf/vesta.conf 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 # # Verifications #
#----------------------------------------------------------# #----------------------------------------------------------#
check_args '2' "$#" 'USER PASSWORD' check_args '2' "$#" 'USER PASSWORD'
is_format_valid 'user' is_format_valid 'user'
# Checking user # Checking user
if [ ! -d "$VESTA/data/users/$user" ] && [ "$user" != 'root' ]; then if [ ! -d "$VESTA/data/users/$user" ] && [ "$user" != 'root' ]; then
echo "Error: password missmatch" 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 exit 9
fi fi
@ -39,7 +44,7 @@ is_password_valid
# Checking empty password # Checking empty password
if [[ -z "$password" ]]; then if [[ -z "$password" ]]; then
echo "Error: password missmatch" 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 exit 9
fi fi
@ -48,6 +53,7 @@ fi
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Parsing user's salt # Parsing user's salt
shadow=$(grep "^$user:" /etc/shadow | cut -f 2 -d :) shadow=$(grep "^$user:" /etc/shadow | cut -f 2 -d :)
@ -61,7 +67,7 @@ then
method='sha-512' method='sha-512'
else else
echo "Error: password missmatch" 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 exit 9
fi fi
else else
@ -71,7 +77,7 @@ fi
if [ -z "$salt" ]; then if [ -z "$salt" ]; then
echo "Error: password missmatch" 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 exit 9
fi fi
@ -79,7 +85,7 @@ fi
hash=$($BIN/v-generate-password-hash $method $salt <<< $password) hash=$($BIN/v-generate-password-hash $method $salt <<< $password)
if [[ -z "$hash" ]]; then if [[ -z "$hash" ]]; then
echo "Error: password missmatch" 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 exit 9
fi fi
@ -87,7 +93,7 @@ fi
result=$(grep "^$user:$hash:" /etc/shadow 2>/dev/null) result=$(grep "^$user:$hash:" /etc/shadow 2>/dev/null)
if [[ -z "$result" ]]; then if [[ -z "$result" ]]; then
echo "Error: password missmatch" 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 exit 9
fi fi
@ -97,6 +103,6 @@ fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Logging # 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 exit