From 8198a9f9464d6de7e67f29e124691c78076bb308 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 4 Nov 2009 13:52:30 +0000
Subject: [PATCH] SAMLBuilder: Require metadata-set and entityid to be set in
metadata.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1947 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Metadata/SAMLBuilder.php | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php
index a8f26191e..f4c224852 100644
--- a/lib/SimpleSAML/Metadata/SAMLBuilder.php
+++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php
@@ -236,6 +236,8 @@ class SimpleSAML_Metadata_SAMLBuilder {
*/
public function addMetadataSP20($metadata) {
assert('is_array($metadata)');
+ assert('isset($metadata["entityid"])');
+ assert('isset($metadata["metadata-set"])');
$e = $this->createElement('SPSSODescriptor');
$e->setAttribute('protocolSupportEnumeration', 'urn:oasis:names:tc:SAML:2.0:protocol');
@@ -359,6 +361,8 @@ class SimpleSAML_Metadata_SAMLBuilder {
*/
public function addMetadataIdP20($metadata) {
assert('is_array($metadata)');
+ assert('isset($metadata["entityid"])');
+ assert('isset($metadata["metadata-set"])');
$e = $this->createElement('IDPSSODescriptor');
$e->setAttribute('protocolSupportEnumeration', 'urn:oasis:names:tc:SAML:2.0:protocol');
@@ -418,6 +422,8 @@ class SimpleSAML_Metadata_SAMLBuilder {
*/
public function addMetadataSP11($metadata) {
assert('is_array($metadata)');
+ assert('isset($metadata["entityid"])');
+ assert('isset($metadata["metadata-set"])');
$e = $this->createElement('SPSSODescriptor');
$e->setAttribute('protocolSupportEnumeration', 'urn:oasis:names:tc:SAML:1.1:protocol');
@@ -464,6 +470,8 @@ class SimpleSAML_Metadata_SAMLBuilder {
*/
public function addMetadataIdP11($metadata) {
assert('is_array($metadata)');
+ assert('isset($metadata["entityid"])');
+ assert('isset($metadata["metadata-set"])');
$e = $this->createElement('IDPSSODescriptor');
$e->setAttribute('protocolSupportEnumeration', 'urn:oasis:names:tc:SAML:1.1:protocol');
--
GitLab