patch#1 : 1. Update dat/json files.
2. Fix json2cbor tool about CRED
patch#2 : Rebase to resolve conflict, minor fix
patch#3 : Resolve SVACE issue, check return value
Change-Id: Ibcaa8f2d0588924e42ab8985dac7b15a82579c8c
Signed-off-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6301
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
-{
- "acl": [
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/res",
- "/oic/d",
- "/oic/p",
- "/oic/res/types/d",
- "/oic/ad",
- "/oic/sec/amacl"
- ],
- "perms": 2,
- "ownrs" : ["YWRtaW5EZXZpY2VVVUlEMA=="]
- },
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/sec/doxm",
- "/oic/sec/pstat"
- ],
- "perms": 2,
- "ownrs" : ["YWRtaW5EZXZpY2VVVUlEMA=="]
- }
- ],
- "pstat": {
- "isop": true,
- "deviceid": "YWRtaW5EZXZpY2VVVUlEMA==",
- "ch": 0,
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3]
- },
- "doxm": {
- "oxm": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "deviceid": "YWRtaW5EZXZpY2VVVUlEMA==",
- "ownr": "YWRtaW5EZXZpY2VVVUlEMA=="
- }
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "61646d69-6e44-6576-6963-655555494430"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "rowneruuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "devowneruuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "rowneruuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "dpc": false\r
+ }\r
+}
\ No newline at end of file
-{
- "acl": [
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/res",
- "/oic/d",
- "/oic/p",
- "/oic/res/types/d",
- "/oic/ad",
- "/oic/sec/acl"
- ],
- "perms": 2,
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- },
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/sec/doxm",
- "/oic/sec/pstat"
- ],
- "perms": 2,
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }
- ],
- "pstat": {
- "isop": true,
- "deviceid": "ZGV2aWNlaWQAAAAAABhanw==",
- "ch": 0,
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3]
- },
- "doxm": {
- "oxm": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "deviceid": "MjIyMjIyMjIyMjIyMjIyMg==",
- "ownr": "MjIyMjIyMjIyMjIyMjIyMg=="
- },
- "cred": [{
- "credid": 1,
- "sub": "MTExMTExMTExMTExMTExMQ==",
- "credtyp": 1,
- "pvdata": "QUFBQUFBQUFBQUFBQUFBQQ==",
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }]
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "32323232-3232-3232-3232-323232323232"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
+ "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "dpc": false\r
+ },\r
+ "cred": {\r
+ "creds": [\r
+ {\r
+ "credid": 1,\r
+ "subjectuuid": "31313131-3131-3131-3131-313131313131",\r
+ "credtype": 1,\r
+ "privatedata": {\r
+ "data": "AAAAAAAAAAAAAAAA",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ }\r
+ ],\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
+ }\r
+}
\ No newline at end of file
-{
- "acl": [
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/res",
- "/oic/d",
- "/oic/p",
- "/oic/res/types/d",
- "/oic/ad",
- "/oic/sec/acl"
- ],
- "perms": 2,
- "ownrs" : ["MTExMTExMTExMTExMTExMQ=="]
- },
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/sec/doxm",
- "/oic/sec/pstat"
- ],
- "perms": 2,
- "ownrs" : ["MTExMTExMTExMTExMTExMQ=="]
- },
- {
- "sub": "Kg==",
- "rsrc": ["/light0", "/light1", "/a/light"],
- "perms": 6,
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }
- ],
- "pstat": {
- "isop": true,
- "deviceid": "ZGV2aWNlaWQAAAAAABhanw==",
- "ch": 0,
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3]
- },
- "doxm": {
- "oxm": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "deviceid": "MTExMTExMTExMTExMTExMQ==",
- "ownr": "MjIyMjIyMjIyMjIyMjIyMg=="
- },
- "cred": [{
- "credid": 1,
- "sub": "MjIyMjIyMjIyMjIyMjIyMg==",
- "credtyp": 1,
- "pvdata": "QUFBQUFBQUFBQUFBQUFBQQ==",
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }]
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/a/light",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/a/light0",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/a/light1",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 6\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "31313131-3131-3131-3131-313131313131"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
+ "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
+ "dpc": false\r
+ },\r
+ "cred": {\r
+ "creds": [\r
+ {\r
+ "credid": 1,\r
+ "subjectuuid": "32323232-3232-3232-3232-323232323232",\r
+ "credtype": 1,\r
+ "privatedata": {\r
+ "data": "AAAAAAAAAAAAAAAA",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ }\r
+ ],\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131"\r
+ }\r
+}\r
+\r
-{
- "acl": {
- "aclist":{
- "aces":[
- {
- "subjectuuid": "*",
- "resources": [
- {
- "href": "/oic/res",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/res/d",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/res/types/d",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/presence",
- "rt": "",
- "if": ""
- }
- ],
- "permission": 2
- },
- {
- "subjectuuid": "*",
- "resources": [
- {
- "href": "/oic/sec/doxm",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/pstat",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/acl",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/crl",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/cred",
- "rt": "",
- "if": ""
- }
- ],
- "permission": 6
- }
- ]
- },
- "rowneruuid" : "646F6F72-4465-7669-6365-555549443030"
- },
- "pstat": {
- "isop": false,
- "deviceuuid": "646F6F72-4465-7669-6365-555549443030",
- "rowneruuid": "646F6F72-4465-7669-6365-555549443030",
- "cm": 2,
- "tm": 0,
- "om": 3,
- "sm": 3
- },
- "doxm": {
- "oxms": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": false,
- "didformat": 0,
- "dpc": false,
- "deviceuuid": "646F6F72-4465-7669-6365-555549443030",
- "rowneruuid": "646F6F72-4465-7669-6365-555549443030"
- }
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/presence",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/crl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/cred",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 6\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "646F6F72-4465-7669-6365-555549443030"\r
+ },\r
+ "pstat": {\r
+ "isop": false,\r
+ "deviceuuid": "646F6F72-4465-7669-6365-555549443030",\r
+ "rowneruuid": "646F6F72-4465-7669-6365-555549443030",\r
+ "cm": 2,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": false,\r
+ "deviceuuid": "646F6F72-4465-7669-6365-555549443030",\r
+ "rowneruuid": "646F6F72-4465-7669-6365-555549443030",\r
+ "dpc": false\r
+ }\r
}
-{
- "acl": {
- "aclist":{
- "aces":[
- {
- "subjectuuid": "*",
- "resources": [
- {
- "href": "/oic/res",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/res/d",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/res/types/d",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/presence",
- "rt": "",
- "if": ""
- }
- ],
- "permission": 2
- },
- {
- "subjectuuid": "*",
- "resources": [
- {
- "href": "/oic/sec/doxm",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/pstat",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/acl",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/crl",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/cred",
- "rt": "",
- "if": ""
- }
- ],
- "permission": 6
- }
- ]
- },
- "rowneruuid" : "6C696768-7444-6576-6963-655555494430"
- },
- "pstat": {
- "isop": false,
- "deviceuuid": "6C696768-7444-6576-6963-655555494430",
- "rowneruuid": "6C696768-7444-6576-6963-655555494430",
- "cm": 2,
- "tm": 0,
- "om": 3,
- "sm": 3
- },
- "doxm": {
- "oxms": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": false,
- "dpc": false,
- "didformat": 0,
- "deviceuuid": "6C696768-7444-6576-6963-655555494430",
- "rowneruuid": "6C696768-7444-6576-6963-655555494430"
- }
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/presence",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/crl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/cred",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 6\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "6C696768-7444-6576-6963-655555494430"\r
+ },\r
+ "pstat": {\r
+ "isop": false,\r
+ "deviceuuid": "6C696768-7444-6576-6963-655555494430",\r
+ "rowneruuid": "6C696768-7444-6576-6963-655555494430",\r
+ "cm": 2,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": false,\r
+ "deviceuuid": "6C696768-7444-6576-6963-655555494430",\r
+ "rowneruuid": "6C696768-7444-6576-6963-655555494430",\r
+ "dpc": false\r
+ }\r
}
-{
- "acl": {
- "aclist":{
- "aces":[
- {
- "subjectuuid": "*",
- "resources": [
- {
- "href": "/oic/res",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/d",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/p",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/res/types/d",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/ad",
- "rt": "",
- "if": ""
- }
- ],
- "permission": 2
- },
- {
- "subjectuuid": "*",
- "resources": [
- {
- "href": "/oic/sec/doxm",
- "rt": "",
- "if": ""
- } ,
- {
- "href": "/oic/sec/pstat",
- "rt": "",
- "if": ""
- }
- ],
- "permission": 2
- }
- ]
- },
- "rowneruuid" : "61646D69-6E44-6576-6963-655555494430"
- },
- "pstat": {
- "isop": true,
- "cm": 2,
- "tm": 0,
- "om": 3,
- "sm": 3,
- "deviceuuid": "61646D69-6E44-6576-6963-655575696430",
- "rowneruuid": "61646D69-6E44-6576-6963-655575696430"
- },
- "doxm": {
- "oxms": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "deviceuuid": "61646D69-6E44-6576-6963-655575696430",
- "dpc": false,
- "devowneruuid": "61646D69-6E44-6576-6963-655575696430",
- "rowneruuid": "61646D69-6E44-6576-6963-655575696430"
- }
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "61646D69-6E44-6576-6963-655555494430"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "61646D69-6E44-6576-6963-655575696430",\r
+ "rowneruuid": "61646D69-6E44-6576-6963-655575696430",\r
+ "cm": 2,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "61646D69-6E44-6576-6963-655575696430",\r
+ "devowneruuid": "61646D69-6E44-6576-6963-655575696430",\r
+ "rowneruuid": "61646D69-6E44-6576-6963-655575696430",\r
+ "dpc": false\r
+ }\r
+}
\ No newline at end of file
-{
- "acl": [
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/res",
- "/oic/d",
- "/oic/p",
- "/oic/res/types/d",
- "/oic/ad"
- ],
- "perms": 2,
- "ownrs" : ["YWRtaW5EZXZpY2VVVUlE"]
- },
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/sec/doxm",
- "/oic/sec/pstat",
- "/oic/sec/acl",
- "/oic/sec/cred"
- ],
- "perms": 7,
- "ownrs" : ["YWRtaW5EZXZpY2VVVUlE"]
- }
- ],
- "crl": {
- "CRLId": 1,
- "ThisUpdate": "MTUwMTAxMDAwMDAwWg==",
- "CRLData": "LQ=="
- },
- "pstat": {
- "isop": true,
- "deviceid": "YWRtaW5EZXZpY2VVVUlE",
- "ch": 0,
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3]
- },
- "doxm": {
- "oxm": [0],
- "oxmsel": 0,
- "owned": true,
- "deviceid": "YWRtaW5EZXZpY2VVVUlE",
- "ownr": "YWRtaW5EZXZpY2VVVUlE"
- }
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/cred",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 7\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "61646d69-6e44-6576-6963-655555494430"\r
+ },\r
+ "crl": {\r
+ "CRLId": 1,\r
+ "ThisUpdate": "150101000000Z",\r
+ "CRLData": "-"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "rowneruuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "devowneruuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "rowneruuid": "61646d69-6e44-6576-6963-655555494430",\r
+ "dpc": false\r
+ }\r
+}
\ No newline at end of file
VERIFY_SUCCESS(TAG, ret == OC_STACK_OK, ERROR);
OICFree(subjectid);
}
- // subjectid
+ // credtype
if (strcmp(name, OIC_JSON_CREDTYPE_NAME) == 0)
{
cborFindResult = cbor_value_get_uint64(&credMap, (uint64_t *) &cred->credType);
DeleteCredList(cred);
}
- cJSON_Delete(value);
CborEncoder encoder = { {.ptr = NULL }, .end = 0 };
size_t cborSize = aclCborSize + pstatCborSize + doxmCborSize + svcCborSize + credCborSize + amaclCborSize;
if (fp1)
{
size_t bytesWritten = fwrite(outPayload, 1, s, fp1);
- OIC_LOG_V(DEBUG, TAG, "Written %zu bytes", bytesWritten);
+ if (bytesWritten == s)
+ {
+ OIC_LOG_V(DEBUG, TAG, "Written %zu bytes", bytesWritten);
+ }
+ else
+ {
+ OIC_LOG_V(ERROR, TAG, "Failed writing %zu bytes", s);
+ }
fclose(fp1);
fp1 = NULL;
}
cJSON *jsonObj = NULL;
size_t jsonObjLen = 0;
- unsigned char base64Buff[sizeof(((OicUuid_t*)0)->id)] = {};
- uint32_t outLen = 0;
- B64Result b64Ret = B64_OK;
cJSON *jsonRoot = cJSON_Parse(jsonStr);
VERIFY_NON_NULL(TAG, jsonRoot, ERROR);
cJSON *jsonPstat = NULL;
cJSON *jsonObj = NULL;
- unsigned char base64Buff[sizeof(((OicUuid_t*) 0)->id)] = {};
- uint32_t outLen = 0;
- B64Result b64Ret = B64_OK;
-
cJSON *jsonRoot = cJSON_Parse(jsonStr);
VERIFY_NON_NULL(TAG, jsonRoot, INFO);
OicSecCred_t * JSONToCredBin(const char * jsonStr)
{
+
+ VERIFY_NON_NULL(TAG, jsonStr, ERROR);
+ OicSecCred_t *headCred = (OicSecCred_t*)OICCalloc(1, sizeof(OicSecCred_t));
+
OCStackResult ret = OC_STACK_ERROR;
- OicSecCred_t * headCred = NULL;
- OicSecCred_t * prevCred = NULL;
- cJSON *jsonCredArray = NULL;
+ cJSON *jsonRoot = NULL;
- cJSON *jsonRoot = cJSON_Parse(jsonStr);
+ jsonRoot = cJSON_Parse(jsonStr);
VERIFY_NON_NULL(TAG, jsonRoot, ERROR);
- jsonCredArray = cJSON_GetObjectItem(jsonRoot, OIC_JSON_CRED_NAME);
+ cJSON *jsonCredMap = cJSON_GetObjectItem(jsonRoot, OIC_JSON_CRED_NAME);
+ VERIFY_NON_NULL(TAG, jsonCredMap, ERROR);
+
+ // creds
+ cJSON *jsonCredArray = NULL;
+ jsonCredArray = cJSON_GetObjectItem(jsonCredMap, OIC_JSON_CREDS_NAME);
VERIFY_NON_NULL(TAG, jsonCredArray, ERROR);
+
if (cJSON_Array == jsonCredArray->type)
{
int numCred = cJSON_GetArraySize(jsonCredArray);
VERIFY_SUCCESS(TAG, numCred > 0, ERROR);
- unsigned char base64Buff[sizeof(((OicUuid_t*)0)->id)] = {};
- uint32_t outLen = 0;
- B64Result b64Ret = B64_OK;
int idx = 0;
do
{
cJSON *jsonCred = cJSON_GetArrayItem(jsonCredArray, idx);
VERIFY_NON_NULL(TAG, jsonCred, ERROR);
- OicSecCred_t *cred = (OicSecCred_t*)OICCalloc(1, sizeof(OicSecCred_t));
- VERIFY_NON_NULL(TAG, cred, ERROR);
-
- headCred = (headCred) ? headCred : cred;
- if (prevCred)
+ OicSecCred_t *cred = NULL;
+ if(idx == 0)
{
- prevCred->next = cred;
+ cred = headCred;
}
+ else
+ {
+ cred = (OicSecCred_t*)OICCalloc(1, sizeof(OicSecCred_t));
+ OicSecCred_t *temp = headCred;
+ while (temp->next)
+ {
+ temp = temp->next;
+ }
+ temp->next = cred;
+ }
+ VERIFY_NON_NULL(TAG, cred, ERROR);
+
size_t jsonObjLen = 0;
cJSON *jsonObj = NULL;
jsonObj = cJSON_GetObjectItem(jsonCred, OIC_JSON_SUBJECTID_NAME);
VERIFY_NON_NULL(TAG, jsonObj, ERROR);
VERIFY_SUCCESS(TAG, cJSON_String == jsonObj->type, ERROR);
- outLen = 0;
- memset(base64Buff, 0, sizeof(base64Buff));
- b64Ret = b64Decode(jsonObj->valuestring, strlen(jsonObj->valuestring),
- base64Buff, sizeof(base64Buff), &outLen);
- VERIFY_SUCCESS(TAG, (b64Ret == B64_OK && outLen <= sizeof(cred->subject.id)),
- ERROR);
- memcpy(cred->subject.id, base64Buff, outLen);
+ ret = ConvertStrToUuid(jsonObj->valuestring, &cred->subject);
+ VERIFY_SUCCESS(TAG, OC_STACK_OK == ret, ERROR);
//CredType -- Mandatory
jsonObj = cJSON_GetObjectItem(jsonCred, OIC_JSON_CREDTYPE_NAME);
VERIFY_NON_NULL(TAG, jsonObj, ERROR);
VERIFY_SUCCESS(TAG, cJSON_Number == jsonObj->type, ERROR);
cred->credType = (OicSecCredType_t)jsonObj->valueint;
-
//PrivateData is mandatory for some of the credential types listed below.
jsonObj = cJSON_GetObjectItem(jsonCred, OIC_JSON_PRIVATEDATA_NAME);
- if ((cred->credType & SYMMETRIC_PAIR_WISE_KEY) ||
- (cred->credType & SYMMETRIC_GROUP_KEY) ||
- (cred->credType & PIN_PASSWORD))
- {
- VERIFY_NON_NULL(TAG, jsonObj, ERROR);
- VERIFY_SUCCESS(TAG, cJSON_String == jsonObj->type, ERROR);
- }
-#ifdef __WITH_X509__
- else if (cred->credType & SIGNED_ASYMMETRIC_KEY)
- {
- VERIFY_NON_NULL(TAG, jsonObj, ERROR);
- VERIFY_SUCCESS(TAG, cJSON_Object == jsonObj->type, ERROR);
- }
-#endif // __WITH_X509__
+
if (NULL != jsonObj)
{
- if (cJSON_String == jsonObj->type)
- {
- jsonObjLen = strlen(jsonObj->valuestring) + 1;
- cred->privateData.data = (uint8_t *)OICCalloc(1, jsonObjLen);
- VERIFY_NON_NULL(TAG, (cred->privateData.data), ERROR);
- outLen = 0;
- uint8_t pskKey[OWNER_PSK_LENGTH_256] = {};
-
- memset(pskKey, 0, sizeof(pskKey));
- b64Ret = b64Decode(jsonObj->valuestring, strlen(jsonObj->valuestring),
- pskKey, sizeof(pskKey), &outLen);
- VERIFY_SUCCESS(TAG, (b64Ret == B64_OK &&
- outLen <= OWNER_PSK_LENGTH_256), ERROR);
- memcpy(cred->privateData.data, pskKey, outLen);
- cred->privateData.len = outLen;
- }
-#ifdef __WITH_X509__
- else if (SIGNED_ASYMMETRIC_KEY == cred->credType && cJSON_Object == jsonObj->type)
- {
- cred->privateData.data = cJSON_PrintUnformatted(jsonObj);
- VERIFY_NON_NULL(TAG, (cred->privateData.data), ERROR);
- }
-#endif // __WITH_X509__
+ cJSON *jsonPriv = cJSON_GetObjectItem(jsonObj, OIC_JSON_DATA_NAME);
+ VERIFY_NON_NULL(TAG, jsonPriv, ERROR);
+ jsonObjLen = strlen(jsonPriv->valuestring);
+ cred->privateData.data = (uint8_t *)OICCalloc(1, jsonObjLen);
+ VERIFY_NON_NULL(TAG, (cred->privateData.data), ERROR);
+ memcpy(cred->privateData.data, jsonPriv->valuestring, jsonObjLen);
+ cred->privateData.len = jsonObjLen;
}
#ifdef __WITH_X509__
//PublicData is mandatory only for SIGNED_ASYMMETRIC_KEY credentials type.
jsonObj = cJSON_GetObjectItem(jsonCred, OIC_JSON_PUBLICDATA_NAME);
- if (cred->credType & SIGNED_ASYMMETRIC_KEY)
- {
- VERIFY_NON_NULL(TAG, jsonObj, ERROR);
- VERIFY_SUCCESS(TAG, cJSON_Object == jsonObj->type, ERROR);
- }
+
if (NULL != jsonObj)
{
- if (cJSON_String == jsonObj->type)
- {
- jsonObjLen = strlen(jsonObj->valuestring) + 1;
- cred->publicData.data = (uint8_t *)OICCalloc(1, jsonObjLen);
- VERIFY_NON_NULL(TAG, (cred->publicData.data), ERROR);
- memcpy(cred->publicData.data, jsonObj->valuestring, jsonObjLen);
- }
- else if (SIGNED_ASYMMETRIC_KEY == cred->credType && cJSON_Object == jsonObj->type)
- {
- cred->publicData.data = cJSON_PrintUnformatted(jsonObj);
- VERIFY_NON_NULL(TAG, (cred->publicData.data), ERROR);
- }
+ cJSON *jsonPub = cJSON_GetObjectItem(jsonObj, OIC_JSON_DATA_NAME);
+ VERIFY_NON_NULL(TAG, jsonPub, ERROR);
+ jsonObjLen = strlen(jsonPub->valuestring);
+ cred->publicData.data = (uint8_t *)OICCalloc(1, jsonObjLen);
+ VERIFY_NON_NULL(TAG, (cred->publicData.data), ERROR);
+ memcpy(cred->publicData.data, jsonPub->valuestring, jsonObjLen);
+ cred->publicData.len = jsonObjLen;
}
#endif // __WITH_X509__
//Period -- Not Mandatory
strncpy(cred->period, jsonObj->valuestring, jsonObjLen);
}
- //Owners -- Mandatory
- jsonObj = cJSON_GetObjectItem(jsonCred, OIC_JSON_OWNERS_NAME);
- VERIFY_NON_NULL(TAG, jsonObj, ERROR);
- VERIFY_SUCCESS(TAG, cJSON_Array == jsonObj->type, ERROR);
- cred->ownersLen = (size_t)cJSON_GetArraySize(jsonObj);
- VERIFY_SUCCESS(TAG, cred->ownersLen > 0, ERROR);
- cred->owners = (OicUuid_t*)OICCalloc(cred->ownersLen, sizeof(OicUuid_t));
- VERIFY_NON_NULL(TAG, (cred->owners), ERROR);
- for(size_t i = 0; i < cred->ownersLen; i++)
- {
- cJSON *jsonOwnr = cJSON_GetArrayItem(jsonObj, i);
- VERIFY_NON_NULL(TAG, jsonOwnr, ERROR);
- VERIFY_SUCCESS(TAG, cJSON_String == jsonOwnr->type, ERROR);
- outLen = 0;
- memset(base64Buff, 0, sizeof(base64Buff));
- b64Ret = b64Decode(jsonOwnr->valuestring, strlen(jsonOwnr->valuestring),
- base64Buff, sizeof(base64Buff), &outLen);
- VERIFY_SUCCESS(TAG, (b64Ret == B64_OK &&
- outLen <= sizeof(cred->owners[i].id)), ERROR);
- memcpy(cred->owners[i].id, base64Buff, outLen);
- }
- prevCred = cred;
+ cred->next = NULL;
+
} while( ++idx < numCred);
}
+ // rownerid
+ cJSON *jsonCredObj = cJSON_GetObjectItem(jsonCredMap, OIC_JSON_ROWNERID_NAME);
+ VERIFY_NON_NULL(TAG, jsonCredObj, ERROR);
+ VERIFY_SUCCESS(TAG, cJSON_String == jsonCredObj->type, ERROR);
+ headCred->ownersLen = 1;
+ VERIFY_SUCCESS(TAG, headCred->ownersLen > 0, ERROR);
+ headCred->owners = (OicUuid_t*)OICCalloc(headCred->ownersLen, sizeof(OicUuid_t));
+ VERIFY_NON_NULL(TAG, (headCred->owners), ERROR);
+ ret = ConvertStrToUuid(jsonCredObj->valuestring, &headCred->owners[0]);
+ VERIFY_SUCCESS(TAG, OC_STACK_OK == ret, ERROR);
ret = OC_STACK_OK;
exit:
- cJSON_Delete(jsonRoot);
+
if (OC_STACK_OK != ret)
{
DeleteCredList(headCred);
jsonAmacl = cJSON_GetObjectItem(jsonRoot, OIC_JSON_AMACL_NAME);
VERIFY_NON_NULL(TAG, jsonAmacl, INFO);
- size_t jsonObjLen = 0;
- cJSON *jsonObj = NULL;
+ cJSON *jsonObj = NULL;
// Resources -- Mandatory
jsonObj = cJSON_GetObjectItem(jsonAmacl, OIC_JSON_RESOURCES_NAME);
-{
- "acl":
- {
- "aclist":
- {
- "aces":
- [
- {
- "subject": "*",
- "resources":
- [
- {"href": "/oic/res", "rt": "", "if": ""},
- {"href": "/oic/d", "rt": "", "if": ""},
- {"href": "/oic/p", "rt": "", "if": ""},
- {"href": "/oic/res/types/d", "rt": "", "if": ""},
- {"href": "/oic/ad", "rt": "", "if": ""},
- {"href": "/oic/sec/acl", "rt": "", "if": ""},
- {"href": "/oic/sec/amacl", "rt": "", "if": ""}
- ],
- "permission": 2
- },
- {
- "subject": "*",
- "resources":
- [
- {"href": "/oic/sec/doxm", "rt": "", "if": ""},
- {"href": "/oic/sec/pstat", "rt": "", "if": ""}
- ],
- "permission": 2
- }
- ]
- },
- "rownerid": "31393139-3139-3139-3139-313931393139"
- },
-
- "pstat":
- {
- "isop": true,
- "deviceid": "31393139-3139-3139-3139-313931393139",
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3],
- "rownerid": "31393139-3139-3139-3139-313931393139"
- },
- "doxm":
- {
- "oxms": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "didformat": 0,
- "deviceid": "31393139-3139-3139-3139-313931393139",
- "devownerid": "61646D69-6E44-6576-6963-655555494430",
- "rownerid": "31393139-3139-3139-3139-313931393139"
- },
- "cred":
- [
- {
- "credid": 1,
- "subject": "MTExMTExMTExMTExMTExMQ==",
- "credtype": 1,
- "privatedata": "QkJCQkJCQkJCQkJCQkJCQg==",
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }
- ]
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/amacl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "31393139-3139-3139-3139-313931393139"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "31393139-3139-3139-3139-313931393139",\r
+ "rowneruuid": "31393139-3139-3139-3139-313931393139",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "31393139-3139-3139-3139-313931393139",\r
+ "devowneruuid": "61646D69-6E44-6576-6963-655555494430",\r
+ "rowneruuid": "31393139-3139-3139-3139-313931393139",\r
+ "dpc": false\r
+ },\r
+ "cred": {\r
+ "creds": [\r
+ {\r
+ "credid": 1,\r
+ "subjectuuid": "31313131-3131-3131-3131-313131313131",\r
+ "credtype": 1,\r
+ "privatedata": {\r
+ "data": "BBBBBBBBBBBBBBBB",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ }\r
+ ],\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
+ }\r
+}
\ No newline at end of file
-{
- "acl":
- {
- "aclist":
- {
- "aces":
- [
- {
- "subject": "*",
- "resources":
- [
- {"href": "/oic/res", "rt": "", "if": ""},
- {"href": "/oic/d", "rt": "", "if": ""},
- {"href": "/oic/p", "rt": "", "if": ""},
- {"href": "/oic/res/types/d", "rt": "", "if": ""},
- {"href": "/oic/ad", "rt": "", "if": ""},
- {"href": "/oic/sec/acl", "rt": "", "if": ""},
- {"href": "/oic/sec/amacl", "rt": "", "if": ""}
- ],
- "permission": 2
- },
- {
- "subject": "*",
- "resources":
- [
- {"href": "/oic/sec/doxm", "rt": "", "if": ""},
- {"href": "/oic/sec/pstat", "rt": "", "if": ""}
- ],
- "permission": 2
- }
- ]
- },
- "rownerid": "32323232-3232-3232-3232-323232323232"
- },
-
- "pstat":
- {
- "isop": true,
- "deviceid": "32323232-3232-3232-3232-323232323232",
- "cm": 2,
- "tm": 0,
- "om": 3,
- "sm": [3],
- "rownerid": "32323232-3232-3232-3232-323232323232"
- },
-
- "doxm":
- {
- "oxms": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "didformat": 0,
- "deviceid": "32323232-3232-3232-3232-323232323232",
- "devownerid": "32323232-3232-3232-3232-323232323232",
- "rownerid": "32323232-3232-3232-3232-323232323232"
- },
-
- "cred":
- [
- {
- "credid": 1,
- "subject": "MTExMTExMTExMTExMTExMQ==",
- "credtype": 1,
- "period": "20150630T060000/20990920T220000",
- "privatedata": "QUFBQUFBQUFBQUFBQUFBQQ==",
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }
- ]
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/amacl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "32323232-3232-3232-3232-323232323232"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "cm": 2,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
+ "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "dpc": false\r
+ },\r
+ "cred": {\r
+ "creds": [\r
+ {\r
+ "credid": 1,\r
+ "subjectuuid": "31313131-3131-3131-3131-313131313131",\r
+ "credtype": 1,\r
+ "privatedata": {\r
+ "data": "AAAAAAAAAAAAAAAA",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ }\r
+ ],\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
+ }\r
}
\ No newline at end of file
-{
- "acl": {
- "aclist":{
- "aces":[
- {
- "subject": "*",
- "resources": [
- {
- "href": "/oic/res",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/d",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/res/types/d",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/presence",
- "rt": "",
- "if": ""
- }
- ],
- "permission": 2
- },
- {
- "subject": "*",
- "resources": [
- {
- "href": "/oic/sec/doxm",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/pstat",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/acl",
- "rt": "",
- "if": ""
- },
- {
- "href": "/oic/sec/cred",
- "rt": "",
- "if": ""
- }
- ],
- "permission": 6
- }
- ]
- },
- "rownerid" : "64697265-6374-7061-6972-696e67446576"
- },
- "pstat": {
- "isop": false,
- "cm": 2,
- "tm": 0,
- "om": 3,
- "sm": [3],
- "deviceid": "64697265-6374-7061-6972-696e67446576",
- "rownerid": "64697265-6374-7061-6972-696e67446576"
- },
- "doxm": {
- "oxms": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": false,
- "didformat": 0,
- "deviceid": "64697265-6374-7061-6972-696e67446576",
- "dpc": false,
- "devownerid": ""
- }
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/presence",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/cred",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 6\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "64697265-6374-7061-6972-696e67446576"\r
+ },\r
+ "pstat": {\r
+ "isop": false,\r
+ "deviceuuid": "64697265-6374-7061-6972-696e67446576",\r
+ "rowneruuid": "64697265-6374-7061-6972-696e67446576",\r
+ "cm": 2,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": false,\r
+ "deviceuuid": "64697265-6374-7061-6972-696e67446576",\r
+ "devowneruuid": "",\r
+ "rowneruuid": "64697265-6374-7061-6972-696e67446576",\r
+ "dpc": false\r
+ }\r
+}
\ No newline at end of file
-{
- "acl":
- {
- "aclist":
- {
- "aces":
- [
- {
- "subject": "*",
- "resources":
- [
- {"href": "/oic/res", "rt": "", "if": ""},
- {"href": "/oic/res/d", "rt": "", "if": ""},
- {"href": "/oic/res/types/d", "rt": "", "if": ""},
- {"href": "/oic/ad", "rt": "", "if": ""},
- {"href": "/oic/sec/acl", "rt": "", "if": ""},
- {"href": "/oic/sec/amacl", "rt": "", "if": ""}
- ],
- "permission": 2
- },
- {
- "subject": "*",
- "resources":
- [
- {"href": "/oic/sec/doxm", "rt": "", "if": ""},
- {"href": "/oic/sec/pstat", "rt": "", "if": ""}
- ],
- "permission": 2
- },
- {
- "subject": "32323232-3232-3232-3232-323232323232",
- "resources":
- [
- {"href": "/oic/sec/acl", "rt": "", "if": ""},
- {"href": "/oic/sec/cred", "rt": "", "if": ""}
- ],
- "permission": 8
- },
- {
- "subject": "31313131-3232-3232-3333-333334343434",
- "resources":
- [
- {"href": "/a/led", "rt": "", "if": ""}
- ],
- "permission": 6,
- "period" : ["20150630T060000/20150630T220000", "20150630T060000/20150630T200000"],
- "recurrence" : ["FREQ=DAILY; BYDAY=MO, WE, FR", "FREQ=DAILY; BYDAY=TU, TH; UNTIL=20160630"]
- },
- {
- "subject": "37373737-3737-3737-3737-373737373737",
- "resources":
- [
- {"href": "/a/led", "rt": "", "if": ""}
- ],
- "permission": 6,
- "period" : ["20150630T060000/20150630T220000"],
- "recurrence" : ["FREQ=DAILY; UNTIL=20150630"]
- }
- ]
- },
- "rownerid": "31313131-3131-3131-3131-313131313131"
- },
-
- "pstat":
- {
- "isop": true,
- "deviceid": "31313131-3131-3131-3131-313131313131",
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3],
- "rownerid": "31313131-3131-3131-3131-313131313131"
- },
-
- "doxm":
- {
- "oxms": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "didformat": 0,
- "deviceid": "31313131-3131-3131-3131-313131313131",
- "devownerid": "32323232-3232-3232-3232-323232323232",
- "rownerid": "31313131-3131-3131-3131-313131313131"
- },
- "cred":
- [
- {
- "credid": 1,
- "subject": "MjIyMjIyMjIyMjIyMjIyMg==",
- "credtype": 1,
- "period": "20150630T060000/20990920T220000",
- "privatedata": "QUFBQUFBQUFBQUFBQUFBQQ==",
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- },
- {
- "credid": 2,
- "subject": "MTkxOTE5MTkxOTE5MTkxOQ==",
- "credtype": 1,
- "period": "20150630T060000/20990920T220000",
- "privatedata": "QkJCQkJCQkJCQkJCQkJCQg==",
- "ownrs" : ["MTkxOTE5MTkxOTE5MTkxOQ=="]
- }
- ]
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/amacl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "32323232-3232-3232-3232-323232323232",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/cred",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 8\r
+ },\r
+ {\r
+ "subjectuuid": "31313131-3232-3232-3333-333334343434",\r
+ "resources": [\r
+ {\r
+ "href": "/a/led",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } \r
+ ],\r
+ "permission": 6,\r
+ "period" : ["20150630T060000/20150630T220000", "20150630T060000/20150630T200000"],\r
+ "recurrence" : ["FREQ=DAILY; BYDAY=MO, WE, FR", "FREQ=DAILY; BYDAY=TU, TH; UNTIL=20160630"]\r
+ },\r
+ {\r
+ "subjectuuid": "37373737-3737-3737-3737-373737373737",\r
+ "resources": [\r
+ {\r
+ "href": "/a/led",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } \r
+ ],\r
+ "permission": 6,\r
+ "period" : ["20150630T060000/20150630T220000"],\r
+ "recurrence" : ["FREQ=DAILY; UNTIL=20150630"]\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "31313131-3131-3131-3131-313131313131"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
+ "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
+ "dpc": false\r
+ },\r
+ "cred": {\r
+ "creds": [\r
+ {\r
+ "credid": 1,\r
+ "subjectuuid": "32323232-3232-3232-3232-323232323232",\r
+ "credtype": 1,\r
+ "period": "20150630T060000/20990920T220000",\r
+ "privatedata": {\r
+ "data": "AAAAAAAAAAAAAAAA",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ },\r
+ {\r
+ "credid": 2,\r
+ "subjectuuid": "31393139-3139-3139-3139-313931393139",\r
+ "credtype": 1,\r
+ "period": "20150630T060000/20990920T220000",\r
+ "privatedata": {\r
+ "data": "BBBBBBBBBBBBBBBB",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ }\r
+ ],\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
+ }\r
}
\ No newline at end of file
-{
- "acl": [
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/res",
- "/oic/d",
- "/oic/p",
- "/oic/res/types/d",
- "/oic/ad",
- "/oic/sec/acl"
- ],
- "perms": 2,
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- },
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/sec/doxm",
- "/oic/sec/pstat"
- ],
- "perms": 2,
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }
- ],
- "pstat": {
- "isop": true,
- "deviceid": "ZGV2aWNlaWQAAAAAABhanw==",
- "ch": 0,
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3]
- },
- "doxm": {
- "oxm": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "deviceid": "MjIyMjIyMjIyMjIyMjIyMg==",
- "ownr": "MjIyMjIyMjIyMjIyMjIyMg=="
- },
- "cred": [{
- "credid": 1,
- "sub": "MTExMTExMTExMTExMTExMQ==",
- "credtyp": 1,
- "pvdata": "QUFBQUFBQUFBQUFBQUFBQQ==",
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }]
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "32323232-3232-3232-3232-323232323232"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
+ "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "dpc": false\r
+ },\r
+ "cred": {\r
+ "creds": [\r
+ {\r
+ "credid": 1,\r
+ "subjectuuid": "31313131-3131-3131-3131-313131313131",\r
+ "credtype": 1,\r
+ "privatedata": {\r
+ "data": "AAAAAAAAAAAAAAAA",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ }\r
+ ],\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
+ }\r
+}
\ No newline at end of file
-{
- "acl": [
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/res",
- "/oic/d",
- "/oic/p",
- "/oic/res/types/d",
- "/oic/ad",
- "/oic/sec/acl"
- ],
- "perms": 2,
- "ownrs" : ["MTExMTExMTExMTExMTExMQ=="]
- },
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/sec/doxm",
- "/oic/sec/pstat"
- ],
- "perms": 2,
- "ownrs" : ["MTExMTExMTExMTExMTExMQ=="]
- },
- {
- "sub": "Kg==",
- "rsrc": ["/a/light"],
- "perms": 6,
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }
- ],
- "pstat": {
- "isop": true,
- "deviceid": "ZGV2aWNlaWQAAAAAABhanw==",
- "ch": 0,
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3]
- },
- "doxm": {
- "oxm": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "deviceid": "MTExMTExMTExMTExMTExMQ==",
- "ownr": "MjIyMjIyMjIyMjIyMjIyMg=="
- },
- "cred": [{
- "credid": 1,
- "sub": "MjIyMjIyMjIyMjIyMjIyMg==",
- "credtyp": 1,
- "pvdata": "QUFBQUFBQUFBQUFBQUFBQQ==",
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }]
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/a/light",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 6\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "31313131-3131-3131-3131-313131313131"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
+ "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
+ "dpc": false\r
+ },\r
+ "cred": {\r
+ "creds": [\r
+ {\r
+ "credid": 1,\r
+ "subjectuuid": "32323232-3232-3232-3232-323232323232",\r
+ "credtype": 1,\r
+ "privatedata": {\r
+ "data": "AAAAAAAAAAAAAAAA",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ }\r
+ ],\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131"\r
+ }\r
+}
\ No newline at end of file
--- /dev/null
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "61646d69-6e44-6576-6963-655575696430"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "61646d69-6e44-6576-6963-655575696430",\r
+ "rowneruuid": "61646d69-6e44-6576-6963-655575696430",\r
+ "cm": 2,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "61646d69-6e44-6576-6963-655575696430",\r
+ "devowneruuid": "61646d69-6e44-6576-6963-655575696430",\r
+ "rowneruuid": "61646d69-6e44-6576-6963-655575696430",\r
+ "dpc": false\r
+ }\r
+}\r
-{
- "acl": [
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/res",
- "/oic/d",
- "/oic/p",
- "/oic/res/types/d",
- "/oic/ad",
- "/oic/sec/acl"
- ],
- "perms": 2,
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- },
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/sec/doxm",
- "/oic/sec/pstat"
- ],
- "perms": 2,
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }
- ],
- "pstat": {
- "isop": true,
- "deviceid": "ZGV2aWNlaWQAAAAAABhanw==",
- "ch": 0,
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3]
- },
- "doxm": {
- "oxm": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "deviceid": "MjIyMjIyMjIyMjIyMjIyMg==",
- "ownr": "MjIyMjIyMjIyMjIyMjIyMg=="
- },
- "cred": [{
- "credid": 1,
- "sub": "MTExMTExMTExMTExMTExMQ==",
- "credtyp": 1,
- "pvdata": "QUFBQUFBQUFBQUFBQUFBQQ==",
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }]
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "32323232-3232-3232-3232-323232323232"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
+ "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "dpc": false\r
+ },\r
+ "cred": {\r
+ "creds": [\r
+ {\r
+ "credid": 1,\r
+ "subjectuuid": "31313131-3131-3131-3131-313131313131",\r
+ "credtype": 1,\r
+ "privatedata": {\r
+ "data": "AAAAAAAAAAAAAAAA",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ }\r
+ ],\r
+ "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
+ }\r
+}
\ No newline at end of file
-{
- "acl": [
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/res",
- "/oic/d",
- "/oic/p",
- "/oic/res/types/d",
- "/oic/ad",
- "/oic/sec/acl"
- ],
- "perms": 2,
- "ownrs" : ["MTExMTExMTExMTExMTExMQ=="]
- },
- {
- "sub": "Kg==",
- "rsrc": [
- "/oic/sec/doxm",
- "/oic/sec/pstat"
- ],
- "perms": 2,
- "ownrs" : ["MTExMTExMTExMTExMTExMQ=="]
- },
- {
- "sub": "Kg==",
- "rsrc": ["/a/light"],
- "perms": 6,
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }
- ],
- "pstat": {
- "isop": true,
- "deviceid": "ZGV2aWNlaWQAAAAAABhanw==",
- "ch": 0,
- "cm": 0,
- "tm": 0,
- "om": 3,
- "sm": [3]
- },
- "doxm": {
- "oxm": [0],
- "oxmsel": 0,
- "sct": 1,
- "owned": true,
- "deviceid": "MTExMTExMTExMTExMTExMQ==",
- "ownr": "MjIyMjIyMjIyMjIyMjIyMg=="
- },
- "cred": [{
- "credid": 1,
- "sub": "MjIyMjIyMjIyMjIyMjIyMg==",
- "credtyp": 1,
- "pvdata": "QUFBQUFBQUFBQUFBQUFBQQ==",
- "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
- }]
-}
+{\r
+ "acl": {\r
+ "aclist": {\r
+ "aces": [\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/res",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/p",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/res/types/d",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/ad",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/oic/sec/acl",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/oic/sec/doxm",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ } ,\r
+ {\r
+ "href": "/oic/sec/pstat",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 2\r
+ },\r
+ {\r
+ "subjectuuid": "*",\r
+ "resources": [\r
+ {\r
+ "href": "/a/light",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/a/light0",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ },\r
+ {\r
+ "href": "/a/light1",\r
+ "rel": "",\r
+ "rt": "",\r
+ "if": ""\r
+ }\r
+ ],\r
+ "permission": 6\r
+ }\r
+ ]\r
+ },\r
+ "rowneruuid" : "31313131-3131-3131-3131-313131313131"\r
+ },\r
+ "pstat": {\r
+ "isop": true,\r
+ "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
+ "cm": 0,\r
+ "tm": 0,\r
+ "om": 3,\r
+ "sm": 3\r
+ },\r
+ "doxm": {\r
+ "oxms": [0],\r
+ "oxmsel": 0,\r
+ "sct": 1,\r
+ "owned": true,\r
+ "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
+ "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
+ "dpc": false\r
+ },\r
+ "cred": {\r
+ "creds": [\r
+ {\r
+ "credid": 1,\r
+ "subjectuuid": "32323232-3232-3232-3232-323232323232",\r
+ "credtype": 1,\r
+ "privatedata": {\r
+ "data": "AAAAAAAAAAAAAAAA",\r
+ "encoding": "oic.sec.encoding.bytestream"\r
+ }\r
+ }\r
+ ],\r
+ "rowneruuid": "31313131-3131-3131-3131-313131313131"\r
+ }\r
+}\r
+\r
projects / platform / upstream / iotivity.git / commitdiff