From 82c340c9aacb17a516584e8f26e4faaccb24ceb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Mon, 28 Apr 2008 07:06:25 +0000
Subject: [PATCH] Changing XML output to be default on all metadata endpoints.
In order to adopt the entity id equals metadata url approach
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@518 44740490-163a-0410-bde0-09ae8108e29a
---
www/index.php | 8 +++----
www/saml2/idp/metadata.php | 28 ++++++++++++----------
www/saml2/sp/metadata.php | 41 ++++++++++++++++---------------
www/shib13/idp/metadata.php | 31 +++++++++++++-----------
www/shib13/sp/metadata.php | 48 ++++++++++++++++++++-----------------
5 files changed, 85 insertions(+), 71 deletions(-)
diff --git a/www/index.php b/www/index.php
index 2479f41cd..a3d5b8f95 100644
--- a/www/index.php
+++ b/www/index.php
@@ -64,22 +64,22 @@ $linksmeta[] = array(
if ($config->getValue('enable.saml20-sp') === true)
$linksmeta[] = array(
- 'href' => 'saml2/sp/metadata.php',
+ 'href' => 'saml2/sp/metadata.php?output=xhtml',
'text' => 'link_meta_saml2sphosted');
if ($config->getValue('enable.saml20-idp') === true)
$linksmeta[] = array(
- 'href' => 'saml2/idp/metadata.php',
+ 'href' => 'saml2/idp/metadata.php?output=xhtml',
'text' => 'link_meta_saml2idphosted');
if ($config->getValue('enable.shib13-sp') === true)
$linksmeta[] = array(
- 'href' => 'shib13/sp/metadata.php',
+ 'href' => 'shib13/sp/metadata.php?output=xhtml',
'text' => 'link_meta_shib13sphosted');
if ($config->getValue('enable.shib13-idp') === true)
$linksmeta[] = array(
- 'href' => 'shib13/idp/metadata.php',
+ 'href' => 'shib13/idp/metadata.php?output=xhtml',
'text' => 'link_meta_shib13idphosted');
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 9fcda4e2d..f97010a00 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -93,25 +93,29 @@ try {
</EntityDescriptor>';
- if (array_key_exists('output', $_GET) && $_GET['output'] == 'xml') {
+ if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
+ $defaultidp = $config->getValue('default-saml20-idp');
+
+ $t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
+
+
+ $t->data['header'] = 'SAML 2.0 IdP Metadata';
+ $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery());
+ $t->data['metadata'] = htmlentities($metaxml);
+ $t->data['metadataflat'] = htmlentities($metaflat);
+ $t->data['defaultidp'] = $defaultidp;
+ $t->show();
+
+ } else {
+
header('Content-Type: application/xml');
echo $metaxml;
exit(0);
- }
+ }
- $defaultidp = $config->getValue('default-saml20-idp');
-
- $t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
-
- $t->data['header'] = 'SAML 2.0 IdP Metadata';
- $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
- $t->data['metadata'] = htmlentities($metaxml);
- $t->data['metadataflat'] = htmlentities($metaflat);
- $t->data['defaultidp'] = $defaultidp;
- $t->show();
} catch(Exception $exception) {
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index 2efc97f73..6af101ad0 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -83,7 +83,28 @@ try {
</EntityDescriptor>';
- if (array_key_exists('output', $_GET) && $_GET['output'] == 'xml') {
+ if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
+ $defaultidp = $config->getValue('default-saml20-idp');
+
+ $t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
+
+ $t->data['header'] = 'SAML 2.0 SP Metadata';
+ $t->data['metadata'] = htmlentities($metaxml);
+ $t->data['metadataflat'] = htmlentities($metaflat);
+ $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
+
+ if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
+ $t->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
+ $t->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
+ }
+
+ $t->data['techemail'] = $config->getValue('technicalcontact_email', 'na');
+ $t->data['version'] = $config->getValue('version', 'na');
+ $t->data['defaultidp'] = $defaultidp;
+
+ $t->show();
+
+ } else {
header('Content-Type: application/xml');
echo $metaxml;
@@ -91,25 +112,7 @@ try {
}
- $defaultidp = $config->getValue('default-saml20-idp');
-
- $t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
- $t->data['header'] = 'SAML 2.0 SP Metadata';
- $t->data['metadata'] = htmlentities($metaxml);
- $t->data['metadataflat'] = htmlentities($metaflat);
- $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
-
- if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
- $t->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
- $t->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
- }
-
- $t->data['techemail'] = $config->getValue('technicalcontact_email', 'na');
- $t->data['version'] = $config->getValue('version', 'na');
- $t->data['defaultidp'] = $defaultidp;
-
- $t->show();
} catch(Exception $exception) {
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 9c7cf1c2b..137b1afa1 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -78,7 +78,23 @@ try {
</EntityDescriptor>';
- if (array_key_exists('output', $_GET) && $_GET['output'] == 'xml') {
+ if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
+ $defaultidp = $config->getValue('default-shib13-idp');
+
+ $t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
+
+ $t->data['header'] = 'Shib 1.3 IdP Metadata';
+
+ $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
+ $t->data['metadata'] = htmlspecialchars($metaxml);
+ $t->data['metadataflat'] = htmlspecialchars($metaflat);
+
+ $t->data['defaultidp'] = $defaultidp;
+
+ $t->show();
+
+ } else {
+
header('Content-Type: application/xml');
echo $metaxml;
@@ -86,19 +102,6 @@ try {
}
- $defaultidp = $config->getValue('default-shib13-idp');
-
- $t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
-
- $t->data['header'] = 'Shib 1.3 IdP Metadata';
-
- $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
- $t->data['metadata'] = htmlspecialchars($metaxml);
- $t->data['metadataflat'] = htmlspecialchars($metaflat);
-
- $t->data['defaultidp'] = $defaultidp;
-
- $t->show();
} catch(Exception $exception) {
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
index 463a4d382..dda97b716 100644
--- a/www/shib13/sp/metadata.php
+++ b/www/shib13/sp/metadata.php
@@ -55,35 +55,39 @@ try {
</EntityDescriptor>';
- if (array_key_exists('output', $_GET) && $_GET['output'] == 'xml') {
+ if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
+ $defaultidp = $config->getValue('default-shib13-idp');
+
+ $t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
+
+
+ $t->data['header'] = 'Shib 1.3 SP Metadata';
+ $t->data['metadata'] = htmlspecialchars($metaxml);
+ $t->data['metadataflat'] = htmlspecialchars($metaflat);
+ $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
+
+ /*
+ if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
+ $et->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
+ $et->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
+ }
+ */
+
+ $t->data['techemail'] = $config->getValue('technicalcontact_email', 'na');
+ $t->data['version'] = $config->getValue('version', 'na');
+ $t->data['defaultidp'] = $defaultidp;
+
+ $t->show();
+
+ } else {
+
header('Content-Type: application/xml');
echo $metaxml;
exit(0);
}
- $defaultidp = $config->getValue('default-shib13-idp');
-
- $t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
-
- $t->data['header'] = 'Shib 1.3 SP Metadata';
- $t->data['metadata'] = htmlspecialchars($metaxml);
- $t->data['metadataflat'] = htmlspecialchars($metaflat);
- $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
-
- /*
- if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
- $et->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
- $et->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
- }
- */
-
- $t->data['techemail'] = $config->getValue('technicalcontact_email', 'na');
- $t->data['version'] = $config->getValue('version', 'na');
- $t->data['defaultidp'] = $defaultidp;
-
- $t->show();
} catch(Exception $exception) {
--
GitLab