From 389ecbe421b5b2f1d6b8019bb01b751146c2925f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 11 Jan 2008 13:04:20 +0000
Subject: [PATCH] Improved the metadata overview admin page by configuring
which parameters that are optional and required in each metadata set
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@153 44740490-163a-0410-bde0-09ae8108e29a
---
www/admin/metadata.php | 34 ++++++++++++----------------------
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/www/admin/metadata.php b/www/admin/metadata.php
index 1e351eec8..accec5a63 100644
--- a/www/admin/metadata.php
+++ b/www/admin/metadata.php
@@ -12,36 +12,31 @@ $config = SimpleSAML_Configuration::getInstance();
//$metadata = new SimpleSAML_XML_MetaDataStore($config);
$session = SimpleSAML_Session::getInstance();
-
-
try {
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-
$et = new SimpleSAML_XHTML_Template($config, 'admin-metadatalist.php');
-
if ($config->getValue('enable.saml20-sp') === true) {
$results = array();
- /*
+
$metalist = $metadata->getList('saml20-sp-hosted');
foreach ($metalist AS $entityid => $mentry) {
$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
- // TODO: UPDATE Required and optional parameter list
- array('entityid', 'host', 'spNameQualifier', 'NameIDFormat', 'ForceAuthn'),
- array('name', 'description')
+ array('entityid', 'host', 'NameIDFormat', 'ForceAuthn'),
+ array()
);
}
$et->data['metadata.saml20-sp-hosted'] = $results;
- */
+
+ $results = array();
$metalist = $metadata->getList('saml20-idp-remote');
foreach ($metalist AS $entityid => $mentry) {
$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
- // TODO: UPDATE Required and optional parameter list
- array('entityid', 'host', 'spNameQualifier', 'NameIDFormat', 'ForceAuthn'),
- array('name', 'description')
+ array('entityid', 'SingleSignOnService', 'SingleLogoutService', 'certFingerprint'),
+ array('name', 'description', 'base64attributes')
);
}
$et->data['metadata.saml20-idp-remote'] = $results;
@@ -53,19 +48,18 @@ try {
$metalist = $metadata->getList('saml20-idp-hosted');
foreach ($metalist AS $entityid => $mentry) {
$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
- // TODO: UPDATE Required and optional parameter list
- array('entityid', 'host', 'spNameQualifier', 'NameIDFormat', 'ForceAuthn'),
- array('name', 'description')
+ array('entityid', 'host', 'privatekey', 'certificate', 'auth'),
+ array('requireconsent')
);
}
$et->data['metadata.saml20-idp-hosted'] = $results;
+ $results = array();
$metalist = $metadata->getList('saml20-sp-remote');
foreach ($metalist AS $entityid => $mentry) {
$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
- // TODO: UPDATE Required and optional parameter list
- array('entityid', 'host', 'spNameQualifier', 'NameIDFormat', 'ForceAuthn'),
- array('name', 'description')
+ array('entityid', 'spNameQualifier', 'AssertionConsumerService', 'SingleLogoutService', 'NameIDFormat'),
+ array('base64attributes', 'attributemap', 'simplesaml.attributes', 'attributes', 'name', 'description')
);
}
$et->data['metadata.saml20-sp-remote'] = $results;
@@ -73,11 +67,7 @@ try {
}
-
-
-
-
$et->data['header'] = 'Metadata overview';
--
GitLab