From 8752b7cfc8e85e835643e26a51af8dc261c00ba8 Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Tue, 4 Mar 2014 16:38:31 +0100
Subject: [PATCH] Delete old SP metadata interfaces.
---
www/saml2/sp/metadata.php | 125 -------------------------------------
www/shib13/sp/metadata.php | 111 --------------------------------
2 files changed, 236 deletions(-)
delete mode 100644 www/saml2/sp/metadata.php
delete mode 100644 www/shib13/sp/metadata.php
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
deleted file mode 100644
index 8d2f2a73a..000000000
--- a/www/saml2/sp/metadata.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * WARNING:
- *
- * THIS FILE IS DEPRECATED AND WILL BE REMOVED IN FUTURE VERSIONS
- *
- * @deprecated
- */
-
-require_once('../../_include.php');
-
-/* Load simpleSAMLphp, configuration and metadata */
-$config = SimpleSAML_Configuration::getInstance();
-$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-
-SimpleSAML_Logger::warning('The file saml2/sp/metadata.php is deprecated and will be removed in future versions.');
-
-
-if (!$config->getValue('enable.saml20-sp', TRUE))
- throw new SimpleSAML_Error_Error('NOACCESS');
-
-/* Check if valid local session exists.. */
-if ($config->getBoolean('admin.protectmetadata', false)) {
- SimpleSAML_Utilities::requireAdmin();
-}
-
-try {
-
-
- $spentityid = isset($_GET['spentityid']) ? $_GET['spentityid'] : $metadata->getMetaDataCurrentEntityID();
- $spmeta = $metadata->getMetaDataConfig($spentityid, 'saml20-sp-hosted');
-
- $metaArray = array(
- 'metadata-set' => 'saml20-sp-remote',
- 'entityid' => $spentityid,
- 'AssertionConsumerService' => $metadata->getGenerated('AssertionConsumerService', 'saml20-sp-hosted'),
- );
-
- $slob = $metadata->getGenerated('SingleLogoutServiceBinding', 'saml20-sp-hosted');
- $slol = $metadata->getGenerated('SingleLogoutService', 'saml20-sp-hosted');
-
- if (is_array($slob)) {
- foreach ($slob as $binding) {
- $metaArray['SingleLogoutService'][] = array(
- 'Binding' => $binding,
- 'Location' => $slol,
- );
- }
- } else {
- $metaArray['SingleLogoutService'][] = array(
- 'Binding' => $slob,
- 'Location' => $slol,
- );
- }
-
- $metaArray['NameIDFormat'] = $spmeta->getString('NameIDFormat', 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient');
-
- if ($spmeta->hasValue('OrganizationName')) {
- $metaArray['OrganizationName'] = $spmeta->getLocalizedString('OrganizationName');
- $metaArray['OrganizationDisplayName'] = $spmeta->getLocalizedString('OrganizationDisplayName', $metaArray['OrganizationName']);
-
- if (!$spmeta->hasValue('OrganizationURL')) {
- throw new SimpleSAML_Error_Exception('If OrganizationName is set, OrganizationURL must also be set.');
- }
- $metaArray['OrganizationURL'] = $spmeta->getLocalizedString('OrganizationURL');
- }
-
-
- if ($spmeta->hasValue('attributes')) {
- $metaArray['attributes'] = $spmeta->getArray('attributes');
- }
- if ($spmeta->hasValue('attributes.NameFormat')) {
- $metaArray['attributes.NameFormat'] = $spmeta->getString('attributes.NameFormat');
- }
- if ($spmeta->hasValue('name')) {
- $metaArray['name'] = $spmeta->getLocalizedString('name');
- }
- if ($spmeta->hasValue('description')) {
- $metaArray['description'] = $spmeta->getLocalizedString('description');
- }
-
- $certInfo = SimpleSAML_Utilities::loadPublicKey($spmeta);
- if ($certInfo !== NULL && array_key_exists('certData', $certInfo)) {
- $metaArray['certData'] = $certInfo['certData'];
- }
-
- $metaflat = '$metadata[' . var_export($spentityid, TRUE) . '] = ' . var_export($metaArray, TRUE) . ';';
-
- $metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($spentityid);
- $metaBuilder->addMetadataSP20($metaArray);
- $metaBuilder->addOrganizationInfo($metaArray);
- $metaBuilder->addContact('technical', array(
- 'emailAddress' => $config->getString('technicalcontact_email', NULL),
- 'name' => $config->getString('technicalcontact_name', NULL),
- ));
- $metaxml = $metaBuilder->getEntityDescriptorText();
-
- /* Sign the metadata if enabled. */
- $metaxml = SimpleSAML_Metadata_Signer::sign($metaxml, $spmeta->toArray(), 'SAML 2 SP');
-
- if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
- $t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
- $t->data['header'] = 'saml20-sp';
- $t->data['metadata'] = htmlspecialchars($metaxml);
- $t->data['metadataflat'] = htmlspecialchars($metaflat);
- $t->data['metaurl'] = SimpleSAML_Utilities::selfURLNoQuery();
- $t->show();
-
- } else {
- header('Content-Type: application/xml');
-
- echo $metaxml;
- exit(0);
- }
-
-
-
-
-} catch(Exception $exception) {
-
- throw new SimpleSAML_Error_Error('METADATA', $exception);
-
-}
-
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
deleted file mode 100644
index 4f3d2dbf4..000000000
--- a/www/shib13/sp/metadata.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * WARNING:
- *
- * THIS FILE IS DEPRECATED AND WILL BE REMOVED IN FUTURE VERSIONS
- *
- * @deprecated
- */
-
-require_once('../../_include.php');
-
-/* Load simpleSAMLphp, configuration and metadata */
-$config = SimpleSAML_Configuration::getInstance();
-$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-
-SimpleSAML_Logger::warning('The file shib13/sp/metadata.php is deprecated and will be removed in future versions.');
-
-if (!$config->getBoolean('enable.shib13-sp', false))
- throw new SimpleSAML_Error_Error('NOACCESS');
-
-/* Check if valid local session exists.. */
-if ($config->getBoolean('admin.protectmetadata', false)) {
- SimpleSAML_Utilities::requireAdmin();
-}
-
-
-try {
-
- $spentityid = isset($_GET['spentityid']) ? $_GET['spentityid'] : $metadata->getMetaDataCurrentEntityID('shib13-sp-hosted');
- $spmeta = $metadata->getMetaDataConfig($spentityid, 'shib13-sp-hosted');
-
- $metaArray = array(
- 'metadata-set' => 'shib13-sp-remote',
- 'entityid' => $spentityid,
- 'AssertionConsumerService' => $metadata->getGenerated('AssertionConsumerService', 'shib13-sp-hosted'),
- );
-
- $certInfo = SimpleSAML_Utilities::loadPublicKey($spmeta);
- if ($certInfo !== NULL && array_key_exists('certData', $certInfo)) {
- $metaArray['certData'] = $certInfo['certData'];
- }
-
- $metaArray['NameIDFormat'] = $spmeta->getString('NameIDFormat', 'urn:mace:shibboleth:1.0:nameIdentifier');
-
- if ($spmeta->hasValue('OrganizationName')) {
- $metaArray['OrganizationName'] = $spmeta->getLocalizedString('OrganizationName');
- $metaArray['OrganizationDisplayName'] = $spmeta->getLocalizedString('OrganizationDisplayName', $metaArray['OrganizationName']);
-
- if (!$spmeta->hasValue('OrganizationURL')) {
- throw new SimpleSAML_Error_Exception('If OrganizationName is set, OrganizationURL must also be set.');
- }
- $metaArray['OrganizationURL'] = $spmeta->getLocalizedString('OrganizationURL');
- }
-
- if ($spmeta->hasValue('attributes')) {
- $metaArray['attributes'] = $spmeta->getArray('attributes');
- }
- if ($spmeta->hasValue('attributes.NameFormat')) {
- $metaArray['attributes.NameFormat'] = $spmeta->getString('attributes.NameFormat');
- }
- if ($spmeta->hasValue('name')) {
- $metaArray['name'] = $spmeta->getLocalizedString('name');
- }
- if ($spmeta->hasValue('description')) {
- $metaArray['description'] = $spmeta->getLocalizedString('description');
- }
-
-
- $metaflat = '$metadata[' . var_export($spentityid, TRUE) . '] = ' . var_export($metaArray, TRUE) . ';';
-
- if ($spmeta->hasValue('certificate')) {
- $metaArray['certificate'] = $spmeta->getString('certificate');
- }
- $metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($spentityid);
- $metaBuilder->addMetadataSP11($metaArray);
- $metaBuilder->addOrganizationInfo($metaArray);
- $metaBuilder->addContact('technical', array(
- 'emailAddress' => $config->getString('technicalcontact_email', NULL),
- 'name' => $config->getString('technicalcontact_name', NULL),
- ));
- $metaxml = $metaBuilder->getEntityDescriptorText();
-
- /* Sign the metadata if enabled. */
- $metaxml = SimpleSAML_Metadata_Signer::sign($metaxml, $spmeta->toArray(), 'Shib 1.3 SP');
-
- if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
- $t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
- $t->data['header'] = 'shib13-sp';
- $t->data['metadata'] = htmlspecialchars($metaxml);
- $t->data['metadataflat'] = htmlspecialchars($metaflat);
- $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), array('output' => 'xml'));
- $t->show();
-
- } else {
-
- header('Content-Type: application/xml');
-
- echo $metaxml;
- exit(0);
- }
-
-
-
-} catch(Exception $exception) {
-
- throw new SimpleSAML_Error_Error('METADATA', $exception);
-
-}
-
-?>
\ No newline at end of file
--
GitLab