From e950db4c8ecdacf4299aabee9f793f1328d3162d Mon Sep 17 00:00:00 2001
From: Sergei Maertens <sergei@maykinmedia.nl>
Date: Wed, 18 Dec 2024 15:44:49 +0100
Subject: [PATCH] :bento: Update XSD for service catalog to v1.24

This version went into effect on October 14th 2024. The previous version
was 1.14.

Schema is taken from https://afsprakenstelsel.etoegang.nl/Startpagina/v3/service-catalog

As far as I can tell, there don't exist any XSDs for the
eHerkenning/EIDAS specific requirements on top of SAML v2.0 and
validating against the SAML metadata XSD will not catch the problems
pointed out.
---
 digid_eherkenning/xsd/eherkenning-dc.xml | 48 ++++++++++++------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/digid_eherkenning/xsd/eherkenning-dc.xml b/digid_eherkenning/xsd/eherkenning-dc.xml
index df478bc..d45abd3 100644
--- a/digid_eherkenning/xsd/eherkenning-dc.xml
+++ b/digid_eherkenning/xsd/eherkenning-dc.xml
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Schema for AS_1.14 Release
-    $Date: 2020-09-07
-    $Author:rahulkumar.gupta@kpn.com
-    https://afsprakenstelsel.etoegang.nl/display/as/Service+catalog
--->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns:esc="urn:etoegang:1.13:service-catalog"
-    targetNamespace="urn:etoegang:1.13:service-catalog"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified">
+           xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+           xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+           xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
+           xmlns:esc="urn:etoegang:1.13:service-catalog"
+           targetNamespace="urn:etoegang:1.13:service-catalog"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
 
-    <!-- Using the local version instead of the remote
-    <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-    -->
+    <!-- use local imports instead of resolving them from the web -->
+    <!-- <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/> -->
     <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
     <!-- <xs:import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"/> -->
     <xs:import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="saml-schema-assertion-2.0.xsd"/>
@@ -39,6 +33,7 @@
             <xs:element ref="esc:RequestedAttribute" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute ref="esc:IsPublic" use="required"/>
+        <xs:attribute ref="esc:IsPortal" use="optional"/>
     </xs:complexType>
     <xs:element name="ServiceInstance" type="esc:ServiceInstanceType" />
     <xs:complexType name="ServiceInstanceType">
@@ -52,13 +47,16 @@
             <xs:element ref="esc:HerkenningsmakelaarId"/>
             <xs:element ref="esc:AdditionalHerkenningsmakelaarId" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="SSOSupport" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+            <xs:element ref="esc:EntityConcernedTypesAllowed" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="esc:ServiceCertificate" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element ref="esc:ServiceIntermediation" minOccurs="0" />
             <xs:element ref="esc:Classifiers" minOccurs="0" />
             <xs:element ref="esc:BsnkStructureVersion" minOccurs="0"/>
             <xs:element ref="esc:BsnkRecipientKeySetVersion" minOccurs="0"/>
+            <xs:element ref="esc:PortalForService" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute ref="esc:IsPublic" use="required"/>
+        <xs:attribute ref="esc:IsPortal" use="optional"/>
     </xs:complexType>
 
     <xs:element name="ServiceCatalogue">
@@ -82,14 +80,14 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="ActingSubjectTypesAllowed">
-    <xs:complexType>
-      <xs:simpleContent>
-       <xs:extension base="xs:anyURI">
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:anyURI">
                     <xs:attribute name="setNumber" type="xs:nonNegativeInteger" use="optional"/>
-       </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
     <xs:element name="ServiceRestrictionsAllowed">
         <xs:complexType>
             <xs:simpleContent>
@@ -135,8 +133,9 @@
     </xs:element>
     <xs:element name="ServiceID" type="xs:anyURI"/>
     <xs:element name="ServiceUUID" type="xs:string"/>
-  <xs:element name="BsnkStructureVersion" type="xs:string"/>
-  <xs:element name="BsnkRecipientKeySetVersion" type="xs:string"/>
+    <xs:element name="BsnkStructureVersion" type="xs:string"/>
+    <xs:element name="BsnkRecipientKeySetVersion" type="xs:string"/>
+    <xs:element name="PortalForService" type="xs:anyURI"/>
     <xs:element name="ServiceName">
         <xs:complexType>
             <xs:simpleContent>
@@ -229,5 +228,6 @@
     <xs:attribute name="IssueInstant" type="xs:dateTime"/>
     <xs:attribute name="IsPublic" type="xs:boolean"/>
     <xs:attribute name="Version" type="xs:anyURI"/>
+    <xs:attribute name="IsPortal" type="xs:boolean"/>
 
 </xs:schema>