Merge branch 'cleanup/ts103120' into 'meeting/LI58e'

Cleanup/ts103120 See merge request trial!55

Merge branch 'cleanup/ts103120' into 'meeting/LI58e'
Cleanup/ts103120 See merge request trial!55
9f1f509f · canterburym · 46fd5670 · ba3461c6 · 9f1f509f · 9f1f509f
Commit 9f1f509f authored Oct 22, 2021 by canterburym
--- a/103120/examples/FooServiceSchema.xsd
+++ b/103120/examples/FooServiceSchema.xsd
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema targetNamespace="http://FooServiceSchema.example.com/schema/v1.1.1/"
+    elementFormDefault="qualified"
+    xmlns="http://FooServiceSchema.example.com/schema/v1.1.1/"
+    xmlns:mstns="http://tempuri.org/XMLSchema.xsd"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+>
+
+  <xs:element name="FooItem" type="FooItem"></xs:element>
+
+  <xs:complexType name="FooItem">
+    <xs:sequence>
+      <xs:element name="item1" type="ItemType"></xs:element>
+      <xs:element name="item2" type="ItemType"></xs:element>
+      <xs:element name="item3" type="ItemType"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="ItemType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Foo"></xs:enumeration>
+      <xs:enumeration value="Bar"></xs:enumeration>
+      <xs:enumeration value="Baz"></xs:enumeration>
+    </xs:restriction>
+  </xs:simpleType>
+
+</xs:schema>
--- a/103120/examples/example.key
+++ b/103120/examples/example.key
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDc9UQSsRmchhOC
+ixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvMOyvBCHq4c3M8hBxt9zKD
+mV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3Jpyx3b4r8IVoUDXai2sjX
+8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8FJfRl2ttWlSFMA2252ak
+OwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAafTFV1eM/dTOSEKYCHVCN0
+cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eTPunYJGanai6PLLr5zNWX
+lvcj/YbZAgMBAAECggEAbm1BPRo3U4uKWpaNmFPdrU3VdlYK9CUCgU8X2PPF4HRN
+TAiBZG6smGqocIQt5MYJFv/T2q2ny6lcHHrdT0BHxpoRRYMqIsZ26bk+o7DxheqU
+LiPdGtiyaX+6CZq71WDwk/tTGmx0GwW+lHXdv9h+iLQxGD4nVXoxWAPgxdEGnONY
+gSYbOhXz+MEFZaW8HnVPfoA+RR9Hg59gnmBCZlhbahqf3WnjAwgS0nsbSUN57wVi
+FcWHWLyzv94bQHcTgalXqVakQv5+ymJKF4ImiYUP2rLPQ8ubqwmdQ6xI8Gp3AGCr
+FY5koP3JT2mMY+aZJEEGWE3U4JRDyrkOpI34No8iEQKBgQD6niFOopCjE2k7eIFr
+c+s5Khp3ITmcgV4tycxngXOQw8GnPEzzZUW7xodTiMPLYz/8lFbJvCAWCeQpmVWX
+U8OX9anzY0U0ILbolXpdpGdZkBHbKWtAVBNOZ/lY0SAmt6/ZWf/EcqpMm/fH+iph
+aqafwQuX4qhy9HlwY2qwyj5y5QKBgQDhtBH9/9Hy0X2HI+uzNRaU0y1BqvuqjHOf
+1v57DM5uYF0MAp1SAfAJcx+jUXdf28Nr4GlxBIvQumq6rsvfKhqBINsKgJf/4+PA
+Lv+fofeUEEqrGHuecB4NbdHP5XIIiuyyuOtRhGq/sclOQSZAa1kxajGvDI1AVHL4
+LCwcy9HA5QKBgQDIq+2HhWvC6DwOvoMCgyMJ9siSMyxqQLwkdb0R8/mRJO3e9s22
+5pRbsq+RF6WPKb2GhVCo39XhT7I+DOUX8p5fAvo+RHKZNsi+m1ILwSRv9ogVsKiM
+LcX3thFWKL1RwysvIn1F03rBNPHGUm206yzYJj8eMwMmaNMERtabEJXIcQKBgHct
+Kvbwlr5daafrCrDkzlilLVdoXlzOrtrung8BUxsrHNaTptg/l6yVslX9VUgzdXvH
+0kVP/jenx2VtmM7sn3Qhkid4gUon3gGDj4yN7HmtJJA1bEjbsLKsk0XwRIdIO/We
+PphLjCsQrxkYDtRs5YJGdTxjsAyF0b9pAlMgiQVAoGBAK/NGV5+IPDHEmz0CNJN
+ApaA2jG8KrsIPWNpgOC3CxPMT3kWYK601y0CLw8ZpUnVTMfPkKMSOVsqaOpHV6eP
+Oecq3bP1CiNunro+j3EOIDIST2ttrlNuKIBaiz63ZMNDbs/DyaGL8Zf688OJCXsb
+yCWSJh8NbrNblNfI0jaMoTGw
+-----END PRIVATE KEY-----
--- a/103120/examples/example.pem
+++ b/103120/examples/example.pem
+-----BEGIN CERTIFICATE-----
+MIIC/zCCAeegAwIBAgIUUOGdj0hEfnnW9gqIOCTJ9EUocnMwDQYJKoZIhvcNAQEL
+BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTA2MjUwNzIyMDlaFw0yNDAzMjEwNzIy
+MDlaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDc9UQSsRmchhOCixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvM
+OyvBCHq4c3M8hBxt9zKDmV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3J
+pyx3b4r8IVoUDXai2sjX8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8
+FJfRl2ttWlSFMA2252akOwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAaf
+TFV1eM/dTOSEKYCHVCN0cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eT
+PunYJGanai6PLLr5zNWXlvcj/YbZAgMBAAGjUzBRMB0GA1UdDgQWBBSFT3NqexF1
+LcYkjqUr9MMTIFp/ATAfBgNVHSMEGDAWgBSFT3NqexF1LcYkjqUr9MMTIFp/ATAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCzwydpNgq680qWmd0D
+4ya9fHUopeX7LBSYOU7NU3CagjXnUMwaCmSpokkH0Wvn1UtXDUF+slA9bEeXkfZm
+70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K
+OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC
+FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0
+FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob
+/scV
+-----END CERTIFICATE-----
--- a/103120/examples/mutliple-auth-example-request.xml
+++ b/103120/examples/mutliple-auth-example-request.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>d442c58c-d5e1-4fd9-90ec-9c228ad947f1</TransactionIdentifier>
    <Timestamp>2020-09-22T08:06:17.025833Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.1.1</NationalProfileVersion>
    </Version>

