diff options
| -rw-r--r-- | lib/SimpleSAML/Metadata/SAMLParser.php | 4 | ||||
| -rw-r--r-- | modules/saml/www/sp/metadata.php | 4 | ||||
| -rw-r--r-- | modules/saml2/www/sp/metadata.php | 2 | ||||
| -rw-r--r-- | www/saml2/idp/metadata.php | 2 | ||||
| -rw-r--r-- | www/saml2/sp/metadata.php | 2 | ||||
| -rw-r--r-- | www/shib13/idp/metadata.php | 2 | ||||
| -rw-r--r-- | www/shib13/sp/metadata.php | 2 |
7 files changed, 18 insertions, 0 deletions
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php index a5885b7..55e2426 100644 --- a/lib/SimpleSAML/Metadata/SAMLParser.php +++ b/lib/SimpleSAML/Metadata/SAMLParser.php @@ -460,6 +460,7 @@ class SimpleSAML_Metadata_SAMLParser { 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 @@ class SimpleSAML_Metadata_SAMLParser { 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 @@ class SimpleSAML_Metadata_SAMLParser { 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 @@ class SimpleSAML_Metadata_SAMLParser { public function getMetadata20IdP() { $ret = $this->getMetadataCommon(); + $ret['metadata-set'] = 'saml20-idp-remote'; /* Find IdP information which supports the SAML 2.0 protocol. */ diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php index 4ac4f40..df6d1f0 100644 --- a/modules/saml/www/sp/metadata.php +++ b/modules/saml/www/sp/metadata.php @@ -17,6 +17,8 @@ if (!($source instanceof sspmod_saml_Auth_Source_SP)) { $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 @@ if ($spconfig->getBoolean('saml11.binding.artifact.enable', FALSE)) { $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), ); diff --git a/modules/saml2/www/sp/metadata.php b/modules/saml2/www/sp/metadata.php index b3462d6..62bbdd9 100644 --- a/modules/saml2/www/sp/metadata.php +++ b/modules/saml2/www/sp/metadata.php @@ -17,6 +17,8 @@ if (!($source instanceof sspmod_saml2_Auth_Source_SP)) { $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(), diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php index 3dbf323..2fb5d49 100644 --- a/www/saml2/idp/metadata.php +++ b/www/saml2/idp/metadata.php @@ -35,6 +35,8 @@ try { $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)), diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php index 12e10e1..ba3c132 100644 --- a/www/saml2/sp/metadata.php +++ b/www/saml2/sp/metadata.php @@ -23,6 +23,8 @@ try { $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'), ); diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php index 0ac1e25..93bc8b5 100644 --- a/www/shib13/idp/metadata.php +++ b/www/shib13/idp/metadata.php @@ -29,6 +29,8 @@ try { } $metaArray = array( + 'metadata-set' => 'shib13-idp-remote', + 'entityid' => $idpentityid, 'SingleSignOnService' => $metadata->getGenerated('SingleSignOnService', 'shib13-idp-hosted'), 'certFingerprint' => $certFingerprint, ); diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php index 1133b57..fb8086b 100644 --- a/www/shib13/sp/metadata.php +++ b/www/shib13/sp/metadata.php @@ -24,6 +24,8 @@ try { $metaArray = array( + 'metadata-set' => 'shib13-sp-remote', + 'entityid' => $spentityid, 'AssertionConsumerService' => $metadata->getGenerated('AssertionConsumerService', 'shib13-sp-hosted'), ); |