Skip to content

Commit 73696af

Browse files
johanibjohanib
committed
refactor: architectural cleanup
1 parent 464f9e4 commit 73696af

24 files changed

Lines changed: 147 additions & 77 deletions

‎config/packages/test/monolog.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,4 @@ monolog:
1212
type: stream
1313
path: "%kernel.logs_dir%/%kernel.environment%.log"
1414
level: DEBUG
15-
test_log_handler:
16-
type: service
17-
id: OpenConext\EngineBlockFunctionalTestingBundle\Log\TestLogHandler
15+

‎config/services/ci/services.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,6 @@ services:
154154
arguments:
155155
- "@request_stack"
156156
- "%global.site_notice.allowed.tags%"
157+
158+
OpenConext\EngineBlockFunctionalTestingBundle\Log\TestLogHandler:
159+
public: true

‎config/services/compat.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,9 @@ services:
5959
engineblock.compat.attribute_release_policy_enforcer:
6060
public: false
6161
class: EngineBlock_Arp_AttributeReleasePolicyEnforcer
62+
63+
EngineBlock_Saml2_AuthnRequestSessionRepository:
64+
class: EngineBlock_Saml2_AuthnRequestSessionRepository
65+
public: true
66+
arguments:
67+
- '@request_stack'

‎config/services/services.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -411,12 +411,3 @@ services:
411411
class: OpenConext\EngineBlockBundle\Sbs\SbsAttributeMerger
412412
arguments:
413413
- "%sram.allowed_attributes%"
414-
415-
EngineBlock_Saml2_AuthnRequestSessionRepository:
416-
class: EngineBlock_Saml2_AuthnRequestSessionRepository
417-
public: true
418-
arguments:
419-
- '@request_stack'
420-
421-
OpenConext\EngineBlockFunctionalTestingBundle\Log\TestLogHandler:
422-
public: true

‎library/EngineBlock/Application/DiContainer.php‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
use OpenConext\EngineBlock\Metadata\Factory\Factory\ServiceProviderFactory;
2121
use OpenConext\EngineBlock\Metadata\LoaRepository;
2222
use OpenConext\EngineBlock\Metadata\MetadataRepository\MetadataRepositoryInterface;
23-
use OpenConext\EngineBlock\Request\CorrelationIdService;
24-
use OpenConext\EngineBlock\Request\CurrentCorrelationId;
2523
use OpenConext\EngineBlock\Service\MfaHelperInterface;
2624
use OpenConext\EngineBlock\Service\ReleaseAsEnforcer;
2725
use OpenConext\EngineBlock\Service\TimeProvider\TimeProviderInterface;
@@ -616,25 +614,6 @@ public function getNameIdSubstituteResolver()
616614
return new EngineBlock_Arp_NameIdSubstituteResolver($this->container->get('engineblock.compat.logger'));
617615
}
618616

619-
/**
620-
* @return CorrelationIdService
621-
*/
622-
public function getCorrelationIdService(): CorrelationIdService
623-
{
624-
return $this->container->get(CorrelationIdService::class);
625-
}
626-
627-
/**
628-
* @return CurrentCorrelationId
629-
*/
630-
public function getCurrentCorrelationId(): CurrentCorrelationId
631-
{
632-
return $this->container->get(CurrentCorrelationId::class);
633-
}
634-
635-
/**
636-
* @return EngineBlock_Saml2_AuthnRequestSessionRepository
637-
*/
638617
public function getAuthnRequestSessionRepository(): EngineBlock_Saml2_AuthnRequestSessionRepository
639618
{
640619
return $this->container->get(EngineBlock_Saml2_AuthnRequestSessionRepository::class);

‎library/EngineBlock/ApplicationSingleton.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public function collectFeedbackInfo(Throwable $exception)
269269
$feedbackInfo['ipAddress'] = $this->getClientIpAddress();
270270
$feedbackInfo['artCode'] = Art::forException($exception);
271271

272-
$currentCorrelationId = $this->getDiContainer()->getCurrentCorrelationId()->correlationId;
272+
$currentCorrelationId = $this->getDiContainerRuntime()->currentCorrelationId->correlationId;
273273
if ($currentCorrelationId !== null) {
274274
$feedbackInfo['correlationId'] = $currentCorrelationId;
275275
}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use OpenConext\EngineBlock\Metadata\Entity\ServiceProvider;
2020
use OpenConext\EngineBlock\Metadata\Factory\Factory\ServiceProviderFactory;
2121
use OpenConext\EngineBlock\Metadata\X509\KeyPairFactory;
22+
use OpenConext\EngineBlock\Request\CorrelationIdServiceInterface;
2223
use OpenConext\EngineBlock\Service\ProcessingStateHelperInterface;
2324
use OpenConext\EngineBlock\Stepup\StepupGatewayCallOutHelper;
2425
use OpenConext\EngineBlockBundle\Authentication\AuthenticationState;
@@ -59,13 +60,19 @@ class EngineBlock_Corto_Module_Service_AssertionConsumer implements EngineBlock_
5960
*/
6061
private $_serviceProviderFactory;
6162

63+
/**
64+
* @var CorrelationIdServiceInterface
65+
*/
66+
private $_correlationIdService;
67+
6268
public function __construct(
6369
EngineBlock_Corto_ProxyServer $server,
6470
EngineBlock_Corto_XmlToArray $xmlConverter,
6571
Session $session,
6672
ProcessingStateHelperInterface $processingStateHelper,
6773
StepupGatewayCallOutHelper $stepupGatewayCallOutHelper,
68-
ServiceProviderFactory $serviceProviderFactory
74+
ServiceProviderFactory $serviceProviderFactory,
75+
CorrelationIdServiceInterface $correlationIdService
6976
)
7077
{
7178
$this->_server = $server;
@@ -74,6 +81,7 @@ public function __construct(
7481
$this->_processingStateHelper = $processingStateHelper;
7582
$this->_stepupGatewayCallOutHelper = $stepupGatewayCallOutHelper;
7683
$this->_serviceProviderFactory = $serviceProviderFactory;
84+
$this->_correlationIdService = $correlationIdService;
7785
}
7886

7987
/**
@@ -90,7 +98,7 @@ public function serve($serviceName, Request $httpRequest)
9098

9199
$application = EngineBlock_ApplicationSingleton::getInstance();
92100

93-
$correlationIdService = $application->getDiContainer()->getCorrelationIdService();
101+
$correlationIdService = $this->_correlationIdService;
94102
$correlationIdService->resolve($receivedResponse->getInResponseTo());
95103
$log = $application->getLogInstance();
96104

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ public function serve($serviceName, Request $httpRequest)
8585
);
8686
}
8787

88-
$container = EngineBlock_ApplicationSingleton::getInstance()->getDiContainer();
8988

90-
$authnRequestRepository = $container->getAuthnRequestSessionRepository();
89+
$authnRequestRepository = EngineBlock_ApplicationSingleton::getInstance()->getDiContainer()->getAuthnRequestSessionRepository();
9190
$request = $authnRequestRepository->findRequestById($id);
9291

9392
if (!$request) {
@@ -96,7 +95,7 @@ public function serve($serviceName, Request $httpRequest)
9695
);
9796
}
9897

99-
$correlationIdService = $container->getCorrelationIdService();
98+
$correlationIdService = EngineBlock_ApplicationSingleton::getInstance()->getDiContainerRuntime()->correlationIdService;
10099
$correlationIdService->resolve($id);
101100

102101
// Flush log if SP or IdP has additional logging enabled

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818

1919
use OpenConext\EngineBlock\Authentication\Value\ConsentType;
20+
use OpenConext\EngineBlock\Request\CorrelationIdServiceInterface;
2021
use OpenConext\EngineBlock\Service\AuthenticationStateHelperInterface;
2122
use OpenConext\EngineBlock\Service\ProcessingStateHelperInterface;
2223
use SAML2\Constants;
@@ -51,26 +52,34 @@ class EngineBlock_Corto_Module_Service_ProcessConsent
5152
*/
5253
private $_processingStateHelper;
5354

55+
/**
56+
* @var CorrelationIdServiceInterface
57+
*/
58+
private $_correlationIdService;
59+
5460
/**
5561
* @param EngineBlock_Corto_ProxyServer $server
5662
* @param EngineBlock_Corto_XmlToArray $xmlConverter
5763
* @param EngineBlock_Corto_Model_Consent_Factory $consentFactory
5864
* @param AuthenticationStateHelperInterface $stateHelper
5965
* @param ProcessingStateHelperInterface $processingStateHelper
66+
* @param CorrelationIdServiceInterface $correlationIdService
6067
*/
6168
public function __construct(
6269
EngineBlock_Corto_ProxyServer $server,
6370
EngineBlock_Corto_XmlToArray $xmlConverter,
6471
EngineBlock_Corto_Model_Consent_Factory $consentFactory,
6572
AuthenticationStateHelperInterface $stateHelper,
66-
ProcessingStateHelperInterface $processingStateHelper
73+
ProcessingStateHelperInterface $processingStateHelper,
74+
CorrelationIdServiceInterface $correlationIdService
6775
)
6876
{
6977
$this->_server = $server;
7078
$this->_xmlConverter = $xmlConverter;
7179
$this->_consentFactory = $consentFactory;
7280
$this->_authenticationStateHelper = $stateHelper;
7381
$this->_processingStateHelper = $processingStateHelper;
82+
$this->_correlationIdService = $correlationIdService;
7483
}
7584

7685
/**
@@ -86,10 +95,7 @@ public function serve($serviceName, Request $httpRequest)
8695

8796
$request = $this->_server->getReceivedRequestFromResponse($response);
8897

89-
$correlationIdService = EngineBlock_ApplicationSingleton::getInstance()
90-
->getDiContainer()
91-
->getCorrelationIdService();
92-
$correlationIdService->resolve($request->getId());
98+
$this->_correlationIdService->resolve($request->getId());
9399

94100
$serviceProvider = $this->_server->getRepository()->fetchServiceProviderByEntityId($request->getIssuer()->getValue());
95101

‎library/EngineBlock/Corto/Module/Service/ProvideConsent.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use OpenConext\EngineBlock\Authentication\Value\ConsentType;
2020
use OpenConext\EngineBlock\Metadata\Entity\IdentityProvider;
2121
use OpenConext\EngineBlock\Metadata\Entity\ServiceProvider;
22+
use OpenConext\EngineBlock\Request\CorrelationIdServiceInterface;
2223
use OpenConext\EngineBlock\Service\AuthenticationStateHelperInterface;
2324
use OpenConext\EngineBlock\Service\Consent\ConsentServiceInterface;
2425
use OpenConext\EngineBlock\Service\ProcessingStateHelperInterface;
@@ -67,6 +68,8 @@ class EngineBlock_Corto_Module_Service_ProvideConsent
6768

6869
private DiscoverySelectionService $discoverySelectionService;
6970

71+
private CorrelationIdServiceInterface $_correlationIdService;
72+
7073
public function __construct(
7174
EngineBlock_Corto_ProxyServer $server,
7275
EngineBlock_Corto_XmlToArray $xmlConverter,
@@ -75,7 +78,8 @@ public function __construct(
7578
AuthenticationStateHelperInterface $authStateHelper,
7679
Environment $twig,
7780
ProcessingStateHelperInterface $processingStateHelper,
78-
DiscoverySelectionService $discoverySelectionService
81+
DiscoverySelectionService $discoverySelectionService,
82+
CorrelationIdServiceInterface $correlationIdService
7983
)
8084
{
8185
$this->_server = $server;
@@ -87,6 +91,7 @@ public function __construct(
8791
$this->_processingStateHelper = $processingStateHelper;
8892
$this->logger = EngineBlock_ApplicationSingleton::getLog();
8993
$this->discoverySelectionService = $discoverySelectionService;
94+
$this->_correlationIdService = $correlationIdService;
9095
}
9196

9297
/**
@@ -100,9 +105,7 @@ public function serve($serviceName, Request $httpRequest)
100105

101106
$receivedRequest = $this->_server->getReceivedRequestFromResponse($response);
102107

103-
$correlationIdService = EngineBlock_ApplicationSingleton::getInstance()
104-
->getDiContainer()
105-
->getCorrelationIdService();
108+
$correlationIdService = $this->_correlationIdService;
106109
$correlationIdService->resolve($receivedRequest->getId());
107110

108111
// update previous response with current response

0 commit comments

Comments
 (0)