--- a/103120/examples/request1.xml
+++ b/103120/examples/request1.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
    <Timestamp>2015-09-01T12:00:00.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/request2.xml
+++ b/103120/examples/request2.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
    <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/request3.xml
+++ b/103120/examples/request3.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
    <Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/request4.xml
+++ b/103120/examples/request4.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
    <Timestamp>2019-09-30T13:37:00.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/request5-Binary-Delivery.xml
+++ b/103120/examples/request5-Binary-Delivery.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
    <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/request5-XML-Delivery.xml
+++ b/103120/examples/request5-XML-Delivery.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
    <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/request6_signed.xml
+++ b/103120/examples/request6_signed.xml
+<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
+  <Header>
+    <SenderIdentifier>
+      <CountryCode>XX</CountryCode>
+      <UniqueIdentifier>ACTOR01</UniqueIdentifier>
+    </SenderIdentifier>
+    <ReceiverIdentifier>
+      <CountryCode>XX</CountryCode>
+      <UniqueIdentifier>ACTOR02</UniqueIdentifier>
+    </ReceiverIdentifier>
+    <TransactionIdentifier>9964584e-c1a5-4ffa-b949-d9da504c4efb</TransactionIdentifier>
+    <Timestamp>2021-06-25T12:00:00.000000Z</Timestamp>
+    <Version>
+      <ETSIVersion>V1.9.1</ETSIVersion>
+      <NationalProfileOwner>XX</NationalProfileOwner>
+      <NationalProfileVersion>v1.0</NationalProfileVersion>
+    </Version>
+  </Header>
+  <Payload>
+    <RequestPayload>
+      <ActionRequests>
+        <ActionRequest>
+          <ActionIdentifier>0</ActionIdentifier>
+          <CREATE>
+            <HI1Object xsi:type="auth:AuthorisationObject">
+              <ObjectIdentifier>68c78910-c922-45f2-aeb3-017eb958bb05</ObjectIdentifier>
+              <CountryCode>XX</CountryCode>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
+              <auth:AuthorisationReference>W000001</auth:AuthorisationReference>
+              <auth:AuthorisationTimespan>
+                <auth:StartTime>2021-06-25T12:00:00Z</auth:StartTime>
+                <auth:EndTime>2021-09-01T12:00:00Z</auth:EndTime>
+              </auth:AuthorisationTimespan>
+            </HI1Object>
+          </CREATE>
+        </ActionRequest>
+        <ActionRequest>
+          <ActionIdentifier>1</ActionIdentifier>
+          <CREATE>
+            <HI1Object xsi:type="task:LITaskObject">
+              <ObjectIdentifier>4d8127db-e8bc-4a69-9378-457f0424ec2c</ObjectIdentifier>
+              <CountryCode>XX</CountryCode>
+              <OwnerIdentifier>ACTOR01</OwnerIdentifier>
+              <AssociatedObjects>
+                <AssociatedObject>68c78910-c922-45f2-aeb3-017eb958bb05</AssociatedObject>
+              </AssociatedObjects>
+              <task:Reference>LIID1</task:Reference>
+              <task:TargetIdentifier>
+                <task:TargetIdentifierValues>
+                  <task:TargetIdentifierValue>
+                    <task:FormatType>
+                      <task:FormatOwner>ETSI</task:FormatOwner>
+                      <task:FormatName>InternationalizedEmailAddress</task:FormatName>
+                    </task:FormatType>
+                    <task:Value>Όνομα.παραδείγματος@example.com</task:Value>
+                  </task:TargetIdentifierValue>
+                </task:TargetIdentifierValues>
+              </task:TargetIdentifier>
+              <task:DeliveryType>
+                <common:Owner>ETSI</common:Owner>
+                <common:Name>TaskDeliveryType</common:Name>
+                <common:Value>IRIandCC</common:Value>
+              </task:DeliveryType>
+              <task:DeliveryDetails>
+                <task:DeliveryDestination>
+                  <task:DeliveryAddress>
+                    <task:IPv4Address>192.0.2.0</task:IPv4Address>
+                  </task:DeliveryAddress>
+                </task:DeliveryDestination>
+              </task:DeliveryDetails>
+              <task:CSPID>
+                <CountryCode>XX</CountryCode>
+                <UniqueIdentifier>RECVER01</UniqueIdentifier>
+              </task:CSPID>
+            </HI1Object>
+          </CREATE>
+        </ActionRequest>
+      </ActionRequests>
+    </RequestPayload>
+  </Payload>
+<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+  <ds:SignedInfo>
+    <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2006/12/xml-c14n11"/>
+    <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <ds:Reference URI="">
+      <ds:Transforms>
+        <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+        <ds:Transform Algorithm="http://www.w3.org/2006/12/xml-c14n11"/>
+      </ds:Transforms>
+      <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+      <ds:DigestValue>kARbaz+wH6oJWSvmy6Fk4vTQ7t4m3Y16IiNNdDO08/I=</ds:DigestValue>
+    </ds:Reference>
+  </ds:SignedInfo>
+  <ds:SignatureValue>DdT9ie03Z9O47sN8ad9gsfuhZhchtNhtvTyNhtiHKuqgNCt696tDH2c68tVqr+iJ3WpCn0gWJHKnYeniTwVPj6fxDh2RbCqk5SVHvdggZjCv3BInNH0ZfOrlvuArJS3UP/gifYXlT5s59Seze1nSjZDNeC25o9WRxNy0krGrhbqIFjxTHDilR40cmKq2SI1540yM3rsc+5D3hgsxGu7ly2dg7qtiFGQIQaFJi8twrViQUnOyDZ63yJHhWeLVU+2FvIuBZh3orDc3VipKsbqrjrDqdfi8qfYEHHPp25DfTpHXnCuhD/3hOwcxvhVJ4+47R8ysO9qMTvGRCUNptgskhQ==</ds:SignatureValue>
+    <ds:KeyInfo>
+      <ds:X509Data>
+        <ds:X509Certificate>MIIC/zCCAeegAwIBAgIUUOGdj0hEfnnW9gqIOCTJ9EUocnMwDQYJKoZIhvcNAQEL
+BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTA2MjUwNzIyMDlaFw0yNDAzMjEwNzIy
+MDlaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDc9UQSsRmchhOCixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvM
+OyvBCHq4c3M8hBxt9zKDmV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3J
+pyx3b4r8IVoUDXai2sjX8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8
+FJfRl2ttWlSFMA2252akOwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAaf
+TFV1eM/dTOSEKYCHVCN0cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eT
+PunYJGanai6PLLr5zNWXlvcj/YbZAgMBAAGjUzBRMB0GA1UdDgQWBBSFT3NqexF1
+LcYkjqUr9MMTIFp/ATAfBgNVHSMEGDAWgBSFT3NqexF1LcYkjqUr9MMTIFp/ATAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCzwydpNgq680qWmd0D
+4ya9fHUopeX7LBSYOU7NU3CagjXnUMwaCmSpokkH0Wvn1UtXDUF+slA9bEeXkfZm
+70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K
+OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC
+FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0
+FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob
+/scV
+</ds:X509Certificate>
+      </ds:X509Data>
+   </ds:KeyInfo>
+  </ds:Signature>
+</HI1Message>
\ No newline at end of file
--- a/103120/examples/response1.xml
+++ b/103120/examples/response1.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
    <Timestamp>2015-09-01T12:00:01.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/response2.xml
