Throw exception when no public key was found in metadata XML document.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1028 44740490-163a-0410-bde0-09ae8108e29a

lib/SimpleSAML/Metadata/MetaDataStorageSource.php

@@ -61,14 +61,14 @@ abstract class SimpleSAML_Metadata_MetaDataStorageSource {
 		}
 
 		switch($type) {
-		case 'flatfile':
-			return new SimpleSAML_Metadata_MetaDataStorageHandlerFlatFile($sourceConfig);
-		case 'xml':
-			return new SimpleSAML_Metadata_MetaDataStorageHandlerXML($sourceConfig);
-		case 'dynamicxml':
-			return new SimpleSAML_Metadata_MetaDataStorageHandlerDynamicXML($sourceConfig);
-		default:
-			throw new Exception('Invalid metadata source type: "' . $type . '".');
+			case 'flatfile':
+				return new SimpleSAML_Metadata_MetaDataStorageHandlerFlatFile($sourceConfig);
+			case 'xml':
+				return new SimpleSAML_Metadata_MetaDataStorageHandlerXML($sourceConfig);
+			case 'dynamicxml':
+				return new SimpleSAML_Metadata_MetaDataStorageHandlerDynamicXML($sourceConfig);
+			default:
+				throw new Exception('Invalid metadata source type: "' . $type . '".');
 		}
 	}
 

lib/SimpleSAML/Metadata/SAMLParser.php

@@ -598,6 +598,11 @@ class SimpleSAML_Metadata_SAMLParser {
 			$ret['NameIDFormat'] = $spd['nameIDFormats'][0];
 		}
 
+		// Require that a certificate is embedded
+		if (!is_array($idp['keys'])) {
+			throw new Exception('Could not find any embedded certificates in metadata document.');
+		}
+
 		/* Add certificate data. Only the first valid certificate will be added. */
 		foreach($idp['keys'] as $key) {
 			if($key['type'] !== 'X509Certificate') {