Merge branch 'main' into release

Author: jaapmarcus

.drone.yml

@@ -0,0 +1,81 @@
+---
+kind: pipeline
+type: ssh
+name: HestiaCP + Nginx + Apache2  
+
+concurrency:
+  limit: 1
+
+server:
+  host:
+    from_secret: server_address
+  user: 
+    from_secret: username
+  ssh_key: 
+    from_secret: ssh_key
+
+platform:
+  os: linux
+  arch: amd64
+   
+steps:
+- name: Download submodules
+  image: alpine/git
+  commands:
+  - git submodule update --init --recursive
+- name: Build Hestia package and install
+  commands:
+  - ./src/hst_autocompile.sh --hestia --install '~localsrc'
+- name: Run Bats
+  commands:
+  - bats ./test/test.bats
+  - bats ./test/restore.bats
+- name: Run Check PHP
+  commands: 
+  - ./test/check_php.sh
+
+trigger:
+  event: [ push, pull_request ]
+
+---
+kind: pipeline
+type: ssh
+name: HestiaCP + Nginx  
+
+concurrency:
+  limit: 1
+
+server:
+  host:
+    from_secret: server_address2
+  user: 
+    from_secret: username
+  ssh_key: 
+    from_secret: ssh_key
+
+platform:
+  os: linux
+  arch: amd64
+   
+steps:
+- name: Download submodules
+  image: alpine/git
+  commands:
+  - git submodule update --init --recursive
+- name: Build Hestia package install
+  commands:
+  - ./src/hst_autocompile.sh --hestia --install '~localsrc'
+- name: Run Bats
+  commands:
+  - bats ./test/test.bats
+  - bats ./test/restore.bats
+- name: Run Check PHP
+  commands: 
+  - ./test/check_php.sh
+
+trigger:
+  event: [ push, pull_request ]
+
+---
+kind: signature
+hmac: f3763c63fcebe50a2ad24dc3fb2ab3191cba15750e4dd80be82cea87466d96bc

CHANGELOG.md

