Version 1.2.0

Author: Kristan Kenney

.gitignore

@@ -10,7 +10,6 @@
 
 .env
 composer.phar
-composer.lock
 test/vendor/
 test/node_modules/
 npm-debug.log

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "test/test_helper/bats-core"]
+	path = test/test_helper/bats-core
+	url = https://github.com/bats-core/bats-core
+[submodule "test/test_helper/bats-assert"]
+	path = test/test_helper/bats-assert
+	url = https://github.com/bats-core/bats-assert
+[submodule "test/test_helper/bats-support"]
+	path = test/test_helper/bats-support
+	url = https://github.com/bats-core/bats-support
+[submodule "test/test_helper/bats-file"]
+	path = test/test_helper/bats-file
+	url = https://github.com/bats-core/bats-file

CHANGELOG.md

@@ -2,9 +2,83 @@
 All notable changes to this project will be documented in this file.
 
 ## [CURRENT] - Development
+
+## [1.2.0] - Major Release (Feature / Quality Update)
 ### Features
+- **NOTE:** Debian 8 is no longer supported as it has reached EOL (end-of-life) status.
+- Added support for Ubuntu Server 20.04 LTS.
+- Added File Manager functionality (with File Gator backend) with the ability to add or remove at any time (`v-add-sys-filemanager` and `v-delete-sys-filemanager`)
+- Extended built-in firewall to support allowing or blocking traffic using IP lists.
+- Improved Apache2 performance by switching to mpm_event instead mod_prefork by default for new installations.
+- Added support for configuring individual TTL per DNS record. Thanks to **@jaapmarcus**!
+- Updated translations for Polish (thanks to @RejectPL!), Dutch, French, German, and Italian (WIP).
+- Added the ability to set the default PHP command line version per-user.
+- Added geolocation support to awstats to improve traffic reports.
+- Enabled Roundcube plugins newmail_notifier and zipdownload by default.
+- Added HELO support for multiple domains and IPs.
+- Added the ability to manage SSH keys from CLI and web interface.
+- Added a manual migration script for apache2 mpm_event for existing installations/upgrades (`$HESTIA/install/upgrade/manual/migrate_mpm_event.sh`).
+- Added BATS system for testing the functionality of Bash scripts (WIP).
+- Added **v-change-sys-db-alias** to change phpMyAdmin and phpPgAdmin access points (`v-change-sys-db-alias pma/pga myCustomURL`).
+
 
 ### Bugfixes
