[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 <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19923
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

diff --git a/resource/csdk/security/provisioning/sample/cloud.dat b/resource/csdk/security/provisioning/sample/cloud.dat
index 86434cc..8c7994f 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/cloud.dat and b/resource/csdk/security/provisioning/sample/cloud.dat differ

diff --git a/resource/csdk/security/provisioning/sample/cloud.json b/resource/csdk/security/provisioning/sample/cloud.json
index 31657f1..432877f 100644 (file)
--- a/resource/csdk/security/provisioning/sample/cloud.json
+++ b/resource/csdk/security/provisioning/sample/cloud.json
@@ -1,49 +1,44 @@
 {
     "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": {

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat
index 3bc4c7a..8c7994f 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_client.json b/resource/csdk/security/provisioning/sample/oic_svr_db_client.json
index 5ae26e7..1f2b4ed 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_client.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_client.json
@@ -3,113 +3,40 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 3,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
-                "permission": 6\r
+                "permission": 14\r
             },\r
             {\r
                 "aceid": 4,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" },\r
+                    { "href": "/oic/sec/roles" }\r
                 ],\r
-                "permission": 6\r
-            },\r
-            {\r
-                "aceid": 5,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
-            },\r
-            {\r
-                "aceid": 6,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
+                "permission": 14\r
             }\r
         ],\r
         "rowneruuid" : "61646D69-6E44-6576-6963-655575696430"\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat
index a077ceb..88f3b17 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
index 274e112..1303238 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.json
@@ -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": ""

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat
index 4cf4d0e..4296544 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
index 88a6936..ddd50db 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
@@ -3,119 +3,46 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 3,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
-                "permission": 6\r
+                "permission": 14\r
             },\r
             {\r
                 "aceid": 4,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" },\r
+                    { "href": "/oic/sec/roles" }\r
                 ],\r
-                "permission": 6\r
-            },\r
-            {\r
-                "aceid": 5,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
-            },\r
-            {\r
-                "aceid": 6,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
+                "permission": 14\r
             }\r
         ],\r
         "rowneruuid": "00000000-0000-0000-0000-000000000000"\r
     },\r
     "pstat": {\r
-        "dos": {"s": 1, "p": false},\r
+        "dos": { "s": 1, "p": false },\r
         "isop": false,\r
         "cm": 2,\r
         "tm": 0,\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.dat
index 360183b..19e4697 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.json
index 9393bea..73a3f5e 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_mvjustworks.json
@@ -3,113 +3,40 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 3,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
-                "permission": 6\r
+                "permission": 14\r
             },\r
             {\r
                 "aceid": 4,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" },\r
+                    { "href": "/oic/sec/roles" }\r
                 ],\r
-                "permission": 6\r
-            },\r
-            {\r
-                "aceid": 5,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
-            },\r
-            {\r
-                "aceid": 6,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
+                "permission": 14\r
             }\r
         ],\r
         "rowneruuid": "00000000-0000-0000-0000-000000000000"\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat
index 491a570..edfb5a4 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.json
index 34ed9f1..d9669f6 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.json
@@ -3,113 +3,40 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 3,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
-                "permission": 6\r
+                "permission": 14\r
             },\r
             {\r
                 "aceid": 4,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" },\r
+                    { "href": "/oic/sec/roles" }\r
                 ],\r
-                "permission": 6\r
-            },\r
-            {\r
-                "aceid": 5,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
-            },\r
-            {\r
-                "aceid": 6,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
+                "permission": 14\r
             }\r
         ],\r
         "rowneruuid": "00000000-0000-0000-0000-000000000000"\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat
index 8a21a23..4ae3ab3 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
index 7cbe1d4..d17b209 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
@@ -3,113 +3,40 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 3,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
-                "permission": 6\r
+                "permission": 14\r
             },\r
             {\r
                 "aceid": 4,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" },\r
+                    { "href": "/oic/sec/roles" }\r
                 ],\r
-                "permission": 6\r
-            },\r
-            {\r
-                "aceid": 5,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
-            },\r
-            {\r
-                "aceid": 6,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
+                "permission": 14\r
             }\r
         ],\r
         "rowneruuid": "00000000-0000-0000-0000-000000000000"\r

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat
index 88538e2..6e0015b 100644 (file)
Binary files a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat and b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat differ

diff --git a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json
index 1f12fa3..2ebc3de 100644 (file)
--- a/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json
+++ b/resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.json
@@ -3,133 +3,44 @@
         "aclist2": [\r
             {\r
                 "aceid": 1,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/sec/pconf",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.pconf"],\r
-                        "if": ["oic.if.baseline"]\r
-                    },{\r
-                        "href": "/oic/sec/dpairing",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.dpairing"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"},\r
+                    { "href": "/oic/sec/pconf"},\r
+                    { "href": "/oic/sec/dpairing"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 2,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/res",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.res"],\r
-                        "if": ["oic.if.ll"]\r
-                    },{\r
-                        "href": "/oic/d",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.d"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/p",\r
-                        "rel": "",\r
-                        "rt": ["oic.wk.p"],\r
-                        "if": ["oic.if.baseline", "oic.if.r"]\r
-                    },{\r
-                        "href": "/oic/sec/pconf",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.pconf"],\r
-                        "if": ["oic.if.baseline"]\r
-                    },{\r
-                        "href": "/oic/sec/dpairing",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.dpairing"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"},\r
+                    { "href": "/oic/sec/pconf"},\r
+                    { "href": "/oic/sec/dpairing"}\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 3,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
+                "subject": { "conntype": "anon-clear" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
-                "permission": 6\r
+                "permission": 14\r
             },\r
             {\r
                 "aceid": 4,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
+                "subject": { "conntype": "auth-crypt" },\r
                 "resources": [\r
-                    {\r
-                        "href": "/oic/sec/doxm",\r
-                        "rel": "",\r
-                        "rt": ["oic.r.doxm"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
+                    { "href": "/oic/sec/doxm" },\r
+                    { "href": "/oic/sec/roles" }\r
                 ],\r
-                "permission": 6\r
-            },\r
-            {\r
-                "aceid": 5,\r
-                "subject": {\r
-                  "conntype": "anon-clear"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
-            },\r
-            {\r
-                "aceid": 6,\r
-                "subject": {\r
-                  "conntype": "auth-crypt"\r
-                },\r
-                "resources": [\r
-                        {\r
-                            "href": "/oic/sec/roles",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                "permission": 31\r
+                "permission": 14\r
             }\r
         ],\r
         "rowneruuid" : "5375624F-776E-6572-436C-69656E743030"\r