+++ b/103120/examples/response2.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
    <Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/response3.xml
+++ b/103120/examples/response3.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
    <Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/response4.xml
+++ b/103120/examples/response4.xml
@@ -12,7 +12,7 @@
    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
    <Timestamp>2019-09-30T13:37:01.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/103120/examples/response5.xml
+++ b/103120/examples/response5.xml
@@ -17,7 +17,7 @@
    <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
    <Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
    <Version>
-      <ETSIVersion>V1.8.1</ETSIVersion>
+      <ETSIVersion>V1.10.1</ETSIVersion>
      <NationalProfileOwner>XX</NationalProfileOwner>
      <NationalProfileVersion>v1.0</NationalProfileVersion>
    </Version>

--- a/testing/check_xsd.py
+++ b/testing/check_xsd.py
@@ -11,7 +11,6 @@ from lxml import etree
 from xml.etree.ElementTree import ParseError
 from xmlschema import XMLSchema, XMLSchemaParseError

-
 def BuildSchemaDictonary (fileList):
    if len(fileList) == 0:
        logging.info("No schema files provided")
@@ -22,7 +21,7 @@ def BuildSchemaDictonary (fileList):
    for schemaFile in fileList:
        try:
            xs = XMLSchema(schemaFile, validation='skip')
-            schemaLocations.append((xs.default_namespace, str(Path(schemaFile).resolve())))
+            schemaLocations.append((xs.target_namespace, str(Path(schemaFile).resolve())))
            logging.info(" [ {0}  ->  {1} ]".format(xs.default_namespace, schemaFile))
        except ParseError as ex:
            logging.warning (" [ {0} failed to parse:  {1} ]".format(schemaFile, ex))
