|
@@ -95,7 +95,9 @@ if [ "$method" = "yescrypt" ]; then
|
|
|
|
|
|
|
|
if [ $? -ne 0 ]; then
|
|
if [ $? -ne 0 ]; then
|
|
|
echo "Error: password missmatch"
|
|
echo "Error: password missmatch"
|
|
|
- echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
|
|
|
|
|
|
|
+ if [ -z "$return_hash" ]; then
|
|
|
|
|
+ echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
|
|
|
|
|
+ fi
|
|
|
exit 9
|
|
exit 9
|
|
|
fi
|
|
fi
|
|
|
else
|
|
else
|
|
@@ -104,7 +106,9 @@ else
|
|
|
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 $ip46 failed to login" >> $HESTIA/log/auth.log
|
|
|
|
|
|
|
+ if [ -z "$return_hash" ]; then
|
|
|
|
|
+ echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
|
|
|
|
|
+ fi
|
|
|
exit 9
|
|
exit 9
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
@@ -113,7 +117,9 @@ 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 $ip46 failed to login" >> $HESTIA/log/auth.log
|
|
|
|
|
|
|
+ if [ -z "$return_hash" ]; then
|
|
|
|
|
+ echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
|
|
|
|
|
+ fi
|
|
|
exit 9
|
|
exit 9
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
@@ -123,8 +129,9 @@ fi
|
|
|
|
|
|
|
|
if [ -n "$return_hash" ]; then
|
|
if [ -n "$return_hash" ]; then
|
|
|
echo $hash
|
|
echo $hash
|
|
|
|
|
+else
|
|
|
|
|
+ # If return_hash is pressent it will log a second time
|
|
|
|
|
+ echo "$date $time $user $ip46 successfully logged in" >> $HESTIA/log/auth.log
|
|
|
fi
|
|
fi
|
|
|
-# Logging
|
|
|
|
|
-echo "$date $time $user $ip46 successfully logged in" >> $HESTIA/log/auth.log
|
|
|
|
|
|
|
|
|
|
exit
|
|
exit
|