External/domain-watchdog
1
0
Fork 0
mirror of https://github.com/maelgangloff/domain-watchdog.git synced 2025-12-29 16:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: expiresInDays domain name

Browse Source
This commit is contained in:
Maël Gangloff
2025-01-20 17:30:54 +01:00
parent 05a7ec9a82
commit 125ac39de1
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/app/custom_rdap_servers.example.yaml
View File

@@ -28,6 +28,7 @@
[ [
[ [
"ag", "ag",
"ac",
"me", "me",
"bz", "bz",
"gi", "gi",

12
src/Entity/Domain.php
View File

@@ -476,13 +476,16 @@ class Domain
return in_array('pending delete', $this->getStatus()) && !in_array('redemption period', $this->getStatus()); return in_array('pending delete', $this->getStatus()) && !in_array('redemption period', $this->getStatus());
} }
/**
* @throws \DateMalformedIntervalStringException
*/
private function calculateDaysFromStatus($lastStatus, \DateTimeImmutable $now): ?int private function calculateDaysFromStatus($lastStatus, \DateTimeImmutable $now): ?int
{ {
if (in_array('pending delete', $lastStatus->getAddStatus()) && !$this->isRedemptionPeriod()) { if (in_array('pending delete', $lastStatus->getAddStatus()) && !$this->isRedemptionPeriod()) {
return self::daysBetween($now, $lastStatus->getCreatedAt()->add(new \DateInterval('P5D'))); return self::daysBetween($now, $lastStatus->getCreatedAt()->add(new \DateInterval('P'. 6 .'D')));
} }
if (in_array('redemption period', $lastStatus->getAddStatus())) { if (in_array('redemption period', $lastStatus->getAddStatus())) {
return self::daysBetween($now, $lastStatus->getCreatedAt()->add(new \DateInterval('P35D'))); return self::daysBetween($now, $lastStatus->getCreatedAt()->add(new \DateInterval('P'.(30 + 6).'D')));
} }
return null; return null;
@@ -532,17 +535,18 @@ class Domain
[$expiredAt, $deletedAt] = $this->getRelevantDates(); [$expiredAt, $deletedAt] = $this->getRelevantDates();
if ($deletedAt) { if ($deletedAt) {
// It has been observed that AFNIC, on the last day, adds a "deleted" event and removes the redemption period status.
if (0 === self::daysBetween($now, $deletedAt) && in_array('pending delete', $this->getStatus())) { if (0 === self::daysBetween($now, $deletedAt) && in_array('pending delete', $this->getStatus())) {
return 0; return 0;
} }
$guess = self::daysBetween($now, $deletedAt->add(new \DateInterval('P30D'))); $guess = self::daysBetween($now, $deletedAt->add(new \DateInterval('P'. 30 .'D')));
return self::returnExpiresIn($guess, $daysToExpiration ?? $guess); return self::returnExpiresIn($guess, $daysToExpiration ?? $guess);
} }
if ($expiredAt) { if ($expiredAt) {
$guess = self::daysBetween($now, $expiredAt->add(new \DateInterval('P'.(45 + 30 + 5).'D'))); $guess = self::daysBetween($now, $expiredAt->add(new \DateInterval('P'.(45 + 30 + 6).'D')));
return self::returnExpiresIn($guess, $daysToExpiration ?? $guess); return self::returnExpiresIn($guess, $daysToExpiration ?? $guess);
} }