Fix bug caused in v-update-letsencrypt-ssl (hestiacp#2627)

* Fix bug caused in v-update-letsencrypt-ssl

* Fix bug with false matches alias string

* Expand with test for Wildcard

Can't be ran on test server due to requirement that DNS records need to be availble

Author: jaapmarcus

bin/v-update-letsencrypt-ssl

@@ -82,7 +82,7 @@ for user in $($HESTIA/bin/v-list-sys-users plain); do
             # Loop through all crt aliases
             for alias in ${aliases//,/ } ; do
                 # Validate if the alias still exists in web.conf
-                if [[ "$ALIAS" =~ $alias ]]; then
+                if [[ ",$ALIAS," =~ ",$alias," ]]; then
                     f_aliases+="$alias,"
                 fi
             done

test/letsencrypt.bats

@@ -33,13 +33,13 @@ function setup() {
 }
 
 @test "[ Web ] Create web domain" {
-    run v-add-web-domain $user $domain $ip yes "www.$domain,renewal.$domain"
+    run v-add-web-domain $user $domain $ip yes "www.$domain,renewal.$domain,foobar.$domain,bar.$domain"
     assert_success
     refute_output
 }
 
 @test "[ Web ] Request new certificate for web domain" {
-    run v-add-letsencrypt-domain $user $domain "www.$domain,renewal.$domain"
+    run v-add-letsencrypt-domain $user $domain "www.$domain,renewal.$domain,foobar.$domain,bar.$domain"
     assert_success
     refute_output
 }
@@ -62,6 +62,18 @@ function setup() {
     refute_output
 }
 
+@test "[ All ] Remove alias and update ssl" {
+    run v-delete-web-domain-alias $user $domain bar.$domain
+    assert_success
+    refute_output
+
+    run v-update-letsencrypt-ssl
+    assert_success
+    refute_output
+    
+}
+
+
 @test [ Web ] Delete web ssl" {
     run v-delete-letsencrypt-domain $user $domain "yes"
     assert_success

test/wildcard.bats

@@ -0,0 +1,52 @@
+#!/usr/bin/env bats
+
+if [ "${PATH#*/usr/local/hestia/bin*}" = "$PATH" ]; then
+    . /etc/profile.d/hestia.sh
+fi
+
+load 'test_helper/bats-support/load'
+load 'test_helper/bats-assert/load'
+load 'test_helper/bats-file/load'
+
+
+function random() {
+    head /dev/urandom | tr -dc 0-9 | head -c$1
+}
+
+function setup() {
+    source /tmp/wildcard.sh
+    source $HESTIA/func/main.sh
+    source $HESTIA/conf/hestia.conf
+    source $HESTIA/func/ip.sh
+}
+
+# User and domain needs to already exists as dns domain due to DNS 
+
+@test "[ Web ] Create web domain" {
+    run v-add-web-domain $user $domain $ip yes "*.$domain"
+    assert_success
+    refute_output
+}
+
+@test "[ Web ] Request new certificate for web domain" {
+    run v-restart-web 
+    run v-add-letsencrypt-domain $user $domain  "*.$domain"
+    assert_success
+    refute_output
+}
+
+@test "[ All ] Run renewal script for LE" {
+    run v-update-letsencrypt-ssl
+    assert_success
+    refute_output
+    
+    run openssl x509 -text -in /usr/local/hestia/data/users/$user/ssl/$domain.crt
+    assert_success
+    assert_output --partial "*.$domain"
+}
+
+@test "[ Web ] Delete web  domain" {
+    run v-delete-web-domain $user $domain "yes"
+    assert_success
+    refute_output
+}