From 7a137b21290c04dc36619150d2c3db79b544e7b0 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 26 Nov 2009 09:18:16 +0000
Subject: [PATCH] saml: Use the new format for endpoints in bindings.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2010 44740490-163a-0410-bde0-09ae8108e29a
---
modules/saml/www/sp/metadata.php | 37 ++++++++++++++++++++++++++------
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index 16b600863..c64da9269 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -19,24 +19,49 @@ $entityId = $source->getEntityId();
$metaArray11 = array(
'metadata-set' => 'shib13-sp-remote',
'entityid' => $entityId,
- 'AssertionConsumerService' => SimpleSAML_Module::getModuleURL('saml/sp/saml1-acs.php/' . $sourceId),
+ 'AssertionConsumerService' => array(
+ array(
+ 'index' => 0,
+ 'Binding' => 'urn:oasis:names:tc:SAML:1.0:profiles:browser-post',
+ 'Location' => SimpleSAML_Module::getModuleURL('saml/sp/saml1-acs.php/' . $sourceId),
+ ),
+ ),
);
$spconfig = $source->getMetadata();
if ($spconfig->getBoolean('saml11.binding.artifact.enable', FALSE)) {
- $metaArray11['AssertionConsumerService.artifact'] = SimpleSAML_Module::getModuleURL('saml/sp/saml1-acs.php/' . $sourceId . '/artifact');
+ $metaArray11['AssertionConsumerService'][] = array(
+ 'index' => 1,
+ 'Binding' => 'urn:oasis:names:tc:SAML:1.0:profiles:artifact-01',
+ 'Location' => SimpleSAML_Module::getModuleURL('saml/sp/saml1-acs.php/' . $sourceId . '/artifact'),
+ );
}
$metaArray20 = array(
'metadata-set' => 'saml20-sp-remote',
'entityid' => $entityId,
- 'AssertionConsumerService' => SimpleSAML_Module::getModuleURL('saml/sp/saml2-acs.php/' . $sourceId),
- 'SingleLogoutService' => SimpleSAML_Module::getModuleURL('saml/sp/saml2-logout.php/' . $sourceId),
+ 'AssertionConsumerService' => array(
+ array(
+ 'index' => 0,
+ 'Binding' => SAML2_Const::BINDING_HTTP_POST,
+ 'Location' => SimpleSAML_Module::getModuleURL('saml/sp/saml2-acs.php/' . $sourceId),
+ ),
+ ),
+ 'SingleLogoutService' => array(
+ array(
+ 'Binding' => SAML2_Const::BINDING_HTTP_REDIRECT,
+ 'Location' => SimpleSAML_Module::getModuleURL('saml/sp/saml2-logout.php/' . $sourceId),
+ ),
+ ),
);
-
+
if ($spconfig->getBoolean('saml20.binding.artifact.enable', FALSE)) {
- $metaArray20['AssertionConsumerService.artifact'] = SimpleSAML_Module::getModuleURL('saml/sp/saml2-acs.php/' . $sourceId);
+ $metaArray20['AssertionConsumerService'][] = array(
+ 'index' => 1,
+ 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact',
+ 'Location' => SimpleSAML_Module::getModuleURL('saml/sp/saml2-acs.php/' . $sourceId),
+ );
}
$certInfo = SimpleSAML_Utilities::loadPublicKey($spconfig->toArray());
--
GitLab