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

refactor: remove rate limiter and use retry strategy

Browse Source
This commit is contained in:
Maël Gangloff
2025-10-28 13:08:16 +01:00
parent 4c1d0f731b
commit 6256ed8604
4 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/MessageHandler/UpdateDomainHandler.php
View File

@@ -3,6 +3,7 @@
namespace App\MessageHandler;
use App\Entity\RdapServer;
use App\Entity\Watchlist;
use App\Exception\DomainNotFoundException;
use App\Exception\MalformedDomainException;
use App\Exception\TldNotSupportedException;
@@ -22,11 +23,9 @@ use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
use Symfony\Component\Mailer\MailerInterface;
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
use Symfony\Component\Messenger\Exception\ExceptionInterface;
use Symfony\Component\Messenger\Exception\RecoverableMessageHandlingException;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Mime\Address;
use Symfony\Component\Notifier\Recipient\Recipient;
use Symfony\Component\RateLimiter\RateLimiterFactory;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
@@ -46,7 +45,7 @@ final readonly class UpdateDomainHandler
private MessageBusInterface $bus,
private WatchlistRepository $watchlistRepository,
private DomainRepository $domainRepository,
private RateLimiterFactory $rdapRequestsLimiter, private LoggerInterface $logger,
private LoggerInterface $logger,
) {
$this->sender = new Address($mailerSenderEmail, $mailerSenderName);
}
@@ -63,6 +62,7 @@ final readonly class UpdateDomainHandler
* @throws ServerExceptionInterface
* @throws MalformedDomainException
* @throws ExceptionInterface
* @throws \Exception
*/
public function __invoke(UpdateDomain $message): void
{
@@ -76,22 +76,17 @@ final readonly class UpdateDomainHandler
return;
}
$limiter = $this->rdapRequestsLimiter->create($rdapServer->getUrl());
$limit = $limiter->consume();
if (!$limit->isAccepted()) {
$retryAfter = $limit->getRetryAfter()->getTimestamp() - time();
$this->logger->warning('Security rate limit reached for this RDAP server', [
'url' => $rdapServer->getUrl(),
'retryAfter' => $retryAfter,
]);
throw new RecoverableMessageHandlingException('Rate limit reached', 0, null, $retryAfter);
}
$watchlist = $this->watchlistRepository->findOneBy(['token' => $message->watchlistToken]);
if (!$this->RDAPService->isToBeUpdated($domain, false, null !== $watchlist->getConnector())) {
$this->logger->debug('The domain name is already present in the database and does not need to be updated at this time', [
'ldhName' => $domain->getLdhName(),
]);
return;
}
$updatedAt = $domain->getUpdatedAt();
$deleted = $domain->getDeleted();
@@ -101,7 +96,6 @@ final readonly class UpdateDomainHandler
* We send messages that correspond to the sending of notifications that will not be processed here.
*/
$this->RDAPService->registerDomain($domain->getLdhName());
$this->bus->dispatch(new DetectDomainChange($watchlist->getToken(), $domain->getLdhName(), $updatedAt));
} catch (DomainNotFoundException) {
$newDomain = $this->domainRepository->findOneBy(['ldhName' => $domain->getLdhName()]);
@@ -123,5 +117,10 @@ final readonly class UpdateDomainHandler
* In this case, the domain name can no longer be updated. Unfortunately, there is nothing more that can be done.
*/
}
/** @var Watchlist $wl */
foreach ($domain->getWatchlists()->getIterator() as $wl) {
$this->bus->dispatch(new DetectDomainChange($wl->getToken(), $domain->getLdhName(), $updatedAt));
}
}
}