Skip to content

GitLab

I
iotivity-classic
Commit 01c9d09f authored by Nathan Heldt-Sheller's avatar Nathan Heldt-Sheller Committed by Randeep
1 Browse files
Options

Update .json/.dat files for ocserverbasicops and occlientbasicops 

Apps located in /resource/csdk/stack/samples/linux/secure directory.

Edited .json to conform to OCF 1.0 SVR schema (e.g. /acl2, /pstat.dos, etc.),
and re-encoded to CBOR using json2cbor.

Depends on 19593.

Change-Id: Ie06b5b349c727e85403b6b7f0a63242993682e4a
Signed-off-by: Nathan Heldt-Sheller's avatarNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19817Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep's avatarRandeep Singh <randeep.s@samsung.com>
parent a6aa8c26
Hide whitespace changes
Inline Side-by-side
Showing with 466 additions and 342 deletions
resource/csdk/stack/samples/linux/secure/oic_amss_db.dat
View file @ 01c9d09f
This diff was suppressed by a .gitattributes entry.
resource/csdk/stack/samples/linux/secure/oic_amss_db.json
View file @ 01c9d09f
{
"acl": {
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},
{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},
{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},
{
"href": "/oic/sec/acl",
"rel": "",
"rt": ["oic.r.acl"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
"aclist2": [
{
"aceid": 1,
"subject": {
"conntype": "anon-clear"
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
},
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": ["oic.r.pstat"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
}
]
},
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
},
{
"aceid": 2,
"subject": {
"conntype": "auth-crypt"
},
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
}
],
"rowneruuid" : "31393139-3139-3139-3139-313931393139"
},
"pstat": {
"dos": {"s": 3, "p": false},
"isop": true,
"deviceuuid": "31393139-3139-3139-3139-313931393139",
"rowneruuid": "31393139-3139-3139-3139-313931393139",
"cm": 0,
"tm": 0,
......
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json
View file @ 01c9d09f
{
"acl": {
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},
{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},
{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},
{
"href": "/oic/sec/acl",
"rel": "",
"rt": ["oic.r.acl"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
"aclist2": [
{
"aceid": 1,
"subject": {
"conntype": "anon-clear"
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
},
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": ["oic.r.pstat"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
}
]
},
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
},
{
"aceid": 2,
"subject": {
"conntype": "auth-crypt"
},
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
}
],
"rowneruuid" : "32323232-3232-3232-3232-323232323232"
},
"pstat": {
"dos": {"s": 3, "p": false},
"isop": true,
"deviceuuid": "32323232-3232-3232-3232-323232323232",
"rowneruuid": "32323232-3232-3232-3232-323232323232",
"cm": 0,
"tm": 0,
......
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json
View file @ 01c9d09f
{
"acl": {
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},
{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},
{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
}
],
"permission": 2
"aclist2": [
{
"aceid": 1,
"subject": {
"conntype": "anon-clear"
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
},
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": ["oic.r.pstat"],
"if": ["oic.if.baseline"]
},
{
"href": "/oic/sec/cred",
"rel": "",
"rt": ["oic.r.cred"],
"if": ["oic.if.baseline"]
}
],
"permission": 6
}
]
},
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
}
],
"permission": 2
},
{
"aceid": 2,
"subject": {
"conntype": "auth-crypt"
},
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
}
],
"permission": 2
},
{
"aceid": 3,
"subject": {
"conntype": "anon-clear"
},
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
],
"permission": 6
},
{
"aceid": 4,
"subject": {
"conntype": "auth-crypt"
},
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
],
"permission": 6
}
],
"rowneruuid" : "64697265-6374-7061-6972-696e67446576"
},
"pstat": {
......
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json
View file @ 01c9d09f
{
"acl": {
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},
{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},
{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},
{
"href": "/oic/sec/acl",
"rel": "",
"rt": ["oic.r.acl"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
"aclist2": [
{
"aceid": 1,
"subject": {
"conntype": "anon-clear"
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
},
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": ["oic.r.pstat"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
}
]
},
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
},
{
"aceid": 2,
"subject": {
"conntype": "auth-crypt"
},
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
}
],
"rowneruuid" : "31393139-3139-3139-3139-313931393139"
},
"pstat": {
"dos": {"s": 3, "p": false},
"isop": true,
"deviceuuid": "31393139-3139-3139-3139-313931393139",
"rowneruuid": "31393139-3139-3139-3139-313931393139",
"cm": 0,
"tm": 0,
......
resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
View file @ 01c9d09f
{
"acl": {
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},
{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]
},
{
"href": "/oic/p",
"rel": "",
"rt": ["oic.wk.p"],
"if": ["oic.if.baseline", "oic.if.r"]
},
{
"href": "/oic/sec/acl",
"rel": "",
"rt": ["oic.r.acl"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
"aclist2": [
{
"aceid": 1,
"subject": {
"conntype": "anon-clear"
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
},
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": ["oic.r.pstat"],
"if": ["oic.if.baseline"]
}
],
"permission": 2
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": ["oic.wk.res"],
"if": ["oic.if.ll"]
},{
"href": "/oic/d",
"rel": "",
"rt": ["oic.wk.d"],
"if": ["oic.if.baseline", "oic.if.r"]