Skip to content
Snippets Groups Projects
Commit 6f292990 authored by Frank Tamás's avatar Frank Tamás
Browse files

Fix the "hack" with numeric keys of $data array

parent 22b8b576
No related branches found
No related tags found
No related merge requests found
...@@ -201,7 +201,8 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerMDX extends SimpleSAML_Metadata_ ...@@ -201,7 +201,8 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerMDX extends SimpleSAML_Metadata_
case 'shib13-sp-remote': case 'shib13-sp-remote':
return $entity->getMetadata1xSP(); return $entity->getMetadata1xSP();
case 'attributeauthority-remote': case 'attributeauthority-remote':
return $entity->getAttributeAuthorities(); $ret = $entity->getAttributeAuthorities();
return $ret[0];
default: default:
SimpleSAML_Logger::warning('MetaData - Handler.MDX: Unknown metadata set: ' . $set); SimpleSAML_Logger::warning('MetaData - Handler.MDX: Unknown metadata set: ' . $set);
...@@ -262,9 +263,7 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerMDX extends SimpleSAML_Metadata_ ...@@ -262,9 +263,7 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerMDX extends SimpleSAML_Metadata_
} }
$entity = SimpleSAML_Metadata_SAMLParser::parseString($xmldata); $entity = SimpleSAML_Metadata_SAMLParser::parseString($xmldata);
SimpleSAML_Logger::debug('MetaData - Handler.MDX: Completed parsing of [' . SimpleSAML_Logger::debug('MetaData - Handler.MDX: Completed parsing of [' . $mdx_url . ']' );
$mdx_url . ']' );
if( $this->validateFingerprint !== NULL) { if( $this->validateFingerprint !== NULL) {
if(!$entity->validateFingerprint($this->validateFingerprint)) { if(!$entity->validateFingerprint($this->validateFingerprint)) {
...@@ -274,14 +273,12 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerMDX extends SimpleSAML_Metadata_ ...@@ -274,14 +273,12 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerMDX extends SimpleSAML_Metadata_
$data = self::getParsedSet($entity, $set); $data = self::getParsedSet($entity, $set);
if ($data === NULL) { if ($data === NULL) {
throw new Exception('No metadata for set "' . $set . throw new Exception('No metadata for set "' . $set . '" available from "' . $index . '".');
'" available from "' . $index . '".');
} }
if (is_array($data[0])) $data = $data[0];
$this->writeToCache($set, $index, $data); $this->writeToCache($set, $index, $data);
return $data; return $data;
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment