Merge pull request #1903 from OpenConext/feature/1902-health-endpoint-doesnt-work

Reinstate monitor endpoints

Author: johanib

config/routes.yaml

@@ -15,3 +15,7 @@ engineblock_api_controllers:
         domain: ".*"
     defaults:
         domain: "%domain%"
+
+open_conext_monitor:
+    resource: "@OpenConextMonitorBundle/Resources/config/routing.yml"
+    prefix: /

src/OpenConext/EngineBlockBundle/EventListener/AuthenticationStateInitializer.php

@@ -23,7 +23,7 @@
 use OpenConext\EngineBlockBundle\Controller\AuthenticationLoopThrottlingController;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
 
 final class AuthenticationStateInitializer
 {
@@ -37,9 +37,14 @@ public function __construct(RequestStack $requestStack)
         $this->session = $requestStack->getSession();
     }
 
-    public function onKernelController(\Symfony\Component\HttpKernel\Event\ControllerEvent $event)
+    public function onKernelController(ControllerEvent $event): void
     {
-        if (!$event->getController()[0] instanceof AuthenticationLoopThrottlingController) {
+        $controller = $event->getController();
+        if (is_array($controller)) {
+            $controller = $controller[0];
+        }
+
+        if (!$controller instanceof AuthenticationLoopThrottlingController) {
             return;
         }
 

tests/functional/OpenConext/EngineBlockBundle/Controller/MonitorControllerTest.php

@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Copyright 2026 SURFnet B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OpenConext\EngineBlockBundle\Tests;
+
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Response;
+
+final class MonitorControllerTest extends WebTestCase
+{
+    #[Test]
+    #[Group('Monitor')]
+    public function internal_info_returns_json()
+    {
+        $client = self::createClient();
+        $client->request('GET', 'https://engine.dev.openconext.local/internal/info');
+
+        $response = $client->getResponse();
+        $this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
+        $this->assertJson($response->getContent());
+    }
+
+    #[Test]
+    #[Group('Monitor')]
+    public function internal_health_returns_json()
+    {
+        $client = self::createClient();
+        $client->request('GET', 'https://engine.dev.openconext.local/internal/health');
+
+        $response = $client->getResponse();
+        $this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
+        $this->assertJson($response->getContent());
+
+        $json = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        $this->assertSame(['status' => 'UP'], $json);
+    }
+}