Merge pull request #1173 from simplesamlphp/tvdijen-patch-expired-entities

Show expired entities in federation-page

lib/SimpleSAML/Metadata/MetaDataStorageHandler.php

@@ -142,10 +142,11 @@ class MetaDataStorageHandler implements \SimpleSAML\Utils\ClearableState
      * where the key is the entity id.
      *
      * @param string $set The set we want to list metadata from.
+     * @param bool $showExpired A boolean specifying whether expired entities should be returned
      *
      * @return array An associative array with the metadata from from the given set.
      */
-    public function getList($set = 'saml20-idp-remote')
+    public function getList($set = 'saml20-idp-remote', $showExpired = false)
     {
         assert(is_string($set));
 
@@ -154,9 +155,9 @@ class MetaDataStorageHandler implements \SimpleSAML\Utils\ClearableState
         foreach ($this->sources as $source) {
             $srcList = $source->getMetadataSet($set);
 
-            foreach ($srcList as $key => $le) {
-                if (array_key_exists('expire', $le)) {
-                    if ($le['expire'] < time()) {
+            if ($showExpired === false) {
+                foreach ($srcList as $key => $le) {
+                    if (array_key_exists('expire', $le) && ($le['expire'] < time())) {
                         unset($srcList[$key]);
                         Logger::warning(
                             "Dropping metadata entity ".var_export($key, true).", expired ".

modules/admin/lib/FederationController.php

@@ -69,14 +69,14 @@ class FederationController
         $entries = [
             'hosted' => array_merge($hostedSPs, $hostedIdPs),
             'remote' => [
-                'saml20-idp-remote' => !empty($hostedSPs) ? $this->mdHandler->getList('saml20-idp-remote') : [],
-                'shib13-idp-remote' => !empty($hostedSPs) ? $this->mdHandler->getList('shib13-idp-remote') : [],
+                'saml20-idp-remote' => !empty($hostedSPs) ? $this->mdHandler->getList('saml20-idp-remote', true) : [],
+                'shib13-idp-remote' => !empty($hostedSPs) ? $this->mdHandler->getList('shib13-idp-remote', true) : [],
                 'saml20-sp-remote' => $this->config->getBoolean('enable.saml20-idp', false) === true
-                    ? $this->mdHandler->getList('saml20-sp-remote') : [],
+                    ? $this->mdHandler->getList('saml20-sp-remote', true) : [],
                 'shib13-sp-remote' => $this->config->getBoolean('enable.shib13-idp', false) === true
-                    ? $this->mdHandler->getList('shib13-sp-remote') : [],
+                    ? $this->mdHandler->getList('shib13-sp-remote', true) : [],
                 'adfs-sp-remote' => ($this->config->getBoolean('enable.adfs-idp', false) === true) &&
-                    Module::isModuleEnabled('adfs') ? $this->mdHandler->getList('adfs-sp-remote') : [],
+                    Module::isModuleEnabled('adfs') ? $this->mdHandler->getList('adfs-sp-remote', true) : [],
             ],
         ];
 

modules/core/www/frontpage_federation.php

@@ -51,8 +51,8 @@ $metaentries = ['hosted' => $metadataHosted, 'remote' => []];
 
 
 if ($isadmin) {
-    $metaentries['remote']['saml20-idp-remote'] = $metadata->getList('saml20-idp-remote');
-    $metaentries['remote']['shib13-idp-remote'] = $metadata->getList('shib13-idp-remote');
+    $metaentries['remote']['saml20-idp-remote'] = $metadata->getList('saml20-idp-remote', true);
+    $metaentries['remote']['shib13-idp-remote'] = $metadata->getList('shib13-idp-remote', true);
 }
 
 if ($config->getBoolean('enable.saml20-idp', false) === true) {
@@ -61,7 +61,7 @@ if ($config->getBoolean('enable.saml20-idp', false) === true) {
         $metaentries['hosted']['saml20-idp']['metadata-url'] =
             $config->getBasePath().'saml2/idp/metadata.php?output=xhtml';
         if ($isadmin) {
-            $metaentries['remote']['saml20-sp-remote'] = $metadata->getList('saml20-sp-remote');
+            $metaentries['remote']['saml20-sp-remote'] = $metadata->getList('saml20-sp-remote', true);
         }
     } catch (Exception $e) {
         \SimpleSAML\Logger::error('Federation: Error loading saml20-idp: '.$e->getMessage());
@@ -73,7 +73,7 @@ if ($config->getBoolean('enable.shib13-idp', false) === true) {
         $metaentries['hosted']['shib13-idp']['metadata-url'] =
             $config->getBasePath().'shib13/idp/metadata.php?output=xhtml';
         if ($isadmin) {
-            $metaentries['remote']['shib13-sp-remote'] = $metadata->getList('shib13-sp-remote');
+            $metaentries['remote']['shib13-sp-remote'] = $metadata->getList('shib13-sp-remote', true);
         }
     } catch (Exception $e) {
         \SimpleSAML\Logger::error('Federation: Error loading shib13-idp: '.$e->getMessage());
@@ -87,7 +87,7 @@ if ($config->getBoolean('enable.adfs-idp', false) === true) {
             ['output' => 'xhtml']
         );
         if ($isadmin) {
-            $metaentries['remote']['adfs-sp-remote'] = $metadata->getList('adfs-sp-remote');
+            $metaentries['remote']['adfs-sp-remote'] = $metadata->getList('adfs-sp-remote', true);
         }
     } catch (Exception $e) {
         \SimpleSAML\Logger::error('Federation: Error loading adfs-idp: '.$e->getMessage());