fix: resolve merge conflicts with main; remove TestLogHandler; wire CurrentCorrelationId into FeedbackController

- Merge DiContainerRuntime/EngineBlockBootstrapper/AssertionConsumer to include
  both CorrelationIdService (feature) and FeedbackStateHelper (main) dependencies
- Remove TestLogHandler: LoggingContext now reads from the file-based log handler
- Remove test_log_handler from CI monolog config and service registry
- Add CurrentCorrelationId injection to FeedbackController DI config
  so correlationId is included in feedback session data

Author: johanib

config/packages/ci/monolog.yaml

@@ -1,8 +1,5 @@
 monolog:
     handlers:
-        test_log_handler:
-            type: service
-            id: OpenConext\EngineBlockFunctionalTestingBundle\Log\TestLogHandler
         test_log_file:
             type: stream
             path: '/tmp/eb-fixtures/log-records.ndjson'

config/packages/test/monolog.yaml

@@ -12,6 +12,4 @@ monolog:
             type:   stream
             path:   "%kernel.logs_dir%/%kernel.environment%.log"
             level:  DEBUG
-        test_log_handler:
-            type: service
-            id: OpenConext\EngineBlockFunctionalTestingBundle\Log\TestLogHandler
+

config/services/ci/services.yml

@@ -154,3 +154,4 @@ services:
         arguments:
             - "@request_stack"
             - "%global.site_notice.allowed.tags%"
+

config/services/compat.yml

@@ -59,3 +59,9 @@ services:
     engineblock.compat.attribute_release_policy_enforcer:
         public: false
         class: EngineBlock_Arp_AttributeReleasePolicyEnforcer
+
+    EngineBlock_Saml2_AuthnRequestSessionRepository:
+        class: EngineBlock_Saml2_AuthnRequestSessionRepository
+        public: true
+        arguments:
+            - '@request_stack'

config/services/controllers/authentication.yml

@@ -33,6 +33,7 @@ services:
             - '@translator'
             - '@twig'
             - '@OpenConext\EngineBlock\Service\FeedbackStateHelper'
+            - '@OpenConext\EngineBlock\Request\CurrentCorrelationId'
 
     OpenConext\EngineBlockBundle\Controller\MetadataController:
         arguments:

config/services/services.yml

@@ -430,12 +430,3 @@ services:
         class: OpenConext\EngineBlockBundle\Sbs\SbsAttributeMerger
         arguments:
             - "%sram.allowed_attributes%"
-
-    EngineBlock_Saml2_AuthnRequestSessionRepository:
-        class: EngineBlock_Saml2_AuthnRequestSessionRepository
-        public: true
-        arguments:
-            - '@request_stack'
-
-    OpenConext\EngineBlockFunctionalTestingBundle\Log\TestLogHandler:
-        public: true

library/EngineBlock/Application/DiContainer.php

@@ -20,8 +20,6 @@
 use OpenConext\EngineBlock\Metadata\Factory\Factory\ServiceProviderFactory;
 use OpenConext\EngineBlock\Metadata\LoaRepository;
 use OpenConext\EngineBlock\Metadata\MetadataRepository\MetadataRepositoryInterface;
-use OpenConext\EngineBlock\Request\CorrelationIdService;
-use OpenConext\EngineBlock\Request\CurrentCorrelationId;
 use OpenConext\EngineBlock\Service\MfaHelperInterface;
 use OpenConext\EngineBlock\Service\ReleaseAsEnforcer;
 use OpenConext\EngineBlock\Service\TimeProvider\TimeProviderInterface;
@@ -616,25 +614,6 @@ public function getNameIdSubstituteResolver()
         return new EngineBlock_Arp_NameIdSubstituteResolver($this->container->get('engineblock.compat.logger'));
     }
 