@@ -1,12 +1,34 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.4.8] - Service release 
+
+### Features
+
+- Add support for automated testing for HestiaCP code with @drone
+- Add support for SMTP server for internal email #1988 @Myself5 / #1165
+
+### Bugfixes
+
+- Updated jQuery and jQuery UI to the latest version due to a vulnerability in jQuery. @dependabot
+- Resolve issue with double ENFORCE_SUBDOMAIN_OWNERSHIP keys in hestia.conf
+- Resolve issue with create new user during install in some cases #2000
+- Fixed an issue with Quick Install apps named Test123 (@PsychotherapistSam)
+- Fix an issue with dovecot 2.3 ssl config (#1432)
+- Load $HESTIA path during upgrade script (#1698)
+- Remove TLS 1.1 from Proftpd config (#950)
+- Don't remove postfix when Exim is not installed (#1995)
+- Fix a bug in no-php Nginx FPM template (##2007)
+- Update German translations
+- Fixed a few minor error in Mail DMS records (#2005)
+
+
 ## [1.4.7] - Service release 
 
 ### Bugfixes
 
-- Fix #1984 phppgadmin not working on apache2 systems
-- Fix #1985 Restart service not working
+- Fixed #1984 phppgadmin not working on apache2 systems
+- Fixed #1985 Restart service not working
 
 
 ## [1.4.6] - Service release 
@@ -19,18 +41,18 @@ All notable changes to this project will be documented in this file.
 
 ### Bugfixes
 
-- Fix #1961 Renewal Apache2 only SSL certificate fails
+- Fixed #1961 Renewal Apache2 only SSL certificate fails
 - Fixed #1956 to prevent reset of defined webmail client.
 - Explicitly disable cron reports #1978 
 - Fixed an issue where in rare cases certificate failed to install @dpeca and @myvesta
 - Fixed an issue where composer failed to install when .composer folder is missing
-- Fix #1980 Lets Encrypt Auto Renewal Reverts Webmail Client back to Roundcube
+- Fixed #1980 Lets Encrypt Auto Renewal Reverts Webmail Client back to Roundcube
 
 ## [1.4.5] - Service release
 
 ### Bugfixes
 
-- Revert #1943 and rework it to fix possible errors occuring on v-rebuild-cron-jobs.
+- Revert #1943 and rework it to fix possible errors occurring on v-rebuild-cron-jobs.
 - Fixed #1956 to prevent reset of defined webmail client.
 - Explicitly disable cron reports #1978
 
@@ -45,15 +67,15 @@ All notable changes to this project will be documented in this file.
 ### 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. 
+- Fixed PHP bug in /list/log/ 
+- Fixed issue with time in /list/services as it was showing as 50 minute1 instead of minutes
+- Add missing back buttons + fix behaviour 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)
+- Fixed possible error occur for v-rebuild-cron-jobs #1943 (thanks @clarkchentw)
+- Restrict access file manager 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)
+- Fixed logical error in installer (@clarkchentw)
 
 ## [1.4.3] - Service release
 
@@ -99,10 +121,10 @@ Then run the update via
 
 ### Bugfixes
 
-- Fix issue wit startup script for iptables / network (#1849) (@myrevery)
-- Fix problem with accidentally replacing nginx.conf during upgrade nginx (#1878 / @myrevery)
-- Fix issue with installing Ubuntu 18.04
-- Fix issue with login into file manger as admin user
+- Fixed issue wit startup script for iptables / network (#1849) (@myrevery)
+- Fixed problem with accidentally replacing nginx.conf during upgrade nginx (#1878 / @myrevery)
+- Fixed issue with installing Ubuntu 18.04
+- Fixed issue with login into file manger as admin user
 - Added proxy_extentions back to support older custom templates
 - Added the possibility to skip the forced reboot when interactive is set to no
 - Fixed an issue with modx template
@@ -539,17 +561,17 @@ Then run the update via
 - Remove broken /webmail alias from previous versions.
 - Webmail IP address is now inherited from web domain when using multiple IPs.
 - Exim now uses the web domain IP if it exists.
-- Fix incorrect MX record for DNS domains using the Office 365 template.
+- Fixed incorrect MX record for DNS domains using the Office 365 template.
 
 ## [1.0.6] - 2019-09-24 - Hotfix
 ### Bugfixes
 - Add support for HTTP/2 Let's Encrypt Server.
 
 ## [1.0.5] - 2019-08-06 - Hotfix
 ### Bugfixes
-- Fix several security issues, thanks to Andrea Cardaci (https://cardaci.xyz/)
+- Fixed several security issues, thanks to Andrea Cardaci (https://cardaci.xyz/)
 - Rework Let's Encrypt ACME staging to use hestia conform standard.
-- Fix if condition, use nginx for Let's Encrypt ACME request if present.
+- Fixed if condition, use nginx for Let's Encrypt ACME request if present.
 
 ## [1.0.4] - 2019-07-09 - Hotfix
 ### Bugfixes

README.md

@@ -2,13 +2,13 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.4.7 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
+**Latest stable release:** Version 1.4.8 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md) | [![Build Status](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp) <br>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>
 **Forums:** [forum.hestiacp.com](https://forum.hestiacp.com/)<br>
 **Discord:** [Join the discussion](https://discord.gg/nXRUZch)<br />
-<br>
+<br><br>
 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ST87LQH2CHGLA)
 <br>
 

bin/v-add-database

@@ -58,6 +58,17 @@ is_object_unsuspended "../../../conf/$type" 'DBHOST' "$host"
 #is_charset_valid
 is_package_full 'DATABASES'
 is_password_valid
+
+if [ "$type" = "pgsql" ]; then 
+   exclude="-"
+    if [[ "$dbuser" =~ $exclude ]]; then
+        check_result $E_INVALID "invalid database user format"
+    fi
+    if [[ "$database" =~ $exclude ]]; then
+      check_result $E_INVALID "invalid database format"
+    fi
+fi
+
 dbpass="$password"
 
 # Perform verification if read-only mode is enabled

bin/v-add-mail-domain-ssl

@@ -78,7 +78,7 @@ fi
 # Call routine to add SSL configuration to mail domain
 add_mail_ssl_config
 
-if [ "$webmail" == "roundcube" ]; then
+if [ "$WEBMAIL" == "roundcube" ]; then
     WEBMAIL_TEMPLATE="default"
     if [ ! -z "$PROXY_SYSTEM" ]; then
         PROXY_TEMPLATE="default"
@@ -88,7 +88,7 @@ if [ "$webmail" == "roundcube" ]; then
     if [ "$WEB_SYSTEM" = "nginx" ]; then
         WEBMAIL_TEMPLATE="web_system"
     fi
-elif [ "$webmail" == "rainloop" ]; then
+elif [ "$WEBMAIL" == "rainloop" ]; then
     WEBMAIL_TEMPLATE="rainloop"
     if [ ! -z "$PROXY_SYSTEM" ]; then
         PROXY_TEMPLATE="default_rainloop"

bin/v-add-mail-domain-webmail

@@ -20,6 +20,10 @@ webmail=$3
 restart="$4"
 quiet=$5
 
+if [ -z "$restart" ]; then 
+    restart="yes"
+fi
+
 # Additional argument formatting
 if [[ "$domain" =~ [[:upper:]] ]]; then
     domain=$(echo "$domain" |tr '[:upper:]' '[:lower:]')

bin/v-add-sys-phpmailer

@@ -0,0 +1,91 @@
+#!/bin/bash
+# info: add PHPMailer functionality to Hestia Control Panel
+# options: [MODE]
+# labels: hestia
+#
+# The function installs PHPMailer for Server sided email communication
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Includes
+# shellcheck source=/usr/local/hestia/func/main.sh
+source $HESTIA/func/main.sh
+# shellcheck source=/usr/local/hestia/conf/hestia.conf
+source $HESTIA/conf/hestia.conf
+# shellcheck source=/usr/local/hestia/install/upgrade/upgrade.conf
+source $HESTIA/install/upgrade/upgrade.conf
+
+MODE=$1
+user="admin"
+
+PM_INSTALL_DIR="$HESTIA/web/inc"
+COMPOSER_BIN="$HOMEDIR/$user/.composer/composer"
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+# Checking root permissions
+if [ "x$(id -u)" != 'x0' ]; then
+    echo "ERROR: v-add-sys-phpmailer can be run executed only by root user"
+    exit 10
+fi
+
+# Ensure that $HESTIA (/usr/local/hestia/) and other variables are valid.
+if [ -z "$HESTIA" ]; then
+    HESTIA="/usr/local/hestia"
+fi
+
+if [ -z "$HOMEDIR" ] || [ -z "$HESTIA_INSTALL_DIR" ]; then
+    echo "ERROR: Environment variables not present, installation aborted."
+    exit 2
+fi
+
+# Ensure that Composer is installed for the user before continuing as it is a dependency of the PHPMailer.
+if [ ! -f "$COMPOSER_BIN" ]; then
+    $BIN/v-add-user-composer "$user"
+    if [ $? -ne 0 ]; then
+        $BIN/v-add-user-notification admin 'Composer installation failed!' '<b>PHPMailer will not work without Composer.</b><br><br>Please try running the installer manually from a shell session:<br>v-add-sys-phpmailer<br><br>If this continues, open an issue report on <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.'
+        exit 1
+    fi
+fi
+
+# Perform verification if read-only mode is enabled
+check_hestia_demo_mode
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+cd "$PM_INSTALL_DIR"
+rm --recursive --force ${PM_INSTALL_DIR}/vendor
+mkdir -p ${PM_INSTALL_DIR}/vendor
+chown $user: -R ${PM_INSTALL_DIR}/vendor
+
+COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php $COMPOSER_BIN --quiet --no-dev install
+
+# Check if installation was successful, if not abort script and throw error message notification and clean-up
+if [ $? -ne 0 ]; then
+    echo "ERROR: PHPMailer installation failed!"
+    echo "Please report this to our development team:"
+    echo "https://github.com/hestiacp/hestiacp/issues"
+    $BIN/v-add-user-notification admin 'PHPMailer installation failed!' 'Please report this to our development team on <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.'
+    # Installation failed, clean up files
+    rm --recursive --force ${PM_INSTALL_DIR}/vendor
+    $BIN/v-change-sys-config-value 'USE_SERVER_SMTP' 'n'
+    $BIN/v-log-action "system" "Error" "Plugins" "PHPMailer installation failed (Version: $pm_v)."
+    exit 1
+fi
+
+# Set permissions
+chown root: -R "${PM_INSTALL_DIR}/vendor"
+
+#----------------------------------------------------------#
+#                       Logging                            #
+#----------------------------------------------------------#
+
+$BIN/v-log-action "system" "Info" "Plugins" "PHPMailer enabled (Version: $pm_v)."
+log_event "$OK" "$ARGUMENTS"