Merge branch 'main' into release

Author: jaapmarcus

CHANGELOG.md

@@ -1,6 +1,27 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.4.4] - Service release
+
+### Features
+
+- Add nginx user_agent separation to desktop/mobile (e.g. for fastcgi cache)
+- Run phpmyadmin folder under www-data user instead of "user" improving security. (@bet0x)
+- Added new template for mod php users to access phpmymyadmin
+
+### Bugfixes
+
+- Add template for when webmail is disabled allowing to generate SSL. 
+- Fix PHP bug in /list/log/ 
+- Fix issue with time in /list/services as it was showing as 50 minute1 instead of minutes
+- Add missing back buttons + fix behavoir of back buttons on login page. 
+- Set "default" when WEB_TEMPLATE and PROXY_TEMPLATE is missing in user.conf 
+- Add BACKEND_TEMPLATE to default package
+- Fix possible error occur for v-rebuild-cron-jobs #1943 (thanks @clarkchentw)
+- Restrict access Filemanager when SSH is enabled for the user (@bet0x)
+- Check for DNS domains when running v-change-sys-ip-nat (@clarkchentw)
+- Fix logical error in installer (@clarkchentw)
+
 ## [1.4.3] - Service release
 
 ### Features

README.md

@@ -2,7 +2,7 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.4.3 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
+**Latest stable release:** Version 1.4.4 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>

bin/v-add-mail-domain-webmail

@@ -60,7 +60,7 @@ check_args '2' "$#" 'USER DOMAIN [WEBMAIL] [RESTART]'
 is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_system_enabled "$IMAP_SYSTEM" 'IMAP_SYSTEM'
-is_type_valid "$WEBMAIL_SYSTEM" "$webmail"
+is_type_valid "$WEBMAIL_SYSTEM disabled" "$webmail"
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
@@ -126,11 +126,16 @@ else
         if [ "$WEB_SYSTEM" = "nginx" ]; then
             WEBMAIL_TEMPLATE="web_system"
         fi
-    else
+    elif [ "$webmail" == "rainloop" ]; then
         WEBMAIL_TEMPLATE="rainloop"
         if [ ! -z "$PROXY_SYSTEM" ]; then
             PROXY_TEMPLATE="default_rainloop"
         fi
+    else
+        WEBMAIL_TEMPLATE="disabled"
+        if [ ! -z "$PROXY_SYSTEM" ]; then
+            PROXY_TEMPLATE="default_disabled"
+        fi
     fi
 
     add_webmail_config "$WEB_SYSTEM" "${WEBMAIL_TEMPLATE}.tpl"

bin/v-add-sys-pma-sso

@@ -84,9 +84,10 @@ sed -i "s/%API_HESTIA_PORT%/$BACKEND_PORT/g" $PMA_INSTALL/hestia-sso.php
 
 
 # Check if config already contains the keys 
-
 touch $PMA_CONFIG/hestia-sso.inc.php
-chmod 644 $PMA_CONFIG/hestia-sso.inc.php
+chmod 640 $PMA_CONFIG/hestia-sso.inc.php
+chown root:www-data $PMA_CONFIG/hestia-sso.inc.php
+
 echo "<?php
 if(isset(\$_GET['hestia_token']) || isset(\$_COOKIE['SignonSession'])){
 \$cfg['Servers'][\$i]['auth_type'] = 'signon';

bin/v-add-web-domain

@@ -169,6 +169,11 @@ fi
 # Preparing domain variables
 prepare_web_domain_values
 
+if [ -z "$WEB_TEMPLATE" ]; then 
+    WEB_TEMPLATE='default'
+    update_user_value "$user" '$WEB_TEMPLATE' "default"
+fi
+
 # Adding web server config
 add_web_config "$WEB_SYSTEM" "$WEB_TEMPLATE.tpl"
 
@@ -180,7 +185,12 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
         PROXY_EXT="$PROXY_EXT,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp"
         PROXY_EXT="$PROXY_EXT,rtf,js,mp3,avi,mpeg,flv,html,htm"
     fi
-    add_web_config "$PROXY_SYSTEM" "$PROXY_TEMPLATE.tpl"
+    if [ -z "$PROXY_TEMPLATE" ]; then 
+        PROXY_TEMPLATE='default'
+        update_user_value "$user" '$PROXY_TEMPLATE' "default"
+    fi
+    
+    add_web_config "$PROXY_SYSTEM" "$PROXY_TEMPLATE.tpl" 
 fi
 
 

bin/v-change-database-owner

@@ -85,7 +85,7 @@ check_hestia_demo_mode
 #----------------------------------------------------------#
 
 # Creating temporary directory
-tmpdir=$(mktemp -p $BACKUP -d "tmp.$database.XXXXXXXXXX" > /dev/null 2>&1)
+tmpdir=$(mktemp -p $BACKUP -d "tmp.$database.XXXXXXXXXX")
 
 # Suspend database
 $BIN/v-suspend-database $owner $database > /dev/null 2>&1

bin/v-change-sys-ip-nat

@@ -70,7 +70,9 @@ fi
 if [ ! -z "$old" ] && [ ! -z "$DNS_SYSTEM" ]; then
     for user in $($HESTIA/bin/v-list-sys-users plain); do
         sed -i "s/$old/$new/" $HESTIA/data/users/$user/dns.conf
-        sed -i "s/$old/$new/" $HESTIA/data/users/$user/dns/*.conf
+        if ls $HESTIA/data/users/$user/dns/*.conf 1> /dev/null 2>&1; then
+            sed -i "s/$old/$new/" $HESTIA/data/users/$user/dns/*.conf
+        fi
         $BIN/v-rebuild-dns-domains $user no
     done
     $BIN/v-restart-dns $restart

bin/v-delete-web-domain

@@ -90,7 +90,7 @@ fi
 sed -i "/DOMAIN='$domain'/ d" $USER_DATA/web.conf
 
 # Deleting proxy
-if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ]; then
     del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
     if [ "$SSL" = 'yes' ]; then
         del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"

bin/v-delete-web-php

@@ -81,10 +81,11 @@ done
 # Do a blank echo to get the \n back
 echo
 
-# Check if installation was sucessfully
+# Check if installation was successfully
 if [ -f "$php_fpm" ]; then
     echo "ERROR: Uninstallation failed, please run the following command manually for debugging:"
     echo "apt-get purge $mph"
+    exit 1; 
 fi
 
 # Cleanup php folder

bin/v-generate-ssl-cert

@@ -74,6 +74,10 @@ args_usage='DOMAIN EMAIL COUNTRY STATE CITY ORG UNIT [ALIASES] [FORMAT]'
 check_args '7' "$#" "$args_usage"
 is_format_valid 'domain' 'aliases' 'format'
 
+release="$(lsb_release -s -r)"
+if [ "$release" = "18.04" ]; then
+    is_format_valid 'email'
+fi
 
 if [ ! -f /root/.rnd ]; then
     touch /root/.rnd
@@ -108,7 +112,7 @@ if [ -z "$aliases" ]; then
         -batch \
         -subj "$subj" \
         -key $domain.key \
-        -out $domain.csr #>/dev/null 2>&1
+        -out $domain.csr >/dev/null 2>&1
 else
     for alias in $(echo $domain,$aliases |tr ',' '\n' |sort -u); do
         if [[ "$alias" = *[![:ascii:]]* ]]; then