From 2b3e0a8350a85ca8f9a1629f8742ae2b6403500a Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Thu, 30 Apr 2026 13:41:43 +0200 Subject: [PATCH] Fixed urlLogin sync --- .../Webhook/AgentSessionController.php | 20 +++++++++++++------ .../OgAgent/Webhook/StatusController.php | 5 +++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/Controller/OgAgent/Webhook/AgentSessionController.php b/src/Controller/OgAgent/Webhook/AgentSessionController.php index 55fc9dc..aadba97 100644 --- a/src/Controller/OgAgent/Webhook/AgentSessionController.php +++ b/src/Controller/OgAgent/Webhook/AgentSessionController.php @@ -26,6 +26,11 @@ class AgentSessionController extends AbstractController ) { } + private function toHttps(string $url): string + { + return str_starts_with($url, 'http://') ? 'https://' . substr($url, 7) : $url; + } + #[Route('/opengnsys/rest/ogagent/started', methods: ['POST'])] public function agentStarted(Request $request): JsonResponse { @@ -67,7 +72,8 @@ class AgentSessionController extends AbstractController $remotePC = $client->getRemotePC(); if ($remotePC && $remotePC->isReservedActive() && $remotePC->getUrlLogin()) { try { - $this->httpClient->request('POST', $remotePC->getUrlLogin(), [ + $url = $this->toHttps($remotePC->getUrlLogin()); + $status = $this->httpClient->request('POST', $url, [ 'verify_peer' => false, 'verify_host' => false, 'json' => [ @@ -78,7 +84,7 @@ class AgentSessionController extends AbstractController ], 'headers' => ['Content-Type' => 'application/json'], ])->getStatusCode(); - $this->logger->info('RemotePC: urlLogin called on agent start', ['ip' => $data['ip']]); + $this->logger->info('RemotePC: urlLogin called on agent start', ['ip' => $data['ip'], 'status' => $status]); } catch (\Throwable $e) { $this->logger->warning('RemotePC: urlLogin on agent start failed', ['ip' => $data['ip'], 'error' => $e->getMessage()]); } @@ -164,13 +170,14 @@ class AgentSessionController extends AbstractController $remotePC = $client->getRemotePC(); if ($remotePC && $remotePC->isReservedActive() && $remotePC->getUrlLogin()) { try { - $this->httpClient->request('POST', $remotePC->getUrlLogin(), [ + $url = $this->toHttps($remotePC->getUrlLogin()); + $status = $this->httpClient->request('POST', $url, [ 'verify_peer' => false, 'verify_host' => false, 'body' => $request->getContent(), 'headers' => ['Content-Type' => 'application/json'], ])->getStatusCode(); - $this->logger->info('RemotePC: loggedin callback sent', ['ip' => $client->getIp()]); + $this->logger->info('RemotePC: loggedin callback sent', ['ip' => $client->getIp(), 'status' => $status]); } catch (\Throwable $e) { $this->logger->warning('RemotePC: loggedin callback failed', ['ip' => $client->getIp(), 'error' => $e->getMessage()]); } @@ -228,13 +235,14 @@ class AgentSessionController extends AbstractController $remotePC = $client->getRemotePC(); if ($remotePC && $remotePC->isReservedActive() && $remotePC->getUrlLogout()) { try { - $this->httpClient->request('POST', $remotePC->getUrlLogout(), [ + $url = $this->toHttps($remotePC->getUrlLogout()); + $status = $this->httpClient->request('POST', $url, [ 'verify_peer' => false, 'verify_host' => false, 'body' => $request->getContent(), 'headers' => ['Content-Type' => 'application/json'], ])->getStatusCode(); - $this->logger->info('RemotePC: loggedout callback sent', ['ip' => $client->getIp()]); + $this->logger->info('RemotePC: loggedout callback sent', ['ip' => $client->getIp(), 'status' => $status]); } catch (\Throwable $e) { $this->logger->warning('RemotePC: loggedout callback failed', ['ip' => $client->getIp(), 'error' => $e->getMessage()]); } diff --git a/src/Controller/OgAgent/Webhook/StatusController.php b/src/Controller/OgAgent/Webhook/StatusController.php index 024f535..6d14d5b 100644 --- a/src/Controller/OgAgent/Webhook/StatusController.php +++ b/src/Controller/OgAgent/Webhook/StatusController.php @@ -371,13 +371,14 @@ class StatusController extends AbstractController $remotePC = $client->getRemotePC(); if ($remotePC && $remotePC->isReservedActive() && $remotePC->getUrlLogin()) { try { - $this->httpClient->request('POST', $remotePC->getUrlLogin(), [ + $url = str_starts_with($remotePC->getUrlLogin(), 'http://') ? 'https://' . substr($remotePC->getUrlLogin(), 7) : $remotePC->getUrlLogin(); + $status = $this->httpClient->request('POST', $url, [ 'verify_peer' => false, 'verify_host' => false, 'json' => ['ip' => $clientIp], 'headers' => ['Content-Type' => 'application/json'], ])->getStatusCode(); - $this->logger->info('RemotePC: early urlLogin called after IniciarSesion ack', ['ip' => $clientIp]); + $this->logger->info('RemotePC: early urlLogin called after IniciarSesion ack', ['ip' => $clientIp, 'status' => $status]); } catch (\Throwable $e) { $this->logger->warning('RemotePC: early urlLogin failed', ['ip' => $clientIp, 'error' => $e->getMessage()]); }