Commit 8b5f9978 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'main' into draft/104196

parents 46a73241 c5367509

102232-1/LI-PS-PDU.asn

+7 −6
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) version41(41)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version42(42)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -10,10 +10,10 @@ IMPORTS 


    -- from ETSI TS 103 280 [44]

    LIID,

    WGS84CoordinateDecimal

    WGS84CoordinateDecimal,

    GNSSLocation

        FROM Common-Parameters

        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version261(261)}



        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version271(271)}



    -- previously from ETSI TS 101 671 [4]; now provided with this specification

    IRI-Parameters,
@@ -207,7 +207,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) version41(41)}

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



-- ====================

-- Top-level definition
@@ -697,7 +697,8 @@ WlanLocationAttributes ::= SEQUENCE 
CPEProvidedLocationAttributes ::= SEQUENCE

{

    wGS84CoordinateDecimal  [0] Common-Parameters.WGS84CoordinateDecimal OPTIONAL,

    ...

    ...,

    gNSSLocation            [1] Common-Parameters.GNSSLocation OPTIONAL

}



IPAddress ::= SEQUENCE

103120/README.md

+13 −7
Original line number Diff line number Diff line 




# TS 103 120 v1.22.1

TS 103 120 v1.22.1 agreed at LI#71 (Sophia Antipolis, FR), tagged as [spec/103120/1.22.1](https://forge.etsi.org/rep/li/schemas-definitions/-/tree/spec/103120/1.22.1/103120?ref_type=tags) and available [from the ETSI portal as a PDF](https://www.etsi.org/deliver/etsi_ts/103100_103199/103120/01.22.01_60/ts_103120v012201p.pdf)

.  

  

Includes the following CRs with Forge changes:

