diff options
| author | Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com> | 2017-05-22 10:54:48 -0700 |
|---|---|---|
| committer | Randeep Singh <randeep.s@samsung.com> | 2017-05-24 08:45:21 +0000 |
| commit | 50df123fef364530e61041eb44250e925276a7ae (patch) | |
| tree | f6df3fef6f1020900409d249814454c3f6c8e43e | |
| parent | a7cb4bb29a58873f2a766fd0cc4b916177e85db9 (diff) | |
| download | iotivity-50df123fef364530e61041eb44250e925276a7ae.tar.gz iotivity-50df123fef364530e61041eb44250e925276a7ae.tar.bz2 iotivity-50df123fef364530e61041eb44250e925276a7ae.zip | |
[IOT-1943] updated .json and .dat in /csdk/stack/samples/linux/secure
These are being referenced as examples in addition to the files
in /csdk/security/provisioning/samples and so must be updated.
Please include these updates in 1.3.0 to avoid creating additional
bad .json and .dat files based off these.
Change-Id: I9f54988c1fb2914a2b63b7d4887edef99e27f440
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20267
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 files changed, 77 insertions, 362 deletions
diff --git a/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat b/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat Binary files differindex 3b7dc82d6..b372bc283 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat +++ b/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat diff --git a/resource/csdk/stack/samples/linux/secure/oic_amss_db.json b/resource/csdk/stack/samples/linux/secure/oic_amss_db.json index 693febe94..6d0076714 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_amss_db.json +++ b/resource/csdk/stack/samples/linux/secure/oic_amss_db.json @@ -3,61 +3,23 @@ "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/sec/doxm",
- "rel": "",
- "rt": ["oic.r.doxm"],
- "if": ["oic.if.baseline"]
- }
+ { "href": "/oic/res" },
+ { "href": "/oic/d" },
+ { "href": "/oic/p" },
+ { "href": "/oic/sec/doxm" }
],
"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/sec/doxm",
- "rel": "",
- "rt": ["oic.r.doxm"],
- "if": ["oic.if.baseline"]
- }
+ { "href": "/oic/res" },
+ { "href": "/oic/d" },
+ { "href": "/oic/p" },
+ { "href": "/oic/sec/doxm" }
],
"permission": 2
}
diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat Binary files differindex d7ad646ed..dbe0f6f59 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json index 2c4e06bea..221f37a6d 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.json @@ -3,61 +3,23 @@ "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/sec/doxm",
- "rel": "",
- "rt": ["oic.r.doxm"],
- "if": ["oic.if.baseline"]
- }
+ { "href": "/oic/res" },
+ { "href": "/oic/d" },
+ { "href": "/oic/p" },
+ { "href": "/oic/sec/doxm" }
],
"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/sec/doxm",
- "rel": "",
- "rt": ["oic.r.doxm"],
- "if": ["oic.if.baseline"]
- }
+ { "href": "/oic/res" },
+ { "href": "/oic/d" },
+ { "href": "/oic/p" },
+ { "href": "/oic/sec/doxm" }
],
"permission": 2
}
diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat Binary files differindex dae6ea588..7f2809afa 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json index a26d85a8a..224107a54 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json @@ -3,83 +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 + "permission": 14 } ], "rowneruuid" : "64697265-6374-7061-6972-696e67446576" diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat Binary files differindex 2747f7916..315108aab 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json index 0e37e1866..11c5bb7a7 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.json @@ -3,61 +3,23 @@ "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/sec/doxm",
- "rel": "",
- "rt": ["oic.r.doxm"],
- "if": ["oic.if.baseline"]
- }
+ { "href": "/oic/res" },
+ { "href": "/oic/d" },
+ { "href": "/oic/p" },
+ { "href": "/oic/sec/doxm" }
],
"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/sec/doxm",
- "rel": "",
- "rt": ["oic.r.doxm"],
- "if": ["oic.if.baseline"]
- }
+ { "href": "/oic/res" },
+ { "href": "/oic/d" },
+ { "href": "/oic/p" },
+ { "href": "/oic/sec/doxm" }
],
"permission": 2
}
diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat Binary files differindex 7b8e67607..156653f95 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json index bef7858e9..f61906e76 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json @@ -3,97 +3,42 @@ "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" },
+ { "href": "/oic/sec/doxm" }
],
"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" },
+ { "href": "/oic/sec/doxm" }
],
"permission": 2
},
{
"aceid": 3,
- "subject": {
- "uuid": "32323232-3232-3232-3232-323232323232"
- },
- "resources": [
- {
- "href": "*",
- "rel": "",
- "rt": ["*"],
- "if": ["*"]
- }
- ],
+ "subject": { "uuid": "32323232-3232-3232-3232-323232323232" },
+ "resources": [{ "wc": "*" }],
"permission": 7
},
{
"aceid": 4,
- "subject": {
- "uuid": "31393139-3139-3139-3139-313931393139"
- },
- "resources": [
- {
- "href": "/a/led",
- "rel": "",
- "rt": ["oic.core"],
- "if": ["oic.if.baseline"]
- }
- ],
+ "subject": { "uuid": "31393139-3139-3139-3139-313931393139" },
+ "resources": [{ "href": "/a/led" }],
"permission": 7
},
{
"aceid": 5,
- "subject": {
- "uuid": "37373737-3737-3737-3737-373737373737"
- },
- "resources": [
- {
- "href": "/a/led",
- "rel": "",
- "rt": ["oic.core"],
- "if": ["oic.if.baseline"]
- }
- ],
+ "subject": { "uuid": "37373737-3737-3737-3737-373737373737" },
+ "resources": [{ "href": "/a/led" }],
"permission": 6
}
],
diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat Binary files differindex 4e2f84f5e..42965444f 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json index 88a6936a5..ddd50dbcc 100644 --- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json +++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.json @@ -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,
|