diff --git a/CDT-CSEBase.xsd b/CDT-CSEBase.xsd index 31e55973a65e23c1e6999a874dc5ca255e39492f..acaf4c0b785fd93e7960d66b27878e6c609a35ae 100644 --- a/CDT-CSEBase.xsd +++ b/CDT-CSEBase.xsd @@ -46,6 +46,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-serviceSubscribedAppRule.xsd" /> <xs:include schemaLocation="CDT-role.xsd" /> <xs:include schemaLocation="CDT-token.xsd" /> + <xs:include schemaLocation="CDT-authorizationDecision.xsd" /> + <xs:include schemaLocation="CDT-authorizationPolicy.xsd" /> + <xs:include schemaLocation="CDT-authorizationInformation.xsd" /> <xs:element name="CSEBase" substitutionGroup="m2m:sg_resource"> <xs:complexType> @@ -64,6 +67,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:element> <xs:element name="pointOfAccess" type="m2m:poaList" /> <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> + <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" /> + <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <!-- Child Resources --> @@ -90,6 +95,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:role" /> <xs:element ref="m2m:token" /> <xs:element ref="m2m:sg_flexContainerResource" /> + <xs:element ref="m2m:authorizationDecision" /> + <xs:element ref="m2m:authorizationPolicy" /> + <xs:element ref="m2m:authorizationInformation" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-authorizationDecision.xsd b/CDT-authorizationDecision.xsd new file mode 100644 index 0000000000000000000000000000000000000000..82084b8b5d0d071c00db516dc306173fe1d91d32 --- /dev/null +++ b/CDT-authorizationDecision.xsd @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes.xsd" /> + <xs:include schemaLocation="CDT-subscription.xsd" /> + + <xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announceable Resources --> + <xs:extension base="m2m:regularResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="decision" type="m2m:authorizationDecision" minOccurs="0"/> + <xs:element name="status" type="m2m:authorizationStatus" minOccurs="0"/> + <xs:element name="to" type="xs:anyURI" minOccurs="0" /> + <xs:element name="from" type="m2m:ID" minOccurs="0" /> + <xs:element name="operation" type="m2m:operation" minOccurs="0" /> + <xs:element name="requestedResourceType" type="m2m:resourceType" minOccurs="0" /> + <xs:element name="filterUsage" type="m2m:filterCriteria" minOccurs="0" /> + <xs:element name="roleIDs" minOccurs="0"> + <xs:simpleType> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="m2m:roleID" /> + </xs:simpleType> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="tokenIDs" minOccurs="0"> + <xs:simpleType> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="m2m:tokenID" /> + </xs:simpleType> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="tokens" minOccurs="0"> + <xs:simpleType> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="m2m:dynAuthJWT" /> + </xs:simpleType> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="requestTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="originatorLocation" type="m2m:locationRegion" minOccurs="0" /> + <xs:element name="originatorIP" type="m2m:ipAddress" minOccurs="0" /> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" + maxOccurs="unbounded"/> + <xs:element ref="m2m:subscription" maxOccurs="unbounded"/> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema> + + diff --git a/CDT-authorizationInformation.xsd b/CDT-authorizationInformation.xsd new file mode 100644 index 0000000000000000000000000000000000000000..880e8e59279c17cc340cdfd4b6236a560df62bdf --- /dev/null +++ b/CDT-authorizationInformation.xsd @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes.xsd" /> + <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-role.xsd" /> + <xs:include schemaLocation="CDT-token.xsd" /> + + <xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announceable Resources --> + <xs:extension base="m2m:regularResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="status" type="m2m:authorizationStatus" minOccurs="0"/> + <xs:element name="from" type="m2m:ID" minOccurs="0"/> + <xs:element name="roleIDs" minOccurs="0"> + <xs:simpleType> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="m2m:roleID" /> + </xs:simpleType> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="tokenIDs" minOccurs="0"> + <xs:simpleType> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="m2m:tokenID" /> + </xs:simpleType> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> + <xs:choice minOccurs="1" maxOccurs="unbounded"> + <xs:element ref="m2m:role" /> + <xs:element ref="m2m:token" /> + <xs:element ref="m2m:subscription" /> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema> + + diff --git a/CDT-authorizationPolicy.xsd b/CDT-authorizationPolicy.xsd new file mode 100644 index 0000000000000000000000000000000000000000..b249183d6ae747e2a08b3422a01167e26d0b1e2c --- /dev/null +++ b/CDT-authorizationPolicy.xsd @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes.xsd" /> + <xs:include schemaLocation="CDT-subscription.xsd" /> + + <xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announceable Resources --> + <xs:extension base="m2m:regularResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="policies" type="m2m:setOfPermissions" minOccurs="0"/> + <xs:element name="combiningAlgorithm" type="m2m:acpCombiningAlgorithm" minOccurs="0"/> + <xs:element name="status" type="m2m:authorizationStatus" minOccurs="0" /> + <xs:element name="to" type="xs:anyURI" minOccurs="0" /> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" + maxOccurs="unbounded"/> + <xs:element ref="m2m:subscription" maxOccurs="unbounded"/> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema> + diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd index 2126a60089e10280ec7a19b61f2d4cfb094d13eb..cb2f41a702a686ec95ca3c0bb5cece7cec25504b 100644 --- a/CDT-commonTypes.xsd +++ b/CDT-commonTypes.xsd @@ -1155,7 +1155,19 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:sequence> </xs:complexType> + <xs:complexType name="ipAddress"> + <xs:sequence> + <xs:element name="ipv4Address" type="m2m:ipv4" minOccurs="0" maxOccurs="1"/> + <xs:element name="ipv6Address" type="m2m:ipv6" minOccurs="0" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="setOfPermissions"> + <xs:sequence> + <xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + <!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is defined below --> diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd index f9c174857b2d2a648033be18fec43c3d04f0362c..d21af2983b976a4ac136e60763c39c968b138dbe 100644 --- a/CDT-enumerationTypes.xsd +++ b/CDT-enumerationTypes.xsd @@ -99,7 +99,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- trafficPattern --> <xs:enumeration value="33" /> <!-- dynamicAuthorizationConsultation --> - <xs:enumeration value="34" /> + <xs:enumeration value="34" /> + <!-- authorizationDecision --> + <xs:enumeration value="35" /> + <!-- authorizationPolicy --> + <xs:enumeration value="36" /> + <!-- authorizationInformation --> + <xs:enumeration value="37" /> <!-- accessControlPolicyAnnc --> <xs:enumeration value="10001" /> <!-- AEAnnc --> @@ -261,6 +267,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:restriction base="xs:integer"> <!-- ACCEPTED --> <xs:enumeration value="1000" /> + <!-- ACCEPTED for nonBlockingRequestSynch --> + <xs:enumeration value="1001" /> + <!-- ACCEPTED for nonBlockingRequestAsynch --> + <xs:enumeration value="1002" /> <!-- OK --> <xs:enumeration value="2000" /> <!-- CREATED --> @@ -309,6 +319,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="4115" /> <!-- ESPRIM_IMPERSONATION_ERROR --> <xs:enumeration value="4116" /> + <!-- ORIGINATOR_HAS_ALREADY_REGISTERED --> + <xs:enumeration value="4117" /> <!-- INTERNAL_SERVER_ERROR --> <xs:enumeration value="5000" /> <!-- NOT_IMPLEMENTED --> @@ -457,6 +469,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="33" /> <!-- dynamicAuthorizationConsultation --> <xs:enumeration value="34" /> + <!-- authorizationDecision --> + <xs:enumeration value="35" /> + <!-- authorizationPolicy --> + <xs:enumeration value="36" /> + <!-- authorizationInformation --> + <xs:enumeration value="37" /> <!-- accessControlPolicyAnnc --> <xs:enumeration value="10001" /> <!-- AEAnnc --> @@ -1230,7 +1248,45 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> + <xs:simpleType name="authorizationDecision"> + <xs:annotation> + <xs:documentation>Used for the decision attribute of the of authorizationDecision resource</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- PERMIT --> + <xs:enumeration value="1" /> + <!-- DENY --> + <xs:enumeration value="2" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="authorizationStatus"> + <xs:annotation> + <xs:documentation>Used for status attribute of authorizationDecision resource</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- PERMIT --> + <xs:enumeration value="1" /> + <!-- NOT_APPLICABLE --> + <xs:enumeration value="2" /> + <!-- MISSING_ATTRIBUTE --> + <xs:enumeration value="3" /> + <!-- SYNTAX_ERROR --> + <xs:enumeration value="4" /> + <!-- PROCESSING_ERROR --> + <xs:enumeration value="5" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="acpCombiningAlgorithm"> + <xs:annotation> + <xs:documentation>Used for combiningAlgorithm attribute of authorizationPolicy resource</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- PERMIT_OVERRIDES --> + <xs:enumeration value="1" /> + </xs:restriction> + </xs:simpleType> + </xs:schema> diff --git a/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd index 7c730d8d87e41fb03b153fd5ab42af7273f7d5bc..c6f2e9d01dbef502ae85da875ba4244eda7ce4d5 100644 --- a/CDT-remoteCSE.xsd +++ b/CDT-remoteCSE.xsd @@ -53,8 +53,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" /> <xs:element name="requestReachability" type="xs:boolean" /> <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> - <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <xs:element name="triggerReferenceNumber" type="xs:unsignedInt" minOccurs="0" /> + <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> + <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" /> <!-- Child Resources --> @@ -98,6 +99,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="CSE-ID" type="m2m:ID" minOccurs="0" /> <xs:element name="requestReachability" type="xs:boolean" minOccurs="0" /> <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> + <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" /> diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd index 714f8cd01ead3ffe662e3f1ce8c34df4ec4a4182..9b2a90c38a0b12b5de58b3b3ecc0e7c2a31818dc 100644 --- a/CDT-responsePrimitive.xsd +++ b/CDT-responsePrimitive.xsd @@ -153,8 +153,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:complexType> <xs:complexType name="listOfChildResourceRef"> - <xs:sequence> - <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="0" maxOccurs="unbounded" /> + <xs:sequence> + <xs:element name="resourceRef" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType>