Revision: 1946
Author: olavmrk
Date: Wed Nov 4 05:52:19 2009
Log: Set metadata-set and entityid in metadata passed to SAMLBuilder.
http://code.google.com/p/simplesamlphp/source/detail?r=1946
Modified:
/trunk/lib/SimpleSAML/Metadata/SAMLParser.php
/trunk/modules/saml/www/sp/metadata.php
/trunk/modules/saml2/www/sp/metadata.php
/trunk/www/saml2/idp/metadata.php
/trunk/www/saml2/sp/metadata.php
/trunk/www/shib13/idp/metadata.php
/trunk/www/shib13/sp/metadata.php
=======================================
--- /trunk/lib/SimpleSAML/Metadata/SAMLParser.php Wed Nov 4 05:51:03 2009
+++ /trunk/lib/SimpleSAML/Metadata/SAMLParser.php Wed Nov 4 05:52:19 2009
@@ -460,6 +460,7 @@
public function getMetadata1xSP() {
$ret = $this->getMetadataCommon();
+ $ret['metadata-set'] = 'shib13-sp-remote';
/* Find SP information which supports one of the SAML 1.x
protocols. */
@@ -528,6 +529,7 @@
public function getMetadata1xIdP() {
$ret = $this->getMetadataCommon();
+ $ret['metadata-set'] = 'shib13-idp-remote';
/* Find IdP information which supports the SAML 1.x protocol. */
$idp = $this->getIdPDescriptors(self::$SAML1xProtocols);
@@ -600,6 +602,7 @@
public function getMetadata20SP() {
$ret = $this->getMetadataCommon();
+ $ret['metadata-set'] = 'saml20-sp-remote';
/* Find SP information which supports the SAML 2.0 protocol. */
@@ -699,6 +702,7 @@
public function getMetadata20IdP() {
$ret = $this->getMetadataCommon();
+ $ret['metadata-set'] = 'saml20-idp-remote';
/* Find IdP information which supports the SAML 2.0 protocol. */
=======================================
--- /trunk/modules/saml/www/sp/metadata.php Tue Oct 6 02:35:25 2009
+++ /trunk/modules/saml/www/sp/metadata.php Wed Nov 4 05:52:19 2009
@@ -17,6 +17,8 @@
$entityId = $source->getEntityId();
$metaArray11 = array(
+ 'metadata-set' => 'shib13-sp-remote',
+ 'entityid' => $entityId,
'AssertionConsumerService' =>
SimpleSAML_Module::getModuleURL('saml/sp/saml1-acs.php/' . $sourceId),
);
@@ -27,6 +29,8 @@
$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),
);
=======================================
--- /trunk/modules/saml2/www/sp/metadata.php Fri Aug 14 04:07:44 2009
+++ /trunk/modules/saml2/www/sp/metadata.php Wed Nov 4 05:52:19 2009
@@ -17,6 +17,8 @@
$entityId = $source->getEntityId();
$metaArray = array(
+ 'metadata-set' => 'saml20-sp-remote',
+ 'entityid' => $entityId,
'AssertionConsumerService' =>
SimpleSAML_Module::getModuleURL('saml2/sp/acs.php'),
'SingleLogoutService' =>
SimpleSAML_Module::getModuleURL('saml2/sp/logout.php/' . $sourceId),
'NameIDFormat' => $source->getNameIDFormat(),
=======================================
--- /trunk/www/saml2/idp/metadata.php Fri Aug 14 04:07:44 2009
+++ /trunk/www/saml2/idp/metadata.php Wed Nov 4 05:52:19 2009
@@ -35,6 +35,8 @@
$urlSLOr =
$metadata->getGenerated('SingleLogoutServiceResponse', 'saml20-idp-hosted',
array('logouttype' => $logouttype));
$metaArray = array(
+ 'metadata-set' => 'saml20-idp-remote',
+ 'entityid' => $idpentityid,
'SingleSignOnService' =>
$metadata->getGenerated('SingleSignOnService', 'saml20-idp-hosted',
array()),
'SingleLogoutService' =>
$metadata->getGenerated('SingleLogoutService', 'saml20-idp-hosted',
array('logouttype' => $logouttype)),
'SingleLogoutServiceResponse' =>
$metadata->getGenerated('SingleLogoutServiceResponse', 'saml20-idp-hosted',
array('logouttype' => $logouttype)),
=======================================
--- /trunk/www/saml2/sp/metadata.php Tue Oct 20 02:14:40 2009
+++ /trunk/www/saml2/sp/metadata.php Wed Nov 4 05:52:19 2009
@@ -23,6 +23,8 @@
$spentityid = isset($_GET['spentityid']) ? $_GET['spentityid'] :
$metadata->getMetaDataCurrentEntityID();
$metaArray = array(
+ 'metadata-set' => 'saml20-sp-remote',
+ 'entityid' => $spentityid,
'AssertionConsumerService' =>
$metadata->getGenerated('AssertionConsumerService', 'saml20-sp-hosted'),
'SingleLogoutService' =>
$metadata->getGenerated('SingleLogoutService', 'saml20-sp-hosted'),
);
=======================================
--- /trunk/www/shib13/idp/metadata.php Fri Aug 14 04:07:44 2009
+++ /trunk/www/shib13/idp/metadata.php Wed Nov 4 05:52:19 2009
@@ -29,6 +29,8 @@
}
$metaArray = array(
+ 'metadata-set' => 'shib13-idp-remote',
+ 'entityid' => $idpentityid,
'SingleSignOnService' =>
$metadata->getGenerated('SingleSignOnService', 'shib13-idp-hosted'),
'certFingerprint' => $certFingerprint,
);
=======================================
--- /trunk/www/shib13/sp/metadata.php Tue Oct 20 02:14:40 2009
+++ /trunk/www/shib13/sp/metadata.php Wed Nov 4 05:52:19 2009
@@ -24,6 +24,8 @@
$metaArray = array(
+ 'metadata-set' => 'shib13-sp-remote',
+ 'entityid' => $spentityid,
'AssertionConsumerService' =>
$metadata->getGenerated('AssertionConsumerService', 'shib13-sp-hosted'),
);
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