-    /**
-     * @return CorrelationIdService
-     */
-    public function getCorrelationIdService(): CorrelationIdService
-    {
-        return $this->container->get(CorrelationIdService::class);
-    }
-
-    /**
-     * @return CurrentCorrelationId
-     */
-    public function getCurrentCorrelationId(): CurrentCorrelationId
-    {
-        return $this->container->get(CurrentCorrelationId::class);
-    }
-
-    /**
-     * @return EngineBlock_Saml2_AuthnRequestSessionRepository
-     */
     public function getAuthnRequestSessionRepository(): EngineBlock_Saml2_AuthnRequestSessionRepository
     {
         return $this->container->get(EngineBlock_Saml2_AuthnRequestSessionRepository::class);

library/EngineBlock/Corto/Module/Service/AssertionConsumer.php

@@ -19,6 +19,7 @@
 use OpenConext\EngineBlock\Metadata\Entity\ServiceProvider;
 use OpenConext\EngineBlock\Metadata\Factory\Factory\ServiceProviderFactory;
 use OpenConext\EngineBlock\Metadata\X509\KeyPairFactory;
+use OpenConext\EngineBlock\Request\CorrelationIdServiceInterface;
 use OpenConext\EngineBlock\Service\FeedbackStateHelperInterface;
 use OpenConext\EngineBlock\Service\ProcessingStateHelperInterface;
 use OpenConext\EngineBlock\Stepup\StepupGatewayCallOutHelper;
@@ -46,13 +47,19 @@ class EngineBlock_Corto_Module_Service_AssertionConsumer implements EngineBlock_
 
     private FeedbackStateHelperInterface $_feedbackStateHelper;
 
+    /**
+     * @var CorrelationIdServiceInterface
+     */
+    private $_correlationIdService;
+
     public function __construct(
         EngineBlock_Corto_ProxyServer $server,
         EngineBlock_Corto_XmlToArray $xmlConverter,
         Session $session,
         ProcessingStateHelperInterface $processingStateHelper,
         StepupGatewayCallOutHelper $stepupGatewayCallOutHelper,
         ServiceProviderFactory $serviceProviderFactory,
+        CorrelationIdServiceInterface $correlationIdService,
         FeedbackStateHelperInterface $feedbackStateHelper
     )
     {
@@ -62,6 +69,7 @@ public function __construct(
         $this->_processingStateHelper = $processingStateHelper;
         $this->_stepupGatewayCallOutHelper = $stepupGatewayCallOutHelper;
         $this->_serviceProviderFactory = $serviceProviderFactory;
+        $this->_correlationIdService = $correlationIdService;
         $this->_feedbackStateHelper = $feedbackStateHelper;
     }
 
@@ -79,7 +87,7 @@ public function serve($serviceName, Request $httpRequest)
 
         $application = EngineBlock_ApplicationSingleton::getInstance();
 
-        $correlationIdService = $application->getDiContainer()->getCorrelationIdService();
+        $correlationIdService = $this->_correlationIdService;
         $correlationIdService->resolve($receivedResponse->getInResponseTo());
         $log = $application->getLogInstance();
 

library/EngineBlock/Corto/Module/Service/ContinueToIdp.php

@@ -85,9 +85,8 @@ public function serve($serviceName, Request $httpRequest)
             );
         }
 
-        $container = EngineBlock_ApplicationSingleton::getInstance()->getDiContainer();
 
-        $authnRequestRepository = $container->getAuthnRequestSessionRepository();
+        $authnRequestRepository =  EngineBlock_ApplicationSingleton::getInstance()->getDiContainer()->getAuthnRequestSessionRepository();
         $request = $authnRequestRepository->findRequestById($id);
 
         if (!$request) {
@@ -96,7 +95,7 @@ public function serve($serviceName, Request $httpRequest)
             );
         }
 
-        $correlationIdService = $container->getCorrelationIdService();
+        $correlationIdService = EngineBlock_ApplicationSingleton::getInstance()->getDiContainerRuntime()->correlationIdService;
         $correlationIdService->resolve($id);
 
         // Flush log if SP or IdP has additional logging enabled

library/EngineBlock/Corto/Module/Service/ProcessConsent.php

@@ -17,6 +17,7 @@
  */
 
 use OpenConext\EngineBlock\Authentication\Value\ConsentType;
+use OpenConext\EngineBlock\Request\CorrelationIdServiceInterface;
 use OpenConext\EngineBlock\Service\AuthenticationStateHelperInterface;
 use OpenConext\EngineBlock\Service\ProcessingStateHelperInterface;
 use SAML2\Constants;
@@ -51,26 +52,34 @@ class EngineBlock_Corto_Module_Service_ProcessConsent
      */
     private $_processingStateHelper;
 
+    /**
+     * @var CorrelationIdServiceInterface
+     */
+    private $_correlationIdService;
+
     /**
      * @param EngineBlock_Corto_ProxyServer $server
      * @param EngineBlock_Corto_XmlToArray $xmlConverter
      * @param EngineBlock_Corto_Model_Consent_Factory $consentFactory
      * @param AuthenticationStateHelperInterface $stateHelper
      * @param ProcessingStateHelperInterface $processingStateHelper
+     * @param CorrelationIdServiceInterface $correlationIdService
      */
     public function __construct(
         EngineBlock_Corto_ProxyServer $server,
         EngineBlock_Corto_XmlToArray $xmlConverter,
         EngineBlock_Corto_Model_Consent_Factory $consentFactory,
         AuthenticationStateHelperInterface $stateHelper,
-        ProcessingStateHelperInterface $processingStateHelper
+        ProcessingStateHelperInterface $processingStateHelper,
+        CorrelationIdServiceInterface $correlationIdService
     )
     {
         $this->_server = $server;
         $this->_xmlConverter = $xmlConverter;
         $this->_consentFactory = $consentFactory;
         $this->_authenticationStateHelper = $stateHelper;
         $this->_processingStateHelper = $processingStateHelper;
+        $this->_correlationIdService = $correlationIdService;
     }
 
     /**
@@ -86,10 +95,7 @@ public function serve($serviceName, Request $httpRequest)
 
         $request = $this->_server->getReceivedRequestFromResponse($response);
 
-        $correlationIdService = EngineBlock_ApplicationSingleton::getInstance()
-            ->getDiContainer()
-            ->getCorrelationIdService();
-        $correlationIdService->resolve($request->getId());
+        $this->_correlationIdService->resolve($request->getId());
 
         $serviceProvider = $this->_server->getRepository()->fetchServiceProviderByEntityId($request->getIssuer()->getValue());