Commit 888cd914 authored by Nathan Heldt-Sheller's avatar Nathan Heldt-Sheller

[IOT-2247] [IOT-2308] Clean up provisioning/sample/*.json files

The goal is to make the .json more readable an remove confusing extra
values.

I tried to leave them functionally identical, with
the exception that I merged the /doxm (Read, Update) and /roles
(Full Control) ACEs into a single ACE with permission 14
(Read, Update, Delete) which is sufficient for both /doxm and /roles.

I verified that at least JustWorks and Random PIN files work,
as well as security unittests.

Change-Id: Id4e7c94a7ce941b5e396b61096b89732aab1be4e
Signed-off-by: Nathan Heldt-Sheller's avatarNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19923Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: default avatarKevin Kane <kkane@microsoft.com>
parent caf5e934
This diff was suppressed by a .gitattributes entry.
{
"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
},
{
"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
}
]
},
"aclist2": [
{
"aceid": 1,
"subject": { "conntype": "anon-clear" },
"resources": [
{ "href": "/oic/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 2,
"subject": { "conntype": "auth-crypt" },
"resources": [
{ "href": "/oic/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 3,
"subject": { "conntype": "anon-clear" },
"resources": [
{ "href": "/oic/sec/doxm" }
],
"permission": 14
},
{
"aceid": 4,
"subject": { "conntype": "auth-crypt" },
"resources": [
{ "href": "/oic/sec/doxm" },
{ "href": "/oic/sec/roles" }
],
"permission": 14
}
],
"rowneruuid" : "61646D69-6E44-6576-6963-655575696430"
},
"pstat": {
......
......@@ -3,113 +3,40 @@
"aclist2": [
{
"aceid": 1,
"subject": {
"conntype": "anon-clear"
},
"subject": { "conntype": "anon-clear" },
"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/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 2,
"subject": {
"conntype": "auth-crypt"
},
"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/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 3,
"subject": {
"conntype": "anon-clear"
},
"subject": { "conntype": "anon-clear" },
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
{ "href": "/oic/sec/doxm" }
],
"permission": 6
"permission": 14
},
{
"aceid": 4,
"subject": {
"conntype": "auth-crypt"
},
"subject": { "conntype": "auth-crypt" },
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
{ "href": "/oic/sec/doxm" },
{ "href": "/oic/sec/roles" }
],
"permission": 6
},
{
"aceid": 5,
"subject": {
"conntype": "anon-clear"
},
"resources": [
{
"href": "/oic/sec/roles",
"rel": "",
"rt": ["oic.r.cred"],
"if": ["oic.if.baseline"]
}
],
"permission": 31
},
{
"aceid": 6,
"subject": {
"conntype": "auth-crypt"
},
"resources": [
{
"href": "/oic/sec/roles",
"rel": "",
"rt": ["oic.r.cred"],
"if": ["oic.if.baseline"]
}
],
"permission": 31
"permission": 14
}
],
"rowneruuid" : "61646D69-6E44-6576-6963-655575696430"
......
......@@ -3,113 +3,40 @@
"aclist2": [
{
"aceid": 1,
"subject": {
"conntype": "anon-clear"
},
"subject": { "conntype": "anon-clear" },
"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/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 2,
"subject": {
"conntype": "auth-crypt"
},
"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/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 3,
"subject": {
"conntype": "anon-clear"
},
"subject": { "conntype": "anon-clear" },
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
{ "href": "/oic/sec/doxm" }
],
"permission": 6
"permission": 14
},
{
"aceid": 4,
"subject": {
"conntype": "auth-crypt"
},
"subject": { "conntype": "auth-crypt" },
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
{ "href": "/oic/sec/doxm" },
{ "href": "/oic/sec/roles" }
],
"permission": 6
},
{
"aceid": 5,
"subject": {
"conntype": "anon-clear"
},
"resources": [
{
"href": "/oic/sec/roles",
"rel": "",
"rt": ["oic.r.cred"],
"if": ["oic.if.baseline"]
}
],
"permission": 31
},
{
"aceid": 6,
"subject": {
"conntype": "auth-crypt"
},
"resources": [
{
"href": "/oic/sec/roles",
"rel": "",
"rt": ["oic.r.cred"],
"if": ["oic.if.baseline"]
}
],
"permission": 31
"permission": 14
}
],
"rowneruuid": ""
......
......@@ -3,119 +3,46 @@
"aclist2": [
{
"aceid": 1,
"subject": {
"conntype": "anon-clear"
},
"subject": { "conntype": "anon-clear" },
"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/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 2,
"subject": {
"conntype": "auth-crypt"
},
"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/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 3,
"subject": {
"conntype": "anon-clear"
},
"subject": { "conntype": "anon-clear" },
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
{ "href": "/oic/sec/doxm" }
],
"permission": 6
"permission": 14
},
{
"aceid": 4,
"subject": {
"conntype": "auth-crypt"
},
"subject": { "conntype": "auth-crypt" },
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
{ "href": "/oic/sec/doxm" },
{ "href": "/oic/sec/roles" }
],
"permission": 6
},
{
"aceid": 5,
"subject": {
"conntype": "anon-clear"
},
"resources": [
{
"href": "/oic/sec/roles",
"rel": "",
"rt": ["oic.r.cred"],
"if": ["oic.if.baseline"]
}
],
"permission": 31
},
{
"aceid": 6,
"subject": {
"conntype": "auth-crypt"
},
"resources": [
{
"href": "/oic/sec/roles",
"rel": "",
"rt": ["oic.r.cred"],
"if": ["oic.if.baseline"]
}
],
"permission": 31
"permission": 14
}
],
"rowneruuid": "00000000-0000-0000-0000-000000000000"
},
"pstat": {
"dos": {"s": 1, "p": false},
"dos": { "s": 1, "p": false },
"isop": false,
"cm": 2,
"tm": 0,
......
......@@ -3,113 +3,40 @@
"aclist2": [
{
"aceid": 1,
"subject": {
"conntype": "anon-clear"
},
"subject": { "conntype": "anon-clear" },
"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/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 2,
"subject": {
"conntype": "auth-crypt"
},
"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/res" },
{ "href": "/oic/d" },
{ "href": "/oic/p"}
],
"permission": 2
},
{
"aceid": 3,
"subject": {
"conntype": "anon-clear"
},
"subject": { "conntype": "anon-clear" },
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
{ "href": "/oic/sec/doxm" }
],
"permission": 6
"permission": 14
},
{
"aceid": 4,
"subject": {
"conntype": "auth-crypt"
},
"subject": { "conntype": "auth-crypt" },
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": ["oic.r.doxm"],
"if": ["oic.if.baseline"]
}
{ "href": "/oic/sec/doxm" },
{ "href": "/oic/sec/roles" }
],