Skip to content
Snippets Groups Projects
Commit 288c91c4 authored by Olav Morken's avatar Olav Morken
Browse files

SAMLBuilder: Fix support for array NameIDFormat everywhere. 

Thanks to Serdar Yigit for reporting this bug!

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2729 44740490-163a-0410-bde0-09ae8108e29a
parent 305f5b69
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/SimpleSAML/Metadata/SAMLBuilder.php
+ 5
− 15
View file @ 288c91c4
...@@ -316,9 +316,7 @@ class SimpleSAML_Metadata_SAMLBuilder { ...@@ -316,9 +316,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
$e->SingleLogoutService = self::createEndpoints($metadata->getEndpoints('SingleLogoutService'), FALSE); $e->SingleLogoutService = self::createEndpoints($metadata->getEndpoints('SingleLogoutService'), FALSE);
if ($metadata->hasValue('NameIDFormat')) { $e->NameIDFormat = $metadata->getArrayizeString('NameIDFormat', array());
$e->NameIDFormat[] = $metadata->getString('NameIDFormat');
}
$endpoints = $metadata->getEndpoints('AssertionConsumerService'); $endpoints = $metadata->getEndpoints('AssertionConsumerService');
foreach ($metadata->getArrayizeString('AssertionConsumerService.artifact', array()) as $acs) { foreach ($metadata->getArrayizeString('AssertionConsumerService.artifact', array()) as $acs) {
...@@ -371,9 +369,7 @@ class SimpleSAML_Metadata_SAMLBuilder { ...@@ -371,9 +369,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
$e->SingleLogoutService = self::createEndpoints($metadata->getEndpoints('SingleLogoutService'), FALSE); $e->SingleLogoutService = self::createEndpoints($metadata->getEndpoints('SingleLogoutService'), FALSE);
if ($metadata->hasValue('NameIDFormat')) { $e->NameIDFormat = $metadata->getArrayizeString('NameIDFormat', array());
$e->NameIDFormat[] = $metadata->getString('NameIDFormat');
}
$e->SingleSignOnService = self::createEndpoints($metadata->getEndpoints('SingleSignOnService'), FALSE); $e->SingleSignOnService = self::createEndpoints($metadata->getEndpoints('SingleSignOnService'), FALSE);
...@@ -405,9 +401,7 @@ class SimpleSAML_Metadata_SAMLBuilder { ...@@ -405,9 +401,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
$this->addCertificate($e, $metadata); $this->addCertificate($e, $metadata);
if ($metadata->hasValue('NameIDFormat')) { $e->NameIDFormat = $metadata->getArrayizeString('NameIDFormat', array());
$e->NameIDFormat[] = $metadata->getString('NameIDFormat');
}
$endpoints = $metadata->getEndpoints('AssertionConsumerService'); $endpoints = $metadata->getEndpoints('AssertionConsumerService');
foreach ($metadata->getArrayizeString('AssertionConsumerService.artifact', array()) as $acs) { foreach ($metadata->getArrayizeString('AssertionConsumerService.artifact', array()) as $acs) {
...@@ -442,9 +436,7 @@ class SimpleSAML_Metadata_SAMLBuilder { ...@@ -442,9 +436,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
$this->addCertificate($e, $metadata); $this->addCertificate($e, $metadata);
if ($metadata->hasValue('NameIDFormat')) { $e->NameIDFormat = $metadata->getArrayizeString('NameIDFormat', array());
$e->NameIDFormat[] = $metadata->getString('NameIDFormat');
}
$e->SingleSignOnService = self::createEndpoints($metadata->getEndpoints('SingleSignOnService'), FALSE); $e->SingleSignOnService = self::createEndpoints($metadata->getEndpoints('SingleSignOnService'), FALSE);
...@@ -473,9 +465,7 @@ class SimpleSAML_Metadata_SAMLBuilder { ...@@ -473,9 +465,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
$e->AttributeService = self::createEndpoints($metadata->getEndpoints('AttributeService'), FALSE); $e->AttributeService = self::createEndpoints($metadata->getEndpoints('AttributeService'), FALSE);
$e->AssertionIDRequestService = self::createEndpoints($metadata->getEndpoints('AssertionIDRequestService'), FALSE); $e->AssertionIDRequestService = self::createEndpoints($metadata->getEndpoints('AssertionIDRequestService'), FALSE);
foreach ($metadata->getArray('NameIDFormat', array()) as $format) { $e->NameIDFormat = $metadata->getArrayizeString('NameIDFormat', array());
$e->NameIDFormat[] = $metadata->getString('NameIDFormat');
}
$this->entityDescriptor->RoleDescriptor[] = $e; $this->entityDescriptor->RoleDescriptor[] = $e;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment