Merge remote-tracking branch 'origin/develop' into 6113-undo-delete-mailbox

Author: helmo

.gitignore

@@ -1,5 +1,39 @@
-.DS_Store
 .idea
 /nbproject/private/
 .phplint-cache
 *.swp
+
+# macOS-specific things to exclude
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+Icon?
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Configuration for the Nova editor
+.nova

.gitlab-ci.yml

@@ -3,6 +3,7 @@ stages:
   - syntax
   - syntax_diff
   - test
+  - build
 
 #
 ### Stage syntax
@@ -16,6 +17,7 @@ syntax:lint:
     - schedules
     - web
     - merge_requests
+    - /^\d+\.\d+\.\d+(p\d+)?$/
 
   script:
     - echo "Syntax checking PHP files"
@@ -31,6 +33,12 @@ syntax_diff:lint:
     - pushes
     - branches
 
+  except:
+    - schedules
+    - web
+    - merge_requests
+    - /^\d+\.\d+\.\d+(p\d+)?$/
+
   script:
     - echo "Syntax checking PHP files"
     - bash ./.git-scripts/syntax.sh commit
@@ -51,15 +59,46 @@ syntax_diff:lint:
 #    - vendor/bin/phplint
 
 
-test:install:
-  stage: test
-  image: jerob/docker-ispconfig
-  only:
-    - schedules
-    - web
-  script:
-    - $CI_PROJECT_DIR/helper_scripts/test_install_docker.sh
-    - apt-get update
-    - apt-get --yes install curl
-    - curl --insecure https://127.0.0.1:8080/login/
-    - ps xaf
+#test:install:
+#  stage: test
+#  image: jerob/docker-ispconfig
+#  only:
+#    - schedules
+#    - web
+#    - /^\d+\.\d+\.\d+$/
+#  
+#  script:
+#    - $CI_PROJECT_DIR/helper_scripts/test_install_docker.sh
+#    - apt-get update
+#    - apt-get --yes install curl
+#    - curl --insecure https://127.0.0.1:8080/login/
+#    - ps xaf
+#    
+#  needs: ["syntax:lint"]
+
+build:package:
+    stage: build
+    image: edbizarro/gitlab-ci-pipeline-php:7.2
+    only:
+        refs:
+            - /^\d+\.\d+\.\d+(p\d+)?$/
+            - web
+
+    script:
+        - echo "Building release."
+        - if [[ "$VER" == "" ]] ; then VER="$CI_COMMIT_TAG" ; fi
+        - if [[ "$VER" == "" ]] ; then VER="3.2dev"$(date +%s) ; fi
+        - if [[ "$VER" != "" ]] ; then echo "Replacing 3.2dev by $VER" ; sed -i -r 's/3\.2dev/'${VER}'/g' install/tpl/config.inc.php.master install/sql/ispconfig3.sql ; fi
+        - RET=0
+        - tar -cpzf ISPConfig-${VER}.tar.gz --exclude "ISPConfig-${VER}.tar.gz" --exclude ".git*" --exclude ".phplint.yml" --transform 's,^\./,ispconfig3_install/,' . || RET=$?
+        - if [[ $RET > 1 ]] ; then exit $RET ; fi
+        - echo "Listing tar contents for verification"
+        - tar -tvf ISPConfig-${VER}.tar.gz
+        - echo "Uploading file to download server"
+        - curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/
+        - if [[ "$VER" =~ ^[0-9]+\.[0-9]+\.[0-9]+(p[0-9]+)?$ ]] ; then echo "Stable release ${VER}" ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/ISPConfig-3-stable.tar.gz ; echo -n "${VER}" > ispconfig3_version.txt ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ispconfig3_version.txt ftp://${DEPLOY_FTP_SERVER}/web/ ; else echo "Dev release ${VER}" ; fi
+        - rm ISPConfig-${VER}.tar.gz
+        - echo "Download url is https://download.ispconfig.org/ISPConfig-${VER}.tar.gz"
+        
+    needs: ["syntax:lint"]
+    allow_failure: false

.gitlab/issue_templates/Bug.md

