*/
#[ORM\OneToMany(targetEntity: WatchListTrigger::class, mappedBy: 'watchList', cascade: ['persist'], orphanRemoval: true)]
- #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create', 'watchlist:update'])]
+ #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create'])]
#[SerializedName('triggers')]
private Collection $watchListTriggers;
#[ORM\ManyToOne(inversedBy: 'watchLists')]
- #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create', 'watchlist:update'])]
+ #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create'])]
private ?Connector $connector = null;
#[ORM\Column(length: 255, nullable: true)]
- #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create', 'watchlist:update'])]
+ #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create'])]
private ?string $name = null;
#[ORM\Column]
#[Groups(['watchlist:list', 'watchlist:item'])]
private ?\DateTimeImmutable $createdAt = null;
+ #[SerializedName('dsn')]
+ #[ORM\Column(type: Types::SIMPLE_ARRAY, nullable: true)]
+ #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create'])]
+ private ?array $webhookDsn = null;
+
public function __construct()
{
$this->token = Uuid::v4();
@@ -119,6 +145,11 @@ class WatchList
return $this->token;
}
+ public function setToken(string $token): void
+ {
+ $this->token = $token;
+ }
+
public function getUser(): ?User
{
return $this->user;
@@ -220,4 +251,16 @@ class WatchList
return $this;
}
+
+ public function getWebhookDsn(): ?array
+ {
+ return $this->webhookDsn;
+ }
+
+ public function setWebhookDsn(?array $webhookDsn): static
+ {
+ $this->webhookDsn = $webhookDsn;
+
+ return $this;
+ }
}
diff --git a/src/Entity/WatchListTrigger.php b/src/Entity/WatchListTrigger.php
index d40b265..c1601fe 100644
--- a/src/Entity/WatchListTrigger.php
+++ b/src/Entity/WatchListTrigger.php
@@ -12,17 +12,17 @@ class WatchListTrigger
{
#[ORM\Id]
#[ORM\Column(length: 255)]
- #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create', 'watchlist:update'])]
+ #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create'])]
private ?string $event = null;
#[ORM\Id]
- #[ORM\ManyToOne(targetEntity: WatchList::class, inversedBy: 'watchListTriggers')]
+ #[ORM\ManyToOne(targetEntity: WatchList::class, cascade: ['persist'], inversedBy: 'watchListTriggers')]
#[ORM\JoinColumn(referencedColumnName: 'token', nullable: false, onDelete: 'CASCADE')]
private ?WatchList $watchList = null;
#[ORM\Id]
#[ORM\Column(enumType: TriggerAction::class)]
- #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create', 'watchlist:update'])]
+ #[Groups(['watchlist:list', 'watchlist:item', 'watchlist:create'])]
private ?TriggerAction $action = null;
public function getEvent(): ?string
diff --git a/src/Message/ProcessDomainTrigger.php b/src/Message/OrderDomain.php
similarity index 85%
rename from src/Message/ProcessDomainTrigger.php
rename to src/Message/OrderDomain.php
index 69dca3c..8a5dcc5 100644
--- a/src/Message/ProcessDomainTrigger.php
+++ b/src/Message/OrderDomain.php
@@ -2,7 +2,7 @@
namespace App\Message;
-final class ProcessDomainTrigger
+final class OrderDomain
{
public function __construct(
public string $watchListToken,
diff --git a/src/Message/SendDomainEventNotif.php b/src/Message/SendDomainEventNotif.php
new file mode 100644
index 0000000..cbe3c54
--- /dev/null
+++ b/src/Message/SendDomainEventNotif.php
@@ -0,0 +1,13 @@
+sender = new Address($mailerSenderEmail, $mailerSenderName);
+ }
+
+ /**
+ * @throws TransportExceptionInterface
+ * @throws \Symfony\Component\Notifier\Exception\TransportExceptionInterface
+ * @throws \Throwable
+ */
+ public function __invoke(OrderDomain $message): void
+ {
+ /** @var WatchList $watchList */
+ $watchList = $this->watchListRepository->findOneBy(['token' => $message->watchListToken]);
+ /** @var Domain $domain */
+ $domain = $this->domainRepository->findOneBy(['ldhName' => $message->ldhName]);
+
+ $connector = $watchList->getConnector();
+ if (null !== $connector && $domain->getDeleted()) {
+ $this->logger->notice('Watchlist {watchlist} is linked to connector {connector}. A purchase attempt will be made for domain name {ldhName} with provider {provider}.', [
+ 'watchlist' => $message->watchListToken,
+ 'connector' => $connector->getId(),
+ 'ldhName' => $message->ldhName,
+ 'provider' => $connector->getProvider()->value,
+ ]);
+ try {
+ $provider = $connector->getProvider();
+ if (null === $provider) {
+ throw new \InvalidArgumentException('Provider not found');
+ }
+
+ $connectorProviderClass = $provider->getConnectorProvider();
+
+ /** @var AbstractProvider $connectorProvider */
+ $connectorProvider = $this->locator->get($connectorProviderClass);
+ $connectorProvider->authenticate($connector->getAuthData());
+
+ $connectorProvider->orderDomain($domain, $this->kernel->isDebug());
+ $this->statService->incrementStat('stats.domain.purchased');
+
+ $notification = (new DomainOrderNotification($this->sender, $domain, $connector));
+ $this->mailer->send($notification->asEmailMessage(new Recipient($watchList->getUser()->getEmail()))->getMessage());
+ $this->chatNotificationService->sendChatNotification($watchList, $notification);
+ } catch (\Throwable $exception) {
+ $this->logger->warning('Unable to complete purchase. An error message is sent to user {username}.', [
+ 'username' => $watchList->getUser()->getUserIdentifier(),
+ ]);
+
+ $notification = (new DomainOrderErrorNotification($this->sender, $domain));
+ $this->mailer->send($notification->asEmailMessage(new Recipient($watchList->getUser()->getEmail()))->getMessage());
+ $this->chatNotificationService->sendChatNotification($watchList, $notification);
+
+ $this->statService->incrementStat('stats.domain.purchase.failed');
+
+ throw $exception;
+ }
+ }
+ }
+}
diff --git a/src/MessageHandler/ProcessDomainTriggerHandler.php b/src/MessageHandler/ProcessDomainTriggerHandler.php
deleted file mode 100644
index 0507094..0000000
--- a/src/MessageHandler/ProcessDomainTriggerHandler.php
+++ /dev/null
@@ -1,164 +0,0 @@
-watchListRepository->findOneBy(['token' => $message->watchListToken]);
- /** @var Domain $domain */
- $domain = $this->domainRepository->findOneBy(['ldhName' => $message->ldhName]);
-
- $connector = $watchList->getConnector();
- if (null !== $connector && $domain->getDeleted()) {
- $this->logger->notice('Watchlist {watchlist} is linked to connector {connector}. A purchase attempt will be made for domain name {ldhName} with provider {provider}.', [
- 'watchlist' => $message->watchListToken,
- 'connector' => $connector->getId(),
- 'ldhName' => $message->ldhName,
- 'provider' => $connector->getProvider()->value,
- ]);
- try {
- $provider = $connector->getProvider();
- if (null === $provider) {
- throw new \Exception('Provider not found');
- }
-
- $connectorProviderClass = $provider->getConnectorProvider();
-
- /** @var ConnectorInterface $connectorProvider */
- $connectorProvider = $this->locator->get($connectorProviderClass);
-
- $connectorProvider->authenticate($connector->getAuthData());
- $connectorProvider->orderDomain($domain, /* $this->kernel->isDebug() */ false);
-
- $this->sendEmailDomainOrdered($domain, $connector, $watchList->getUser());
- } catch (\Throwable $t) {
- dump($t);
- $this->logger->error('Unable to complete purchase. An error message is sent to user {username}.', [
- 'username' => $watchList->getUser()->getUserIdentifier(),
- 'error' => $t,
- ]);
- $this->sendEmailDomainOrderError($domain, $watchList->getUser());
- }
- }
-
- /** @var DomainEvent $event */
- foreach ($domain->getEvents()->filter(fn ($event) => $message->updatedAt < $event->getDate() && $event->getDate() < new \DateTime()) as $event) {
- $watchListTriggers = $watchList->getWatchListTriggers()
- ->filter(fn ($trigger) => $trigger->getEvent() === $event->getAction());
-
- /** @var WatchListTrigger $watchListTrigger */
- foreach ($watchListTriggers->getIterator() as $watchListTrigger) {
- $this->logger->info('Action {event} has been detected on the domain name {ldhName}. A notification is sent to user {username}.', [
- 'event' => $event->getAction(),
- 'ldhName' => $message->ldhName,
- 'username' => $watchList->getUser()->getUserIdentifier(),
- ]);
- if (TriggerAction::SendEmail == $watchListTrigger->getAction()) {
- $this->sendEmailDomainUpdated($event, $watchList->getUser());
- }
- }
- }
- }
-
- /**
- * @throws TransportExceptionInterface
- */
- private function sendEmailDomainOrdered(Domain $domain, Connector $connector, User $user): void
- {
- $email = (new TemplatedEmail())
- ->from(new Address($this->mailerSenderEmail, $this->mailerSenderName))
- ->to($user->getEmail())
- ->priority(Email::PRIORITY_HIGHEST)
- ->subject('A domain name has been ordered')
- ->htmlTemplate('emails/success/domain_ordered.html.twig')
- ->locale('en')
- ->context([
- 'domain' => $domain,
- 'provider' => $connector->getProvider()->value,
- ]);
-
- $this->mailer->send($email);
- }
-
- /**
- * @throws TransportExceptionInterface
- */
- private function sendEmailDomainOrderError(Domain $domain, User $user): void
- {
- $email = (new TemplatedEmail())
- ->from(new Address($this->mailerSenderEmail, $this->mailerSenderName))
- ->to($user->getEmail())
- ->subject('An error occurred while ordering a domain name')
- ->htmlTemplate('emails/errors/domain_order.html.twig')
- ->locale('en')
- ->context([
- 'domain' => $domain,
- ]);
-
- $this->mailer->send($email);
- }
-
- /**
- * @throws TransportExceptionInterface
- */
- private function sendEmailDomainUpdated(DomainEvent $domainEvent, User $user): void
- {
- $email = (new TemplatedEmail())
- ->from(new Address($this->mailerSenderEmail, $this->mailerSenderName))
- ->to($user->getEmail())
- ->priority(Email::PRIORITY_HIGHEST)
- ->subject('A domain name has been changed')
- ->htmlTemplate('emails/success/domain_updated.html.twig')
- ->locale('en')
- ->context([
- 'event' => $domainEvent,
- ]);
-
- $this->mailer->send($email);
- }
-}
diff --git a/src/MessageHandler/ProcessWatchListTriggerHandler.php b/src/MessageHandler/ProcessWatchListTriggerHandler.php
deleted file mode 100644
index c43d9c5..0000000
--- a/src/MessageHandler/ProcessWatchListTriggerHandler.php
+++ /dev/null
@@ -1,90 +0,0 @@
-watchListRepository->findOneBy(['token' => $message->watchListToken]);
-
- $this->logger->info('Domain names from Watchlist {token} will be processed.', [
- 'token' => $message->watchListToken,
- ]);
-
- /** @var Domain $domain */
- foreach ($watchList->getDomains()
- ->filter(fn ($domain) => $domain->getUpdatedAt()
- ->diff(
- new \DateTimeImmutable('now'))->days >= 7
- || $this->RDAPService::isToBeWatchClosely($domain, $domain->getUpdatedAt())
- ) as $domain
- ) {
- $updatedAt = $domain->getUpdatedAt();
-
- try {
- $this->RDAPService->registerDomain($domain->getLdhName());
- } catch (\Throwable $e) {
- $this->logger->error('An update error email is sent to user {username}.', [
- 'username' => $watchList->getUser()->getUserIdentifier(),
- 'error' => $e,
- ]);
- $this->sendEmailDomainUpdateError($domain, $watchList->getUser());
- }
-
- $this->bus->dispatch(new ProcessDomainTrigger($watchList->getToken(), $domain->getLdhName(), $updatedAt));
- }
- }
-
- /**
- * @throws TransportExceptionInterface
- */
- private function sendEmailDomainUpdateError(Domain $domain, User $user): void
- {
- $email = (new TemplatedEmail())
- ->from(new Address($this->mailerSenderEmail, $this->mailerSenderName))
- ->to($user->getEmail())
- ->subject('An error occurred while updating a domain name')
- ->htmlTemplate('emails/errors/domain_update.html.twig')
- ->locale('en')
- ->context([
- 'domain' => $domain,
- ]);
-
- $this->mailer->send($email);
- }
-}
diff --git a/src/MessageHandler/ProcessWatchListsTriggerHandler.php b/src/MessageHandler/ProcessWatchListsTriggerHandler.php
index ee2085c..881c255 100644
--- a/src/MessageHandler/ProcessWatchListsTriggerHandler.php
+++ b/src/MessageHandler/ProcessWatchListsTriggerHandler.php
@@ -4,7 +4,7 @@ namespace App\MessageHandler;
use App\Entity\WatchList;
use App\Message\ProcessWatchListsTrigger;
-use App\Message\ProcessWatchListTrigger;
+use App\Message\UpdateDomainsFromWatchlist;
use App\Repository\WatchListRepository;
use Random\Randomizer;
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
@@ -30,7 +30,7 @@ final readonly class ProcessWatchListsTriggerHandler
/** @var WatchList $watchList */
foreach ($watchLists as $watchList) {
- $this->bus->dispatch(new ProcessWatchListTrigger($watchList->getToken()));
+ $this->bus->dispatch(new UpdateDomainsFromWatchlist($watchList->getToken()));
}
}
}
diff --git a/src/MessageHandler/SendDomainEventNotifHandler.php b/src/MessageHandler/SendDomainEventNotifHandler.php
new file mode 100644
index 0000000..481ed90
--- /dev/null
+++ b/src/MessageHandler/SendDomainEventNotifHandler.php
@@ -0,0 +1,80 @@
+sender = new Address($mailerSenderEmail, $mailerSenderName);
+ }
+
+ /**
+ * @throws TransportExceptionInterface
+ * @throws \Exception
+ * @throws ExceptionInterface
+ */
+ public function __invoke(SendDomainEventNotif $message): void
+ {
+ /** @var WatchList $watchList */
+ $watchList = $this->watchListRepository->findOneBy(['token' => $message->watchListToken]);
+ /** @var Domain $domain */
+ $domain = $this->domainRepository->findOneBy(['ldhName' => $message->ldhName]);
+
+ /** @var DomainEvent $event */
+ foreach ($domain->getEvents()->filter(fn ($event) => $message->updatedAt < $event->getDate() && $event->getDate() < new \DateTime()) as $event) {
+ $watchListTriggers = $watchList->getWatchListTriggers()
+ ->filter(fn ($trigger) => $trigger->getEvent() === $event->getAction());
+
+ /** @var WatchListTrigger $watchListTrigger */
+ foreach ($watchListTriggers->getIterator() as $watchListTrigger) {
+ $this->logger->info('Action {event} has been detected on the domain name {ldhName}. A notification is sent to user {username}.', [
+ 'event' => $event->getAction(),
+ 'ldhName' => $message->ldhName,
+ 'username' => $watchList->getUser()->getUserIdentifier(),
+ ]);
+
+ $recipient = new Recipient($watchList->getUser()->getEmail());
+ $notification = new DomainUpdateNotification($this->sender, $event);
+
+ if (TriggerAction::SendEmail == $watchListTrigger->getAction()) {
+ $this->mailer->send($notification->asEmailMessage($recipient)->getMessage());
+ } elseif (TriggerAction::SendChat == $watchListTrigger->getAction()) {
+ $this->chatNotificationService->sendChatNotification($watchList, $notification);
+ }
+
+ $this->statService->incrementStat('stats.alert.sent');
+ }
+ }
+ }
+}
diff --git a/src/MessageHandler/UpdateDomainsFromWatchlistHandler.php b/src/MessageHandler/UpdateDomainsFromWatchlistHandler.php
new file mode 100644
index 0000000..11a938d
--- /dev/null
+++ b/src/MessageHandler/UpdateDomainsFromWatchlistHandler.php
@@ -0,0 +1,100 @@
+sender = new Address($mailerSenderEmail, $mailerSenderName);
+ }
+
+ /**
+ * @throws ExceptionInterface
+ * @throws TransportExceptionInterface
+ * @throws ClientExceptionInterface
+ * @throws DecodingExceptionInterface
+ * @throws RedirectionExceptionInterface
+ * @throws ServerExceptionInterface
+ * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
+ * @throws \Throwable
+ */
+ public function __invoke(UpdateDomainsFromWatchlist $message): void
+ {
+ /** @var WatchList $watchList */
+ $watchList = $this->watchListRepository->findOneBy(['token' => $message->watchListToken]);
+
+ $this->logger->info('Domain names from Watchlist {token} will be processed.', [
+ 'token' => $message->watchListToken,
+ ]);
+
+ /** @var Domain $domain */
+ foreach ($watchList->getDomains()
+ ->filter(fn ($domain) => $domain->getUpdatedAt()
+ ->diff(new \DateTimeImmutable())->days >= 7
+ || (
+ ($domain->getUpdatedAt()
+ ->diff(new \DateTimeImmutable())->h * 60 + $domain->getUpdatedAt()
+ ->diff(new \DateTimeImmutable())->i) >= 50
+ && $this->RDAPService::isToBeWatchClosely($domain)
+ )
+ || (count(array_intersect($domain->getStatus(), ['auto renew period', 'client hold', 'server hold'])) > 0
+ && $domain->getUpdatedAt()->diff(new \DateTimeImmutable())->days >= 1
+ )
+ ) as $domain
+ ) {
+ $updatedAt = $domain->getUpdatedAt();
+
+ try {
+ $this->RDAPService->registerDomain($domain->getLdhName());
+ $this->bus->dispatch(new SendDomainEventNotif($watchList->getToken(), $domain->getLdhName(), $updatedAt));
+ } catch (NotFoundHttpException) {
+ if (null !== $watchList->getConnector()) {
+ $this->bus->dispatch(new OrderDomain($watchList->getToken(), $domain->getLdhName(), $updatedAt));
+ }
+ } catch (\Throwable $e) {
+ $this->logger->error('An update error email is sent to user {username}.', [
+ 'username' => $watchList->getUser()->getUserIdentifier(),
+ 'error' => $e,
+ ]);
+ $email = (new DomainUpdateErrorNotification($this->sender, $domain))
+ ->asEmailMessage(new Recipient($watchList->getUser()->getEmail()));
+ $this->mailer->send($email->getMessage());
+
+ throw $e;
+ }
+ }
+ }
+}
diff --git a/src/MessageHandler/UpdateRdapServersHandler.php b/src/MessageHandler/UpdateRdapServersHandler.php
index 5002f8f..3d139af 100644
--- a/src/MessageHandler/UpdateRdapServersHandler.php
+++ b/src/MessageHandler/UpdateRdapServersHandler.php
@@ -4,6 +4,7 @@ namespace App\MessageHandler;
use App\Message\UpdateRdapServers;
use App\Service\RDAPService;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
@@ -14,8 +15,10 @@ use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
#[AsMessageHandler]
final readonly class UpdateRdapServersHandler
{
- public function __construct(private RDAPService $RDAPService)
- {
+ public function __construct(
+ private RDAPService $RDAPService,
+ private ParameterBagInterface $bag
+ ) {
}
/**
@@ -29,17 +32,32 @@ final readonly class UpdateRdapServersHandler
{
/** @var \Throwable[] $throws */
$throws = [];
+
try {
$this->RDAPService->updateTldListIANA();
$this->RDAPService->updateGTldListICANN();
} catch (\Throwable $throwable) {
$throws[] = $throwable;
}
+
try {
- $this->RDAPService->updateRDAPServers();
+ $this->RDAPService->updateRDAPServersFromIANA();
} catch (\Throwable $throwable) {
$throws[] = $throwable;
}
+
+ try {
+ $this->RDAPService->updateRDAPServersFromIANA();
+ } catch (\Throwable $throwable) {
+ $throws[] = $throwable;
+ }
+
+ try {
+ $this->RDAPService->updateRDAPServersFromFile($this->bag->get('custom_rdap_servers_file'));
+ } catch (\Throwable $throwable) {
+ $throws[] = $throwable;
+ }
+
if (!empty($throws)) {
throw $throws[0];
}
diff --git a/src/Notifier/DomainOrderErrorNotification.php b/src/Notifier/DomainOrderErrorNotification.php
new file mode 100644
index 0000000..b86694c
--- /dev/null
+++ b/src/Notifier/DomainOrderErrorNotification.php
@@ -0,0 +1,59 @@
+domain->getLdhName();
+ $this->subject("Error: Domain Order $ldhName")
+ ->content("Domain name $ldhName tried to be purchased. The attempt failed.")
+ ->importance(Notification::IMPORTANCE_HIGH);
+
+ return ChatMessage::fromNotification($this);
+ }
+
+ public function asPushMessage(?RecipientInterface $recipient = null, ?string $transport = null): ?PushMessage
+ {
+ $ldhName = $this->domain->getLdhName();
+ $this->subject("Error: Domain Order $ldhName")
+ ->content("Domain name $ldhName tried to be purchased. The attempt failed.")
+ ->importance(Notification::IMPORTANCE_HIGH);
+
+ return PushMessage::fromNotification($this);
+ }
+
+ public function asEmailMessage(EmailRecipientInterface $recipient): EmailMessage
+ {
+ return new EmailMessage((new TemplatedEmail())
+ ->from($this->sender)
+ ->to($recipient->getEmail())
+ ->subject('An error occurred while ordering a domain name')
+ ->htmlTemplate('emails/errors/domain_order.html.twig')
+ ->locale('en')
+ ->context([
+ 'domain' => $this->domain,
+ ]));
+ }
+}
diff --git a/src/Notifier/DomainOrderNotification.php b/src/Notifier/DomainOrderNotification.php
new file mode 100644
index 0000000..0c17497
--- /dev/null
+++ b/src/Notifier/DomainOrderNotification.php
@@ -0,0 +1,63 @@
+domain->getLdhName();
+ $this
+ ->subject("Success: Domain Ordered $ldhName!")
+ ->content("Domain name $ldhName has just been purchased. The API provider did not return an error.")
+ ->importance(Notification::IMPORTANCE_HIGH);
+
+ return ChatMessage::fromNotification($this);
+ }
+
+ public function asPushMessage(?RecipientInterface $recipient = null, ?string $transport = null): ?PushMessage
+ {
+ $ldhName = $this->domain->getLdhName();
+ $this
+ ->subject("Success: Domain Ordered $ldhName!")
+ ->content("Domain name $ldhName has just been purchased. The API provider did not return an error.")
+ ->importance(Notification::IMPORTANCE_HIGH);
+
+ return PushMessage::fromNotification($this);
+ }
+
+ public function asEmailMessage(EmailRecipientInterface $recipient): EmailMessage
+ {
+ return new EmailMessage((new TemplatedEmail())
+ ->from($this->sender)
+ ->to($recipient->getEmail())
+ ->priority(Email::PRIORITY_HIGHEST)
+ ->subject('A domain name has been ordered')
+ ->htmlTemplate('emails/success/domain_ordered.html.twig')
+ ->locale('en')
+ ->context([
+ 'domain' => $this->domain,
+ 'provider' => $this->connector->getProvider()->value,
+ ]));
+ }
+}
diff --git a/src/Notifier/DomainUpdateErrorNotification.php b/src/Notifier/DomainUpdateErrorNotification.php
new file mode 100644
index 0000000..6b2e1e5
--- /dev/null
+++ b/src/Notifier/DomainUpdateErrorNotification.php
@@ -0,0 +1,56 @@
+domain->getLdhName();
+ $this->subject("Error: Domain Update $ldhName")
+ ->content("Domain name $ldhName tried to be updated. The attempt failed.")
+ ->importance(Notification::IMPORTANCE_MEDIUM);
+
+ return ChatMessage::fromNotification($this);
+ }
+
+ public function asPushMessage(?RecipientInterface $recipient = null, ?string $transport = null): ?PushMessage
+ {
+ $ldhName = $this->domain->getLdhName();
+ $this->subject("Error: Domain Update $ldhName")
+ ->content("Domain name $ldhName tried to be updated. The attempt failed.")
+ ->importance(Notification::IMPORTANCE_MEDIUM);
+
+ return PushMessage::fromNotification($this);
+ }
+
+ public function asEmailMessage(EmailRecipientInterface $recipient): EmailMessage
+ {
+ return new EmailMessage((new TemplatedEmail())
+ ->from($this->sender)
+ ->to($recipient->getEmail())
+ ->subject('An error occurred while updating a domain name')
+ ->htmlTemplate('emails/errors/domain_update.html.twig')
+ ->locale('en')
+ ->context([
+ 'domain' => $this->domain,
+ ]));
+ }
+}
diff --git a/src/Notifier/DomainUpdateNotification.php b/src/Notifier/DomainUpdateNotification.php
new file mode 100644
index 0000000..65c02cd
--- /dev/null
+++ b/src/Notifier/DomainUpdateNotification.php
@@ -0,0 +1,60 @@
+domainEvent->getDomain()->getLdhName();
+ $action = $this->domainEvent->getAction();
+ $this->subject("Domain changed $ldhName ($action)")
+ ->content("Domain name $ldhName information has been updated ($action).")
+ ->importance(Notification::IMPORTANCE_HIGH);
+
+ return ChatMessage::fromNotification($this);
+ }
+
+ public function asPushMessage(?RecipientInterface $recipient = null, ?string $transport = null): ?PushMessage
+ {
+ $ldhName = $this->domainEvent->getDomain()->getLdhName();
+ $action = $this->domainEvent->getAction();
+ $this->subject("Domain changed $ldhName ($action)")
+ ->content("Domain name $ldhName information has been updated ($action).")
+ ->importance(Notification::IMPORTANCE_HIGH);
+
+ return PushMessage::fromNotification($this);
+ }
+
+ public function asEmailMessage(EmailRecipientInterface $recipient): EmailMessage
+ {
+ return new EmailMessage((new TemplatedEmail())
+ ->from($this->sender)
+ ->to($recipient->getEmail())
+ ->priority(Email::PRIORITY_HIGHEST)
+ ->subject('A domain name has been changed')
+ ->htmlTemplate('emails/success/domain_updated.html.twig')
+ ->locale('en')
+ ->context([
+ 'event' => $this->domainEvent,
+ ]));
+ }
+}
diff --git a/src/Notifier/DomainWatchdogNotification.php b/src/Notifier/DomainWatchdogNotification.php
new file mode 100644
index 0000000..19583d2
--- /dev/null
+++ b/src/Notifier/DomainWatchdogNotification.php
@@ -0,0 +1,11 @@
+subject('Test notification')
+ ->content('This is a test message. If you can read me, this Webhook is configured correctly')
+ ->importance(Notification::IMPORTANCE_LOW);
+
+ return ChatMessage::fromNotification($this);
+ }
+
+ public function asPushMessage(?RecipientInterface $recipient = null, ?string $transport = null): ?PushMessage
+ {
+ $this
+ ->subject('Test notification')
+ ->content('This is a test message. If you can read me, this Webhook is configured correctly')
+ ->importance(Notification::IMPORTANCE_LOW);
+
+ return PushMessage::fromNotification($this);
+ }
+}
diff --git a/src/Scheduler/SendNotifWatchListTriggerSchedule.php b/src/Scheduler/SendNotifWatchListTriggerSchedule.php
index 87308e5..54c8fdb 100644
--- a/src/Scheduler/SendNotifWatchListTriggerSchedule.php
+++ b/src/Scheduler/SendNotifWatchListTriggerSchedule.php
@@ -21,7 +21,7 @@ final readonly class SendNotifWatchListTriggerSchedule implements ScheduleProvid
{
return (new Schedule())
->add(
- RecurringMessage::every('1 day', new ProcessWatchListsTrigger()),
+ RecurringMessage::every('1 hour', new ProcessWatchListsTrigger()),
)
->stateful($this->cache);
}
diff --git a/src/Security/EmailVerifier.php b/src/Security/EmailVerifier.php
index 7d09bfb..233ac87 100644
--- a/src/Security/EmailVerifier.php
+++ b/src/Security/EmailVerifier.php
@@ -22,7 +22,7 @@ readonly class EmailVerifier
/**
* @throws TransportExceptionInterface
*/
- public function sendEmailConfirmation(string $verifyEmailRouteName, User $user, TemplatedEmail $email): void
+ public function sendEmailConfirmation(string $verifyEmailRouteName, User $user, TemplatedEmail $email): TemplatedEmail
{
$signatureComponents = $this->verifyEmailHelper->generateSignature(
$verifyEmailRouteName,
@@ -39,6 +39,8 @@ readonly class EmailVerifier
$email->context($context);
$this->mailer->send($email);
+
+ return $email;
}
public function handleEmailConfirmation(Request $request, User $user): void
diff --git a/src/Security/JWTAuthenticator.php b/src/Security/JWTAuthenticator.php
index d43a240..db57bc5 100644
--- a/src/Security/JWTAuthenticator.php
+++ b/src/Security/JWTAuthenticator.php
@@ -11,6 +11,7 @@ use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\KernelInterface;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
@@ -21,6 +22,7 @@ class JWTAuthenticator implements AuthenticationSuccessHandlerInterface
public function __construct(
protected JWTTokenManagerInterface $jwtManager,
protected EventDispatcherInterface $dispatcher,
+ protected KernelInterface $kernel
) {
}
@@ -43,10 +45,10 @@ class JWTAuthenticator implements AuthenticationSuccessHandlerInterface
new Cookie(
'BEARER',
$jwt,
- time() + 7200, // expiration
+ time() + 604800, // expiration
'/',
null,
- false,
+ !$this->kernel->isDebug(),
true,
false,
'strict'
diff --git a/src/Security/OAuthAuthenticator.php b/src/Security/OAuthAuthenticator.php
index 2d3f24c..59c6067 100644
--- a/src/Security/OAuthAuthenticator.php
+++ b/src/Security/OAuthAuthenticator.php
@@ -75,7 +75,7 @@ class OAuthAuthenticator extends OAuth2Authenticator implements AuthenticationEn
new Cookie(
'BEARER',
$token,
- time() + 7200, // expiration
+ time() + 604800, // expiration
'/',
null,
true,
diff --git a/src/Service/ChatNotificationService.php b/src/Service/ChatNotificationService.php
new file mode 100644
index 0000000..8e73f00
--- /dev/null
+++ b/src/Service/ChatNotificationService.php
@@ -0,0 +1,74 @@
+getWebhookDsn();
+ if (null !== $webhookDsn && 0 !== count($webhookDsn)) {
+ foreach ($webhookDsn as $dsnString) {
+ try {
+ $dsn = new Dsn($dsnString);
+ } catch (InvalidArgumentException $exception) {
+ throw new BadRequestHttpException($exception->getMessage());
+ }
+
+ $scheme = $dsn->getScheme();
+ $webhookScheme = WebhookScheme::tryFrom($scheme);
+
+ if (null === $webhookScheme) {
+ throw new BadRequestHttpException("The DSN scheme ($scheme) is not supported");
+ }
+
+ $transportFactoryClass = $webhookScheme->getChatTransportFactory();
+ /** @var AbstractTransportFactory $transportFactory */
+ $transportFactory = new $transportFactoryClass();
+
+ $push = $notification->asPushMessage(new NoRecipient());
+ $chat = $notification->asChatMessage(new NoRecipient(), $webhookScheme->value);
+
+ try {
+ $factory = $transportFactory->create($dsn);
+
+ if ($factory->supports($push)) {
+ $factory->send($push);
+ } elseif ($factory->supports($chat)) {
+ $factory->send($chat);
+ } else {
+ throw new BadRequestHttpException('Unsupported message type');
+ }
+
+ $this->logger->info('Chat message sent with {schema} for Watchlist {token}',
+ [
+ 'scheme' => $webhookScheme->name,
+ 'token' => $watchList->getToken(),
+ ]);
+ } catch (\Throwable $exception) {
+ $this->logger->error('Unable to send a chat message to {scheme} for Watchlist {token}',
+ [
+ 'scheme' => $webhookScheme->name,
+ 'token' => $watchList->getToken(),
+ ]);
+ throw new BadRequestHttpException($exception->getMessage());
+ }
+ }
+ }
+ }
+}
diff --git a/src/Service/Connector/AbstractConnector.php b/src/Service/Connector/AbstractConnector.php
deleted file mode 100644
index dd6ab4b..0000000
--- a/src/Service/Connector/AbstractConnector.php
+++ /dev/null
@@ -1,13 +0,0 @@
-authData = $authData;
- }
-}
diff --git a/src/Service/Connector/AbstractProvider.php b/src/Service/Connector/AbstractProvider.php
new file mode 100644
index 0000000..d167a26
--- /dev/null
+++ b/src/Service/Connector/AbstractProvider.php
@@ -0,0 +1,64 @@
+getCachedTldList();
+ if (!$item->isHit()) {
+ $supportedTldList = $this->getSupportedTldList();
+ $item
+ ->set($supportedTldList)
+ ->expiresAfter(new \DateInterval('PT1H'));
+ $this->cacheItemPool->saveDeferred($item);
+ } else {
+ $supportedTldList = $item->get();
+ }
+
+ $extensionList = [];
+ foreach ($domainList as $domain) {
+ // We want to check the support of TLDs and SLDs here.
+ // For example, it is not enough for the Connector to support .fr for it to support the domain name example.asso.fr.
+ // It must support .asso.fr.
+ $extension = explode('.', $domain->getLdhName(), 2)[1];
+ if (!in_array($extension, $extensionList)) {
+ $extensionList[] = $extension;
+ }
+ }
+
+ foreach ($extensionList as $extension) {
+ if (!in_array($extension, $supportedTldList)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ public function authenticate(array $authData): void
+ {
+ $this->authData = $authData;
+ }
+
+ abstract protected function getCachedTldList(): CacheItemInterface;
+
+ abstract protected function getSupportedTldList(): array;
+}
diff --git a/src/Service/Connector/ConnectorInterface.php b/src/Service/Connector/ConnectorInterface.php
deleted file mode 100644
index b7d9bf5..0000000
--- a/src/Service/Connector/ConnectorInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-getDeleted()) {
- throw new InvalidArgumentException('The domain name still appears in the WHOIS database');
+ throw new \InvalidArgumentException('The domain name still appears in the WHOIS database');
}
$ldhName = $domain->getLdhName();
if (!$ldhName) {
- throw new InvalidArgumentException('Domain name cannot be null');
+ throw new \InvalidArgumentException('Domain name cannot be null');
}
$authData = self::verifyAuthData($this->authData, $this->client);
@@ -130,4 +133,32 @@ class GandiConnector extends AbstractConnector
return $authDataReturned;
}
+
+ /**
+ * @throws TransportExceptionInterface
+ * @throws ServerExceptionInterface
+ * @throws RedirectionExceptionInterface
+ * @throws DecodingExceptionInterface
+ * @throws ClientExceptionInterface
+ */
+ protected function getSupportedTldList(): array
+ {
+ $authData = self::verifyAuthData($this->authData, $this->client);
+
+ $response = $this->client->request('GET', '/v5/domain/tlds', (new HttpOptions())
+ ->setAuthBearer($authData['token'])
+ ->setHeader('Accept', 'application/json')
+ ->setBaseUri(self::BASE_URL)
+ ->toArray())->toArray();
+
+ return array_map(fn ($tld) => $tld['name'], $response);
+ }
+
+ /**
+ * @throws \Psr\Cache\InvalidArgumentException
+ */
+ protected function getCachedTldList(): CacheItemInterface
+ {
+ return $this->cacheItemPool->getItem('app.provider.ovh.supported-tld');
+ }
}
diff --git a/src/Service/Connector/NamecheapConnector.php b/src/Service/Connector/NamecheapConnector.php
index 01fe649..9adc61c 100644
--- a/src/Service/Connector/NamecheapConnector.php
+++ b/src/Service/Connector/NamecheapConnector.php
@@ -3,11 +3,12 @@
namespace App\Service\Connector;
use App\Entity\Domain;
+use Psr\Cache\CacheItemInterface;
use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
use Symfony\Contracts\HttpClient\HttpClientInterface;
#[Autoconfigure(public: true)]
-class NamecheapConnector extends AbstractConnector
+class NamecheapConnector extends AbstractProvider
{
public const BASE_URL = 'https://api.namecheap.com/xml.response';
@@ -83,4 +84,14 @@ class NamecheapConnector extends AbstractConnector
{
return $authData;
}
+
+ protected function getCachedTldList(): CacheItemInterface
+ {
+ // TODO: Implement getCachedTldList() method.
+ }
+
+ protected function getSupportedTldList(): array
+ {
+ // TODO: Implement getSupportedTldList() method.
+ }
}
diff --git a/src/Service/Connector/OvhConnector.php b/src/Service/Connector/OvhProvider.php
similarity index 73%
rename from src/Service/Connector/OvhConnector.php
rename to src/Service/Connector/OvhProvider.php
index 3651370..c34b59c 100644
--- a/src/Service/Connector/OvhConnector.php
+++ b/src/Service/Connector/OvhProvider.php
@@ -3,14 +3,22 @@
namespace App\Service\Connector;
use App\Entity\Domain;
+use GuzzleHttp\Exception\ClientException;
use Ovh\Api;
+use Ovh\Exceptions\InvalidParameterException;
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\InvalidArgumentException;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Contracts\HttpClient\HttpClientInterface;
-class OvhConnector extends AbstractConnector
+class OvhProvider extends AbstractProvider
{
public const REQUIRED_ROUTES = [
+ [
+ 'method' => 'GET',
+ 'path' => '/domain/extensions',
+ ],
[
'method' => 'GET',
'path' => '/order/cart',
@@ -45,12 +53,12 @@ class OvhConnector extends AbstractConnector
public function orderDomain(Domain $domain, bool $dryRun = false): void
{
if (!$domain->getDeleted()) {
- throw new \Exception('The domain name still appears in the WHOIS database');
+ throw new \InvalidArgumentException('The domain name still appears in the WHOIS database');
}
$ldhName = $domain->getLdhName();
if (!$ldhName) {
- throw new \Exception('Domain name cannot be null');
+ throw new \InvalidArgumentException('Domain name cannot be null');
}
$authData = self::verifyAuthData($this->authData, $this->client);
@@ -87,7 +95,7 @@ class OvhConnector extends AbstractConnector
);
if (empty($offer)) {
$conn->delete("/order/cart/{$cartId}");
- throw new \Exception('Cannot buy this domain name');
+ throw new \InvalidArgumentException('Cannot buy this domain name');
}
$item = $conn->post("/order/cart/{$cartId}/domain", [
@@ -163,14 +171,18 @@ class OvhConnector extends AbstractConnector
$consumerKey
);
- $res = $conn->get('/auth/currentCredential');
- if (null !== $res['expiration'] && new \DateTime($res['expiration']) < new \DateTime()) {
- throw new \Exception('These credentials have expired');
- }
+ try {
+ $res = $conn->get('/auth/currentCredential');
+ if (null !== $res['expiration'] && new \DateTime($res['expiration']) < new \DateTime()) {
+ throw new BadRequestHttpException('These credentials have expired');
+ }
- $status = $res['status'];
- if ('validated' !== $status) {
- throw new \Exception("The status of these credentials is not valid ($status)");
+ $status = $res['status'];
+ if ('validated' !== $status) {
+ throw new BadRequestHttpException("The status of these credentials is not valid ($status)");
+ }
+ } catch (ClientException $exception) {
+ throw new BadRequestHttpException($exception->getMessage());
}
foreach (self::REQUIRED_ROUTES as $requiredRoute) {
@@ -186,7 +198,7 @@ class OvhConnector extends AbstractConnector
}
if (!$ok) {
- throw new BadRequestHttpException('The credentials provided do not have enough permissions to purchase a domain name.');
+ throw new BadRequestHttpException('This Connector does not have enough permissions on the Provider API. Please recreate this Connector.');
}
}
@@ -202,4 +214,33 @@ class OvhConnector extends AbstractConnector
'waiveRetractationPeriod' => $waiveRetractationPeriod,
];
}
+
+ /**
+ * @throws InvalidParameterException
+ * @throws \JsonException
+ * @throws \Exception
+ */
+ protected function getSupportedTldList(): array
+ {
+ $authData = self::verifyAuthData($this->authData, $this->client);
+
+ $conn = new Api(
+ $authData['appKey'],
+ $authData['appSecret'],
+ $authData['apiEndpoint'],
+ $authData['consumerKey']
+ );
+
+ return $conn->get('/domain/extensions', [
+ 'ovhSubsidiary' => $authData['ovhSubsidiary'],
+ ]);
+ }
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ protected function getCachedTldList(): CacheItemInterface
+ {
+ return $this->cacheItemPool->getItem('app.provider.ovh.supported-tld');
+ }
}
diff --git a/src/Service/RDAPService.php b/src/Service/RDAPService.php
index 7e6e38c..46dfe18 100644
--- a/src/Service/RDAPService.php
+++ b/src/Service/RDAPService.php
@@ -28,6 +28,7 @@ use Psr\Log\LoggerInterface;
use Symfony\Component\HttpClient\Exception\ClientException;
use Symfony\Component\HttpFoundation\Exception\BadRequestException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Yaml\Yaml;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
@@ -73,7 +74,17 @@ readonly class RDAPService
'xn--hlcj6aya9esc7a',
];
- public const IMPORTANT_EVENTS = [EventAction::Deletion->value, EventAction::Expiration->value];
+ private const IMPORTANT_EVENTS = [EventAction::Deletion->value, EventAction::Expiration->value];
+ private const IMPORTANT_STATUS = [
+ 'redemption period',
+ 'pending delete',
+ 'pending create',
+ 'pending renew',
+ 'pending restore',
+ 'pending transfer',
+ 'pending update',
+ 'add period',
+ ];
public function __construct(private HttpClientInterface $client,
private EntityRepository $entityRepository,
@@ -86,7 +97,8 @@ readonly class RDAPService
private RdapServerRepository $rdapServerRepository,
private TldRepository $tldRepository,
private EntityManagerInterface $em,
- private LoggerInterface $logger
+ private LoggerInterface $logger,
+ private StatService $statService
) {
}
@@ -96,10 +108,11 @@ readonly class RDAPService
*
* @throws \Exception
*/
- public static function isToBeWatchClosely(Domain $domain, \DateTimeImmutable $updatedAt): bool
+ public static function isToBeWatchClosely(Domain $domain): bool
{
- if ($updatedAt->diff(new \DateTimeImmutable('now'))->days < 1) {
- return false;
+ $status = $domain->getStatus();
+ if ((!empty($status) && count(array_intersect($status, self::IMPORTANT_STATUS))) || $domain->getDeleted()) {
+ return true;
}
/** @var DomainEvent[] $events */
@@ -162,6 +175,8 @@ readonly class RDAPService
]);
try {
+ $this->statService->incrementStat('stats.rdap_queries.count');
+
$res = $this->client->request(
'GET', $rdapServerUrl.'domain/'.$idnDomain
)->toArray();
@@ -213,6 +228,11 @@ readonly class RDAPService
$this->em->persist($domain);
$this->em->flush();
+ /** @var DomainEvent $event */
+ foreach ($domain->getEvents()->getIterator() as $event) {
+ $event->setDeleted(true);
+ }
+
foreach ($res['events'] as $rdapEvent) {
if ($rdapEvent['eventAction'] === EventAction::LastUpdateOfRDAPDatabase->value) {
continue;
@@ -229,7 +249,14 @@ readonly class RDAPService
}
$domain->addEvent($event
->setAction($rdapEvent['eventAction'])
- ->setDate(new \DateTimeImmutable($rdapEvent['eventDate'])));
+ ->setDate(new \DateTimeImmutable($rdapEvent['eventDate']))
+ ->setDeleted(false)
+ );
+ }
+
+ /** @var DomainEntity $domainEntity */
+ foreach ($domain->getDomainEntities()->getIterator() as $domainEntity) {
+ $domainEntity->setDeleted(true);
}
if (array_key_exists('entities', $res) && is_array($res['entities'])) {
@@ -270,8 +297,9 @@ readonly class RDAPService
$domain->addDomainEntity($domainEntity
->setDomain($domain)
->setEntity($entity)
- ->setRoles($roles))
- ->updateTimestamps();
+ ->setRoles($roles)
+ ->setDeleted(false)
+ );
$this->em->persist($domainEntity);
$this->em->flush();
@@ -279,10 +307,18 @@ readonly class RDAPService
}
if (array_key_exists('nameservers', $res) && is_array($res['nameservers'])) {
+ $domain->getNameservers()->clear();
+
foreach ($res['nameservers'] as $rdapNameserver) {
$nameserver = $this->nameserverRepository->findOneBy([
'ldhName' => strtolower($rdapNameserver['ldhName']),
]);
+
+ $domainNS = $domain->getNameservers()->findFirst(fn (int $key, Nameserver $ns) => $ns->getLdhName() === $rdapNameserver['ldhName']);
+
+ if (null !== $domainNS) {
+ $nameserver = $domainNS;
+ }
if (null === $nameserver) {
$nameserver = new Nameserver();
}
@@ -349,7 +385,7 @@ readonly class RDAPService
if (false === $lastDotPosition) {
throw new BadRequestException('Domain must contain at least one dot');
}
- $tld = strtolower(substr($domain, $lastDotPosition + 1));
+ $tld = strtolower(idn_to_ascii(substr($domain, $lastDotPosition + 1)));
return $this->tldRepository->findOneBy(['tld' => $tld]);
}
@@ -365,7 +401,7 @@ readonly class RDAPService
if (null === $entity) {
$entity = new Entity();
- } else {
+
$this->logger->info('The entity {handle} was not known to this Domain Watchdog instance.', [
'handle' => $rdapEntity['handle'],
]);
@@ -392,6 +428,14 @@ readonly class RDAPService
return $entity;
}
+ /** @var EntityEvent $event */
+ foreach ($entity->getEvents()->getIterator() as $event) {
+ $event->setDeleted(true);
+ }
+
+ $this->em->persist($entity);
+ $this->em->flush();
+
foreach ($rdapEntity['events'] as $rdapEntityEvent) {
$eventAction = $rdapEntityEvent['eventAction'];
if ($eventAction === EventAction::LastChanged->value || $eventAction === EventAction::LastUpdateOfRDAPDatabase->value) {
@@ -403,13 +447,15 @@ readonly class RDAPService
]);
if (null !== $event) {
+ $event->setDeleted(false);
continue;
}
$entity->addEvent(
(new EntityEvent())
->setEntity($entity)
->setAction($rdapEntityEvent['eventAction'])
- ->setDate(new \DateTimeImmutable($rdapEntityEvent['eventDate'])));
+ ->setDate(new \DateTimeImmutable($rdapEntityEvent['eventDate']))
+ ->setDeleted(false));
}
return $entity;
@@ -423,14 +469,23 @@ readonly class RDAPService
* @throws ClientExceptionInterface
* @throws ORMException
*/
- public function updateRDAPServers(): void
+ public function updateRDAPServersFromIANA(): void
{
- $this->logger->info('Started updating the RDAP server list.');
+ $this->logger->info('Start of update the RDAP server list from IANA.');
$dnsRoot = $this->client->request(
'GET', 'https://data.iana.org/rdap/dns.json'
)->toArray();
+ $this->updateRDAPServers($dnsRoot);
+ }
+
+ /**
+ * @throws ORMException
+ * @throws \Exception
+ */
+ private function updateRDAPServers(array $dnsRoot): void
+ {
foreach ($dnsRoot['services'] as $service) {
foreach ($service[0] as $tld) {
if ('' === $tld) {
@@ -442,7 +497,10 @@ readonly class RDAPService
if (null === $server) {
$server = new RdapServer();
}
- $server->setTld($tldReference)->setUrl($rdapServerUrl)->updateTimestamps();
+ $server
+ ->setTld($tldReference)
+ ->setUrl($rdapServerUrl)
+ ->setUpdatedAt(new \DateTimeImmutable(array_key_exists('publication', $dnsRoot) ? $dnsRoot['publication'] : 'now'));
$this->em->persist($server);
}
@@ -451,6 +509,19 @@ readonly class RDAPService
$this->em->flush();
}
+ /**
+ * @throws ORMException
+ */
+ public function updateRDAPServersFromFile(string $fileName): void
+ {
+ if (!file_exists($fileName)) {
+ return;
+ }
+
+ $this->logger->info('Start of update the RDAP server list from custom config file.');
+ $this->updateRDAPServers(Yaml::parseFile($fileName));
+ }
+
/**
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
diff --git a/src/Service/StatService.php b/src/Service/StatService.php
new file mode 100644
index 0000000..336a415
--- /dev/null
+++ b/src/Service/StatService.php
@@ -0,0 +1,26 @@
+pool->getItem($key);
+ $item->set(($item->get() ?? 0) + 1);
+
+ return $this->pool->save($item);
+ } catch (\Throwable) {
+ }
+
+ return false;
+ }
+}
diff --git a/symfony.lock b/symfony.lock
index e266829..27aefdb 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -153,6 +153,24 @@
"config/packages/debug.yaml"
]
},
+ "symfony/discord-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "5.2",
+ "ref": "b97655f9a2fb8fc04d9f4081e0b5599d897b7f6e"
+ }
+ },
+ "symfony/engagespot-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "6.1",
+ "ref": "99e2d9bebabbc56ec54bc93278989853ea6c9256"
+ }
+ },
"symfony/flex": {
"version": "2.4",
"recipe": {
@@ -184,6 +202,15 @@
"src/Kernel.php"
]
},
+ "symfony/google-chat-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "5.3",
+ "ref": "5954a3403bf1cdc557e2b71d3854cc81ba7d37cb"
+ }
+ },
"symfony/lock": {
"version": "7.1",
"recipe": {
@@ -217,6 +244,15 @@
"ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f"
}
},
+ "symfony/mattermost-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "5.1",
+ "ref": "60df16a0ff39e942f6579e624d5630fc6b4e0cc1"
+ }
+ },
"symfony/messenger": {
"version": "7.1",
"recipe": {
@@ -229,6 +265,15 @@
"config/packages/messenger.yaml"
]
},
+ "symfony/microsoft-teams-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "5.3",
+ "ref": "e4e1704f0b11573aaededc00640492c915de0bbe"
+ }
+ },
"symfony/monolog-bundle": {
"version": "3.10",
"recipe": {
@@ -253,6 +298,15 @@
"config/packages/notifier.yaml"
]
},
+ "symfony/ntfy-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "6.4",
+ "ref": "0d5e496659d7361bb4e6648eb8332f8cf097533d"
+ }
+ },
"symfony/phpunit-bridge": {
"version": "7.1",
"recipe": {
@@ -268,6 +322,24 @@
"tests/bootstrap.php"
]
},
+ "symfony/pushover-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "6.3",
+ "ref": "b9dc3c716eb686c267d767eb3c78ad47c11c34cb"
+ }
+ },
+ "symfony/rocket-chat-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "5.1",
+ "ref": "5c91d24b503de5cc0d0eb880fc95afa1bef8b6f4"
+ }
+ },
"symfony/routing": {
"version": "7.1",
"recipe": {
@@ -294,6 +366,15 @@
"config/routes/security.yaml"
]
},
+ "symfony/slack-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "5.2",
+ "ref": "8fb9603326990013efbe6d71c2dd78ada316808a"
+ }
+ },
"symfony/stimulus-bundle": {
"version": "2.18",
"recipe": {
@@ -308,6 +389,15 @@
"assets/controllers/hello_controller.js"
]
},
+ "symfony/telegram-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "5.0",
+ "ref": "6cecb59a0e96c9e1cee469f2b82fa920101a68e8"
+ }
+ },
"symfony/translation": {
"version": "7.1",
"recipe": {
@@ -387,6 +477,15 @@
"webpack.config.js"
]
},
+ "symfony/zulip-notifier": {
+ "version": "7.1",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "5.2",
+ "ref": "f420901c554baf7cde79a2a0bbf9b37ab1a650aa"
+ }
+ },
"symfonycasts/verify-email-bundle": {
"version": "v1.17.0"
},
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 9d6eec5..4cddf07 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -12,7 +12,7 @@
Domain Watchdog
+ {{ title|default('Domain Watchdog - Notification') }}
+
+
+
+
+
+ {% block content %}{% endblock %}
+
+
+
Domain Watchdog Error
-
-
-
-
-
-
Hello, Domain name: {{ domain.ldhName }}
-
Here are some possible explanations:
-
- The Connector configuration you provided is no longer valid.
- It is likely that the domain is no longer available for registration.
- A temporary interruption is affecting the registration of this domain name.
-
-
-
Thank you for your understanding,
-
-
-
Hello, Domain name: {{ domain.ldhName }}
+ Here are some possible explanations:
+
+ The Connector configuration you provided is no longer valid.
+ It is likely that the domain is no longer available for registration.
+ A temporary interruption is affecting the registration of this domain name.
+
+ Thank you for your understanding,
+{% endblock %}
diff --git a/templates/emails/errors/domain_update.html.twig b/templates/emails/errors/domain_update.html.twig
index 2c953d4..ccac161 100644
--- a/templates/emails/errors/domain_update.html.twig
+++ b/templates/emails/errors/domain_update.html.twig
@@ -1,81 +1,20 @@
-
-
-
-
- Domain Watchdog Error
-
-
-
-
-
-
Hello, Domain name: {{ domain.ldhName }}
-
Here are some possible explanations:
-
- It is likely that the domain will be available for registration again.
- A temporary outage affects the provision of domain name information.
-
-
-
Thank you for your understanding,
-
-
-
-
Hello, Domain name: {{ domain.ldhName }}
+ Here are some possible explanations:
+
+ It is likely that the domain will be available for registration again.
+ A temporary outage affects the provision of domain name information.
+
+ Thank you for your understanding,
+{% endblock %}
diff --git a/templates/emails/success/confirmation_email.html.twig b/templates/emails/success/confirmation_email.html.twig
index ec66cc6..0324caf 100644
--- a/templates/emails/success/confirmation_email.html.twig
+++ b/templates/emails/success/confirmation_email.html.twig
@@ -1,66 +1,14 @@
-
-
-
-
- Domain Watchdog - Confirm Email
-
-
-
-
-
-
Hello, Confirm my Email .
- This link will expire in {{ expiresAtMessageKey|trans(expiresAtMessageData, 'VerifyEmailBundle') }}.
-
-
-
-
Hello, Confirm my Email .
+ This link will expire in {{ expiresAtMessageKey|trans(expiresAtMessageData, 'VerifyEmailBundle') }}.
+
+{% endblock %}
diff --git a/templates/emails/success/domain_ordered.html.twig b/templates/emails/success/domain_ordered.html.twig
index 710caea..376cc7f 100644
--- a/templates/emails/success/domain_ordered.html.twig
+++ b/templates/emails/success/domain_ordered.html.twig
@@ -1,67 +1,15 @@
-
-
-
-
- Domain Watchdog - Domain Ordered
-
-
-
-
-
-
Hello, Domain name: {{ domain.ldhName }}Connector provider : {{ provider }}
-
-
-
Hello, Domain name: {{ domain.ldhName }}Connector provider : {{ provider }}
+{% endblock %}
diff --git a/templates/emails/success/domain_updated.html.twig b/templates/emails/success/domain_updated.html.twig
index 6d40dc6..1c3bd6a 100644
--- a/templates/emails/success/domain_updated.html.twig
+++ b/templates/emails/success/domain_updated.html.twig
@@ -1,67 +1,15 @@
-
-
-
-
- Domain Watchdog Alert
-
-
-
-
-
-
Hello, Domain name: {{ event.domain.ldhName }}Action: {{ event.action }}Effective Date: {{ event.date | date("c") }}
-
-
-
Hello, Domain name: {{ event.domain.ldhName }}Action: {{ event.action }}Effective Date: {{ event.date | date("c") }}
+{% endblock %}
diff --git a/translations/de.po b/translations/de.po
new file mode 100644
index 0000000..2d65aab
--- /dev/null
+++ b/translations/de.po
@@ -0,0 +1,1400 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2024-09-09 09:41+0000\n"
+"Last-Translator: Maรซl Gangloff \n"
+"Language-Team: German \n"
"Language-Team: French