Merge branch 'main' into staging/docs

Author: Kristan Kenney

.gitignore

@@ -15,3 +15,4 @@ test/node_modules/
 npm-debug.log
 .phpunit.result.cache
 .vs
+.nova

CHANGELOG.md

@@ -42,6 +42,7 @@ All notable changes to this project will be documented in this file.
 - Fixed an issue with paswords containing "`'`" - [Forum](https://forum.hestiacp.com/t/two-factor-authentication-issue-with-standard-user/1652/)
 - Refactored LXD compiler script
 - Cleaned up entries used in the Google / Gmail DNS template - thanks **@madito**
+- Improved translations (NL, DE, UK, RU, ES, IT, ZH-CN)
 
 ## [1.2.4] - Service Release
 ### Features

bin/v-add-remote-dns-host

@@ -16,6 +16,8 @@ port=$2
 PORT=$port
 user=$3
 USER=$user
+hash=$user
+HASH=$user
 password=$4; HIDE=4
 PASSWORD=$password
 type=${5-api}
@@ -33,9 +35,14 @@ source $HESTIA/conf/hestia.conf
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-args_usage='HOST PORT USER PASSWORD [TYPE] [DNS_USER]'
-check_args '4' "$#" "$args_usage"
-is_format_valid 'host' 'port' 'user' 'type' 'dns_user'
+args_usage='HOST PORT USER [PASSWORD] [TYPE] [DNS_USER]'
+check_args '3' "$#" "$args_usage"
+is_format_valid 'host' 'port' 'type' 'dns_user'
+if [ -z "$password" ]; then
+    is_format_valid 'hash'
+else
+    is_format_valid 'user'
+fi
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_password_valid
 is_dnshost_new
@@ -51,10 +58,17 @@ time_n_date=$(date +'%T %F')
 time=$(echo "$time_n_date" |cut -f 1 -d \ )
 date=$(echo "$time_n_date" |cut -f 2 -d \ )
 
-# Concatentating dns host string
-str="HOST='$host' PORT='$port' USER='$user' PASSWORD='$password'"
-str="$str DNS_USER='$dns_user' TYPE='$type' SUSPENDED='no'"
-str="$str TIME='$time' DATE='$date'"
+if [ -z "$password" ]; then
+    # Concatentating dns host string
+    str="HOST='$host' PORT='$port' HASH='$hash'"
+    str="$str DNS_USER='$dns_user' TYPE='$type' SUSPENDED='no'"
+    str="$str TIME='$time' DATE='$date'"
+else
+    # Concatentating dns host string
+    str="HOST='$host' PORT='$port' USER='$user' PASSWORD='$password'"
+    str="$str DNS_USER='$dns_user' TYPE='$type' SUSPENDED='no'"
+    str="$str TIME='$time' DATE='$date'"
+fi    
 
 # Adding host to dns-cluster.conf
 echo "$str" >> $HESTIA/conf/dns-cluster.conf

bin/v-add-user

@@ -62,6 +62,13 @@ check_result $? "user creation failed" $E_INVALID
 # Adding password
 echo "$user:$password" | /usr/sbin/chpasswd
 
+if [ $? -ne 0 ]; then 
+    # Delete user on failure
+    /usr/sbin/deluser "$user" > /dev/null 2>&1
+    echo "Error: Password not accepted due to PAM restrictions"
+    exit 2
+fi
+
 # Add a general group for normal users created by Hestia
 if [ -z "$(grep ^hestia-users: /etc/group)" ]; then
     groupadd --system "hestia-users"

bin/v-add-web-domain-ftp

@@ -93,6 +93,14 @@ fi
 
 # Set ftp user password
 echo "$ftp_user:$password" | /usr/sbin/chpasswd
+
+if [ $? -ne 0 ]; then 
+    # Delete user on failure again
+    /usr/sbin/deluser "$ftp_user"  > /dev/null 2>&1
+    echo "Error: Password not accepted due to PAM restrictions"
+    exit 2
+fi
+
 ftp_md5=$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)
 
 # Adding jailed sftp env

bin/v-change-user-password

@@ -47,6 +47,12 @@ check_hestia_demo_mode
 
 # Changing user password
 echo "$user:$password" | /usr/sbin/chpasswd
+
+if [ $? -ne 0 ]; then 
+    echo "Error: Password not accepted due to PAM restrictions"
+    exit 2
+fi
+
 md5=$(awk -v user=$user -F : 'user == $1 {print $2}' /etc/shadow)
 
 if [ "$user" = 'admin' ] && [ -e "$HESTIA/web/reset.admin" ]; then

bin/v-change-web-domain-ftp-password

@@ -56,6 +56,12 @@ check_hestia_demo_mode
 
 # Changing ftp user password
 echo "$ftp_user:$password" | /usr/sbin/chpasswd
+
+if [ $? -ne 0 ]; then 
+    echo "Error: Password not accepted due to PAM restrictions"
+    exit 2
+fi
+
 ftp_md5=$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)
 
 

bin/v-restore-user

@@ -133,6 +133,11 @@ fi
 
 # Restoring user account
 if [ "$create_user" = 'yes' ]; then
+    
+    # Add check if user already exists as Linux User
+    getent passwd $user > /dev/null 2&>1
+    check_result "$E_EXISTS" "User already exists"  
+
     echo "-- USER --" |tee $tmpdir/restore.log
     echo -e "$(date "+%F %T") $user" |tee -a $tmpdir/restore.log
 

bin/v-update-sys-hestia-git

@@ -96,7 +96,7 @@ timestamp() {
 
 # Set install flags
 if [ ! -z "$1" ]; then
-    fork_check=$(curl -s --head -w %{http_code} https://raw.githubusercontent.com/$fork/hestiacp/release/src/deb/hestia/control -o /dev/null)
+    fork_check=$(curl -s --head -w %{http_code} https://raw.githubusercontent.com/$fork/hestiacp/main/src/deb/hestia/control -o /dev/null)
     if [ $fork_check -ne "200" ]; then
         echo "ERROR: invalid repository name specified."
         exit 1

func/main.sh

@@ -921,6 +921,12 @@ is_service_format_valid() {
     fi
 }
 
+is_hash_format_valid() {
+  if ! [[ "$1" =~ ^[_A-Za-z0-9]{1,32}$ ]]; then
+        check_result $E_INVALID "invalid $2 format :: $1"
+    fi    
+}
+
 # Format validation controller
 is_format_valid() {
     for arg_name in $*; do
@@ -952,6 +958,7 @@ is_format_valid() {
                 extentions)     is_common_format_valid "$arg" 'extentions' ;;
                 ftp_password)   is_password_format_valid "$arg" ;;
                 ftp_user)       is_user_format_valid "$arg" "$arg_name" ;;
+                hash)           is_hash_format_valid "$arg" "$arg_name" ;;
                 host)           is_object_format_valid "$arg" "$arg_name" ;;
                 hour)           is_cron_format_valid "$arg" $arg_name ;;
                 id)             is_int_format_valid "$arg" 'id' ;;