Skip to content

Commit 92d7044

Browse files
committed
fix date/time format for fail2ban
1 parent 2b042c2 commit 92d7044

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

bin/v-check-user-password

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# Argument defenition
1313
user=$1
14-
password=$2
14+
password=$2; HIDE=2
1515
ip=${3-127.0.0.1}
1616

1717
# Includes
@@ -29,7 +29,7 @@ validate_format 'user'
2929
# Checking user
3030
if [ ! -d "$VESTA/data/users/$user" ] && [ "$user" != 'root' ]; then
3131
echo "Error: password missmatch"
32-
echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
32+
echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
3333
exit 9
3434
fi
3535

@@ -39,7 +39,7 @@ is_password_valid
3939
# Checking empty password
4040
if [[ -z "$password" ]]; then
4141
echo "Error: password missmatch"
42-
echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
42+
echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
4343
exit 9
4444
fi
4545

@@ -60,23 +60,23 @@ fi
6060

6161
if [ -z "$salt" ]; then
6262
echo "Error: password missmatch"
63-
echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
63+
echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
6464
exit 9
6565
fi
6666

6767
# Generating SHA-512
6868
hash=$($BIN/v-generate-password-hash $method $salt <<< $password)
6969
if [[ -z "$hash" ]]; then
7070
echo "Error: password missmatch"
71-
echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
71+
echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
7272
exit 9
7373
fi
7474

7575
# Checking hash
7676
result=$(grep "^$user:$hash:" /etc/shadow 2>/dev/null)
7777
if [[ -z "$result" ]]; then
7878
echo "Error: password missmatch"
79-
echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
79+
echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
8080
exit 9
8181
fi
8282

@@ -86,6 +86,6 @@ fi
8686
#----------------------------------------------------------#
8787

8888
# Logging
89-
echo "$DATE $user $ip successfully logged in" >> $VESTA/log/auth.log
89+
echo "$DATE $TIME $user $ip successfully logged in" >> $VESTA/log/auth.log
9090

9191
exit

0 commit comments

Comments
 (0)