Commit 7d4b4996 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'meeting/LI73' into 'main'

Output of LI#73

See merge request !321
parents 344e85fd 98ad726d
Loading
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
temp.asn

# Editors
.vscode/
.idea/
+64 −7
Original line number Diff line number Diff line
LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version42(42)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version43(43)}

DEFINITIONS IMPLICIT TAGS ::=

@@ -9,11 +9,13 @@ IMPORTS
    -- Any of the IMPORTs may be commented out if they are not used (see clause A.3)

    -- from ETSI TS 103 280 [44]
    GNSSLocation,
    LIID,
    WGS84CoordinateDecimal,
    GNSSLocation
    LongString,
    ShortString,
    WGS84CoordinateDecimal
        FROM Common-Parameters
        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version271(271)}
        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version281(281)}

    -- previously from ETSI TS 101 671 [4]; now provided with this specification
    IRI-Parameters,
@@ -207,7 +209,7 @@ IMPORTS

lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}

li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version42(42)}
li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version43(43)}

-- ====================
-- Top-level definition
@@ -269,7 +271,8 @@ TimeStampQualifier ::= ENUMERATED
HI4Payload ::= CHOICE
{
    threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload,
    ...
    ...,
    hi4Notification          [2] HI4Notification
}

-- ====================================
@@ -478,7 +481,6 @@ GcseIRI ::= CHOICE
    ...
}


-- ===========================
-- Definitions for TRI Payload
-- ===========================
@@ -671,6 +673,61 @@ EncryptedPayloadType ::= ENUMERATED
        -- encrypted payload is ETSI TS 102 232-1 (the present document)
}

-- =================================
-- Definitions for HI4 notifications
-- =================================

HI4Notification ::= CHOICE
{
    liActivated                 [1] HI4LINotification,
    liDeactivated               [2] HI4LINotification,
    liModified                  [3] HI4LINotification,
    ...
}

HI4LINotification ::= SEQUENCE
{
    activationTime              [1] GeneralizedTime OPTIONAL,
    deactivationTime            [2] GeneralizedTime OPTIONAL,
    targetIdentifiers           [3] SEQUENCE OF TargetIdentifier OPTIONAL,
    serviceType                 [4] DictionaryEntry OPTIONAL,
    targetIdentifierSubtype     [5] DictionaryEntry OPTIONAL,
    interceptType               [6] InterceptType OPTIONAL,
    ownerIdentifier             [7] Common-Parameters.ShortString OPTIONAL,
    authorizationReference      [8] Common-Parameters.LongString OPTIONAL,
    ...
}

TargetIdentifier ::= CHOICE
{
    targetIdentifierFormat      [1] TargetIdentifierFormat,
    ...
}

TargetIdentifierFormat ::= SEQUENCE
{
    formatOwner                 [1] Common-Parameters.ShortString,
    formatName                  [2] Common-Parameters.ShortString,
    targetValue                 [3] Common-Parameters.LongString,
    ...
}

InterceptType ::= ENUMERATED
{
    iriAndCc(1),
    iriOnly(2),
    ccOnly(3),
    ...
}

DictionaryEntry ::= SEQUENCE
{
    owner                       [1] Common-Parameters.ShortString,
    name                        [2] Common-Parameters.ShortString,
    value                       [3] Common-Parameters.ShortString,
    ...
}

