github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-20 05:14:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix date/time format for fail2ban

Browse source
This commit is contained in:
Serghey Rodin 2015-10-21 18:56:29 +03:00
commit 92d7044c59
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
bin/v-check-user-password
View file

@ -11,7 +11,7 @@
# Argument defenition # Argument defenition
user=$1 user=$1
password=$2 password=$2; HIDE=2
ip=${3-127.0.0.1} ip=${3-127.0.0.1}
# Includes # Includes
@ -29,7 +29,7 @@ validate_format '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 $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 +39,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 $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
@ -60,7 +60,7 @@ fi
if [ -z "$salt" ]; then if [ -z "$salt" ]; then
echo "Error: password missmatch" echo "Error: password missmatch"
echo "$DATE $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
@ -68,7 +68,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 $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
@ -76,7 +76,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 $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
@ -86,6 +86,6 @@ fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Logging # Logging
echo "$DATE $user $ip successfully logged in" >> $VESTA/log/auth.log echo "$DATE $TIME $user $ip successfully logged in" >> $VESTA/log/auth.log
exit exit