@@ -53,6 +52,7 @@ def ValidateXSDFiles (fileList):
    
    schemaLocations = BuildSchemaDictonary(fileList)
    errors = {}
+    schemaDictionary = {}

    logging.info("Schema validation:")
    for schemaFile in fileList:
@@ -60,6 +60,7 @@ def ValidateXSDFiles (fileList):
            schema = XMLSchema(schemaFile, locations = schemaLocations)
            logging.info(schemaFile + ": OK")
            errors[schemaFile] = []
+            schemaDictionary[schema.target_namespace] = schema
        except XMLSchemaParseError as ex:
            if (ex.schema_url) and (ex.schema_url != ex.origin_url):
                logging.info("  Error {1} comes from {0}, suppressing".format(ex.schema_url, ex.message))
@@ -67,7 +68,7 @@ def ValidateXSDFiles (fileList):
            else:
                logging.warning(schemaFile + ": Failed validation ({0})".format(ex))
                errors[schemaFile] = [ex.message]
-    return errors
+    return errors, schemaDictionary


 def ValidateInstanceDocuments (coreFile, supportingSchemas, instanceDocs):
@@ -91,6 +92,7 @@ if __name__ == '__main__':
    parser = argparse.ArgumentParser()
    parser.add_argument("-v", "--verbosity", help="verbosity level", action="count", default=0)
    parser.add_argument("input", help="include a directory or file", action="append", nargs="+")
+    parser.add_argument("-p", "--primaryNamespace", help="Primary schema namespace for instance doc validation")
    args = parser.parse_args()

    logging.getLogger().setLevel(logging.WARNING)