* TS 103120 CR121 - Takedowns ([MR 294](https://forge.etsi.org/rep/li/schemas-definitions/-/merge_requests/294)).

* TS 103 120 CR 119 - Selective IRI Delivery Policies ([MR 288](https://forge.etsi.org/rep/li/schemas-definitions/-/merge_requests/288)).

* TS 103 120 CR118 - Supporting encryption of outcome data ([MR 281](https://forge.etsi.org/rep/li/schemas-definitions/-/merge_requests/281)).



  

For all changes, including non-Forge changes, see the change history in the published specification.  





# TS 103 120 v1.21.1

TS 103 120 v1.21.1 agreed at LI#70 (New York, US), tagged as [spec/103120/1.21.1](https://forge.etsi.org/rep/li/schemas-definitions/-/tree/spec/103120/1.21.1/103120?ref_type=tags) and available [from the ETSI portal as a PDF](https://www.etsi.org/deliver/etsi_ts/103100_103199/103120/01.21.01_60/ts_103120v012101p.pdf)

.
@@ -200,13 +213,6 @@ TS 103 120 v1.6.1 (2020-08-06) agreed at LI#54-e, tagged as [spec/103120/1.6.1]( 
No MR information in the Forge.





# TS 103 120 v1.6.1

TS 103 120 v1.6.1 (2020-08-06) agreed at LI#54-e, tagged as [spec/103120/1.6.1](https://forge.etsi.org/rep/li/schemas-definitions/-/tree/spec/103120/1.6.1/103120?ref_type=tags) and available [from the ETSI portal as a PDF](https://www.etsi.org/deliver/etsi_ts/103100_103199/103120/01.06.01_60/ts_103120v010601p.pdf)

.  

  

No MR information in the Forge.





# TS 103 120 v1.5.1

TS 103 120 v1.5.1 (2020-03-20) agreed at LI#53 (Sophia-Antipolis, 2020-02-04), tagged as [spec/103120/1.5.1](https://forge.etsi.org/rep/li/schemas-definitions/-/tree/spec/103120/1.5.1/103120?ref_type=tags) and available [from the ETSI portal as a PDF](https://www.etsi.org/deliver/etsi_ts/103100_103199/103120/01.05.01_60/ts_103120v010501p.pdf)

.

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+75 −0
Original line number Diff line number Diff line
@@ -328,6 +328,10 @@ 
                <Value>Warrant</Value>

                <Meaning>This Document represents a legal warrant</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>TakedownRefinement</Value>

                <Meaning>This Document provides additional information required to fully identify the material subject to a Takedown request (see clause 8).</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>
@@ -870,4 +874,75 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

        <!--NFType: see Clause 7.8.2.2.2 Table 7.30 -->

        <Owner>ETSI</Owner>

        <Name>NFType</Name>

        <DictionaryEntries/>

        <!--No definition so far -->

    </Dictionary>

    <Dictionary>

        <!--IRIEvents: see Clause 7.8.2.3.3 Table 7.32 -->

        <Owner>ETSI</Owner>

        <Name>IRIEvents</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>All</Value>

                <Meaning>All IRI Events</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

        <!--IRIAction: see Clause 7.8.3 Table 7.34-->

        <Owner>ETSI</Owner>

        <Name>IRIAction</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>NotDelivered</Value>

                <Meaning>IRI that matches this policy is not delivered</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Delivered</Value>

                <Meaning>IRI that matches the policy is delivered</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

        <!--IRIAction: see Table 8.33-->

        <Owner>ETSI</Owner>

        <Name>TDTaskStatus</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>Pending</Value>

                <Meaning>The Task has been acknowledged by the provider but has not yet been handled.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Resolved</Value>

                <Meaning>The Task has been processed and appropriate actions have been taken (e.g. the relevant material has been taken down). If not all the requested material was taken down, the Explanation field should be populated (e.g. this could include the situation that material was only taken down in certain geographical areas). </Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Rejected</Value>

                <Meaning>The Task has been denied or rejected by the CSP. The provider shall, where appropriate, give an explanation about why this was done.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Error</Value>

                <Meaning>The Task has not been processed as it is technically not compliant with the present document.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

        <!--IRIAction: see Table 8.33-->

        <Owner>ETSI</Owner>

        <Name>TDTaskDesiredStatus</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>Pending</Value>

                <Meaning>The Task has been acknowledged by the provider but has not yet been handled.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Cancelled</Value>

                <Meaning>The Task has not been processed as it is technically not compliant with the present document.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

</Dictionaries>

103120/examples/xml/request_takedown.xml

0 → 100644
+142 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<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" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document">

    <Header>

        <SenderIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR01</UniqueIdentifier>

        </SenderIdentifier>

        <ReceiverIdentifier>

            <CountryCode>XX</CountryCode>

            <UniqueIdentifier>ACTOR02</UniqueIdentifier>

        </ReceiverIdentifier>

        <TransactionIdentifier>9410d520-17c0-4a98-b081-dd2a3c771619</TransactionIdentifier>

        <Timestamp>2026-01-19T12:00:00.000000Z</Timestamp>

        <Version>

            <ETSIVersion>V1.22.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>136b255e-fc86-4727-932f-878cb5b7cd27</ObjectIdentifier>

                            <CountryCode>XX</CountryCode>

                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <auth:AuthorisationDesiredStatus>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>AuthorisationDesiredStatus</common:Name>

                                <common:Value>SubmittedToCSP</common:Value>

                            </auth:AuthorisationDesiredStatus>

                            <auth:AuthorisationCSPID>

                                <auth:CSPID>

                                    <CountryCode>XX</CountryCode>

                                    <UniqueIdentifier>ACTOR02</UniqueIdentifier>

                                </auth:CSPID>

                            </auth:AuthorisationCSPID>

                            <auth:AuthorisationServedTimestamp>2026-01-19T12:00:00Z</auth:AuthorisationServedTimestamp>

                            <auth:AuthorisationApprovalDetails>

                                <common:ApproverDetails>

                                    <common:ApproverName>Name of person submitting the request</common:ApproverName>

                                    <common:ApproverContactDetails>

                                        <common:ApproverEmailAddress>actor01@example.com</common:ApproverEmailAddress>

                                        <common:ApproverPhoneNumber>442079460223</common:ApproverPhoneNumber>

                                    </common:ApproverContactDetails>

                                </common:ApproverDetails>

                            </auth:AuthorisationApprovalDetails>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>1</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="task:TDTaskObject">

                            <ObjectIdentifier>29939969-292d-4e9f-be5e-b74bcd7764fb</ObjectIdentifier>

                            <CountryCode>XX</CountryCode>

                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <AssociatedObjects>

                                <AssociatedObject>136b255e-fc86-4727-932f-878cb5b7cd27</AssociatedObject>

                            </AssociatedObjects>

                            <task:RequesterReference>Requester-assigned reference</task:RequesterReference>

                            <task:DesiredStatus>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>TDTaskDesiredStatus</common:Name>

                                <common:Value>Pending</common:Value>

                            </task:DesiredStatus>

                            <task:RequestDetails>

                                <task:RequestValues>

                                    <task:RequestValue>

                                        <task:FormatType>

                                            <task:FormatOwner>ETSI</task:FormatOwner>

                                            <task:FormatName>EmailAddress</task:FormatName>

                                        </task:FormatType>

                                        <task:Value>user@example.com</task:Value>

                                    </task:RequestValue>

                                </task:RequestValues>

                                <task:RequestValueRefinement>Further details refining the data related to the given RequestValues which is requested to be taken down</task:RequestValueRefinement>

                                <task:ObservedTimes>

                                    <task:ObservedTime>2025-12-01T12:00:00Z</task:ObservedTime>

                                    <task:ObservedTime>2025-12-02T12:00:00Z</task:ObservedTime>

                                    <task:ObservedTime>2025-12-03T12:00:00Z</task:ObservedTime>

                                </task:ObservedTimes>

                            </task:RequestDetails>

                            <task:CSPID>

                                <CountryCode>XX</CountryCode>

                                <UniqueIdentifier>ACTOR02</UniqueIdentifier>

                            </task:CSPID>

                            <task:Deadlines>

                                <task:TakedownDeadline>

                                    <task:DateTime>2026-02-01:12:00:00Z</task:DateTime>

                                    <task:NatureOfDeadline>

                                        <common:Owner>ETSI</common:Owner>

                                        <common:Name>TDNatureOfDeadline</common:Name>

                                        <common:Value>Example value</common:Value>

                                    </task:NatureOfDeadline>

                                    <task:OtherInformation>Any other human-readable information related to the deadline</task:OtherInformation>

                                </task:TakedownDeadline>

                            </task:Deadlines>

                            <task:AlternativeDisclosureReferences>

                                <task:AlternativeDisclosureReference>

                                    <task:ReferenceValue>Alternative disclosure reference</task:ReferenceValue>

                                    <task:NatureOfReference>

                                        <common:Owner>Pre-agreed owner</common:Owner>

                                        <common:Name>Pre-agreed dictionary</common:Name>

                                        <common:Value>Pre-agreed value</common:Value>

                                    </task:NatureOfReference>

                                </task:AlternativeDisclosureReference>

                            </task:AlternativeDisclosureReferences>

                            <task:ManualInformation>Any other human-readable information associated with the take-down</task:ManualInformation>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>2</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="doc:DocumentObject">

                            <ObjectIdentifier>eb229e4e-e80c-4b4a-9d82-a4bb1cdffa9a</ObjectIdentifier>

                            <CountryCode>XX</CountryCode>

                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <AssociatedObjects>

                                <AssociatedObject>136b255e-fc86-4727-932f-878cb5b7cd27</AssociatedObject>

                            </AssociatedObjects>

                            <doc:DocumentName>Document name chosen by the requester</doc:DocumentName>

                            <doc:DocumentType>

                                <common:Owner>ETSI</common:Owner>

                                <common:Name>DocumentType</common:Name>

                                <common:Value>TakedownRefinement</common:Value>

                            </doc:DocumentType>

                            <doc:DocumentBody>

                                <doc:Contents>VGhpcyBpcyBub3QgYW4gaW1hZ2UgDQo=</doc:Contents>

                                <doc:ContentType>image/jpeg</doc:ContentType>

                            </doc:DocumentBody>

                        </HI1Object>

                    </CREATE>

                </ActionRequest>

            </ActionRequests>

        </RequestPayload>

    </Payload>

</HI1Message>

103120/schema/json/ts_103120_Delivery.schema.json

+16 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ 
        },

        "delivery:DeliveryDesiredStatus": {

          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"

        },

        "delivery:EncryptionDetails": {

          "$ref": "#/$defs/DeliveryEncryptionDetails"

        }

      },

      "required": [
@@ -302,6 +305,19 @@ 
        "delivery:URL"

      ],

      "additionalProperties": false

    },

    "DeliveryEncryptionDetails": {

      "type": "object",

      "properties": {

        "delivery:EncryptionReference": {

          "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier"

        },

        "delivery:AdditionalInformation": {

          "$ref": "ts_103280_2017_07#/$defs/LongString"

        }

      },

      "required": [],

      "additionalProperties": false

    }

  }

}