@@ -1,41 +1,45 @@
-## short description
-What is happening and what is wrong with that?
+<!-- Before creating a bug report, please:
+- Read the contribution guidelines: https://git.ispconfig.org/ispconfig/ispconfig3/-/blob/develop/CONTRIBUTING.md
+- Do not ask support questions here. If you are unsure if your problem is a bug, post a thread on the forum: https://www.howtoforge.com/community/#ispconfig-3.23
+- Make sure to remove any content from the description that you did not add. For example, if there are no related log entries, remove the whole "Related log entries" part.
+-->
 
-## correct behaviour
-What should happen instead?
+## Summary
+<!-- What is happening and what is wrong with that? -->
 
-## environment
-Server OS: (debian/ubuntu/centos/...)  
-Server OS version: (wheezy/trusty/centos6/...)
-ISPConfig version: (3.0.5.4/3.1.5/3.1dev/...)
-_you can use `grep 'ISPC_APP_VERSION' /usr/local/ispconfig/server/lib/config.inc.php` to get it from the command line_
+## Steps to reproduce
+1. [First step]
+2. [Second step]
+3. [and so on...]
 
-If it might be related to the problem  
-```
-insert the output of `nginx -v` or `apachectl -v` here
-```
+## Correct behaviour
+<!-- What should happen instead? -->
+
+## Environment
+Server OS + version: (Debian 10/Ubuntu 20.04/CentOS 8/...) \
+ISPConfig version: (3.1.15p3/3.2.3/3.2dev/...)
+<!-- _you can use `grep 'ISPC_APP_VERSION' /usr/local/ispconfig/server/lib/config.inc.php` to get it from the command line_ -->
+Software version of the related software:
+<!-- You can use 'nginx -v' or 'apachectl -v' to find the webserver version. Use 'php -v' to find the PHP version.> Put this in code blocks, like so: -->
 ```
-insert the output of `php -v` here
+Output of the command
 ```
 
-## proposed fix
+## Proposed fix
 optional, of course.  
-if you want to post code snippets, please use  
+if you want to post code snippets, please use
 ```  
 your code  
 ```
-or attach a code file. Best is to create a merge request of course.  
+or attach a code file. Best is to create a merge request of course.
 
-## references
-if you know of related bugs or feature requests, please reference them by using `#<bugnumber>`, e. g. #123  
-if you have done a merge request already, please reference it by using `!<mergenumber>`, e. g. !12  
+## References
+if you know of related bugs or feature requests, please reference them by using `#<issuenumber>`, e. g. #6105
+if you have done a merge request already, please reference it by using `!<mergenumber>`, e. g. !1444 
 if you know of a forum post on howtoforge.com that deals with this topic, just add the link to the forum topic here
 
-## screenshots
+## Screenshots
 optional, of course.  
 Add screenshots of the problem by clicking "Attach a file" on the bottom right.
 
-## log entries
-```
-apache / nginx error.log lines (if related)
-```
+## Related log entries

CONTRIBUTING.md

@@ -9,6 +9,7 @@ This document is under development and will be continuously improved.
 * If you want to report several bugs or request several features, open a separate issue for each one of them.
 
 # Branches
+* If you are a new user, please send an email to: dev [at] ispconfig [dot] org to receive rights to fork the project.
 * Please create an issue for each contribution you want to make.
 * Do not put multiple contributions into a single branch and merge request. Each contribution should have it's own branch.
 * Do not use the develop branch in your forked project for your contribution. Create a separate branch for each issue.

README.md

@@ -1,43 +1,46 @@
 # ISPConfig - Hosting Control Panel
