WS-Fed: Update metadata and add WS-Fed metadata to the admin metadata overview.

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

metadata-templates/wsfed-idp-remote.php

@@ -3,9 +3,8 @@
 $metadata = array( 
 
 	'urn:federation:pingfederate:localhost' => array(
-		'host' => 'localhost',
 		'prp' => 'https://localhost:9031/idp/prp.wsf',
-		'cert' => '/cert/pingfed-localhost.pem',
+		'certificate' => 'pingfed-localhost.pem',
 	),	
 );
 

metadata-templates/wsfed-sp-hosted.php

@@ -2,8 +2,7 @@
 
 $metadata = array( 
 	'urn:federation:simplesamlphp:localhost' => array(
-		'host'				=>	'localhost',
-		'realm' => 'urn:federation:simplesamlphp:localhost',
+		'host' => 'localhost',
 	),
 );
 

templates/default/admin-metadatalist.php

@@ -114,6 +114,11 @@
 		if (array_key_exists('metadata.shib13-idp-remote', $this->data)) 
 			showEntry('Shib 1.3 Identity Provider (Remote)', $this->data['metadata.shib13-idp-remote'], $this->data['baseurlpath']);
 
+		if (array_key_exists('metadata.wsfed-sp-hosted', $this->data))
+			showEntry('WS-Federation Service Provider (Hosted)', $this->data['metadata.wsfed-sp-hosted'], $this->data['baseurlpath']);
+		if (array_key_exists('metadata.wsfed-idp-remote', $this->data))
+			showEntry('WS-Federation Identity Provider (Remote)', $this->data['metadata.wsfed-idp-remote'], $this->data['baseurlpath']);
+
 		
 		?>
 

www/admin/metadata.php

@@ -119,6 +119,29 @@ try {
 		
 	}
 
+	if ($config->getValue('enable.wsfed-sp') === true) {
+		$results = array();
+		$metalist = $metadata->getList('wsfed-sp-hosted');
+		foreach ($metalist AS $entityid => $mentry) {
+			$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
+				array('entityid', 'host'),
+				array()
+			);
+		}
+		$et->data['metadata.wsfed-sp-hosted'] = $results;
+
+		$results = array();
+		$metalist = $metadata->getList('wsfed-idp-remote');
+		foreach ($metalist AS $entityid => $mentry) {
+			$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
+				array('entityid', 'prp', 'certificate'),
+				array()
+			);
+		}
+		$et->data['metadata.wsfed-idp-remote'] = $results;
+
+	}
+
 	$et->data['header'] = 'Metadata overview';
 	$et->data['icon'] = 'bino.png';