-- ===================================
-- Common Parameters
-- ===================================
+112 −0
Original line number Diff line number Diff line
{
  "@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",
  "@xmlns:dest": "http://uri.etsi.org/03120/common/2026/07/Destination",
  "Header": {
    "SenderIdentifier": {
      "CountryCode": "XX",
      "UniqueIdentifier": "ACTOR01"
    },
    "ReceiverIdentifier": {
      "CountryCode": "XX",
      "UniqueIdentifier": "ACTOR02"
    },
    "TransactionIdentifier": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e",
    "Timestamp": "2019-09-30T13:37:00.000000Z",
    "Version": {
      "ETSIVersion": "V1.13.1",
      "NationalProfileOwner": "XX",
      "NationalProfileVersion": "v1.0"
    }
  },
  "Payload": {
    "RequestPayload": {
      "ActionRequests": {
        "ActionRequest": [
          {
            "ActionIdentifier": 0,
            "CREATE": {
              "HI1Object": {
                "@xsi:type": "{http://uri.etsi.org/03120/common/2026/07/Destination}LDDestinationObject",
                "ObjectIdentifier": "2d1ac880-8750-4d3c-abe7-ea4a17646043",
                "CountryCode": "XX",
                "OwnerIdentifier": "ACTOR01",
                "dest:DeliveryAddress": {
                  "task:IPv4Address": "192.0.2.0"
                },
                "dest:FriendlyName": "TestLDDestination"
              }
            }
          },
          {
            "ActionIdentifier": 1,
            "CREATE": {
              "HI1Object": {
                "@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject",
                "ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045",
                "CountryCode": "XX",
                "OwnerIdentifier": "ACTOR01",
                "auth:AuthorisationReference": "W000001",
                "auth:AuthorisationTimespan": {
                  "auth:StartTime": "2019-09-30T12:00:00Z",
                  "auth:EndTime": "2019-12-01T12:00:00Z"
                }
              }
            }
          },
          {
            "ActionIdentifier": 2,
            "CREATE": {
              "HI1Object": {
                "@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Task}LDTaskObject",
                "ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36",
                "CountryCode": "XX",
                "OwnerIdentifier": "ACTOR01",
                "AssociatedObjects": {
                  "AssociatedObject": [
                    "7dbbc880-8750-4d3c-abe7-ea4a17646045"
                  ]
                },
                "task:Reference": "XX-ACTOR01-1234",
                "task:RequestDetails": {
                  "task:Type": {
                    "common:Owner": "ETSI",
                    "common:Name": "RequestType",
                    "common:Value": "SubscriberData"
                  },
                  "task:StartTime": "2019-09-30T12:00:00Z",
                  "task:EndTime": "2019-12-30T12:00:00Z",
                  "task:RequestValues": {
                    "task:RequestValue": [
                      {
                        "task:FormatType": {
                          "task:FormatOwner": "ETSI",
                          "task:FormatName": "InternationalE164"
                        },
                        "task:Value": "442079460223"
                      }
                    ]
                  }
                },
                "task:DeliveryDetails": {
                  "task:LDDeliveryDestination": [
                    {
                      "task:DestinationReference": "2d1ac880-8750-4d3c-abe7-ea4a17646043"
                    }
                  ]
                },
                "task:CSPID": {
                  "CountryCode": "XX",
                  "UniqueIdentifier": "ACTOR02"
                }
              }
            }
          }
        ]
      }
    }
  }
}
+120 −0
Original line number Diff line number Diff line
{
  "@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",
  "@xmlns:dest": "http://uri.etsi.org/03120/common/2026/07/Destination",
  "Header": {
    "SenderIdentifier": {
      "CountryCode": "XX",
      "UniqueIdentifier": "ACTOR01"
    },
    "ReceiverIdentifier": {
      "CountryCode": "XX",
      "UniqueIdentifier": "ACTOR02"
    },
    "TransactionIdentifier": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e",
    "Timestamp": "2015-09-01T12:00:00.000000Z",
    "Version": {
      "ETSIVersion": "V1.13.1",
      "NationalProfileOwner": "XX",
      "NationalProfileVersion": "v1.0"
    }
  },
  "Payload": {
    "RequestPayload": {
      "ActionRequests": {
        "ActionRequest": [
          {
            "ActionIdentifier": 0,
            "CREATE": {
              "HI1Object": {
                "@xsi:type": "{http://uri.etsi.org/03120/common/2026/07/Destination}LIDestinationObject",
                "ObjectIdentifier": "2daac880-8750-4d3c-abe7-ea4a17646043",
                "CountryCode": "XX",
                "OwnerIdentifier": "ACTOR01",
                "dest:DeliveryAddress": {
                  "task:IPv4Address": "192.0.2.0"
                },
                "dest:FriendlyName": "TestLIDestination"
              }
            }
          },
          {
            "ActionIdentifier": 1,
            "CREATE": {
              "HI1Object": {
                "@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject",
                "ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045",
                "CountryCode": "XX",
                "OwnerIdentifier": "ACTOR01",
                "auth:AuthorisationReference": "W000001",
                "auth:AuthorisationTimespan": {
                  "auth:StartTime": "2015-09-01T12:00:00Z",
                  "auth:EndTime": "2015-12-01T12:00:00Z"
                }
              }
            }
          },
          {
            "ActionIdentifier": 2,
            "CREATE": {
              "HI1Object": {
                "@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject",
                "ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36",
                "CountryCode": "XX",
                "OwnerIdentifier": "ACTOR01",
                "AssociatedObjects": {
                  "AssociatedObject": [
                    "7dbbc880-8750-4d3c-abe7-ea4a17646045"
                  ]
                },
                "task:Reference": "LIID1",
                "task:TargetIdentifier": {
                  "task:TargetIdentifierValues": {
                    "task:TargetIdentifierValue": [
                      {
                        "task:FormatType": {
                          "task:FormatOwner": "ETSI",
                          "task:FormatName": "InternationalE164"
                        },
                        "task:Value": "442079460223"
                      }
                    ]
                  },
                  "task:ServiceType": {
                    "common:Owner": "ETSI",
                    "common:Name": "TaskServiceType",
                    "common:Value": "DataType1"
                  },
                  "task:TargetIdentifierSubtype": {
                    "common:Owner": "CSP01",
                    "common:Name": "TargetIdentifierSubtype",
                    "common:Value": "AccountType1"
                  }
                },
                "task:DeliveryType": {
                  "common:Owner": "ETSI",
                  "common:Name": "TaskDeliveryType",
                  "common:Value": "IRIandCC"
                },
                "task:DeliveryDetails": {
                  "task:DeliveryDestination": [
                    {
                      "task:DestinationReference": "2daac880-8750-4d3c-abe7-ea4a17646043"
                    }
                  ]
                },
                "task:CSPID": {
                  "CountryCode": "XX",
                  "UniqueIdentifier": "RECVER01"
                }
              }
            }
          }
        ]
      }
    }
  }
}
+52 −0
Original line number Diff line number Diff line
{
  "@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": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e",
    "Timestamp": "2015-09-01T12:00:01.000000Z",
    "Version": {
      "ETSIVersion": "V1.13.1",
      "NationalProfileOwner": "XX",
      "NationalProfileVersion": "v1.0"
    }
  },
  "Payload": {
    "ResponsePayload": {
      "ActionResponses": {
        "ActionResponse": [
          {
            "ActionIdentifier": 0,
            "CREATEResponse": {
              "Identifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045"
            }
          },
          {
            "ActionIdentifier": 1,
            "CREATEResponse": {
              "Identifier": "2b36a78b-b628-416d-bd22-404e68a0cd36"
            }
          }
        ]
      }
    }
  },
  "Signatures": [
    {
      "hash_algorithm": "sha-256",
      "algorithm": "Ed25519",
      "public_key": "MCowBQYDK2VwAyEAubMonBfU9pvIbj5RCiWQLD45Jvu6mKr+kQXjvjW8ZkU",
      "value": "B6vWORSsHlPfyHOvqEhnyH0vEVI90gfZADeP7uLQPOrYfDKMIZKopcnag9hZH0IrAZhgz5awTgt6AUfRX/fCCA=="
    }
  ]
}
Loading