From b990a3d8946c6843b416bca4ad43347504e09ff3 Mon Sep 17 00:00:00 2001 From: jmbardallo Date: Wed, 8 Apr 2026 11:07:05 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Partition:=20a=C3=B1adido=20campo=20deployD?= =?UTF-8?q?ate=20a=20la=20BBDD=20extra=C3=ADdo=20autom=C3=A1ticamente=20y?= =?UTF-8?q?=20de=20forma=20idempotente=20de=20la=20variable=20img=3D=20del?= =?UTF-8?q?=20getConfiguration=20del=20cliente,=20y=20securizaci=C3=B3n=20?= =?UTF-8?q?de=20fallbacks=20a=20null=20por=20seguridad.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 10 +++++++++- src/Dto/Output/PartitionOutput.php | 8 ++++++++ src/Entity/Partition.php | 15 +++++++++++++++ src/Service/CreatePartitionService.php | 26 ++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78f39ea..39571c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,15 @@ # Changelog +## [1.4.0] - 2026-04-08 +### Added +- Entidad Partition: Añadido el campo deployDate expuesto mediante el DTO para registrar la fecha exacta de despliegue de imagen. +- CreatePartitionService: Inclusión de lógica idempotente que asocia la imagen y extrae su fecha real directamente del fichero /.ogimage enviado por el cliente en el parámetro img=. + +### Fixed +- Limpieza explícita del deployDate (null) en caso de que el inventario no informe de fecha o haya alteraciones en el payload para evitar desincronizaciones de trazas de la imagen subyacente. + ## [1.3.0] - 2026-03-31 ### Added -Añadida acción Refresh para actualizar el estado de un cliente o clientes. Se actualiza su configuración de discos y se recarga el ogBrowser por si hubiese cambio del menu. +- Añadida acción Refresh para actualizar el estado de un cliente o clientes. Se actualiza su configuración de discos y se recarga el ogBrowser por si hubiese cambio del menu. ## [1.2.11] - 2026-03-25 ### Added diff --git a/src/Dto/Output/PartitionOutput.php b/src/Dto/Output/PartitionOutput.php index 76e55e2..0063ba6 100644 --- a/src/Dto/Output/PartitionOutput.php +++ b/src/Dto/Output/PartitionOutput.php @@ -74,6 +74,13 @@ class PartitionOutput extends AbstractOutput )] public ?int $memoryUsage = null; + #[Groups(['partition:read', 'client:read'])] + #[ApiProperty( + description: 'Fecha de despliegue de la imagen', + example: '2025-01-01T00:00:00+00:00' + )] + public ?\DateTimeInterface $deployDate = null; + public function __construct(Partition $partition) { parent::__construct($partition); @@ -94,5 +101,6 @@ class PartitionOutput extends AbstractOutput } $this->memoryUsage = $partition->getMemoryUsage() / 100; + $this->deployDate = $partition->getDeployDate(); } } \ No newline at end of file diff --git a/src/Entity/Partition.php b/src/Entity/Partition.php index 3308da9..dde3700 100644 --- a/src/Entity/Partition.php +++ b/src/Entity/Partition.php @@ -43,6 +43,21 @@ class Partition extends AbstractEntity #[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')] private ?ImageImageRepository $image = null; + #[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)] + private ?\DateTimeInterface $deployDate = null; + + public function getDeployDate(): ?\DateTimeInterface + { + return $this->deployDate; + } + + public function setDeployDate(?\DateTimeInterface $deployDate): static + { + $this->deployDate = $deployDate; + + return $this; + } + public function getDiskNumber(): ?int { return $this->diskNumber; diff --git a/src/Service/CreatePartitionService.php b/src/Service/CreatePartitionService.php index b72fd91..5798fe8 100644 --- a/src/Service/CreatePartitionService.php +++ b/src/Service/CreatePartitionService.php @@ -63,6 +63,32 @@ class CreatePartitionService $partitionEntity->setOperativeSystem($operativeSystem); } } + + if (isset($cfg['img']) && $cfg['img'] !== '') { + $imgParts = explode(':', $cfg['img']); + $imgName = $imgParts[0]; + $imgDate = $imgParts[1] ?? null; + + $imageImageRepository = $this->entityManager->getRepository(\App\Entity\ImageImageRepository::class) + ->findOneBy(['name' => $imgName]); + + if ($imageImageRepository) { + $partitionEntity->setImage($imageImageRepository); + $partitionEntity->setDeployDate(null); + if ($imgDate) { + $dateObj = \DateTime::createFromFormat('YmdHi', $imgDate); + if ($dateObj) { + $partitionEntity->setDeployDate($dateObj); + } + } + } else { + $partitionEntity->setImage(null); + $partitionEntity->setDeployDate(null); + } + } elseif (isset($cfg['img']) && $cfg['img'] === '') { + $partitionEntity->setImage(null); + $partitionEntity->setDeployDate(null); + } $partitionEntity->setClient($clientEntity); $partitionEntity->setDiskNumber($cfg['disk']); -- 2.40.1 From 2eff4066dad70f5f8d294efaacb08b306a001470 Mon Sep 17 00:00:00 2001 From: jmbardallo Date: Thu, 9 Apr 2026 08:51:27 +0200 Subject: [PATCH 2/2] =?UTF-8?q?A=C3=B1adido=20tratamiento=20a=20RESPUESTA?= =?UTF-8?q?=5FActualizar=20para=20tratar=20la=20informacion=20de=20configu?= =?UTF-8?q?racion=20que=20envia=20el=20agente,=20de=20esta=20forma=20actua?= =?UTF-8?q?liza=20la=20informacion=20de=20la=20particion=20con=20el=20nomb?= =?UTF-8?q?re=20y=20la=20fecha=20de=20despliegue=20de=20una=20imagen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OgAgent/Webhook/StatusController.php | 25 +++++++++++++++++++ src/Service/CreatePartitionService.php | 4 +-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/Controller/OgAgent/Webhook/StatusController.php b/src/Controller/OgAgent/Webhook/StatusController.php index 3abd737..bc989ae 100644 --- a/src/Controller/OgAgent/Webhook/StatusController.php +++ b/src/Controller/OgAgent/Webhook/StatusController.php @@ -44,6 +44,7 @@ class StatusController extends AbstractController const string RESTORE_IMAGE_GIT = 'RESPUESTA_RestaurarImagenGit'; const string CONFIGURE_IMAGE = 'RESPUESTA_Configurar'; const string HARDWARE_INVENTORY = 'RESPUESTA_InventarioHardware'; + const string REFRESH = 'RESPUESTA_Actualizar'; const string SOFTWARE_INVENTORY = 'RESPUESTA_InventarioSoftware'; const string RUN_SCRIPT = 'RESPUESTA_EjecutarScript'; @@ -324,6 +325,30 @@ class StatusController extends AbstractController } } + if (isset($data['nfn']) && $data['nfn'] === self::REFRESH) { + $trace = $this->entityManager->getRepository(Trace::class)->findOneBy(['jobId' => $data['job_id'] ?? '']); + if ($trace) { + $client = $trace->getClient(); + $trace->setStatus(TraceStatus::SUCCESS); + $trace->setFinishedAt(new \DateTime()); + $this->entityManager->persist($trace); + } else { + $clientIp = $data['iph'] ?? $request->getClientIp(); + $client = $this->entityManager->getRepository(Client::class)->findOneBy(['ip' => $clientIp]); + } + + if ($client) { + $client->setStatus(ClientStatus::OG_LIVE); + $this->entityManager->persist($client); + + if (isset($data['cfg'])) { + $this->createPartitionService->__invoke($data, $client); + $this->logger->info('Partition configuration updated via RESPUESTA_Actualizar', ['job_id' => $data['job_id'] ?? 'none']); + } + } + $this->entityManager->flush(); + } + return new JsonResponse(data: 'Webhook finished', status: Response::HTTP_OK); } diff --git a/src/Service/CreatePartitionService.php b/src/Service/CreatePartitionService.php index 5798fe8..9e16482 100644 --- a/src/Service/CreatePartitionService.php +++ b/src/Service/CreatePartitionService.php @@ -66,7 +66,7 @@ class CreatePartitionService if (isset($cfg['img']) && $cfg['img'] !== '') { $imgParts = explode(':', $cfg['img']); - $imgName = $imgParts[0]; + $imgName = trim($imgParts[0]); $imgDate = $imgParts[1] ?? null; $imageImageRepository = $this->entityManager->getRepository(\App\Entity\ImageImageRepository::class) @@ -76,7 +76,7 @@ class CreatePartitionService $partitionEntity->setImage($imageImageRepository); $partitionEntity->setDeployDate(null); if ($imgDate) { - $dateObj = \DateTime::createFromFormat('YmdHi', $imgDate); + $dateObj = \DateTime::createFromFormat('YmdHi', trim($imgDate)); if ($dateObj) { $partitionEntity->setDeployDate($dateObj); } -- 2.40.1