From c1c4e0425553e69776728242358563021fc0beda Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Sat, 8 Jun 2024 19:29:03 +0000 Subject: [PATCH 01/13] Transposing LI(24)P66009 CR to XSD. --- .../ts_103120_ETSIDictionaryDefinitions.xml | 50 +++++++++++++++ 103120/schema/xsd/ts_103120_Common.xsd | 5 ++ 103120/schema/xsd/ts_103120_Config.xsd | 62 +++++++++++++++++++ 103120/schema/xsd/ts_103120_Core.xsd | 15 ++++- 4 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 103120/schema/xsd/ts_103120_Config.xsd diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 11a43a9..e30f748 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -723,6 +723,56 @@ + + + ETSI + LIWorkflowEndpoint + + + NewAuthorisation + Implementer supports the "New Authorisation" Endpoint. + + + AuthorisationExtension + Implementer supports the "Authorisation Extension" Endpoint. + + + AuthorisationCancellation + Implementer supports the "Authorisation Cancellation" Endpoint. + + + TaskAddition + Implementer supports the "Task Addition" Endpoint. + + + TaskCancellation + Implementer supports the "Task Cancellation" Endpoint. + + + ChangeOfDelivery + Implementer supports the "Change of Delivery" Endpoint. + + + + + + ETSI + LPWorkflowEndpoint + + + NewPreservation + Implementer supports the "New Preservation" Endpoint. + + + PreservationExtension + Implementer supports the "Preservation Extension" Endpoint. + + + PreservationCancellation + Implementer supports the "Preservation Cancellation" Endpoint. + + + ETSI diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd index 4bc2338..cea9e81 100644 --- a/103120/schema/xsd/ts_103120_Common.xsd +++ b/103120/schema/xsd/ts_103120_Common.xsd @@ -6,6 +6,11 @@ + + + + + diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd new file mode 100644 index 0000000..308e18b --- /dev/null +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index e0b772c..eeb5562 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -1,6 +1,7 @@ - + + @@ -71,6 +72,7 @@ + @@ -84,6 +86,7 @@ + @@ -158,6 +161,16 @@ + + + + + + + + + + -- GitLab From 02e6e90ce263897dbb4703c2d99f30ffc551acec Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 10 Jun 2024 08:48:18 +0100 Subject: [PATCH 02/13] Adding new config xsd to testing config --- testing/xsd_compile_targets.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json index bb4f13e..6f90cb7 100644 --- a/testing/xsd_compile_targets.json +++ b/testing/xsd_compile_targets.json @@ -19,6 +19,7 @@ "103280/TS_103_280.xsd", "103221-1/examples/ExampleGenericObjects.xsd", "103120/schema/xsd/ts_103120_Common.xsd", + "103120/schema/xsd/ts_103120_Config.xsd", "103120/schema/xsd/ts_103120_Core.xsd", "103120/schema/xsd/ts_103120_TrafficPolicy.xsd", "testing/deps/xmldsig/xmldsig-core-schema.xsd" @@ -39,6 +40,7 @@ "supportingSchemas" : [ "103120/schema/xsd/ts_103120_Authorisation.xsd", "103120/schema/xsd/ts_103120_Common.xsd", + "103120/schema/xsd/ts_103120_Config.xsd", "103120/schema/xsd/ts_103120_Delivery.xsd", "103120/schema/xsd/ts_103120_Document.xsd", "103120/schema/xsd/ts_103120_Notification.xsd", @@ -58,6 +60,7 @@ "103280/TS_103_280.xsd", "103120/schema/xsd/ts_103120_Common.xsd", "103120/schema/xsd/ts_103120_Core.xsd", + "103120/schema/xsd/ts_103120_Config.xsd", "103120/schema/xsd/ts_103120_Task.xsd", "testing/deps/xmldsig/xmldsig-core-schema.xsd", "103707/examples/FooServiceSchema.xsd" -- GitLab From 49741129b15edf55e83c858a850e55d14b7bcdbb Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 10 Jun 2024 09:13:07 +0100 Subject: [PATCH 03/13] Adding an example CONFIG request and response --- 103120/examples/xml/request_config.xml | 30 +++++++++ 103120/examples/xml/response_config.xml | 90 +++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 103120/examples/xml/request_config.xml create mode 100644 103120/examples/xml/response_config.xml diff --git a/103120/examples/xml/request_config.xml b/103120/examples/xml/request_config.xml new file mode 100644 index 0000000..99a9c5b --- /dev/null +++ b/103120/examples/xml/request_config.xml @@ -0,0 +1,30 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + eb6b002d-15c3-4c3b-af6c-27ede73641e5 + 2024-06-10T08:50:31.000000Z + + V1.16.1 + XX + v1.0 + +
+ + + + + 0 + + + + + + \ No newline at end of file diff --git a/103120/examples/xml/response_config.xml b/103120/examples/xml/response_config.xml new file mode 100644 index 0000000..23af8dd --- /dev/null +++ b/103120/examples/xml/response_config.xml @@ -0,0 +1,90 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + eb6b002d-15c3-4c3b-af6c-27ede73641e5 + 2024-06-10T08:50:31.000000Z + + V1.16.1 + XX + v1.0 + +
+ + + + + 0 + + 2024-05-10T08:52:32Z + + ACTOR02 + + + ProprietaryIdentifier + This is an illustration of a proprietary identifier type specific to this CSP, which consists of the string "CSP" followed by 10 digits + ^CSP[0-9]{10}$ + + + + + + InternationalE164 + ETSI + This configuration entry tells the LEA that they can use the ETSI standard format E164 number for LI of service A + + + ACTOR02 + LIServerTypes + ServiceA + + + + + + + PropietaryIdentifier + ACTOR02 + This configuration entry tells the LEA that they can use the propietary identifier format type described in the TargetFormatTypeDefinitions for LI of both Service A and Service B + + + ACTOR02 + LIServerTypes + ServiceA + + + ACTOR02 + LIServerTypes + ServiceB + + + + + + + + + + ETSI + LIWorkflowEndpoint + NewAuthorisation + + This tells the LEA what endpoint to use for new warrants. For brevity, in this example, this is the only endpoint specified. + https://ts103120.example.com/li/authorisation/new + + + + + + + + + + \ No newline at end of file -- GitLab From 402b77b947b95ea75d501be2a6e3f74fc81c5ce9 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 10 Jun 2024 13:19:26 +0100 Subject: [PATCH 04/13] Adding dictionaries --- 103120/examples/xml/response_config.xml | 24 ++++++++++++++++++++---- 103120/schema/xsd/ts_103120_Core.xsd | 4 +++- testing/xsd_compile_targets.json | 3 +++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/103120/examples/xml/response_config.xml b/103120/examples/xml/response_config.xml index 23af8dd..e7007e9 100644 --- a/103120/examples/xml/response_config.xml +++ b/103120/examples/xml/response_config.xml @@ -1,5 +1,5 @@ - +
XX @@ -24,6 +24,22 @@ 0 2024-05-10T08:52:32Z + + + ACTOR2 + LIServiceTypes + + + ServiceA + This is a dictionary entry + + + ServiceB + This is a dictionary entry + + + + ACTOR02 @@ -42,7 +58,7 @@ ACTOR02 - LIServerTypes + LIServiceTypes ServiceA @@ -56,12 +72,12 @@ ACTOR02 - LIServerTypes + LIServiceTypes ServiceA ACTOR02 - LIServerTypes + LIServiceTypes ServiceB diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index eeb5562..bfd905d 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -1,7 +1,8 @@ - + + @@ -165,6 +166,7 @@ + diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json index 6f90cb7..8aa1774 100644 --- a/testing/xsd_compile_targets.json +++ b/testing/xsd_compile_targets.json @@ -21,6 +21,7 @@ "103120/schema/xsd/ts_103120_Common.xsd", "103120/schema/xsd/ts_103120_Config.xsd", "103120/schema/xsd/ts_103120_Core.xsd", + "103120/dictionaries/ts_103120_Dictionaries.xsd", "103120/schema/xsd/ts_103120_TrafficPolicy.xsd", "testing/deps/xmldsig/xmldsig-core-schema.xsd" ], @@ -42,6 +43,7 @@ "103120/schema/xsd/ts_103120_Common.xsd", "103120/schema/xsd/ts_103120_Config.xsd", "103120/schema/xsd/ts_103120_Delivery.xsd", + "103120/dictionaries/ts_103120_Dictionaries.xsd", "103120/schema/xsd/ts_103120_Document.xsd", "103120/schema/xsd/ts_103120_Notification.xsd", "103120/schema/xsd/ts_103120_Task.xsd", @@ -61,6 +63,7 @@ "103120/schema/xsd/ts_103120_Common.xsd", "103120/schema/xsd/ts_103120_Core.xsd", "103120/schema/xsd/ts_103120_Config.xsd", + "103120/dictionaries/ts_103120_Dictionaries.xsd", "103120/schema/xsd/ts_103120_Task.xsd", "testing/deps/xmldsig/xmldsig-core-schema.xsd", "103707/examples/FooServiceSchema.xsd" -- GitLab From 73061eae1e590f9a60a3502b100ecde17a51feca Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Mon, 10 Jun 2024 19:09:14 +0000 Subject: [PATCH 05/13] Mark non-mandatory fields as such. --- 103120/schema/xsd/ts_103120_Config.xsd | 12 ++++++------ 103120/schema/xsd/ts_103120_Core.xsd | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index 308e18b..bad5d2a 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -29,10 +29,10 @@ - - - - + + + + @@ -43,7 +43,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index bfd905d..ce8fb72 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -166,11 +166,11 @@ - - + + - - + + -- GitLab From 3b132ccebec8e4f41137b74642d26ea43e350a59 Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Wed, 19 Jun 2024 08:05:25 +0000 Subject: [PATCH 06/13] Update config request and response naming for r1 --- .../dictionaries/ts_103120_ETSIDictionaryDefinitions.xml | 4 ++-- 103120/examples/xml/response_config.xml | 4 ++-- 103120/schema/xsd/ts_103120_Core.xsd | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index e30f748..eb46ca4 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -724,7 +724,7 @@ - + ETSI LIWorkflowEndpoint @@ -755,7 +755,7 @@ - + ETSI LPWorkflowEndpoint diff --git a/103120/examples/xml/response_config.xml b/103120/examples/xml/response_config.xml index e7007e9..bf99aa5 100644 --- a/103120/examples/xml/response_config.xml +++ b/103120/examples/xml/response_config.xml @@ -22,7 +22,7 @@ 0 - + 2024-05-10T08:52:32Z @@ -98,7 +98,7 @@ - + diff --git a/103120/schema/xsd/ts_103120_Core.xsd b/103120/schema/xsd/ts_103120_Core.xsd index ce8fb72..76cfe1d 100644 --- a/103120/schema/xsd/ts_103120_Core.xsd +++ b/103120/schema/xsd/ts_103120_Core.xsd @@ -73,7 +73,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -162,8 +162,8 @@ - - + + -- GitLab From 0cbd40148a08c4a931b812cf56b43b16af183af9 Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Wed, 19 Jun 2024 08:08:52 +0000 Subject: [PATCH 07/13] Correct error in example to pass pipeline check. --- 103120/examples/xml/request_config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/examples/xml/request_config.xml b/103120/examples/xml/request_config.xml index 99a9c5b..69a98e1 100644 --- a/103120/examples/xml/request_config.xml +++ b/103120/examples/xml/request_config.xml @@ -22,7 +22,7 @@ 0 - + -- GitLab From fe63909326aeaabc3513d559d83b5256ad427815 Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Thu, 20 Jun 2024 09:47:41 +0000 Subject: [PATCH 08/13] Add uniqueness constraint and bad response config. --- 103120/examples/xml/response_config.xml | 9 +++++++++ 103120/schema/xsd/ts_103120_Config.xsd | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/103120/examples/xml/response_config.xml b/103120/examples/xml/response_config.xml index bf99aa5..d6cdc4b 100644 --- a/103120/examples/xml/response_config.xml +++ b/103120/examples/xml/response_config.xml @@ -95,6 +95,15 @@ This tells the LEA what endpoint to use for new warrants. For brevity, in this example, this is the only endpoint specified. https://ts103120.example.com/li/authorisation/new + + + ETSI + LIWorkflowEndpoint + NewAuthorisation + + This tells the LEA what endpoint to use for the newest of warrants. For brevity, in this example, this is the only endpoint specified. + https://ts103120.example.com/li/authorisation/new/newer + diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index bad5d2a..0de78d1 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -47,6 +47,10 @@ + + + + @@ -59,4 +63,8 @@ + + + + \ No newline at end of file -- GitLab From b42cb4a4dcbe74d8f8da11d837bbcfc13980ffa5 Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Thu, 20 Jun 2024 09:59:32 +0000 Subject: [PATCH 09/13] Try moving unique inside complex type. --- 103120/schema/xsd/ts_103120_Config.xsd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index 0de78d1..b4e6f10 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -38,7 +38,11 @@ - + + + + + @@ -47,14 +51,14 @@ - - - - + + + + @@ -63,8 +67,4 @@ - - - - \ No newline at end of file -- GitLab From 5a8674dbbdbb8af073648bda15b47dc2613c6ca3 Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Thu, 20 Jun 2024 10:05:09 +0000 Subject: [PATCH 10/13] Try putitng unique inside of element tag. --- 103120/schema/xsd/ts_103120_Config.xsd | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index b4e6f10..4aa85e6 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -37,12 +37,13 @@ - + + + + + + - - - - @@ -53,12 +54,13 @@ - + + + + + + - - - - -- GitLab From 60529ea8fe581f64d88ce6ebad22d3d2b245698c Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Thu, 20 Jun 2024 10:08:59 +0000 Subject: [PATCH 11/13] Correct path -> xpath. --- 103120/schema/xsd/ts_103120_Config.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index 4aa85e6..76a2acb 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -40,7 +40,7 @@ - + @@ -57,7 +57,7 @@ - + -- GitLab From 701496ceb599c36601b47fc63e60486069c53ff7 Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Thu, 20 Jun 2024 10:15:27 +0000 Subject: [PATCH 12/13] Try pushing bad response. --- 103120/examples/xml/response_config.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/103120/examples/xml/response_config.xml b/103120/examples/xml/response_config.xml index d6cdc4b..4890fd9 100644 --- a/103120/examples/xml/response_config.xml +++ b/103120/examples/xml/response_config.xml @@ -104,6 +104,15 @@ This tells the LEA what endpoint to use for the newest of warrants. For brevity, in this example, this is the only endpoint specified. https://ts103120.example.com/li/authorisation/new/newer + + + ETSI + LIWorkflowEndpoint + NewAuthorisation + + This tells the LEA what endpoint to use for the newest of warrants. For brevity, in this example, this is the only endpoint specified. + https://ts103120.example.com/li/authorisation/new/newer + -- GitLab From 2ad9c9c68c0415febd64b0e357956d5e9507332b Mon Sep 17 00:00:00 2001 From: kaufmannj Date: Thu, 20 Jun 2024 10:49:42 +0000 Subject: [PATCH 13/13] Rolling back to pre-unique element commit. --- 103120/examples/xml/response_config.xml | 18 ------------------ 103120/schema/xsd/ts_103120_Config.xsd | 14 ++------------ 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/103120/examples/xml/response_config.xml b/103120/examples/xml/response_config.xml index 4890fd9..bf99aa5 100644 --- a/103120/examples/xml/response_config.xml +++ b/103120/examples/xml/response_config.xml @@ -95,24 +95,6 @@ This tells the LEA what endpoint to use for new warrants. For brevity, in this example, this is the only endpoint specified. https://ts103120.example.com/li/authorisation/new - - - ETSI - LIWorkflowEndpoint - NewAuthorisation - - This tells the LEA what endpoint to use for the newest of warrants. For brevity, in this example, this is the only endpoint specified. - https://ts103120.example.com/li/authorisation/new/newer - - - - ETSI - LIWorkflowEndpoint - NewAuthorisation - - This tells the LEA what endpoint to use for the newest of warrants. For brevity, in this example, this is the only endpoint specified. - https://ts103120.example.com/li/authorisation/new/newer - diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index 76a2acb..4e752e9 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -37,12 +37,7 @@ - - - - - - + @@ -54,12 +49,7 @@ - - - - - - + -- GitLab