@@ -100,8 +102,10 @@ if __name__ == '__main__':
        logging.getLogger().setLevel(logging.DEBUG)
        logging.debug("Very verbose selected")

+
    logging.debug(f"Path: {args.input}")
    includeFileList = []
+    includeInstanceDocList = []
    for path in args.input[0]:
        p = Path(path)
        if not p.exists():
@@ -112,12 +116,25 @@ if __name__ == '__main__':
            for g in glob.glob(os.path.join(str(p), "*.xsd")):
                logging.info(f">Including {g}")
                includeFileList.append(g)
+            for g in glob.glob(os.path.join(str(p), "*.xml")):
+                logging.info(f">Including instance doc {g}")
+                includeInstanceDocList.append(g)
        else:
-            logging.info(f"Including {p.absolute()}")
-            includeFileList.append(p.absolute())
+            logging.info(f">Including {p.absolute()}")
+            if str(p.absolute()).endswith('.xml'):
+                includeInstanceDocList.append(str(p.absolute()))
+            elif str(p.absolute()).endswith('.xsd'):
+                includeFileList.append(str(p.absolute()))
+            else:
+                logging.warning(f'Ignoring file {p.absolute()}')
    
+    if len(includeInstanceDocList) and (args.primaryNamespace is None):
+        print("Cannot validate instance documents without specifying a primary namespace (use -h for usage guidelines)")
+        exit(-1)
+
    syntaxErrors = 0
    
+    print ("=============================")
    print ("XSD syntax checks:")
    print ("-----------------------------")
    for file in includeFileList:
@@ -132,9 +149,12 @@ if __name__ == '__main__':
    if (syntaxErrors > 0):
        print (f"{syntaxErrors} syntax errors detected")
        exit(syntaxErrors)
+    else:
+        print ("0 syntax errors detected")

-    results = ValidateXSDFiles(includeFileList)
+    results, schemaDict = ValidateXSDFiles(includeFileList)
    
+    print ("=============================")
    print ("XSD build checks:")
    print ("-----------------------------")
    errorCount = 0
@@ -152,4 +172,23 @@ if __name__ == '__main__':

    print ("-----------------------------")
    print (f"{errorCount} build errors detected")
-    exit(errorCount)
\ No newline at end of file
+    if (errorCount > 0):
+        exit(errorCount)
+
+    print ("=============================")
+    print ("Instance document checks")
+    print ("-----------------------------")
+    errorCount = 0
+
+    primarySchema = schemaDict[args.primaryNamespace]
+    for instanceDoc in includeInstanceDocList:
+        try:
+            results = primarySchema.validate(instanceDoc)
+            print (f"  {instanceDoc} : OK")
+        except Exception as ex:
+            errorCount += 1
+            print (f"  {instanceDoc} : {str(ex)}")
+    print ("-----------------------------")
+    print (f"{errorCount} instance doc errors detected")
+    print ("=============================")
+    exit(errorCount)
--- a/testing/deps/xmldsig/xmldsig-core-schema.xsd
+++ b/testing/deps/xmldsig/xmldsig-core-schema.xsd
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema 
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified"> 
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence> 
+    <element ref="ds:SignedInfo"/> 
+    <element ref="ds:SignatureValue"/> 
+    <element ref="ds:KeyInfo" minOccurs="0"/> 
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
+  </sequence>  
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/> 
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence> 
+    <element ref="ds:CanonicalizationMethod"/> 
+    <element ref="ds:SignatureMethod"/> 
+    <element ref="ds:Reference" maxOccurs="unbounded"/> 
+  </sequence>  
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence> 
+    <element ref="ds:Transforms" minOccurs="0"/> 
+    <element ref="ds:DigestMethod"/> 
+    <element ref="ds:DigestValue"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+  <attribute name="URI" type="anyURI" use="optional"/> 
+  <attribute name="Type" type="anyURI" use="optional"/> 
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>  
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded"> 
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/> 
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true"> 
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>    
+  <attribute name="Algorithm" type="anyURI" use="required"/> 
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/> 
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">     
+    <element ref="ds:KeyName"/> 
+    <element ref="ds:KeyValue"/> 
+    <element ref="ds:RetrievalMethod"/> 
+    <element ref="ds:X509Data"/> 
+    <element ref="ds:PGPData"/> 
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/> 
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>