From d32eb4a928f5f0e256202ca244cf141411e4489d Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Wed, 3 Feb 2016 13:22:20 +0100
Subject: [PATCH] Make
SimpleSAML\Utils\Config\Metadata::isHiddenFromDiscovery() resilient to all
kinds of failures.
---
lib/SimpleSAML/Utils/Config/Metadata.php | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/SimpleSAML/Utils/Config/Metadata.php b/lib/SimpleSAML/Utils/Config/Metadata.php
index 9ec472015..3f6b1bea6 100644
--- a/lib/SimpleSAML/Utils/Config/Metadata.php
+++ b/lib/SimpleSAML/Utils/Config/Metadata.php
@@ -255,12 +255,11 @@ class Metadata
*
* @return boolean True if the entity should be hidden, false otherwise.
*/
- public static function isHiddenFromDiscovery($metadata)
+ public static function isHiddenFromDiscovery(array $metadata)
{
- if (array_key_exists(self::$ENTITY_CATEGORY, $metadata['EntityAttributes'])) {
- if (in_array(self::$HIDE_FROM_DISCOVERY, $metadata['EntityAttributes'][self::$ENTITY_CATEGORY])) {
- return true;
- }
+ try {
+ return in_array(self::$HIDE_FROM_DISCOVERY, $metadata['EntityAttributes'][self::$ENTITY_CATEGORY]);
+ } catch (\Exception $e) {
}
return false;
}
--
GitLab