Add more checks to make sure ipv6 and 4 keep working (hestiacp#2564)

* Add more checks to make sure ipv6 and 4 keep working

* Update bugged test

* Add check for incorrect hash

Author: jaapmarcus

bin/v-check-user-hash

@@ -13,7 +13,7 @@
 # Argument definition
 user=$1
 hash=$2; HIDE=2
-ip=${3-127.0.0.1}
+ip46=${3-127.0.0.1}
 
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf
@@ -32,7 +32,7 @@ date=$(echo "$time_n_date" |cut -f 2 -d \ )
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER HASH'
-is_format_valid 'user'
+is_format_valid 'user' 'ip46'
 
 # Checking user
 if [ ! -d "$HESTIA/data/users/$user" ] && [ "$user" != 'root' ]; then
@@ -47,7 +47,7 @@ is_hash_valid
 # Checking empty hash
 if [[ -z "$hash" ]]; then
     echo "Error: password missmatch"
-    echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
     exit 9
 fi
 
@@ -70,7 +70,7 @@ then
         method='sha-512'
     else
         echo "Error: password missmatch"
-        echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+        echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
         exit 9
     fi
 else
@@ -81,14 +81,14 @@ fi
 # Checking salt
 if [ -z "$salt" ]; then
     echo "Error: password missmatch"
-    echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
     exit 9
 fi
 
 # Comparing hashes
 if [[ "$shadow" != "$hash" ]]; then
     echo "Error: password missmatch"
-    echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
     exit 9
 fi
 
@@ -97,6 +97,6 @@ fi
 #----------------------------------------------------------#
 
 # Logging
-echo "$date $time $user $ip successfully logged in" >> $HESTIA/log/auth.log
+echo "$date $time $user $ip46 successfully logged in" >> $HESTIA/log/auth.log
 
 exit

bin/v-check-user-password

@@ -13,8 +13,8 @@
 # Argument definition
 user=$1
 password=$2; HIDE=2
-ip=${3-127.0.0.1}
-return_hash=$4
+ip46=${3-127.0.0.1}
+return_hash=${4-no}
 
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf
@@ -32,23 +32,20 @@ date=$(echo "$time_n_date" |cut -f 2 -d \ )
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '2' "$#" 'USER PASSWORD RETURN_HASH'
-is_format_valid 'user'
+check_args '2' "$#" 'USER PASSWORD [ip] [RETURN_HASH]'
+is_format_valid 'user' 'password' 'ip46'
 
 # Checking user
 if [ ! -d "$HESTIA/data/users/$user" ]; then
     echo "Error: password missmatch"
-    echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
     exit 9
 fi
 
-# Checking user password
-is_password_valid
-
 # Checking empty password
 if [[ -z "$password" ]]; then
     echo "Error: password missmatch"
-    echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
     exit 9
 fi
 
@@ -81,15 +78,15 @@ fi
 
 if [ -z "$salt" ]; then
     echo "Error: password missmatch"
-    echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
     exit 9
 fi
 
 if [ "$method" = "yescrypt" ]; then
     hash=$(mkpasswd "$password" "$shadow")
     if [ $? -ne 0 ]; then 
         echo "Error: password missmatch"
-        echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+        echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
         exit 9
     fi
 else
@@ -98,7 +95,7 @@ else
     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" >> $HESTIA/log/auth.log
+        echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
         exit 9
     fi
 fi
@@ -107,7 +104,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" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
     exit 9
 fi
 

bin/v-get-user-salt

@@ -12,7 +12,7 @@
 
 # Argument definition
 user=$1
-ip=${2-127.0.0.1}
+ip46=${2-127.0.0.1}
 format=${3-shell}
 
 # Includes
@@ -63,13 +63,13 @@ csv_list() {
 #----------------------------------------------------------#
 
 
-check_args '1' "$#" 'USER [IP] [SALT]'
-is_format_valid 'user' 'ip'
+check_args '1' "$#" 'USER [IP] [FORMAT]'
+is_format_valid 'user' 'ip46'
 
 # Checking user
 if [ ! -d "$HESTIA/data/users/$user" ]; then
     echo "Error: password missmatch"
-    echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
     exit 9
 fi
 
@@ -93,12 +93,12 @@ then
         method='sha-512'
     else
         echo "Error: password missmatch"
-        echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+        echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
         exit 9
     fi
 elif [[ "$shadow" =~ ! ]]; then 
     echo "Error: Account has been suspended"
-    echo "$date $time $user $ip has been suspended" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 has been suspended" >> $HESTIA/log/auth.log
     exit 5
 else
     salt=${shadow:0:2}
@@ -107,7 +107,7 @@ fi
 
 if [ -z "$salt" ]; then
     echo "Error: password missmatch"
-    echo "$date $time $user $ip failed to login" >> $HESTIA/log/auth.log
+    echo "$date $time $user $ip46 failed to login" >> $HESTIA/log/auth.log
     exit 9
 fi