Merge branch 'main' into release

Author: jaapmarcus

.drone.yml

@@ -40,7 +40,13 @@ steps:
   - ./test/check_php.sh
 
 trigger:
-  event: [ push, pull_request ]
+  event: [ pull_request, push ]
+  ref:
+  - refs/heads/staging/*
+  - refs/heads/beta
+  - refs/heads/release
+  - refs/heads/main
+  - refs/pull/*/head
 
 ---
 kind: pipeline
@@ -88,7 +94,13 @@ steps:
   - ./test/check_php.sh
 
 trigger:
-  event: [ push, pull_request ]
+  event: [ pull_request, push ]
+  ref:
+  - refs/heads/staging/*
+  - refs/heads/beta
+  - refs/heads/release
+  - refs/heads/main
+  - refs/pull/*/head
 
 ---
 kind: pipeline
@@ -107,6 +119,54 @@ steps:
 trigger:
    event: [ pull_request, push ] 
 
+---
+kind: pipeline
+type: docker
+name: Push to beta atp server
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: Build
+    image: debian:bullseye
+    commands:
+    - ln -snf /etc/localtime && echo CET > /etc/timezone
+    - ./src/hst_autocompile.sh --dontinstalldeps --hestia --debug --cross --noinstall --keepbuild --debug '~localsrc'
+    - mkdir -p ./hestia/
+    - mv /tmp/hestiacp-src/deb/*.deb ./hestia/
+  - name: Upload
+    image: appleboy/drone-scp
+    settings:
+      host:
+        from_secret: apt_server
+      user: root
+      key:
+        from_secret: ssh_key
+      port: 22
+      command_timeout: 2m
+      target: /root/
+      source:
+        - ./hestia/*
+  - name: Publish
+    image: appleboy/drone-ssh
+    settings:
+        host:
+          from_secret: apt_server
+        user: root
+        key:
+          from_secret: ssh_key
+        port: 22
+        command_timeout: 2m
+        script:
+            - freight-add ./hestia/*.deb apt/bionic apt/focal apt/strech apt/buster apt/bullseye
+            - freight-cache
+            - rm -fr ./hestia/
+  
+trigger:
+    event: [ promote] 
+
 ---
 kind: signature
-hmac: e6d1a0d62ad4f5b0b8bed33c248e55e6de60ee9c1601ee5395fe5d5e72942e85
+hmac: 31806a1e5357c43d17d24ef797995fb9952a1d883ad282fd152d7d0378112213

CHANGELOG.md

@@ -1,6 +1,28 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.5.8] - Service release
+
+### Features
+
+ - No new features has been introduced
+
+### Bugfixes
+
+- Fixed an issue where SFTP jail was not enabled correctly for additional FTP accounts #2403 
+- Fixed an issue in the installer where the "Press any key to continue" prompt only responded to the Enter key #2398 
+- Fixed an issue where list sort order preference variable wasn't saved properly #2391
+- Fixed an issue with inconsistent behaviour in mail account settings information dialog #2392
+- Fixed an issue where .gnupg folder in /root/ had the wrong permissions set.
+- Fixed an issue where users were being redirected to login page when visiting /reset/ endpoint #2401
+- Fixed an issue where deleting sftp jail did not revert back permissions of said user. #2143
+- Fixed an issue where "REDIRECT" variable wasn't cleared correctly causing other sites to redirect to the domain after v-update-letsencrypt-ssl
+- Changed repository url MariaDB for new installs to https://wdlm.mariadb.com/repo/mariadb-server
+
+### Dependencies
+
+- Update phpMyAdmin to 5.1.3 (https://github.com/phpmyadmin/phpmyadmin/releases/tag/RELEASE_5_1_3)
+
 ## [1.5.7] - Service release
 
 ### Bugfixes

README.md

@@ -2,7 +2,7 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.5.5 | [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>
+**Latest stable release:** Version 1.5.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>

bin/v-add-sys-sftp-jail

@@ -72,9 +72,8 @@ fi
 # Checking users
 shells="rssh|nologin"
 for user in $(grep "$HOMEDIR" /etc/passwd |egrep "$shells" |cut -f 1 -d:); do
-    if [ -d "$HESTIA/data/users/$user" ]; then
+    # Include all users v-add-user-sftp-jail will handle it
     $BIN/v-add-user-sftp-jail "$user" "no"
-    fi
 done
 
 # Restart ssh service

bin/v-add-user-sftp-jail

@@ -32,8 +32,8 @@ check=$(is_object_valid 'user' 'USER' "$user")
 if [ $? -ne 0 ]; then 
     user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin")
     #try to detect "owner" of the ftp_user if not found dont set it up
-    user=$(echo $user_str | cut -f6 -d : | cut -f3 -d / ) 
-    is_object_valid 'user' 'USER' "$user"
+    user_owner=$(echo $user_str | cut -f6 -d : | cut -f3 -d / ) 
+    is_object_valid 'user' 'USER' "$user_owner"
 fi 
 user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin")
 if [ -z "$user_str" ]; then

bin/v-add-web-domain

@@ -33,6 +33,8 @@ source $HESTIA/func/main.sh
 source $HESTIA/func/domain.sh
 # shellcheck source=/usr/local/hestia/func/ip.sh
 source $HESTIA/func/ip.sh
+# shellcheck source=/usr/local/hestia/func/syshealth.sh
+source $HESTIA/func/syshealth.sh
 # load config file
 source_conf "$HESTIA/conf/hestia.conf"
 
@@ -212,6 +214,8 @@ echo "DOMAIN='$domain' IP='$ip' IP6='' CUSTOM_DOCROOT='' ALIAS='$ALIAS' TPL='$WE
  STATS='' STATS_USER='' STATS_CRYPT='' U_DISK='0' U_BANDWIDTH='0'\
  SUSPENDED='no' TIME='$time' DATE='$date'" >> $USER_DATA/web.conf
 
+syshealth_repair_web_config
+
 # Restarting web server
 $BIN/v-restart-web "$restart"
 check_result $? "Web restart failed" >/dev/null

bin/v-change-user-sort-order

@@ -39,7 +39,7 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
-$HESTIA/bin/v-change-user-config-value "$user" "$PREF_UI_SORT" "$sort_order"
+$HESTIA/bin/v-change-user-config-value "$user" 'PREF_UI_SORT' "$sort_order"
 
 #----------------------------------------------------------#
 #                       Hestia                             #

bin/v-check-user-password

@@ -62,7 +62,10 @@ if echo "$shadow" | grep -qE '^\$[0-9a-z]+\$[^\$]+\$'
 then
     salt=$(echo "$shadow" |cut -f 3 -d \$)
     method=$(echo "$shadow" |cut -f 2 -d \$)
-    if [ "$method" -eq '1' ]; then
+    if [ "$method" = "y" ]; then
+        echo "Unsuported hash method";
+        exit 1;   
+    elif [ "$method" -eq '1' ]; then
         method='md5'
     elif [ "$method" -eq '6' ]; then
         method='sha-512'

bin/v-delete-user-sftp-jail

@@ -60,7 +60,10 @@ done
 users=$(IFS=',';echo "${new_users[*]// /|}";IFS=$' \t\n')
 sed -i "s/$ssh_users/$users/g" /etc/ssh/sshd_config
 
-
+# chown permissions back to user:user
+if [ -d "/home/$user" ]; then
+    chown $user:$user /home/$user
+fi
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
@@ -70,6 +73,6 @@ service ssh restart > /dev/null 2>&1
 service sshd restart > /dev/null 2>&1
 
 # Logging
-#log_event "$OK" "$ARGUMENTS"
+log_event "$OK" "$ARGUMENTS"
 
 exit

bin/v-update-letsencrypt-ssl

@@ -15,6 +15,8 @@
 source /etc/hestiacp/hestia.conf
 # shellcheck source=/usr/local/hestia/func/main.sh
 source $HESTIA/func/main.sh
+# shellcheck source=/usr/local/hestia/func/syshealth.sh
+source $HESTIA/func/syshealth.sh
 # load config file
 source_conf "$HESTIA/conf/hestia.conf"
 
@@ -39,7 +41,8 @@ for user in $($HESTIA/bin/v-list-sys-users plain); do
     USER_DATA=$HESTIA/data/users/$user
 
     for domain in $(search_objects 'web' 'LETSENCRYPT' 'yes' 'DOMAIN'); do
-
+        # Clear any keys related to web domains
+        sanitize_config_file "web"
         domain_suspended="$(get_object_value 'web' 'DOMAIN' "$domain" '$SUSPENDED')"
         if [ "$domain_suspended" = "yes" ]; then
             continue