Fix wildcard check for alias domains(#4202)

Thom · Thom · commit c95cb8e1ad03 · 2023-02-12T21:43:44.000+01:00
diff --git a/server/lib/classes/letsencrypt.inc.php b/server/lib/classes/letsencrypt.inc.php
@@ -403,8 +403,10 @@ public function request_certificates($data, $server_type = 'apache') {
 		if(is_array($aliasdomains)) {
 			foreach($aliasdomains as $aliasdomain) {
 				$temp_domains[] = $aliasdomain['domain'];
-				if(isset($aliasdomain['subdomain']) && substr($aliasdomain['domain'],0,4) != 'www.' && ($aliasdomain['subdomain'] == "www" OR $aliasdomain['subdomain'] == "*")) {
+				if (isset($aliasdomain['subdomain']) && substr($aliasdomain['domain'],0,4) != 'www.' && ($aliasdomain['domain']['subdomain'] == "www" || ($aliasdomain['domain']['subdomain'] == "*" && (!$use_acme || $global_sites_config['acme_dns_user'] == '')))) {
 					$temp_domains[] = "www." . $aliasdomain['domain'];
+				} elseif ($aliasdomain['domain']['subdomain'] == "*" && ($use_acme && $global_sites_config['acme_dns_user'] != '')) {
+					$temp_domains[] = "*." . $aliasdomain['domain'];
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -403,8 +403,10 @@ public function request_certificates($data, $server_type = 'apache') {`
`403`	`403`	`if(is_array($aliasdomains)) {`
`404`	`404`	`foreach($aliasdomains as $aliasdomain) {`
`405`	`405`	`$temp_domains[] = $aliasdomain['domain'];`
`406`		`- if(isset($aliasdomain['subdomain']) && substr($aliasdomain['domain'],0,4) != 'www.' && ($aliasdomain['subdomain'] == "www" OR $aliasdomain['subdomain'] == "*")) {`
	`406`	`+ if (isset($aliasdomain['subdomain']) && substr($aliasdomain['domain'],0,4) != 'www.' && ($aliasdomain['domain']['subdomain'] == "www" \|\| ($aliasdomain['domain']['subdomain'] == "*" && (!$use_acme \|\| $global_sites_config['acme_dns_user'] == '')))) {`
`407`	`407`	`$temp_domains[] = "www." . $aliasdomain['domain'];`
	`408`	`+ } elseif ($aliasdomain['domain']['subdomain'] == "*" && ($use_acme && $global_sites_config['acme_dns_user'] != '')) {`
	`409`	`+ $temp_domains[] = "*." . $aliasdomain['domain'];`
`408`	`410`	`}`
`409`	`411`	`}`
`410`	`412`	`}`