More complete registrationInfo

ghalse · thijskh · commit d579520f8f8b · 2023-02-15T10:49:19.000+01:00
diff --git a/src/SimpleSAML/Metadata/SAMLParser.php b/src/SimpleSAML/Metadata/SAMLParser.php
@@ -919,6 +919,14 @@ private static function processExtensions($element, array $parentExtensions = []
                     } else {
                         $ret['RegistrationInfo']['authority'] = $e->getRegistrationAuthority();
                     }
+                    $registrationInstant = $e->getRegistrationInstant();
+                    if ($registrationInstant !== null) {
+                        $ret['RegistrationInfo']['instant'] = $registrationInstant;
+                    }
+                    $registrationPolicy = $e->getRegistrationPolicy();
+                    if (!empty($registrationPolicy)) {
+                        $ret['RegistrationInfo']['policies'] = $registrationPolicy;
+                    }
                 }
                 if ($e instanceof EntityAttributes && !empty($e->getChildren())) {
                     foreach ($e->getChildren() as $attr) {
diff --git a/tests/src/SimpleSAML/Metadata/SAMLParserTest.php b/tests/src/SimpleSAML/Metadata/SAMLParserTest.php
@@ -40,7 +40,6 @@ public function testRegistrationInfo(): void
 XML
         );
 
-
         $entities = SAMLParser::parseDescriptorsElement($document->documentElement);
         $this->assertArrayHasKey('theEntityID', $entities);
         // RegistrationInfo is accessible in the SP or IDP metadata accessors
@@ -102,6 +101,72 @@ public function testRegistrationInfoInheritance(): void
     }
 
 
+    /**
+     * Test Registration Info is parsed
+     */
+    public function testRegistrationPolicy(): void
+    {
+        $expected = [
+            'authority' => 'https://safire.ac.za',
+            'policies' => [ 'en' => 'https://safire.ac.za/safire/policy/mrps/v20190207.html' ],
+        ];
+
+        $document = DOMDocumentFactory::fromString(
+            <<<XML
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+  <EntityDescriptor entityID="theEntityID">
+    <Extensions>
+      <mdrpi:RegistrationInfo registrationAuthority="https://safire.ac.za">
+        <mdrpi:RegistrationPolicy xml:lang="en">https://safire.ac.za/safire/policy/mrps/v20190207.html</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </Extensions>
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"/>
+  </EntityDescriptor>
+</EntitiesDescriptor>
+XML
+        );
+
+        $entities = SAMLParser::parseDescriptorsElement($document->documentElement);
+        $this->assertArrayHasKey('theEntityID', $entities);
+        // RegistrationInfo is accessible in the SP or IDP metadata accessors
+        /** @var array $metadata */
+        $metadata = $entities['theEntityID']->getMetadata20SP();
+        $this->assertEquals($expected, $metadata['RegistrationInfo']);
+    }
+
+
+    /**
+     * Test Registration Info is parsed
+     */
+    public function testRegistrationInstant(): void
+    {
+        $expected = [
+            'authority' => 'https://safire.ac.za',
+            'instant' => 1675861615,
+        ];
+
+        $document = DOMDocumentFactory::fromString(
+            <<<XML
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+  <EntityDescriptor entityID="theEntityID">
+    <Extensions>
+      <mdrpi:RegistrationInfo registrationAuthority="https://safire.ac.za" registrationInstant="2023-02-08T13:06:55Z" />
+    </Extensions>
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"/>
+  </EntityDescriptor>
+</EntitiesDescriptor>
+XML
+        );
+
+        $entities = SAMLParser::parseDescriptorsElement($document->documentElement);
+        $this->assertArrayHasKey('theEntityID', $entities);
+        // RegistrationInfo is accessible in the SP or IDP metadata accessors
+        /** @var array $metadata */
+        $metadata = $entities['theEntityID']->getMetadata20SP();
+        $this->assertEquals($expected, $metadata['RegistrationInfo']);
+    }
+
+
     /**
      * Test AttributeConsumingService is parsed
      */
