Skip to content

Commit

Permalink
Validate TSL XSD schemas
Browse files Browse the repository at this point in the history 
IB-8160

Signed-off-by: Raul Metsma <raul@metsma.ee>
  • Loading branch information
@metsma
metsma committed Aug 28, 2024
1 parent 72437de commit bf66345
Show file tree
Hide file tree
Showing 9 changed files with 1,320 additions and 2 deletions.
43 changes: 43 additions & 0 deletions etc/schema/ts_119612v020101_additionaltypes_xsd.xsd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ****** NOTICE ******
This document is part of ETSI TS 119 612. In the event that any
part of this document in conflict with the text of TS 119 612
then that text shall prevail as the authoritative source
-->
<xsd:schema targetNamespace="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tslx="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:tsl="http://uri.etsi.org/02231/v2#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xsd:import namespace="http://uri.etsi.org/02231/v2#" schemaLocation="ts_119612v020201_201601xsd.xsd"/>
<xsd:import namespace="http://uri.etsi.org/01903/v1.3.2#" schemaLocation="XAdES01903v132-201601.xsd"/>
<!-- -->
<!-- -->
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.3.13 Pointers to other TSLs</xsd:documentation></xsd:annotation>
<xsd:element name="MimeType" type="xsd:string"/>
<xsd:annotation><xsd:documentation>X509CertificateLocation element was specified in TS 102 231 v3.1.2 clause B.4.3 The ServiceDigitalIdentityType. It is now deprecated and is not used</xsd:documentation></xsd:annotation>
<xsd:element name="X509CertificateLocation" type="tsl:NonEmptyURIType"/>
<xsd:annotation><xsd:documentation>PublicKeyLocation element was specified in TS 102 231 v3.1.2 clause B.4.3 The ServiceDigitalIdentityType. It is now deprecated and is not used</xsd:documentation></xsd:annotation>
<xsd:element name="PublicKeyLocation" type="tsl:NonEmptyURIType"/>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.3 OtherCriteria, bullet 1) ExtendedKeyUsage</xsd:documentation></xsd:annotation>
<xsd:element name="ExtendedKeyUsage" type="tslx:ExtendedKeyUsageType"/>
<xsd:complexType name="ExtendedKeyUsageType">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="KeyPurposeId" type="xades:ObjectIdentifierType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.3 TakenOverBy Extension</xsd:documentation></xsd:annotation>
<xsd:element name="TakenOverBy" type="tslx:TakenOverByType"/>
<xsd:complexType name="TakenOverByType">
<xsd:sequence>
<xsd:element name="URI" type="tsl:NonEmptyMultiLangURIType"/>
<xsd:element name="TSPName" type="tsl:InternationalNamesType"/>
<xsd:element ref="tsl:SchemeOperatorName"/>
<xsd:element ref="tsl:SchemeTerritory"/>
<xsd:element name="OtherQualifier" type="tsl:AnyType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.3 OtherCriteria, bullet 2) CertSubjectDNAttribute</xsd:documentation></xsd:annotation>
<xsd:element name="CertSubjectDNAttribute" type="tslx:CertSubjectDNAttributeType"/>
<xsd:complexType name="CertSubjectDNAttributeType">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="AttributeOID" type="xades:ObjectIdentifierType"/>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
43 changes: 43 additions & 0 deletions etc/schema/ts_119612v020101_additionaltypes_xsd.xsd.orig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ****** NOTICE ******
This document is part of ETSI TS 119 612. In the event that any
part of this document in conflict with the text of TS 119 612
then that text shall prevail as the authoritative source
-->
<xsd:schema targetNamespace="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tslx="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:tsl="http://uri.etsi.org/02231/v2#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xsd:import namespace="http://uri.etsi.org/02231/v2#" schemaLocation="http://uri.etsi.org/19612/v1.2.1/tsl.xsd"/>
<xsd:import namespace="http://uri.etsi.org/01903/v1.3.2#" schemaLocation="http://uri.etsi.org/01903/v1.3.2/XAdES.xsd"/>
<!-- -->
<!-- -->
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.3.13 Pointers to other TSLs</xsd:documentation></xsd:annotation>
<xsd:element name="MimeType" type="xsd:string"/>
<xsd:annotation><xsd:documentation>X509CertificateLocation element was specified in TS 102 231 v3.1.2 clause B.4.3 The ServiceDigitalIdentityType. It is now deprecated and is not used</xsd:documentation></xsd:annotation>
<xsd:element name="X509CertificateLocation" type="tsl:NonEmptyURIType"/>
<xsd:annotation><xsd:documentation>PublicKeyLocation element was specified in TS 102 231 v3.1.2 clause B.4.3 The ServiceDigitalIdentityType. It is now deprecated and is not used</xsd:documentation></xsd:annotation>
<xsd:element name="PublicKeyLocation" type="tsl:NonEmptyURIType"/>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.3 OtherCriteria, bullet 1) ExtendedKeyUsage</xsd:documentation></xsd:annotation>
<xsd:element name="ExtendedKeyUsage" type="tslx:ExtendedKeyUsageType"/>
<xsd:complexType name="ExtendedKeyUsageType">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="KeyPurposeId" type="xades:ObjectIdentifierType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.3 TakenOverBy Extension</xsd:documentation></xsd:annotation>
<xsd:element name="TakenOverBy" type="tslx:TakenOverByType"/>
<xsd:complexType name="TakenOverByType">
<xsd:sequence>
<xsd:element name="URI" type="tsl:NonEmptyMultiLangURIType"/>
<xsd:element name="TSPName" type="tsl:InternationalNamesType"/>
<xsd:element ref="tsl:SchemeOperatorName"/>
<xsd:element ref="tsl:SchemeTerritory"/>
<xsd:element name="OtherQualifier" type="tsl:AnyType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.3 OtherCriteria, bullet 2) CertSubjectDNAttribute</xsd:documentation></xsd:annotation>
<xsd:element name="CertSubjectDNAttribute" type="tslx:CertSubjectDNAttributeType"/>
<xsd:complexType name="CertSubjectDNAttributeType">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="AttributeOID" type="xades:ObjectIdentifierType"/>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
92 changes: 92 additions & 0 deletions etc/schema/ts_119612v020101_sie_xsd.xsd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ****** NOTICE ******
This document is part of ETSI TS 119 612. In the event that any
part of this document in conflict with the text of TS 119 612
then that text shall prevail as the authoritative source
-->
<xsd:schema targetNamespace="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns:tsl="http://uri.etsi.org/02231/v2#" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xsd:import namespace="http://uri.etsi.org/01903/v1.3.2#" schemaLocation="XAdES01903v132-201601.xsd"/>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2 Qualifications Extension</xsd:documentation></xsd:annotation>
<xsd:element name="Qualifications" type="tns:QualificationsType"/>
<xsd:complexType name="QualificationsType">
<xsd:sequence maxOccurs="unbounded">
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.1 QualificationElement-->
<xsd:element name="QualificationElement" type="tns:QualificationElementType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.1 QualificationElement</xsd:documentation></xsd:annotation>
<xsd:complexType name="QualificationElementType">
<xsd:sequence>
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.3 Qualifier-->
<xsd:element name="Qualifiers" type="tns:QualifiersType"/>
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2 CriteriaList-->
<xsd:element name="CriteriaList" type="tns:CriteriaListType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation>
<xsd:documentation>Please first try to use the CriteriaList before doing the OtherCriteria extension point.</xsd:documentation>
</xsd:annotation>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2 CriteriaList</xsd:documentation></xsd:annotation>
<xsd:complexType name="CriteriaListType">
<xsd:sequence>
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.1 KeyUsage-->
<xsd:element name="KeyUsage" type="tns:KeyUsageType" minOccurs="0" maxOccurs="unbounded"/>
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.2 PolicySet-->
<xsd:element name="PolicySet" type="tns:PoliciesListType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="CriteriaList" type="tns:CriteriaListType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="Description" type="xsd:string" minOccurs="0"/>
<xsd:element name="otherCriteriaList" type="xades:AnyType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="assert">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="all"/>
<xsd:enumeration value="atLeastOne"/>
<xsd:enumeration value="none"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.3 Qualifier</xsd:documentation></xsd:annotation>
<xsd:complexType name="QualifiersType">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="Qualifier" type="tns:QualifierType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="QualifierType">
<xsd:attribute name="uri" type="anyURI"/>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.2 PolicySet</xsd:documentation></xsd:annotation>
<xsd:complexType name="PoliciesListType">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="PolicyIdentifier" type="xades:ObjectIdentifierType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.1 KeyUsage</xsd:documentation></xsd:annotation>
<xsd:complexType name="KeyUsageType">
<xsd:sequence maxOccurs="9">
<xsd:element name="KeyUsageBit" type="tns:KeyUsageBitType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="KeyUsageBitType">
<xsd:simpleContent>
<xsd:extension base="xsd:boolean">
<xsd:attribute name="name">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="digitalSignature"/>
<xsd:enumeration value="nonRepudiation"/>
<xsd:enumeration value="keyEncipherment"/>
<xsd:enumeration value="dataEncipherment"/>
<xsd:enumeration value="keyAgreement"/>
<xsd:enumeration value="keyCertSign"/>
<xsd:enumeration value="crlSign"/>
<xsd:enumeration value="encipherOnly"/>
<xsd:enumeration value="decipherOnly"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
</xsd:schema>
92 changes: 92 additions & 0 deletions etc/schema/ts_119612v020101_sie_xsd.xsd.orig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ****** NOTICE ******
This document is part of ETSI TS 119 612. In the event that any
part of this document in conflict with the text of TS 119 612
then that text shall prevail as the authoritative source
-->
<xsd:schema targetNamespace="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns:tsl="http://uri.etsi.org/02231/v2#" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xsd:import namespace="http://uri.etsi.org/01903/v1.3.2#" schemaLocation="http://uri.etsi.org/01903/v1.3.2/XAdES.xsd"/>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2 Qualifications Extension</xsd:documentation></xsd:annotation>
<xsd:element name="Qualifications" type="tns:QualificationsType"/>
<xsd:complexType name="QualificationsType">
<xsd:sequence maxOccurs="unbounded">
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.1 QualificationElement-->
<xsd:element name="QualificationElement" type="tns:QualificationElementType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.1 QualificationElement</xsd:documentation></xsd:annotation>
<xsd:complexType name="QualificationElementType">
<xsd:sequence>
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.3 Qualifier-->
<xsd:element name="Qualifiers" type="tns:QualifiersType"/>
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2 CriteriaList-->
<xsd:element name="CriteriaList" type="tns:CriteriaListType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation>
<xsd:documentation>Please first try to use the CriteriaList before doing the OtherCriteria extension point.</xsd:documentation>
</xsd:annotation>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2 CriteriaList</xsd:documentation></xsd:annotation>
<xsd:complexType name="CriteriaListType">
<xsd:sequence>
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.1 KeyUsage-->
<xsd:element name="KeyUsage" type="tns:KeyUsageType" minOccurs="0" maxOccurs="unbounded"/>
<!--Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.2 PolicySet-->
<xsd:element name="PolicySet" type="tns:PoliciesListType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="CriteriaList" type="tns:CriteriaListType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="Description" type="xsd:string" minOccurs="0"/>
<xsd:element name="otherCriteriaList" type="xades:AnyType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="assert">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="all"/>
<xsd:enumeration value="atLeastOne"/>
<xsd:enumeration value="none"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.3 Qualifier</xsd:documentation></xsd:annotation>
<xsd:complexType name="QualifiersType">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="Qualifier" type="tns:QualifierType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="QualifierType">
<xsd:attribute name="uri" type="anyURI"/>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.2 PolicySet</xsd:documentation></xsd:annotation>
<xsd:complexType name="PoliciesListType">
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="PolicyIdentifier" type="xades:ObjectIdentifierType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:annotation><xsd:documentation>Specified in TS 119 612 v2.1.1 clause 5.5.9.2.2.1 KeyUsage</xsd:documentation></xsd:annotation>
<xsd:complexType name="KeyUsageType">
<xsd:sequence maxOccurs="9">
<xsd:element name="KeyUsageBit" type="tns:KeyUsageBitType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="KeyUsageBitType">
<xsd:simpleContent>
<xsd:extension base="xsd:boolean">
<xsd:attribute name="name">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="digitalSignature"/>
<xsd:enumeration value="nonRepudiation"/>
<xsd:enumeration value="keyEncipherment"/>
<xsd:enumeration value="dataEncipherment"/>
<xsd:enumeration value="keyAgreement"/>
<xsd:enumeration value="keyCertSign"/>
<xsd:enumeration value="crlSign"/>
<xsd:enumeration value="encipherOnly"/>
<xsd:enumeration value="decipherOnly"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
</xsd:schema>
Loading

0 comments on commit bf66345

Please sign in to comment.