Back to the two failures that were there before

monkeyiq · monkeyiq · commit a6b2764d5083 · 2024-06-16T08:16:27.000+10:00
The presence of a "Default binding" on the below page would seem to indicate that if the binding is not present in the Array of arrays then it will be set to the default: https://github.com/simplesamlphp/simplesamlphp/blob/simplesamlphp-2.2/docs/simplesamlphp-metadata-endpoints.md The test suite was expecting to be able to do this, though it was also using the old direct single string representation. It probably makes sense if we are moving to on the the array of arrays syntax to either not show a default on the simplesamlphp-metadata-endpoints page or to use the default if the binding is not explicitly supplied.
diff --git a/src/SimpleSAML/Configuration.php b/src/SimpleSAML/Configuration.php
@@ -1230,7 +1230,7 @@ public function getEndpoints(string $endpointType): array
             }
 
             if (!array_key_exists('Binding', $ep)) {
-                throw new Exception($iloc . ': Missing Binding.');
+                $ep['Binding'] = $this->getDefaultBinding($endpointType);
             }
             if (!is_string($ep['Binding'])) {
                 throw new Exception($iloc . ': Binding must be a string.');
diff --git a/tests/src/SimpleSAML/ConfigurationTest.php b/tests/src/SimpleSAML/ConfigurationTest.php
@@ -827,12 +827,10 @@ public function testGetDefaultEndpoint(): void
             'ArtifactResolutionService' =>
                 [[
                     'Location' => 'https://example.com/ars',
-                    'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP',
                 ]],
             'SingleSignOnService' =>
                 [[
                     'Location' => 'https://example.com/sso',
-                    'Binding' => Constants::BINDING_HTTP_REDIRECT,
                 ]],
             'SingleLogoutService' => [[
                 'Location' => 'https://example.com/slo',
@@ -890,7 +888,7 @@ public function testGetDefaultEndpoint(): void
         $a['metadata-set'] = 'foo';
         $c = Configuration::loadFromArray($a);
         try {
-            $c->getDefaultEndpoint('SingleSignOnService');
+            $v = $c->getDefaultEndpoint('SingleSignOnService');
             $this->fail('No valid metadata set specified.');
         } catch (Exception $e) {
             $this->assertStringStartsWith('Missing default binding for', $e->getMessage());

Original file line number	Diff line number	Diff line change
`@@ -1230,7 +1230,7 @@ public function getEndpoints(string $endpointType): array`
`1230`	`1230`	`}`
`1231`	`1231`
`1232`	`1232`	`if (!array_key_exists('Binding', $ep)) {`
`1233`		`- throw new Exception($iloc . ': Missing Binding.');`
	`1233`	`+ $ep['Binding'] = $this->getDefaultBinding($endpointType);`
`1234`	`1234`	`}`
`1235`	`1235`	`if (!is_string($ep['Binding'])) {`
`1236`	`1236`	`throw new Exception($iloc . ': Binding must be a string.');`