maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix possible missing _ecc suffix of let's encrypt folder when cleaning up after deleting a domain

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-11-02 11:33:08 +01:00
parent 762f295d3d
commit cefd9226bd
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Froxlor/Domain/Domain.php
View File

@@ -320,12 +320,15 @@ class Domain
* @throws \Exception * @throws \Exception
*/ */
public static function triggerLetsEncryptCSRForAliasDestinationDomain( public static function triggerLetsEncryptCSRForAliasDestinationDomain(
int $aliasDestinationDomainID, int $aliasDestinationDomainID,
FroxlorLogger $log FroxlorLogger $log
) { ) {
if ($aliasDestinationDomainID > 0) { if ($aliasDestinationDomainID > 0) {
$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, $log->logAction(
"LetsEncrypt CSR triggered for domain ID " . $aliasDestinationDomainID); FroxlorLogger::ADM_ACTION,
LOG_INFO,
"LetsEncrypt CSR triggered for domain ID " . $aliasDestinationDomainID
);
$upd_stmt = Database::prepare("UPDATE $upd_stmt = Database::prepare("UPDATE
`" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
SET SET
@@ -349,15 +352,20 @@ class Domain
$acmesh = AcmeSh::getAcmeSh(); $acmesh = AcmeSh::getAcmeSh();
if (file_exists($acmesh)) { if (file_exists($acmesh)) {
$certificate_folder = AcmeSh::getWorkingDirFromEnv($domainname); $certificate_folder = AcmeSh::getWorkingDirFromEnv($domainname);
if (file_exists($certificate_folder)) { $certificate_ecc_folder = AcmeSh::getWorkingDirFromEnv($domainname, true);
if (file_exists($certificate_folder) || file_exists($certificate_ecc_folder)) {
$params = " --remove -d " . $domainname; $params = " --remove -d " . $domainname;
if (Settings::Get('system.leecc') > 0) { if (file_exists($certificate_ecc_folder)) {
$params .= " --ecc"; $params .= " --ecc";
} }
// run remove command // run remove command
FileDir::safe_exec($acmesh . $params); FileDir::safe_exec($acmesh . $params);
// remove certificates directory // remove certificates directory
FileDir::safe_exec('rm -rf ' . $certificate_folder); if (file_exists($certificate_folder)) {
FileDir::safe_exec('rm -rf ' . $certificate_folder);
} elseif (file_exists($certificate_ecc_folder)) {
FileDir::safe_exec('rm -rf ' . $certificate_ecc_folder);
}
} }
} }
return true; return true;