From 11e88d1d73ba738e1299d43a8530dc52bafe80c9 Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Wed, 14 May 2025 15:02:29 -0500 Subject: [PATCH 01/15] Add new fields to the targeting configuration in XML config schema --- 103120/schema/xsd/ts_103120_Config.xsd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index 4e752e98..9e628604 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -31,7 +31,9 @@ + + -- GitLab From c7b6adf753cd4296e404e087c212118e0fc3943f Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Wed, 14 May 2025 15:14:10 -0500 Subject: [PATCH 02/15] Add new fields to the targeting configuration in JSON config schema --- 103120/schema/json/ts_103120_Config.schema.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/103120/schema/json/ts_103120_Config.schema.json b/103120/schema/json/ts_103120_Config.schema.json index 6686a319..da254d04 100644 --- a/103120/schema/json/ts_103120_Config.schema.json +++ b/103120/schema/json/ts_103120_Config.schema.json @@ -79,9 +79,15 @@ "config:AssociatedLIServiceTypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, + "config:AssociatedLDType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" + }, "config:AssociatedLDRequestSubtypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, + "config:AssociatedLPType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" + } "config:AssociatedLPRequestSubtypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" } -- GitLab From 9c61a312a6abe6b14622c73ae4519c9b91f18a6d Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Wed, 14 May 2025 15:19:16 -0500 Subject: [PATCH 03/15] Add new fields to xml_to_json python utility --- utils/xml_to_json.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index 66f4fe1d..519ecdaf 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -94,7 +94,9 @@ coerce_to_empty = [ coerce_null_to_empty = [ 'SupportedLIWorkflowEndpoints', 'SupportedLPWorkflowEndpoints', + 'config:AssociatedLDType', 'config:AssociatedLDRequestSubtypes', + 'config:AssociatedLPType', 'config:AssociatedLPRequestSubtypes', 'config:AssociatedLIRequestSubtypes', ] -- GitLab From 3eefa5e151aab67ce1b25c606cb5aa2b166da60e Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Wed, 14 May 2025 17:45:43 -0500 Subject: [PATCH 04/15] Use plural for the new the name of the AssociatedL?Types fields --- 103120/schema/json/ts_103120_Config.schema.json | 6 +++--- 103120/schema/xsd/ts_103120_Config.xsd | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/103120/schema/json/ts_103120_Config.schema.json b/103120/schema/json/ts_103120_Config.schema.json index da254d04..0477506e 100644 --- a/103120/schema/json/ts_103120_Config.schema.json +++ b/103120/schema/json/ts_103120_Config.schema.json @@ -79,15 +79,15 @@ "config:AssociatedLIServiceTypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, - "config:AssociatedLDType": { + "config:AssociatedLDTypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, "config:AssociatedLDRequestSubtypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, - "config:AssociatedLPType": { + "config:AssociatedLPTypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" - } + }, "config:AssociatedLPRequestSubtypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" } diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index 9e628604..473b94c9 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -31,9 +31,9 @@ - + - + -- GitLab From 623dcfc99eccc89b7c0e9f6c51a41a2a52919095 Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Wed, 14 May 2025 17:57:30 -0500 Subject: [PATCH 05/15] Add XML example of GETCSPCONFIG request-response messages for e-Evidence use case --- 103120/examples/xml/request_ee_config.xml | 31 ++++ 103120/examples/xml/response_ee_config.xml | 181 +++++++++++++++++++++ 2 files changed, 212 insertions(+) create mode 100644 103120/examples/xml/request_ee_config.xml create mode 100644 103120/examples/xml/response_ee_config.xml diff --git a/103120/examples/xml/request_ee_config.xml b/103120/examples/xml/request_ee_config.xml new file mode 100644 index 00000000..33a96810 --- /dev/null +++ b/103120/examples/xml/request_ee_config.xml @@ -0,0 +1,31 @@ + + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + da735c3f-3ab9-4e9e-810e-daf84d973505 + 2025-05-14T15:21:00.000000Z + + V1.18.1 + XX + v1.0 + +
+ + + + + 0 + + + + + + \ No newline at end of file diff --git a/103120/examples/xml/response_ee_config.xml b/103120/examples/xml/response_ee_config.xml new file mode 100644 index 00000000..5f0be7ad --- /dev/null +++ b/103120/examples/xml/response_ee_config.xml @@ -0,0 +1,181 @@ + + + +
+ + XX + ACTOR01 + + + XX + + ACTOR02 + + da735c3f-3ab9-4e9e-810e-daf84d973505 + 2025-05-14T15:21:03.000000Z + + V1.18.1 + XX + v1.0 + +
+ + + + + 0 + + 2025-04-03T07:25:21Z + + + + ACTOR2 + LDRequestSubtype + + + ServiceA + Service A allows users to ... + + + ServiceB + Service B allows users to ... + + + + + ACTOR2 + LPServiceTypes + + + ServiceA + Service A allows users to ... + + + ServiceB + Service B allows users to ... + + + + + + + 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}$ + + + + + + + + PropietaryIdentifier + ACTOR02 + This targeting configuration defines that the service provider accepts lawful disclosure and lawful preservation requests for the propietary identifier format type described in the TargetFormatTypeDefinitions, associated with Service A for the "Subscriber Data" category only + + + + ETSI + RequestType + SubscriberData + + + + + ACTOR02 + LDRequestSubtype + ServiceA + + + + + ETSI + RequestType + SubscriberData + + + + + ACTOR02 + LPServiceTypes + ServiceA + + + + + + InternationalE164 + ETSI + This targeting configuration defines that the service provider accepts lawful disclosure and lawful preservation requests for a telephone number (as ETSI standard format E164 number) associated with Service A and Service B for the "Traffic Data" and "Content Data" categories + + + + ETSI + RequestType + TrafficData + + + ETSI + RequestType + StoredContentData + + + + + ACTOR02 + LDRequestSubtype + ServiceA + + + ACTOR02 + LDRequestSubtype + ServiceB + + + + + ETSI + RequestType + TrafficData + + + ETSI + RequestType + StoredContentData + + + + + ACTOR02 + LPServiceTypes + ServiceA + + + ACTOR02 + LPServiceTypes + ServiceB + + + + + + + + ETSI + LPWorkflowEndpoint + 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/lp/authorisation/new + + + + + + + + + \ No newline at end of file -- GitLab From 29c96f9c2c66fc0a5ead8cae090d2a8786a80081 Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Wed, 14 May 2025 17:58:34 -0500 Subject: [PATCH 06/15] Fix incorrect attribute names for AssociatedL?Subtypes both in XML and JSON --- 103120/schema/json/ts_103120_Config.schema.json | 4 ++-- 103120/schema/xsd/ts_103120_Config.xsd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/103120/schema/json/ts_103120_Config.schema.json b/103120/schema/json/ts_103120_Config.schema.json index 0477506e..88ff0315 100644 --- a/103120/schema/json/ts_103120_Config.schema.json +++ b/103120/schema/json/ts_103120_Config.schema.json @@ -82,13 +82,13 @@ "config:AssociatedLDTypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, - "config:AssociatedLDRequestSubtypes": { + "config:AssociatedLDSubtypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, "config:AssociatedLPTypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, - "config:AssociatedLPRequestSubtypes": { + "config:AssociatedLPSubtypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" } }, diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index 473b94c9..5b38ef60 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -32,9 +32,9 @@ - + - + -- GitLab From e081fd5ce47e3e72ac23570966b963b155969238 Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Wed, 14 May 2025 20:37:25 -0500 Subject: [PATCH 07/15] Fix confusion between the AssociatedL.?Subtypes attributes and dictionary names --- 103120/examples/json/response_config.json | 8 ++++---- 103120/examples/xml/response_config.xml | 8 ++++---- 103120/examples/xml/response_ee_config.xml | 12 ++++++------ utils/xml_to_json.py | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/103120/examples/json/response_config.json b/103120/examples/json/response_config.json index d0f4a1f8..330c864a 100644 --- a/103120/examples/json/response_config.json +++ b/103120/examples/json/response_config.json @@ -77,8 +77,8 @@ } ] }, - "config:AssociatedLDRequestSubtypes": {}, - "config:AssociatedLPRequestSubtypes": {} + "config:AssociatedLDSubtypes": {}, + "config:AssociatedLPSubtypes": {} }, { "config:FormatName": "PropietaryIdentifier", @@ -98,8 +98,8 @@ } ] }, - "config:AssociatedLDRequestSubtypes": {}, - "config:AssociatedLPRequestSubtypes": {} + "config:AssociatedLDSubtypes": {}, + "config:AssociatedLPSubtypes": {} } ] }, diff --git a/103120/examples/xml/response_config.xml b/103120/examples/xml/response_config.xml index bf99aa57..b0c72571 100644 --- a/103120/examples/xml/response_config.xml +++ b/103120/examples/xml/response_config.xml @@ -62,8 +62,8 @@ ServiceA - - + + PropietaryIdentifier @@ -81,8 +81,8 @@ ServiceB - - + + diff --git a/103120/examples/xml/response_ee_config.xml b/103120/examples/xml/response_ee_config.xml index 5f0be7ad..a08682fa 100644 --- a/103120/examples/xml/response_ee_config.xml +++ b/103120/examples/xml/response_ee_config.xml @@ -44,7 +44,7 @@ ACTOR2 - LPServiceTypes + LPRequestSubtype ServiceA @@ -97,13 +97,13 @@ SubscriberData - + ACTOR02 - LPServiceTypes + LPRequestSubtype ServiceA - + @@ -150,12 +150,12 @@ ACTOR02 - LPServiceTypes + LPRequestSubtype ServiceA ACTOR02 - LPServiceTypes + LPRequestSubtype ServiceB diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index 519ecdaf..7e4d34ba 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -94,11 +94,11 @@ coerce_to_empty = [ coerce_null_to_empty = [ 'SupportedLIWorkflowEndpoints', 'SupportedLPWorkflowEndpoints', - 'config:AssociatedLDType', - 'config:AssociatedLDRequestSubtypes', - 'config:AssociatedLPType', - 'config:AssociatedLPRequestSubtypes', - 'config:AssociatedLIRequestSubtypes', + 'config:AssociatedLDTypes', + 'config:AssociatedLDSubtypes', + 'config:AssociatedLPTypes', + 'config:AssociatedLPSubtypes', + 'config:AssociatedLIServiceTypes', ] def postprocessor (path, key, value): -- GitLab From 6924a1f3ec1314e964efbf35eb2ddad1cfebe66d Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Wed, 14 May 2025 20:42:22 -0500 Subject: [PATCH 08/15] Fix typo in SupportedLPWorkflowEndpoint schema, both in XML and JSON --- 103120/schema/json/ts_103120_Config.schema.json | 4 ++-- 103120/schema/xsd/ts_103120_Config.xsd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/103120/schema/json/ts_103120_Config.schema.json b/103120/schema/json/ts_103120_Config.schema.json index 88ff0315..216d88ef 100644 --- a/103120/schema/json/ts_103120_Config.schema.json +++ b/103120/schema/json/ts_103120_Config.schema.json @@ -146,7 +146,7 @@ "SupportedLPWorkflowEndpoint": { "type": "object", "properties": { - "config:LIWorkflowEndpoint": { + "config:LPWorkflowEndpoint": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, "config:Guidance": { @@ -157,7 +157,7 @@ } }, "required": [ - "config:LIWorkflowEndpoint", + "config:LPWorkflowEndpoint", "config:URL" ], "additionalProperties": false diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index 5b38ef60..fcf3f479 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -56,7 +56,7 @@ - + -- GitLab From 42217d2a328dd33a6eed080991b26f4ccc5b8a19 Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Thu, 15 May 2025 08:20:23 -0500 Subject: [PATCH 09/15] Removing 2nd dictionary in ee config example to troubleshoot validation error: failed validating with XsdGroup(model='sequence', occurs=[1, 1]) --- 103120/examples/xml/response_ee_config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/103120/examples/xml/response_ee_config.xml b/103120/examples/xml/response_ee_config.xml index a08682fa..8b1105f0 100644 --- a/103120/examples/xml/response_ee_config.xml +++ b/103120/examples/xml/response_ee_config.xml @@ -42,7 +42,7 @@ - + -- GitLab From 04c6cf86bc9f3b5aea15f629055ced0d09ac70a1 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 15 May 2025 15:38:15 +0100 Subject: [PATCH 10/15] Maybe fixing example? --- 103120/examples/xml/response_ee_config.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/103120/examples/xml/response_ee_config.xml b/103120/examples/xml/response_ee_config.xml index 8b1105f0..4ef75354 100644 --- a/103120/examples/xml/response_ee_config.xml +++ b/103120/examples/xml/response_ee_config.xml @@ -172,10 +172,9 @@ https://ts103120.example.com/lp/authorisation/new - - \ No newline at end of file + -- GitLab From 9f22c728371404b91b426f4401fdcad7d1efb5f6 Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Thu, 15 May 2025 11:35:55 -0500 Subject: [PATCH 11/15] Add back SupportedLIWorkflowEndpoints to e-Evidence Config example for completeness --- 103120/examples/xml/response_ee_config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/103120/examples/xml/response_ee_config.xml b/103120/examples/xml/response_ee_config.xml index 4ef75354..b3b0d98c 100644 --- a/103120/examples/xml/response_ee_config.xml +++ b/103120/examples/xml/response_ee_config.xml @@ -161,6 +161,7 @@ + -- GitLab From 1960db2ed053702e54dca78770bb63ee38c936b9 Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Fri, 16 May 2025 17:10:40 -0500 Subject: [PATCH 12/15] Maintain backward compatibility with previous schemas rather than with the specification --- 103120/examples/json/response_config.json | 8 ++--- 103120/examples/xml/response_config.xml | 8 ++--- 103120/examples/xml/response_ee_config.xml | 32 +++++++++---------- .../schema/json/ts_103120_Config.schema.json | 8 ++--- 103120/schema/xsd/ts_103120_Config.xsd | 8 ++--- utils/xml_to_json.py | 10 +++--- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/103120/examples/json/response_config.json b/103120/examples/json/response_config.json index 330c864a..d0f4a1f8 100644 --- a/103120/examples/json/response_config.json +++ b/103120/examples/json/response_config.json @@ -77,8 +77,8 @@ } ] }, - "config:AssociatedLDSubtypes": {}, - "config:AssociatedLPSubtypes": {} + "config:AssociatedLDRequestSubtypes": {}, + "config:AssociatedLPRequestSubtypes": {} }, { "config:FormatName": "PropietaryIdentifier", @@ -98,8 +98,8 @@ } ] }, - "config:AssociatedLDSubtypes": {}, - "config:AssociatedLPSubtypes": {} + "config:AssociatedLDRequestSubtypes": {}, + "config:AssociatedLPRequestSubtypes": {} } ] }, diff --git a/103120/examples/xml/response_config.xml b/103120/examples/xml/response_config.xml index b0c72571..bf99aa57 100644 --- a/103120/examples/xml/response_config.xml +++ b/103120/examples/xml/response_config.xml @@ -62,8 +62,8 @@ ServiceA - - + + PropietaryIdentifier @@ -81,8 +81,8 @@ ServiceB - - + + diff --git a/103120/examples/xml/response_ee_config.xml b/103120/examples/xml/response_ee_config.xml index b3b0d98c..18a9b7f1 100644 --- a/103120/examples/xml/response_ee_config.xml +++ b/103120/examples/xml/response_ee_config.xml @@ -76,34 +76,34 @@ ACTOR02 This targeting configuration defines that the service provider accepts lawful disclosure and lawful preservation requests for the propietary identifier format type described in the TargetFormatTypeDefinitions, associated with Service A for the "Subscriber Data" category only - + ETSI RequestType SubscriberData - - + + ACTOR02 LDRequestSubtype ServiceA - - + + ETSI RequestType SubscriberData - - + + ACTOR02 LPRequestSubtype ServiceA - + @@ -111,7 +111,7 @@ ETSI This targeting configuration defines that the service provider accepts lawful disclosure and lawful preservation requests for a telephone number (as ETSI standard format E164 number) associated with Service A and Service B for the "Traffic Data" and "Content Data" categories - + ETSI RequestType @@ -122,8 +122,8 @@ RequestType StoredContentData - - + + ACTOR02 LDRequestSubtype @@ -134,8 +134,8 @@ LDRequestSubtype ServiceB - - + + ETSI RequestType @@ -146,8 +146,8 @@ RequestType StoredContentData - - + + ACTOR02 LPRequestSubtype @@ -158,7 +158,7 @@ LPRequestSubtype ServiceB - + diff --git a/103120/schema/json/ts_103120_Config.schema.json b/103120/schema/json/ts_103120_Config.schema.json index 216d88ef..36cd7743 100644 --- a/103120/schema/json/ts_103120_Config.schema.json +++ b/103120/schema/json/ts_103120_Config.schema.json @@ -79,16 +79,16 @@ "config:AssociatedLIServiceTypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, - "config:AssociatedLDTypes": { + "config:AssociatedLDRequestTypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, - "config:AssociatedLDSubtypes": { + "config:AssociatedLDRequestSubtypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, - "config:AssociatedLPTypes": { + "config:AssociatedLPRequestTypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" }, - "config:AssociatedLPSubtypes": { + "config:AssociatedLPRequestSubtypes": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntries" } }, diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index fcf3f479..ab9cce80 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -31,10 +31,10 @@ - - - - + + + + diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index 7e4d34ba..becbdfed 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -92,12 +92,12 @@ coerce_to_empty = [ ] coerce_null_to_empty = [ - 'SupportedLIWorkflowEndpoints', + 'SupportedLIWorkflowEndpoints',utils/xml_to_json.py 'SupportedLPWorkflowEndpoints', - 'config:AssociatedLDTypes', - 'config:AssociatedLDSubtypes', - 'config:AssociatedLPTypes', - 'config:AssociatedLPSubtypes', + 'config:AssociatedLDRequestTypes', + 'config:AssociatedLDRequestSubtypes', + 'config:AssociatedLPRequestTypes', + 'config:AssociatedLPRequestSubtypes', 'config:AssociatedLIServiceTypes', ] -- GitLab From f29b01154eaa1a415b4bb15d8b7d8df34e5e79da Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Fri, 16 May 2025 22:58:01 -0500 Subject: [PATCH 13/15] Fix GETCSPCONFIG XML and JSON examples incorrectly mixing ACTOR2 and ACTOR02 --- 103120/examples/json/response_config.json | 2 +- 103120/examples/xml/response_config.xml | 2 +- 103120/examples/xml/response_ee_config.xml | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/103120/examples/json/response_config.json b/103120/examples/json/response_config.json index d0f4a1f8..d38cac70 100644 --- a/103120/examples/json/response_config.json +++ b/103120/examples/json/response_config.json @@ -33,7 +33,7 @@ "Dictionaries": { "dictionaries:Dictionary": [ { - "dictionaries:Owner": "ACTOR2", + "dictionaries:Owner": "ACTOR02", "dictionaries:Name": "LIServiceTypes", "dictionaries:DictionaryEntries": { "dictionaries:DictionaryEntry": [ diff --git a/103120/examples/xml/response_config.xml b/103120/examples/xml/response_config.xml index bf99aa57..bf268b70 100644 --- a/103120/examples/xml/response_config.xml +++ b/103120/examples/xml/response_config.xml @@ -26,7 +26,7 @@ 2024-05-10T08:52:32Z - ACTOR2 + ACTOR02 LIServiceTypes diff --git a/103120/examples/xml/response_ee_config.xml b/103120/examples/xml/response_ee_config.xml index 18a9b7f1..bcb763d6 100644 --- a/103120/examples/xml/response_ee_config.xml +++ b/103120/examples/xml/response_ee_config.xml @@ -4,11 +4,12 @@
XX + ACTOR01 XX - + ACTOR02 da735c3f-3ab9-4e9e-810e-daf84d973505 @@ -26,10 +27,10 @@ 0 2025-04-03T07:25:21Z - + - ACTOR2 + ACTOR02 LDRequestSubtype @@ -42,8 +43,8 @@ - + - + ACTOR02 @@ -68,7 +69,7 @@ - + -- GitLab From 28981e41a9811721e400b5ce04c59ff0131a7fad Mon Sep 17 00:00:00 2001 From: commeau <1379-commeau@users.noreply.forge.etsi.org> Date: Mon, 19 May 2025 12:06:34 -0500 Subject: [PATCH 14/15] Add JSON example of GETCSPCONFIG request-response messages for e-Evidence use case --- 103120/examples/json/request_ee_config.json | 37 ++++ 103120/examples/json/response_ee_config.json | 210 +++++++++++++++++++ utils/xml_to_json.py | 2 +- 3 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 103120/examples/json/request_ee_config.json create mode 100644 103120/examples/json/response_ee_config.json diff --git a/103120/examples/json/request_ee_config.json b/103120/examples/json/request_ee_config.json new file mode 100644 index 00000000..f1363f3e --- /dev/null +++ b/103120/examples/json/request_ee_config.json @@ -0,0 +1,37 @@ +{ + "@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", + "UniqueIdentifier": "ACTOR01" + }, + "ReceiverIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR02" + }, + "TransactionIdentifier": "da735c3f-3ab9-4e9e-810e-daf84d973505", + "Timestamp": "2025-05-14T15:21:00.000000Z", + "Version": { + "ETSIVersion": "V1.18.1", + "NationalProfileOwner": "XX", + "NationalProfileVersion": "v1.0" + } + }, + "Payload": { + "RequestPayload": { + "ActionRequests": { + "ActionRequest": [ + { + "ActionIdentifier": 0, + "GETCSPCONFIG": {} + } + ] + } + } + } + } + \ No newline at end of file diff --git a/103120/examples/json/response_ee_config.json b/103120/examples/json/response_ee_config.json new file mode 100644 index 00000000..3024a39c --- /dev/null +++ b/103120/examples/json/response_ee_config.json @@ -0,0 +1,210 @@ +{ + "@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:config": "http://uri.etsi.org/03120/common/2024/06/Config", + "@xmlns:dictionaries": "http://uri.etsi.org/03280/common/2019/10/Dictionaries", + "Header": { + "SenderIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR01" + }, + "ReceiverIdentifier": { + "CountryCode": "XX", + "UniqueIdentifier": "ACTOR02" + }, + "TransactionIdentifier": "da735c3f-3ab9-4e9e-810e-daf84d973505", + "Timestamp": "2025-05-14T15:21:03.000000Z", + "Version": { + "ETSIVersion": "V1.18.1", + "NationalProfileOwner": "XX", + "NationalProfileVersion": "v1.0" + } + }, + "Payload": { + "ResponsePayload": { + "ActionResponses": { + "ActionResponse": [ + { + "ActionIdentifier": 0, + "GETCSPCONFIGResponse": { + "LastChanged": "2025-04-03T07:25:21Z", + "Dictionaries": { + "dictionaries:Dictionary": [ + { + "dictionaries:Owner": "ACTOR02", + "dictionaries:Name": "LDRequestSubtype", + "dictionaries:DictionaryEntries": { + "dictionaries:DictionaryEntry": [ + { + "dictionaries:Value": "ServiceA", + "dictionaries:Meaning": "Service A allows users to ..." + }, + { + "dictionaries:Value": "ServiceB", + "dictionaries:Meaning": "Service B allows users to ..." + } + ] + } + }, + { + "dictionaries:Owner": "ACTOR02", + "dictionaries:Name": "LPRequestSubtype", + "dictionaries:DictionaryEntries": { + "dictionaries:DictionaryEntry": [ + { + "dictionaries:Value": "ServiceA", + "dictionaries:Meaning": "Service A allows users to ..." + }, + { + "dictionaries:Value": "ServiceB", + "dictionaries:Meaning": "Service B allows users to ..." + } + ] + } + } + ] + }, + "TargetFormatTypeDefinitions": { + "config:FormatOwner": "ACTOR02", + "config:TargetFormatTypeDefinitionEntries": { + "config:TargetFormatTypeDefinitionEntry": [ + { + "config:FormatName": "ProprietaryIdentifier", + "config:Description": "This is an illustration of a proprietary identifier type specific to this CSP, which consists of the string \"CSP\" followed by 10 digits", + "config:FormatRegex": "^CSP[0-9]{10}$" + } + ] + } + }, + "TargetingConfigurations": { + "config:TargetingConfiguration": [ + { + "config:FormatName": "PropietaryIdentifier", + "config:FormatOwner": "ACTOR02", + "config:Guidance": "This targeting configuration defines that the service provider accepts lawful disclosure and lawful preservation requests for the propietary identifier format type described in the TargetFormatTypeDefinitions, associated with Service A for the \"Subscriber Data\" category only", + "config:AssociatedLIServiceTypes": {}, + "config:AssociatedLDRequestTypes": { + "common:DictionaryEntry": [ + { + "common:Owner": "ETSI", + "common:Name": "RequestType", + "common:Value": "SubscriberData" + } + ] + }, + "config:AssociatedLDRequestSubtypes": { + "common:DictionaryEntry": [ + { + "common:Owner": "ACTOR02", + "common:Name": "LDRequestSubtype", + "common:Value": "ServiceA" + } + ] + }, + "config:AssociatedLPRequestTypes": { + "common:DictionaryEntry": [ + { + "common:Owner": "ETSI", + "common:Name": "RequestType", + "common:Value": "SubscriberData" + } + ] + }, + "config:AssociatedLPRequestSubtypes": { + "common:DictionaryEntry": [ + { + "common:Owner": "ACTOR02", + "common:Name": "LPRequestSubtype", + "common:Value": "ServiceA" + } + ] + } + }, + { + "config:FormatName": "InternationalE164", + "config:FormatOwner": "ETSI", + "config:Guidance": "This targeting configuration defines that the service provider accepts lawful disclosure and lawful preservation requests for a telephone number (as ETSI standard format E164 number) associated with Service A and Service B for the \"Traffic Data\" and \"Content Data\" categories", + "config:AssociatedLIServiceTypes": {}, + "config:AssociatedLDRequestTypes": { + "common:DictionaryEntry": [ + { + "common:Owner": "ETSI", + "common:Name": "RequestType", + "common:Value": "TrafficData" + }, + { + "common:Owner": "ETSI", + "common:Name": "RequestType", + "common:Value": "StoredContentData" + } + ] + }, + "config:AssociatedLDRequestSubtypes": { + "common:DictionaryEntry": [ + { + "common:Owner": "ACTOR02", + "common:Name": "LDRequestSubtype", + "common:Value": "ServiceA" + }, + { + "common:Owner": "ACTOR02", + "common:Name": "LDRequestSubtype", + "common:Value": "ServiceB" + } + ] + }, + "config:AssociatedLPRequestTypes": { + "common:DictionaryEntry": [ + { + "common:Owner": "ETSI", + "common:Name": "RequestType", + "common:Value": "TrafficData" + }, + { + "common:Owner": "ETSI", + "common:Name": "RequestType", + "common:Value": "StoredContentData" + } + ] + }, + "config:AssociatedLPRequestSubtypes": { + "common:DictionaryEntry": [ + { + "common:Owner": "ACTOR02", + "common:Name": "LPRequestSubtype", + "common:Value": "ServiceA" + }, + { + "common:Owner": "ACTOR02", + "common:Name": "LPRequestSubtype", + "common:Value": "ServiceB" + } + ] + } + } + ] + }, + "SupportedLIWorkflowEndpoints": {}, + "SupportedLPWorkflowEndpoints": { + "config:SupportedLPWorkflowEndpoint": [ + { + "config:LPWorkflowEndpoint": { + "common:Owner": "ETSI", + "common:Name": "LPWorkflowEndpoint", + "common:Value": "NewAuthorisation" + }, + "config:Guidance": "This tells the LEA what endpoint to use for new warrants. For brevity, in this example, this is the only endpoint specified.", + "config:URL": "https://ts103120.example.com/lp/authorisation/new" + } + ] + } + } + } + ] + } + } + } + } + \ No newline at end of file diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index becbdfed..0fc07d79 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -92,7 +92,7 @@ coerce_to_empty = [ ] coerce_null_to_empty = [ - 'SupportedLIWorkflowEndpoints',utils/xml_to_json.py + 'SupportedLIWorkflowEndpoints', 'SupportedLPWorkflowEndpoints', 'config:AssociatedLDRequestTypes', 'config:AssociatedLDRequestSubtypes', -- GitLab From a9e87b6a1c0525931fbe6223b72a807733462fe2 Mon Sep 17 00:00:00 2001 From: Patrick Hoskins Date: Wed, 4 Jun 2025 08:55:20 +0000 Subject: [PATCH 15/15] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: canterburym --- 103120/schema/xsd/ts_103120_Config.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103120/schema/xsd/ts_103120_Config.xsd b/103120/schema/xsd/ts_103120_Config.xsd index ab9cce80..ea81df33 100644 --- a/103120/schema/xsd/ts_103120_Config.xsd +++ b/103120/schema/xsd/ts_103120_Config.xsd @@ -56,6 +56,7 @@ + -- GitLab