Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 17:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

simplify

Browse source
This commit is contained in:
Hemachandar 2025-12-17 21:04:15 +05:30
parent 0e27088e2a
commit db0dbeb27b
1 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/Appwrite/Platform/Workers/Certificates.php
View file

@ -195,9 +195,7 @@ class Certificates extends Action
// Validate domain and DNS records. Skip if job is forced
if (!$skipRenewCheck) {
$mainDomain = $validationDomain ?? $this->getMainDomain();
$isMainDomain = !isset($mainDomain) || $domain->get() === $mainDomain;
$this->validateDomain($rule, $isMainDomain, $log);
$this->validateDomain($rule, $domain, $validationDomain, $log);
// If certificate exists already, double-check expiry date. Skip if job is forced
if (!$certificates->isRenewRequired($domain->get(), $domainType, $log)) {
@ -211,7 +209,7 @@ class Certificates extends Action
$renewDate = $certificates->issueCertificate($certName, $domain->get(), $domainType);
// If certificate is generated instantly, we can mark the rule as 'verified'.
if ($certificates->isInstantGeneration()) {
if ($certificates->isInstantGeneration($domain->get(), $domainType)) {
$rule->setAttribute('status', RULE_STATUS_VERIFIED);
$certificate->setAttribute('logs', 'Certificate successfully generated.');
}
@ -350,6 +348,31 @@ class Certificates extends Action
->trigger();
}
/**
* Internal domain validation functionality to prevent unnecessary attempts. We check:
* - Domain needs to be public and valid (prevents NFT domains that are not supported)
* - Domain must have proper DNS record
*
* @param Document $rule Rule to validate
* @param Domain $domain Domain to validate
* @param string|null $validationDomain Override for main domain check
* @param Log $log Logger for adding metrics
*
* @return void
* @throws Exception
*/
private function validateDomain(Document $rule, Domain $domain, ?string $validationDomain = null, Log $log): void
{
$mainDomain = $validationDomain ?? $this->getMainDomain();
$isMainDomain = !isset($mainDomain) || $domain->get() === $mainDomain;
if (!$isMainDomain) {
$this->verifyRule($rule, $log);
} else {
// Main domain validation
// TODO: Would be awesome to check A/AAAA record here. Maybe dry run?
}
}
/**
* Get main domain. Needed as we do different checks for main and non-main domains.
*
@ -366,29 +389,7 @@ class Certificates extends Action
}
/**
* Internal domain validation functionality to prevent unnecessary attempts. We check:
* - Domain needs to be public and valid (prevents NFT domains that are not supported)
* - Domain must have proper DNS record
*
* @param Document $rule Rule to validate
* @param bool $isMainDomain In case of master domain, we look for different DNS configurations
* @param Log $log Logger for adding metrics
*
* @return void
* @throws Exception
*/
private function validateDomain(Document $rule, bool $isMainDomain, Log $log): void
{
if (!$isMainDomain) {
$this->verifyRule($rule, $log);
} else {
// Main domain validation
// TODO: Would be awesome to check A/AAAA record here. Maybe dry run?
}
}
/**
* Method to make sure information about error is delivered to admnistrator.
* Method to make sure information about error is delivered to administrator.
*
* @param string $domain Domain that caused the error
* @param string $errorMessage Verbose error message