+- Prevent ability to change the password of a non-Hestia user account. Thanks to **Alexandre Zanni**!
+- Adjust Let's Encrypt validation check for IDN domains, thanks to **@zanami**!
+- Set backup download location on FTP/SFTP restore, thanks to **@Daniyal-Javani**!
+- Stop trying to renew Let's Encrypt certificates after multiple consecutive failed attempts. Thanks to **@dpeca**!
+- Fixed an issue with auto-logout when used behind Cloudflare proxy and reworked 2FA authentication part. Thanks to **@rmj-s**!
+- Fixed an issue where changing an email account password would fail if similar account names were present.
+- Fixed an issue where e-mail quota was not preserved when (un)suspending or rebuilding a mail account.
+- Fixed an issue where SSH configuration was not saved currently when edited from the Web interface.
+- Fixed an issue where DNS IP did not use NAT/Public IP when available after changing web domain IP.
+- Fixed an issue that would occur when a user would attempt to recover their account when two-factor authentication is enabled.
+- Fixed permission issues that were presented when restoring a user backup.
+- Improved page load performance of Control Panel web interface.
+- Use Sury.org repository for Apache2 packages.
+- Improved compatibility with Roundcube and PHP 7.4.
+- Restrict the ability to edit crontab service via Control Panel web interface.
+- Check whether Nginx, Apache2 and MariaDB are selected for installation prior to adding third party repositories.
+- Restrict public access to Apache2 server-status page.
+- Remove duplicated set-cookie line in default fpm config.
+- Ignore empty lines when listing firewall rules.
+- Improved top-level navigation in the Control Panel web interface (Server tab has been moved next to the Notification icon).
+- Corrected various minor user interface and theme issues.
+- Cleanup temporary files when uploading custom SSL certificate from Web interface.
+- Cleanup temporary files when adding/renewing Let's Encrypt SSL certificate.
+- Cleanup temporary files after running v-list-sys-services.
+- Removed some legacy code and unused assets.
+- Don't calculate /home folder size in v-list-sys-info.
+- Adjust v-list-sys-services to honor the changed fail2ban service name.
+- Rework busy port validation in v-change-sys-port.
+- Implement a validation function to verify the correct version in hestia.conf prior to installation.
+- Introduced a delay when an incorrect username, password, or 2FA code has been entered repeatedly.
+- Improved "Forgot password" function prevent brute force attacks.
+- Fixed an issue where the backup update counter was not updated properly when v-delete-user-backup was executed.
+- Fixed an issue with public_(s)html file ownership.
+- Fixed an issue with phpPgAdmin access.
+- Fixed an issue where the wrong port was set for www.conf on certain configurations.
+- Fixed an issue where Composer would fail to install.
+- Fixed an issue where the selected theme was not immediately applied.
+- Fixed an issue where HTTP-to-HTTPS redirection and HTTP Strict Transport Security (HSTS) events were not shown in the user history log.
+- Fixed an issue where the web domain access log page was incorrectly formatted.
+- Fixed an issue where awstats would show a HostAliases error if a web domain did not have any aliases.
+- Fixed an issue where awstats configuration was not updated if web domain aliases were added or removed.
+- Fixed an issue where user interface elements would overlap or display in the wrong place when using non-English locales.
+- Fixed an issue where phpMyAdmin and phpPgAdmin were inaccessible from the Web UI if custom URLs had been set.
+- Fixed an issue where mail SSL certificates were not restored properly from a backup archive.
+- Fixed an issue where mail domain configuration files were not removed when the domain was deleted.
+- Improved the functionality of `v-change-domain-owner` to correctly move mail domains and provide status output and logging/notifications.
+- Improved the functionality of `v-update-sys-hestia-git` to allow user to specify GitHub repository and whether to build only core package or core and dependencies.
+- Corrected the behavior of phpMyAdmin and phpPgAdmin so that alias dialogs accept custom word only and not full URL, aligns with webmail alias behavior.
+- Corrected the behavior of the installer so that APT repositories are not added if installation is aborted due to version mismatch.
+- Fixed an issue where upgrade procedures were not executed correctly when skipping between versions (e.g. 1.0.6 > 1.2.0).
+
+### Known issues and notes
+- **NOTE:** Custom phpMyAdmin and phpPgAdmin URL's will be reset once during this upgrade to correct a legacy code issue.
+- Let's Encrypt renewal fails when removing alias from web domain (#856)
+- Some translation strings need to be updated for accuracy (#746)
+- v-restore-user only works with backup archives stored in /backup mount point (#641)
 
 ## [1.1.1] - 2020-03-24 - Hotfix
 ### Features

CONTRIBUTING.md

@@ -1,40 +1,44 @@
-How to Contribute
-==================================================
-
-Do you want to contribute to the Hestia Control Panel project? The easiest way to get started is to [submit an issue report](https://github.com/hestiacp/hestia/issues) if you come across a bug or issue. If you are a developer, please feel free to submit your code via pull request for review.
-
-**We appreciate and welcome all contributions to our project; it is with the help of the open-source community that we are able to build a product that meets our users needs.**
-
 Code Contributions & Pull Requests - Guidelines
 -----------------------
 
-**All pull requests must include:**
-1. A brief but descriptive title, such as **Fixed syntax error in php.ini** or **Updated rebuild_mail_conf function in rebuild.sh**.
-2. A detailed description of the changes that you've made.
-   1. Example: "Apache subdomain configuration was incorrect, modified variables in templates to point to the correct files."
-3. Only commits which are related to the pull request or issue itself.
+All pull requests must include a brief but descriptive title, and a description of the changes that you've made with as much detail as possible. **Only include commits that are related to your feature, bug fix, or patch in your pull request.**
 
-### Code formatting and comments:
-We ask that you please try to follow existing naming schemes and coding conventions as much as possible, and that you add brief but descriptive comments in your source code to aid other developers in debugging and understanding your code in the future.
+## Code formatting and comments:
+We ask that you follow existing naming schemes and coding conventions where possible, and that you add comments in your source code where appropriate to aid other developers in debugging and understanding your code in the future.
 
-### Squashing commits for smaller changes:
-When submitting a pull request with multiple smaller commits which are related to the same issue (or file), we ask that you please **squash your commits** in order to keep the project's commit history clean and easy to follow for other developers. For example, if you are submitting a fix for two files which contain the same code change, merge those changes into one commit before submitting your request.
+## Squashing commits for smaller changes:
+When submitting a pull request with multiple smaller commits which are related to the same issue (or file), we ask that you please **squash your commits** in order to keep the project's commit history clean and easy to follow for other developers.
 
-### Working with branches:
+## Working with branches:
 Development for this project takes place in branches to effectively develop, manage, and test new features and code changes, helping to ensure that each release meets high quality standards. Our primary branches are as follows:
 
-* **master**: Active development code for the the next version of Hestia Control Panel.
-* **release**: The latest stable release code - installation packages generally align with this branch.
+### Primary branches:
+
+* `develop`: Active development code for the the next version of Hestia Control Panel, considered to be unstable.
+* `beta`: Feature locked code for the next release, which receives fixes only and goes through feedback and testing.
+* `release`: Code in this branch aligns with the latest packages available on our APT repositories.
+
+### I want to contribute some code to Hestia Control Panel, where do I start?
+
+First, create a new branch for your work based on the `develop` branch to ensure that you have the latest commits in your local repository, which will help make sure that your pull requests only contain the commits that are necessary. 
+
+When creating your branches, **please adhere to the following naming conventions:**
+
+- **Prefix:** `bugfix/` or `feature/` based on the type of submission.
+- **ID**: `888` (GitHub Issue ID if an issue exists) -or- `2020-07` (Year-Month if an issue does not already exist)
+- **Separator:** `_` (underscore)
+- **Title:** `my-awesome-patch`
 
-We ask that you create a new branch for your work based on **master**, this will allow you to submit only the necessary commits/changes that you've made. We generally adhere to the below naming convention for internal branches; you're welcome to use your own naming conventions so long as your commits follow the guidelines mentioned above.
+Branch name examples:
+* `feature/777_my-awesome-new-feature` or `feature/2020-07_my-other-new-feature`
+* `bugfix/000_some-bug-fix` or `bugfix/2020-07_this-feature-is-broken`
 
-* **feature-name**: New features
-* **bugfix-000**: Bug fixes
+Once your code is complete and you have reviewed it for errors, submit a pull request to the correct integration branch:
 
-**Note**: Replace **000** with the GitHub Issue ID if available, or use a short but descriptive name.
+* `staging/fixes`: bugfix/ branches will merge to this branch when they have been tested/verified.
+* `staging/features`: feature/ branches will merge to this branch when they have been tested/verified.
 
-### Feature freeze:
-Once development has reached a point where all planned new features have been incorporated, the **master** branch will then enter a "feature freeze" period where only fixes to the existing functionality will be added or merged for inclusion. Once any known issues have been resolved and the build has passed internal validation and testing procedures, it will then be pushed to **release** and tagged with it's respective version number and made available through our APT repositories.
+All `staging` branches will integrate to `develop` to form the next release of Hestia Control Panel. Once all features and fixes planned for the release are merged, the code will then be pushed to the `beta` branch where it is feature locked, assigned a version number, and will receive thorough testing before being pushed to the `release` branch with new packages being pushed to APT.
 
 **Please ensure that all pull requests meet the guidelines listed above; those that do not will be rejected and sent back for review.**
 

ISSUE_TEMPLATE.md

@@ -1,55 +1,25 @@
-### Please fill in the relevant sections below and remove those which do not apply.
+**Please include as much information as possible in your issue report, such as the configuration of your server and any troubleshooting steps that you've already performed.**
 
-**To help aid our developers in debugging your issue we ask that you include as much information as possible, including the configuration of your server and troubleshooting steps already performed.**
-
-**Please DO NOT include any personal or sensitive information in your issue reports, including usernames or passwords!**
+**NOTE: Do not include any personal or sensitive information, such as email addresses or passwords.**
 
 ===
 
 ### In a few words, please describe the issue that you're experiencing:
 Please enter your answer here (e.g. When I try adding a web domain, an error message appeared stating that the php-fpm pool did not exist).
 
 ### What steps did you take when the issue occured? 
-1. Ex.: Log into the Hestia Control Panel using Firefox
-2. Ex.: Click on the Web tab
-3. Ex.: Click on Add Web Domain
-4. Ex.: Attempted to add a domain and received an error.
+1. Ex.: Click on the Web tab
+2. Ex.: Click on Add Web Domain
+3. Ex.: Attempted to add a domain and received an Internal Server Error.
 
 ### Expected behavior:
 Please enter your answer here (e.g. the web domain should have been added successfully).
 
-### Does this issue always occur, or is it intermittent?
-Please enter your answer here (e.g. it happens every time I try to perform the steps above).
-
-### Operating system distribution and release:
-Please enter your answer here (e.g. Ubuntu 18.04.3 LTS)
-
-### Which version of Hestia Control Panel is currently installed?
-You can find this information in $HESTIA/conf/hestia.conf by running the following command:
-`grep VERSION $HESTIA/conf/hestia.conf`
-
-Please enter your answer here (e.g. 1.1.0)
-
-### Which branch are you using?
-Please enter your answer here (e.g release, master, etc.)
-
-### When did this issue occur? After a clean installation, or after an upgrade?
-Please enter your answer here (e.g the feature stopped working after upgrading to the latest release)
-
-**Note:** If you have upgraded from an older release on an existing server, please let us know which version was previously installed if at all possible.
-
-### Which of the following web server configurations are you using?
-- Apache + Nginx (default)
-- Nginx + PHP-FPM
-- Multi-PHP
-- PHP-FPM + Multi-PHP
-- Other (please specify)
-
-### In order to better assist, please post any relevant log information below:
-Tip: Most log files can be found under ***/var/log/***.
+### Operating system:
+Please enter your answer here (e.g. Ubuntu 20.04 LTS)
 
-### Related issues or forum threads:
-Find something that might be related to this? Please let us know by adding any relevate issue numbers or URLs here (e.g. issue #000 or https://forum.hestiacp.com/...)
+### Hestia Control Panel version:
+Please enter your answer here (e.g. 1.2.0). 
 
 ### Additional notes:
 If there is anything else that you'd like us to know about this issue, feel free to share here.