-![alt text](https://www.ispconfig.org/wp-content/themes/ispconfig/images/ispconfig_logo.png "") \
+![ISPConfig logo](https://www.ispconfig.org/wp-content/themes/ispconfig/images/ispconfig_logo.png "") \
 Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/develop/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/develop)
 
 ## Functions
 - Manage multiple servers from one control panel
 - Single server, multiserver and mirrored clusters.
-- Webserver management (Apache2 and nginx)
+- Webserver management
 - Mailserver management
-- DNS server management (BIND and PowerDNS)
+- DNS server management
 - Virtualization (OpenVZ)
 - Administrator, reseller, client and mailuser login
-- Open Source software (BSD license)
+- Open Source software ([BSD license](LICENSE))
 
 ## Supported daemons
-- HTTP: Apache2 and nginx
+- HTTP: Apache2 and NGINX
 - HTTP stats: Webalizer, GoAccess and AWStats
 - Let's Encrypt: Acme.sh and certbot
 - SMTP: Postfix
 - POP3/IMAP: Dovecot
 - Spamfilter: Rspamd and Amavis
 - FTP: PureFTPD
-- DNS: BIND9 and PowerDNS
+- DNS: BIND9 and PowerDNS[^1]
 - Database: MariaDB and MySQL
 
+[^1]: not actively tested
+
 ## Supported operating systems
-- Debian 9, 10, and testing
+- Debian 9 - 11, and testing
 - Ubuntu 16.04 - 20.04
 - CentOS 7 and 8
 
 ## Auto-install script
-You can install ISPConfig with our official autoinstaller: https://git.ispconfig.org/ispconfig/ispconfig-autoinstaller/-/blob/master/README.md
+You can install the "Perfect Server" with ISPConfig using [our official autoinstaller](https://www.howtoforge.com/ispconfig-autoinstall-debian-ubuntu/)
 
 ## Migration tool
-The Migration Tool helps you to import data from other control panels (currently ISPConfig 2 and 3 – 3.2, Plesk 10 – 12.5, Plesk Onyx, CPanel** and Confixx 3). For more information, see https://www.ispconfig.org/add-ons/ispconfig-migration-tool/
+The Migration Tool helps you to import data from other control panels (currently ISPConfig 2 and 3 – 3.2, Plesk 10 – 12.5, Plesk Onyx, CPanel[^2] and Confixx 3). For more information, see https://www.ispconfig.org/add-ons/ispconfig-migration-tool/
 
-** The Migration Toolkit contains now beta support for migrating CPanel to ISPConfig.
+[^2]: The Migration Toolkit now contains beta support for migrating CPanel to ISPConfig.
 
 ## Documentation
 You can support ISPConfig development by buying the manual: https://www.ispconfig.org/documentation/
 
 ## Contributing
-If you like to contribute to the ISPConfig development, please send an email to: dev [at] ispconfig [dot] org.
+If you like to contribute to the ISPConfig development, please read the contributing guidelines: [CONTRIBUTING.MD](CONTRIBUTING.md)
+

docs/autoinstall_samples/autoinstall.conf_sample.php

@@ -29,7 +29,7 @@
 
 /* optional expert mode settings, needed only for expert mode */
 $autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
-$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));
+$autoinstall['mysql_ispconfig_password'] = bin2hex(random_bytes(20));
 $autoinstall['join_multiserver_setup'] = 'n'; // y, n (default)
 $autoinstall['mysql_master_hostname'] = 'master.example.com';
 $autoinstall['mysql_master_root_user'] = 'root';
@@ -70,4 +70,4 @@
 $autoupdate['svc_detect_change_vserver_server'] = 'yes'; // yes (default), no
 $autoupdate['svc_detect_change_db_server'] = 'yes'; // yes (default), no
 
-?>
+?>

helper_scripts/cert_check.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+chkdata() {
+	F=$1
+	CRT=$2
+	KEY=$3
+	if [[ "$CRT" != "" && "$KEY" != "" ]] ; then
+		if [[ ! -f "$CRT" ]] ; then
+			echo "[WARN] CERTIFICATE FILE ${CRT} MISSING FOR ${F}" ;
+		else 
+			echo -n "Checking ${CRT}" ;
+			CHK=$(openssl x509 -in "${CRT}" -text -noout >/dev/null 2>&1 ; echo $?);
+			if [[ $CHK -ne 0 ]] ; then
+				echo " FAILED!" ;
+			else
+				echo " OK" ;
+			fi
+		fi
+		if [[ ! -f "$KEY" ]] ; then
+			echo "[WARN] KEY FILE ${KEY} MISSING FOR ${F}" ;
+		else
+			echo -n "Checking ${KEY}" ;
+			CHK=$(openssl rsa -in "${KEY}" -check -noout >/dev/null 2>&1 ; echo $?);
+			if [[ $CHK -ne 0 ]] ; then
+				echo " FAILED!" ;
+			else
+				echo " OK" ;
+			fi
+		fi
+	
+		if [[ -f "$CRT" && -f "$KEY" ]] ; then
+			echo -n "Checking that key and certificate match";
+			MDCRT=$(openssl x509 -noout -modulus -in "${CRT}" | openssl md5) ;
+			MDKEY=$(openssl rsa -noout -modulus -in "${KEY}" | openssl md5) ;
+			if [[ "$MDCRT" != "$MDKEY" ]] ; then
+				echo " FAILED!" ;
+			else
+				echo " OK" ;
+			fi
+		fi
+		echo "---" ;
+	elif [[ "$CRT" != ""  || "$KEY" != "" ]] ; then
+		echo "[WARN] Check SSL config of ${F}";
+		echo "---" ;
+	fi
+}
+
+if [[ -d /etc/apache2/sites-enabled ]] ; then
+	echo "Checking enabled apache vhosts" ;
+	for FIL in /etc/apache2/sites-enabled/* ; do
+		CRT=$(grep 'SSLCertificateFile' "${FIL}" | grep -E -v '^[[:space:]]*#' | awk '{print $2}' | head -n 1) ;
+		KEY=$(grep 'SSLCertificateKeyFile' "${FIL}" | grep -E -v '^[[:space:]]*#' | awk '{print $2}' | head -n 1) ;
+		chkdata "$FIL" "$CRT" "$KEY" ;
+	done
+fi
+
+if [[ -d /etc/nginx/sites-enabled ]] ; then
+	echo "Checking enabled nginx vhosts" ;
+	for FIL in /etc/nginx/sites-enabled/* ; do
+		CRT=$(grep 'ssl_certificate' "${FIL}" | grep -E -v '^[[:space:]]*#' | awk '{print $2}' | head -n 1) ;
+		CRT=${CRT%;}
+		KEY=$(grep 'ssl_certificate_key' "${FIL}" | grep -E -v '^[[:space:]]*#' | awk '{print $2}' | head -n 1) ;
+		KEY=${KEY%;}
+		chkdata "$FIL" "$CRT" "$KEY" ;
+	done
+fi

install/dist/conf/centos52.conf.php

@@ -147,6 +147,11 @@
 $conf['amavis']['config_dir'] = '/etc';
 $conf['amavis']['init_script'] = 'amavisd';
 
+//* Rspamd
+$conf['rspamd']['installed'] = false; // will be detected automatically during installation
+$conf['rspamd']['config_dir'] = '/etc/rspamd';
+$conf['rspamd']['init_script'] = 'rspamd';
+
 //* ClamAV
 $conf['clamav']['installed'] = false; // will be detected automatically during installation
 $conf['clamav']['init_script'] = 'clamd';
@@ -216,4 +221,7 @@
 //* OpenVZ
 $conf['openvz']['installed'] = false;
 
+// AppArmor
+$conf['apparmor']['installed'] = false;
+
 ?>

install/dist/conf/centos53.conf.php

@@ -147,6 +147,11 @@
 $conf['amavis']['config_dir'] = '/etc';
 $conf['amavis']['init_script'] = 'amavisd';
 
+//* Rspamd
+$conf['rspamd']['installed'] = false; // will be detected automatically during installation
+$conf['rspamd']['config_dir'] = '/etc/rspamd';
+$conf['rspamd']['init_script'] = 'rspamd';
+
 //* ClamAV
 $conf['clamav']['installed'] = false; // will be detected automatically during installation
 $conf['clamav']['init_script'] = 'clamd';
@@ -216,4 +221,7 @@
 //* OpenVZ
 $conf['openvz']['installed'] = false;
 
+// AppArmor
+$conf['apparmor']['installed'] = false;
+
 ?>