Support retrieving subset of all metadata + fix typo in configuration file + more robust http metadata download

andreassolberg · andreassolberg · commit 5657c3c21762 · 2009-06-16T11:50:53.000Z
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1524 44740490-163a-0410-bde0-09ae8108e29a
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -272,7 +272,7 @@ public static function parseDescriptorsFile($file) {
 
 		$doc = new DOMDocument();
 
-		$res = $doc->load($file);
+		$res = @$doc->load($file);
 		if($res !== TRUE) {
 			throw new Exception('Failed to read XML from file: ' . $file);
 		}
diff --git a/modules/aggregator/config-templates/aggregator.php b/modules/aggregator/config-templates/aggregator.php
@@ -4,7 +4,7 @@
 $config = array(
 
 	/* List of aggregators. */
-	'aggragators' => array(
+	'aggregators' => array(
 		'example' => array(
 			array('type' => 'flatfile'),  /* Metadata from metadata-directory. */
 			array('type' => 'xml', 'url' => 'https://idp.example.org/Metadata'),
diff --git a/modules/aggregator/www/index.php b/modules/aggregator/www/index.php
@@ -1,19 +1,31 @@
 <?php
 
-/* Types of metadata. */
-$metadataSets = array(
-	'saml20-idp-remote',
-	'saml20-sp-remote',
-	'shib13-idp-remote',
-	'shib13-sp-remote',
-	);
-
 $globalConfig = SimpleSAML_Configuration::getInstance();
 $aggregatorConfig = SimpleSAML_Configuration::getConfig('aggregator.php');
 
 
 $reconstruct = $aggregatorConfig->getBoolean('reconstruct', FALSE);
-$aggregators = $aggregatorConfig->getArray('aggragators');
+$aggregators = $aggregatorConfig->getArray('aggregators');
+
+$metadataSets = array('saml20-idp-remote', 'saml20-sp-remote', 'shib13-idp-remote', 'shib13-sp-remote');
+if ($aggregatorConfig->hasValue('default-set')) {
+	$metadataSets = $aggregatorConfig->getArray('default-set');
+}
+if (isset($_REQUEST['set'])) {
+	switch($_REQUEST) {
+		case 'saml2' :
+			$metadataSets = array('saml20-idp-remote', 'saml20-sp-remote'); break;
+		case 'shib13' :
+			$metadataSets = array('shib13-idp-remote', 'shib13-sp-remote'); break;
+		case 'idp' :
+			$metadataSets = array('saml20-idp-remote', 'shib13-idp-remote'); break;
+		case 'sp' :
+			$metadataSets = array('saml20-sp-remote', 'shib13-sp-remote'); break;
+		
+		default:
+			$metadataSets = array($_REQUEST['set']);
+	}
+}
 
 if (!array_key_exists('id', $_GET)) {
 	$t = new SimpleSAML_XHTML_Template($globalConfig, 'aggregator:list.php');
diff --git a/modules/metarefresh/lib/MetaLoader.php b/modules/metarefresh/lib/MetaLoader.php
@@ -29,8 +29,13 @@ public function __construct($expire = NULL) {
 	 * @param $src  Filename of the metadata file.
 	 */
 	public function loadSource($source) {
-
-		$entities = SimpleSAML_Metadata_SAMLParser::parseDescriptorsFile($source['src']);
+		
+		$entities = array();
+		try {
+			$entities = SimpleSAML_Metadata_SAMLParser::parseDescriptorsFile($source['src']);
+		} catch(Exception $e) {
+			SimpleSAML_Logger::warning('metarefresh: Failed to retrieve metadata. ' . $e->getMessage());
+		}
 		$ca = NULL;
 		foreach($entities as $entity) {
 			if(array_key_exists('validateFingerprint', $source) && $source['validateFingerprint'] !== NULL) {

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ public static function parseDescriptorsFile($file) {`
`272`	`272`
`273`	`273`	`$doc = new DOMDocument();`
`274`	`274`
`275`		`- $res = $doc->load($file);`
	`275`	`+ $res = @$doc->load($file);`
`276`	`276`	`if($res !== TRUE) {`
`277`	`277`	`throw new Exception('Failed to read XML from file: ' . $file);`
`278`	`278`	`}`