diff --git a/lib/classes/ssl/class.lescript.php b/lib/classes/ssl/class.lescript.php index fee654e9..cb73586c 100644 --- a/lib/classes/ssl/class.lescript.php +++ b/lib/classes/ssl/class.lescript.php @@ -1,7 +1,7 @@ // All rights reserved. -// +// // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are met: // * Redistributions of source code must retain the above copyright @@ -12,7 +12,7 @@ // * Neither the name of the nor the // names of its contributors may be used to endorse or promote products // derived from this software without specific prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND // ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -59,10 +59,10 @@ class lescript $keys = $this->generateKey(); // Only store the accountkey in production, in staging always generate a new key if (Settings::Get('system.letsencryptca') == 'production') { - $upd_stmt = Database::prepare(" - UPDATE `".TABLE_PANEL_CUSTOMERS."` SET `lepublickey` = :public, `leprivatekey` = :private WHERE `customerid` = :customerid; - "); - Database::pexecute($upd_stmt, array('public' => $keys['public'], 'private' => $keys['private'], 'customerid' => $certrow['customerid'])); + $upd_stmt = Database::prepare(" + UPDATE `".TABLE_PANEL_CUSTOMERS."` SET `lepublickey` = :public, `leprivatekey` = :private WHERE `customerid` = :customerid; + "); + Database::pexecute($upd_stmt, array('public' => $keys['public'], 'private' => $keys['private'], 'customerid' => $certrow['customerid'])); } $this->accountKey = $keys['private']; $this->postNewReg(); @@ -77,7 +77,7 @@ class lescript public function signDomains(array $domains, $domainkey = null) { - + if (!$this->accountKey) { throw new \RuntimeException("Account not initiated"); } @@ -166,7 +166,7 @@ class lescript $count = 0; do { if(empty($result['status']) || $result['status'] == "invalid") { - @unlink($tokenPath); + @unlink($tokenPath); throw new \RuntimeException("Verification ended with error: ".json_encode($result)); } $ended = !($result['status'] === "pending"); diff --git a/scripts/jobs/cron_letsencrypt.php b/scripts/jobs/cron_letsencrypt.php index 1211ffe2..7ac89a98 100644 --- a/scripts/jobs/cron_letsencrypt.php +++ b/scripts/jobs/cron_letsencrypt.php @@ -42,12 +42,12 @@ while ($certrow = $certificates_stmt->fetch(PDO::FETCH_ASSOC)) { if ($certrow['ssl_redirect'] != 2) { $cronlog->logAction(CRON_ACTION, LOG_DEBUG, "Updating " . $certrow['domain']); - + if ($certrow['ssl_cert_file']) { $cronlog->logAction(CRON_ACTION, LOG_DEBUG, "letsencrypt using old key / SAN for " . $certrow['domain']); // Parse the old certificate $x509data = openssl_x509_parse($certrow['ssl_cert_file']); - + // We are interessted in the old SAN - data $san = explode(', ', $x509data['extensions']['subjectAltName']); $domains = array(); @@ -62,20 +62,20 @@ while ($certrow = $certificates_stmt->fetch(PDO::FETCH_ASSOC)) { $domains[] = 'www.' . $certrow['domain']; } } - + try { // Initialize Lescript with documentroot $le = new lescript($cronlog); - + // Initialize Lescript $le->initAccount($certrow); - + // Request the new certificate (old key may be used) $return = $le->signDomains($domains, $certrow['ssl_key_file']); - + // We are interessted in the expirationdate $newcert = openssl_x509_parse($return['crt']); - + // Store the new data Database::pexecute($updcert_stmt, array( 'id' => $certrow['id'], @@ -87,7 +87,7 @@ while ($certrow = $certificates_stmt->fetch(PDO::FETCH_ASSOC)) { 'expirationdate' => date('Y-m-d H:i:s', $newcert['validTo_time_t']) ) ); - + if ($certrow['ssl_redirect'] == 3) { Database::pexecute($upddom_stmt, array( 'domainid' => $certrow['domainid']