Clean up support for 'special' eb entities in service registry

In the past, the service regisry(manage) would contain special entities
for engineblock itself as an IdP and SP. This is no longer the case for
a long time now, the code related to these exceptions can be cleaned up.
The service registry only contains remote IdPs and SPs now.

Author: thijskh

library/EngineBlock/Corto/Adapter.php

@@ -21,7 +21,6 @@
 use OpenConext\EngineBlock\Metadata\MetadataRepository\Filter\RemoveOtherWorkflowStatesFilter;
 use OpenConext\EngineBlock\Metadata\MetadataRepository\MetadataRepositoryInterface;
 use OpenConext\EngineBlock\Metadata\MetadataRepository\Visitor\DisableDisallowedEntitiesInWayfVisitor;
-use OpenConext\EngineBlock\Metadata\MetadataRepository\Visitor\EngineBlockMetadataVisitor;
 use OpenConext\EngineBlock\Metadata\Service;
 
 class EngineBlock_Corto_Adapter
@@ -362,8 +361,6 @@ protected function _configureProxyServer(EngineBlock_Corto_ProxyServer $proxySer
 
         $this->configureProxyCertificates($proxyServer);
 
-        $this->enrichEngineBlockMetadata($proxyServer);
-
         $proxyServer->setRepository($this->getMetadataRepository());
         $proxyServer->setBindingsModule(new EngineBlock_Corto_Module_Bindings($proxyServer));
         $proxyServer->setServicesModule(new EngineBlock_Corto_Module_Services($proxyServer));
@@ -479,28 +476,4 @@ protected function configureProxyCertificates(EngineBlock_Corto_ProxyServer $pro
 
         return $proxyServer->getSigningCertificates();
     }
-
-    /**
-     * Modify EngineBlocks own metadata entries.
-     *
-     * See EngineBlockMetadataVisitor for more information on what is modified
-     * and why.
-     *
-     * @param EngineBlock_Corto_ProxyServer $proxyServer
-     */
-    protected function enrichEngineBlockMetadata(EngineBlock_Corto_ProxyServer $proxyServer)
-    {
-        $idpEntityId = $proxyServer->getUrl('idpMetadataService');
-        $spEntityId = $proxyServer->getUrl('spMetadataService');
-        $keyPair = $proxyServer->getSigningCertificates();
-
-        $visitor = new EngineBlockMetadataVisitor(
-            $idpEntityId,
-            $spEntityId,
-            $keyPair,
-            EngineBlock_ApplicationSingleton::getInstance()->getDiContainer()->getAttributeMetadata()
-        );
-
-        $this->getMetadataRepository()->appendVisitor($visitor);
-    }
 }

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

@@ -151,13 +151,6 @@ public function serve($serviceName, Request $httpRequest)
         // those that are not allowed.
         $candidateIDPs = $this->_server->getRepository()->findAllIdentityProviderEntityIds($scopedIdps);
 
-        $posOfOwnIdp = array_search($this->_server->getUrl('idpMetadataService'), $candidateIDPs);
-        if ($posOfOwnIdp !== false) {
-            $log->info("Removed ourselves from the candidate IdP list");
-            unset($candidateIDPs[$posOfOwnIdp]);
-            // This could be removed after the magic entities are removed completely https://www.pivotaltracker.com/story/show/168249058
-        }
-
         if (count($scopedIdps) > 0) {
             $log->info(
                 sprintf('%d candidate IdPs after scoping', count($candidateIDPs)),
@@ -497,12 +490,6 @@ protected function _transformIdpsForWayf(array $idpEntityIds, $isDebugRequest, $
 
         $wayfIdps = array();
         foreach ($identityProviders as $identityProvider) {
-            if ($identityProvider->entityId === $this->_server->getUrl('idpMetadataService')) {
-                // Skip ourselves as a valid Idp
-                // This could be removed after the magic entities are removed completely https://www.pivotaltracker.com/story/show/168249058
-                continue;
-            }
-
             if ($identityProvider->getCoins()->hidden()) {
                 continue;
             }

src/OpenConext/EngineBlock/Metadata/MetadataRepository/IdpsMetadataRepository.php

@@ -102,13 +102,6 @@ private function convertIdentityProviders(
         $collection = new IdentityProviderEntityCollection();
 
         foreach ($idps as $idp) {
-            // Don't add ourselves
-            // TODO: remove after the 'magic' entities are removed
-            // @see: https://www.pivotaltracker.com/story/show/168249058
-            if ($idp->entityId === $this->urlProvider->getUrl('metadata_idp', false, null, null)) {
-                continue;
-            }
-
             // Do not reveal hidden IdP's
             if ($idp->getCoins()->hidden()) {
                 continue;