From dca1377a088b83b026e95261be245d923a39b8d6 Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Mon, 20 Apr 2026 18:39:31 +0200 Subject: [PATCH] refs #2973. Refactor classroom status --- config/api_platform/OrganizationalUnit.yaml | 8 ++ .../OgAgent/AbstractOgAgentController.php | 46 ++++--- .../OrganizationalUnitStatusAction.php | 119 ++++++++++++++++++ 3 files changed, 153 insertions(+), 20 deletions(-) create mode 100644 src/Controller/OgAgent/OrganizationalUnitStatusAction.php diff --git a/config/api_platform/OrganizationalUnit.yaml b/config/api_platform/OrganizationalUnit.yaml index f465857..2853aa1 100644 --- a/config/api_platform/OrganizationalUnit.yaml +++ b/config/api_platform/OrganizationalUnit.yaml @@ -40,6 +40,14 @@ resources: uriTemplate: /organizational-units/{uuid}/propagate-network-settings controller: App\Controller\PropagateNetworkSettingsAction + agent_status: + class: ApiPlatform\Metadata\Post + method: POST + input: false + output: false + uriTemplate: /organizational-units/{uuid}/agent/status + controller: App\Controller\OgAgent\OrganizationalUnitStatusAction + properties: App\Entity\OrganizationalUnit: id: diff --git a/src/Controller/OgAgent/AbstractOgAgentController.php b/src/Controller/OgAgent/AbstractOgAgentController.php index 97fd405..92aab6a 100644 --- a/src/Controller/OgAgent/AbstractOgAgentController.php +++ b/src/Controller/OgAgent/AbstractOgAgentController.php @@ -30,11 +30,35 @@ abstract class AbstractOgAgentController extends AbstractController protected readonly CreateRepositoryAction $createRepositoryAction, protected readonly SshKeyAction $sshKeyAction, #[Autowire(env: 'SSL_ENABLED')] - private readonly string $sslEnabled, + protected readonly string $sslEnabled, ) { } + protected function buildRequestOptions(array $params = [], ?string $token = null): array + { + $options = array_merge($params, [ + 'headers' => [ + 'accept' => 'application/json', + 'Content-Type' => 'application/json', + 'Authorization' => $token, + ], + 'verify_peer' => false, + 'verify_host' => false, + 'timeout' => 10, + ]); + + if ($this->sslEnabled === 'true') { + $options['verify_peer'] = true; + $options['verify_host'] = false; + $options['cafile'] = '/opt/opengnsys/ogcore/etc/certificates/ca.crt'; + $options['local_cert'] = '/opt/opengnsys/ogcore/etc/certificates/ogcore.crt'; + $options['local_pk'] = '/opt/opengnsys/ogcore/etc/certificates/ogcore.key'; + } + + return $options; + } + /** * @throws TransportExceptionInterface * @throws ServerExceptionInterface @@ -43,25 +67,7 @@ abstract class AbstractOgAgentController extends AbstractController */ public function createRequest(string $method, string $url, array $params = [], string $token = null): array { - $params = array_merge($params, [ - 'headers' => [ - 'accept' => 'application/json', - 'Content-Type' => 'application/json', - 'Authorization' => $token, - ], - 'verify_peer' => false, - 'verify_host' => false, - 'timeout' => 10 - ]); - - - if ($this->sslEnabled === 'true') { - $params['verify_peer'] = true; - $params['verify_host'] = false; - $params['cafile'] = '/opt/opengnsys/ogcore/etc/certificates/ca.crt'; - $params['local_cert'] = '/opt/opengnsys/ogcore/etc/certificates/ogcore.crt'; - $params['local_pk'] = '/opt/opengnsys/ogcore/etc/certificates/ogcore.key'; - } + $params = $this->buildRequestOptions($params, $token); try { $response = $this->httpClient->request($method, $url, $params); diff --git a/src/Controller/OgAgent/OrganizationalUnitStatusAction.php b/src/Controller/OgAgent/OrganizationalUnitStatusAction.php new file mode 100644 index 0000000..797132a --- /dev/null +++ b/src/Controller/OgAgent/OrganizationalUnitStatusAction.php @@ -0,0 +1,119 @@ +clientRepository->findClientsByOrganizationalUnitAndDescendants( + $organizationalUnit->getId() + ); + + if (empty($clients)) { + return new JsonResponse(['results' => []], Response::HTTP_OK); + } + + $options = $this->buildRequestOptions(['json' => ['full-config' => false]]); + + $pending = []; + foreach ($clients as $client) { + if (!$client->getIp()) { + continue; + } + + $clientOptions = array_merge($options, [ + 'headers' => array_merge($options['headers'] ?? [], [ + 'Authorization' => $client->getToken(), + ]), + ]); + + $pending[] = [ + 'client' => $client, + 'response' => $this->httpClient->request( + 'POST', + 'https://' . $client->getIp() . ':8000/opengnsys/status', + $clientOptions + ), + ]; + } + + $results = []; + foreach ($pending as $item) { + $client = $item['client']; + try { + $data = $item['response']->toArray(throw: true); + + if (isset($data['cfg'])) { + $this->createPartitionService->__invoke($data, $client); + } + + if ($client->getStatus() !== ClientStatus::LINUX + && $client->getStatus() !== ClientStatus::MACOS + && $client->getStatus() !== ClientStatus::WINDOWS) { + $client->setStatus(ClientStatus::OG_LIVE); + } + + $this->entityManager->persist($client); + + $results[] = [ + 'uuid' => $client->getUuid(), + 'ip' => $client->getIp(), + 'status' => $client->getStatus(), + 'success' => true, + ]; + } catch (\Throwable $e) { + $this->logger->error('Error checking client status', [ + 'client' => $client->getUuid(), + 'error' => $e->getMessage(), + ]); + + $client->setStatus(ClientStatus::OFF); + $this->entityManager->persist($client); + + $results[] = [ + 'uuid' => $client->getUuid(), + 'ip' => $client->getIp(), + 'status' => ClientStatus::OFF, + 'success' => false, + ]; + } + } + + $this->entityManager->flush(); + + return new JsonResponse(['results' => $results], Response::HTTP_OK); + } +}