Staging/1.5.15 (hestiacp#2590)

* Cherry pick commit with fix
* Prepare for 1.5.15 release

Author: jaapmarcus

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.5.15] - Service release
+
+### Bugfixes
+
+- Fixed an issue with wildcard DNS records 
+
+### Dependencies
+
+- Update phpMyAdmin to 5.1.4 (https://www.phpmyadmin.net/files/5.1.4/) (#2529)
 
 ## [1.5.14] - Service release
 

func/main.sh

@@ -876,7 +876,7 @@ is_common_format_valid() {
 }
 
 is_no_new_line_format() {
-    test=$(echo $1 | head -n1 );
+    test=$(echo "$1" | head -n1 );
     if [[ "$test" != "$1" ]]; then
       check_result "$E_INVALID" "invalid value :: $1"
     fi

install/hst-install-debian.sh

@@ -31,7 +31,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.5.14'
+HESTIA_INSTALL_VER='1.5.15'
 # Dependencies
 pma_v='5.1.3'
 rc_v="1.5.2"

install/hst-install-ubuntu.sh

@@ -31,7 +31,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.5.14'
+HESTIA_INSTALL_VER='1.5.15'
 # Dependencies
 pma_v='5.1.3'
 rc_v="1.5.2"

install/upgrade/upgrade.conf

@@ -36,7 +36,7 @@ UPGRADE_RESTART_SERVICES='true'
 
 # Check if update is required by matching versions if version != current version run update 
 # Set version of phpMyAdmin to install during upgrade if not already installed
-pma_v='5.1.3'
+pma_v='5.1.4'
 
 # Set version of RoundCube (Webmail) to update during upgrade if not already installed
 # Note: only applies to "non-apt installs >= 1.4.0 or manually phased out"

src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.5.14
+Version: 1.5.15
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

test/checks.bats

@@ -179,28 +179,27 @@ r'
 }
 
 @test "is_alias_format_valid success" {
-     run is_domain_format_valid 'hestiacp.com' "key"
+     run is_alias_format_valid 'hestiacp.com' "key"
     assert_success
 }
 
-@test "is_alias_format_valid www" {
-     run is_domain_format_valid 'www' "key"
-    assert_failure $E_INVALID
+@test "is_alias_format_valid success www.domain.com" {
+     run is_alias_format_valid 'www.hestiacp.com' "key"
+    assert_success
 }
-@test "is_alias_format_valid number" {
-     run is_domain_format_valid '12345' "key"
-    assert_failure $E_INVALID
+@test "is_alias_format_valid success hestiacp.com,www.hestiacp.com" {
+     run is_alias_format_valid 'hestiacp.com,www.hestiacp.com' "key"
+    assert_success
 }
 
-@test "is_alias_format_valid .." {
-     run is_domain_format_valid '..' "key"
-    assert_failure $E_INVALID
+@test "is_alias_format_valid success *.hestiacp.com" {
+     run is_alias_format_valid '*.hestiacp.com' "key"
+    assert_success
 }
-@test "is_alias_format_valid LF." {
-     run is_domain_format_valid 'c
-1eshutdown
-r' "key"
-    assert_failure $E_INVALID
+
+@test "is_alias_format_valid success www.hestiacp.com,*.hestiacp.com" {
+     run is_alias_format_valid 'www.hestiacp.com,*.hestiacp.com' "key"
+    assert_success
 }
 
 @test "is_extention_format_valid test" {

test/test.bats

@@ -1179,6 +1179,12 @@ function check_ip_not_banned(){
     refute_output
 }
 
+@test "DNS: Add domain record *.domain.com" {
+    run v-add-dns-record $user $domain '*' A 198.18.0.125 '' 30
+    assert_success
+    refute_output
+}
+
 @test "DNS: Change DNS record" {
   run v-change-dns-record $user $domain 20 test A 198.18.0.125 "" "" 1500
   assert_success