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

feat: add ipAddress to the logs if anonymous query

Browse Source
This commit is contained in:
Maël Gangloff
2025-12-13 13:43:46 +01:00
parent 00e97f0d48
commit 94a29bc8df
4 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Service/RDAPService.php
View File

@@ -65,6 +65,10 @@ class RDAPService
'Private',
];
public const PENDING_DELETE_DURATION_DAYS = 5;
public const REDEMPTION_PERIOD_DURATION_DAYS = 30;
public const AUTO_RENEW_PERIOD_DURATION_DAYS = 45;
public function __construct(
private readonly HttpClientInterface $client,
private readonly EntityRepository $entityRepository,
@@ -740,13 +744,13 @@ class RDAPService
in_array('pending delete', $lastStatus->getAddStatus())
|| in_array('redemption period', $lastStatus->getDeleteStatus()))
) {
return self::daysBetween($now, $lastStatus->getCreatedAt()->add(new \DateInterval('P'. 5 .'D')));
return self::daysBetween($now, $lastStatus->getCreatedAt()->add(new \DateInterval('P'.self::PENDING_DELETE_DURATION_DAYS.'D')));
}
if ($domain->isRedemptionPeriod()
&& in_array('redemption period', $lastStatus->getAddStatus())
) {
return self::daysBetween($now, $lastStatus->getCreatedAt()->add(new \DateInterval('P'.(30 + 5).'D')));
return self::daysBetween($now, $lastStatus->getCreatedAt()->add(new \DateInterval('P'.(self::REDEMPTION_PERIOD_DURATION_DAYS + self::PENDING_DELETE_DURATION_DAYS).'D')));
}
return null;
@@ -772,7 +776,7 @@ class RDAPService
[$expiredAt, $deletedAt] = $this->getRelevantDates($domain);
if ($expiredAt) {
$guess = self::daysBetween($now, $expiredAt->add(new \DateInterval('P'.(45 + 30 + 5).'D')));
$guess = self::daysBetween($now, $expiredAt->add(new \DateInterval('P'.(self::AUTO_RENEW_PERIOD_DURATION_DAYS + self::REDEMPTION_PERIOD_DURATION_DAYS + self::PENDING_DELETE_DURATION_DAYS).'D')));
}
if ($deletedAt) {
@@ -781,7 +785,7 @@ class RDAPService
return 0;
}
$guess = self::daysBetween($now, $deletedAt->add(new \DateInterval('P'. 30 .'D')));
$guess = self::daysBetween($now, $deletedAt->add(new \DateInterval('P'.self::REDEMPTION_PERIOD_DURATION_DAYS.'D')));
}
return self::returnExpiresIn([

4
src/State/AutoRegisterDomainProvider.php
View File

@@ -72,6 +72,7 @@ readonly class AutoRegisterDomainProvider implements ProviderInterface
$idnDomain = RDAPService::convertToIdn($uriVariables['ldhName']);
$user = $this->security->getUser();
$request = $this->requestStack->getCurrentRequest();
if (null !== $user) {
$this->logger->info('User wants to update a domain name', [
@@ -81,11 +82,10 @@ readonly class AutoRegisterDomainProvider implements ProviderInterface
} else {
$this->logger->info('Anonymous wants to update a domain name', [
'ldhName' => $idnDomain,
'ipAddress' => $request->getClientIp(),
]);
}
$request = $this->requestStack->getCurrentRequest();
/** @var ?Domain $domain */
$domain = $this->domainRepository->findOneBy(['ldhName' => $idnDomain]);
// If the domain name exists in the database, recently updated and not important, we return the stored Domain