From 9c3549c604ff1a1d20252ee86feeaba88da999fe Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Mon, 4 Nov 2019 11:39:06 +0100 Subject: [PATCH] lowercase domain-names in AcmeSh implementation to avoid https://github.com/Neilpang/acme.sh/issues/2556 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php index 8fc4952b..545ad323 100644 --- a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php +++ b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php @@ -209,7 +209,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron if ($cert_mode) { $domains = array( - $certrow['domain'] + strtolower($certrow['domain']) ); $froxlor_aliases = Settings::Get('system.froxloraliases'); @@ -217,7 +217,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron $froxlor_aliases = explode(",", $froxlor_aliases); foreach ($froxlor_aliases as $falias) { if (\Froxlor\Validate\Validate::validateDomain(trim($falias))) { - $domains[] = trim($falias); + $domains[] = strtolower(trim($falias)); } } } @@ -269,12 +269,12 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron $cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $certrow['domain']); $domains = array( - $certrow['domain'] + strtolower($certrow['domain']) ); // add www. to SAN list if ($certrow['wwwserveralias'] == 1) { $cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $certrow['domain']); - $domains[] = 'www.' . $certrow['domain']; + $domains[] = strtolower('www.' . $certrow['domain']); } // add alias domains (and possibly www.) to SAN list @@ -284,10 +284,10 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron $aliasdomains = $aliasdomains_stmt->fetchAll(\PDO::FETCH_ASSOC); foreach ($aliasdomains as $aliasdomain) { $cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $aliasdomain['domain']); - $domains[] = $aliasdomain['domain']; + $domains[] = strtolower($aliasdomain['domain']); if ($aliasdomain['wwwserveralias'] == 1) { $cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $aliasdomain['domain']); - $domains[] = 'www.' . $aliasdomain['domain']; + $domains[] = strtolower('www.' . $aliasdomain['domain']); } }