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 <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19817
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat b/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat
index 8eb0616..3b7dc82 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat and b/resource/csdk/stack/samples/linux/secure/oic_amss_db.dat differ

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 32d7b62..693febe 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_amss_db.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_amss_db.json
@@ -1,63 +1,72 @@
 {\r
     "acl": {\r
-        "aclist": {\r
-            "aces": [\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/res",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.res"],\r
-                            "if": ["oic.if.ll"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/d",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.d"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/p",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.p"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
+        "aclist2": [\r
+            {\r
+                "aceid": 1,\r
+                "subject": {\r
+                  "conntype": "anon-clear"\r
                 },\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/sec/doxm",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.doxm"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/pstat",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.pstat"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
-                }\r
-            ]\r
-        },\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/doxm",\r
+                        "rel": "",\r
+                        "rt": ["oic.r.doxm"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 2\r
+            },\r
+            {\r
+                "aceid": 2,\r
+                "subject": {\r
+                  "conntype": "auth-crypt"\r
+                },\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/doxm",\r
+                        "rel": "",\r
+                        "rt": ["oic.r.doxm"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 2\r
+            }\r
+        ],\r
         "rowneruuid" : "31393139-3139-3139-3139-313931393139"\r
     },\r
     "pstat": {\r
         "dos": {"s": 3, "p": false},\r
         "isop": true,\r
-        "deviceuuid": "31393139-3139-3139-3139-313931393139",\r
         "rowneruuid": "31393139-3139-3139-3139-313931393139",\r
         "cm": 0,\r
         "tm": 0,\r

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
index 184e10f..d7ad646 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_devowner.dat differ

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 a5e4772..2c4e06b 100644 (file)
--- 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
@@ -1,63 +1,72 @@
 {\r
     "acl": {\r
-        "aclist": {\r
-            "aces": [\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/res",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.res"],\r
-                            "if": ["oic.if.ll"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/d",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.d"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/p",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.p"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
+        "aclist2": [\r
+            {\r
+                "aceid": 1,\r
+                "subject": {\r
+                  "conntype": "anon-clear"\r
                 },\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/sec/doxm",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.doxm"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/pstat",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.pstat"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
-                }\r
-            ]\r
-        },\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/doxm",\r
+                        "rel": "",\r
+                        "rt": ["oic.r.doxm"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 2\r
+            },\r
+            {\r
+                "aceid": 2,\r
+                "subject": {\r
+                  "conntype": "auth-crypt"\r
+                },\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/doxm",\r
+                        "rel": "",\r
+                        "rt": ["oic.r.doxm"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 2\r
+            }\r
+        ],\r
         "rowneruuid" : "32323232-3232-3232-3232-323232323232"\r
     },\r
     "pstat": {\r
         "dos": {"s": 3, "p": false},\r
         "isop": true,\r
-        "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
         "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
         "cm": 0,\r
         "tm": 0,\r

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
index 836dde1..dae6ea5 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.dat differ

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 c280b40..a26d85a 100644 (file)
--- 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
@@ -1,57 +1,87 @@
 {
     "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": {

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
index 7354bfd..2747f79 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client_nondevowner.dat differ

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 f30b29e..0e37e18 100644 (file)
--- 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
@@ -1,63 +1,72 @@
 {\r
     "acl": {\r
-        "aclist": {\r
-            "aces": [\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/res",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.res"],\r
-                            "if": ["oic.if.ll"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/d",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.d"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/p",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.p"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
+        "aclist2": [\r
+            {\r
+                "aceid": 1,\r
+                "subject": {\r
+                  "conntype": "anon-clear"\r
                 },\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/sec/doxm",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.doxm"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/pstat",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.pstat"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
-                }\r
-            ]\r
-        },\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/doxm",\r
+                        "rel": "",\r
+                        "rt": ["oic.r.doxm"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 2\r
+            },\r
+            {\r
+                "aceid": 2,\r
+                "subject": {\r
+                  "conntype": "auth-crypt"\r
+                },\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/doxm",\r
+                        "rel": "",\r
+                        "rt": ["oic.r.doxm"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 2\r
+            }\r
+        ],\r
         "rowneruuid" : "31393139-3139-3139-3139-313931393139"\r
     },\r
     "pstat": {\r
         "dos": {"s": 3, "p": false},\r
         "isop": true,\r
-        "deviceuuid": "31393139-3139-3139-3139-313931393139",\r
         "rowneruuid": "31393139-3139-3139-3139-313931393139",\r
         "cm": 0,\r
         "tm": 0,\r

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
index ad154f7..7b8e676 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.dat differ

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 c985873..bef7858 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
@@ -1,99 +1,107 @@
 {\r
     "acl": {\r
-        "aclist": {\r
-            "aces": [\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/res",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.res"],\r
-                            "if": ["oic.if.ll"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/d",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.d"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/p",\r
-                            "rel": "",\r
-                            "rt": ["oic.wk.p"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/acl",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.acl"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\r
+        "aclist2": [\r
+            {\r
+                "aceid": 1,\r
+                "subject": {\r
+                  "conntype": "anon-clear"\r
                 },\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/sec/doxm",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.doxm"],\r
-                            "if": ["oic.if.baseline"]\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/pstat",\r
-                            "rel": "",\r
-                            "rt": ["oic.r.pstat"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 2\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
+                ],\r
+                "permission": 2\r
+            },\r
+            {\r
+                "aceid": 2,\r
+                "subject": {\r
+                  "conntype": "auth-crypt"\r
                 },\r
-                {\r
-                    "subjectuuid": "32323232-3232-3232-3232-323232323232",\r
-                    "resources": [\r
-                        {\r
-                            "href": "*",\r
-                            "rel": "",\r
-                            "rt": ["*"],\r
-                            "if": ["*"]\r
-                        }\r
-                    ],\r
-                    "permission": 7\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
+                ],\r
+                "permission": 2\r
+            },\r
+            {\r
+                "aceid": 3,\r
+                "subject": {\r
+                    "uuid": "32323232-3232-3232-3232-323232323232"\r
                 },\r
-                {\r
-                    "subjectuuid": "31393139-3139-3139-3139-313931393139",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/a/led",\r
-                            "rel": "",\r
-                            "rt": ["oic.core"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 7\r
+                "resources": [\r
+                    {\r
+                        "href": "*",\r
+                        "rel": "",\r
+                        "rt": ["*"],\r
+                        "if": ["*"]\r
+                    }\r
+                ],\r
+                "permission": 7\r
+            },\r
+            {\r
+                "aceid": 4,\r
+                "subject": {\r
+                    "uuid": "31393139-3139-3139-3139-313931393139"\r
                 },\r
-                {\r
-                    "subjectuuid": "37373737-3737-3737-3737-373737373737",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/a/led",\r
-                            "rel": "",\r
-                            "rt": ["oic.core"],\r
-                            "if": ["oic.if.baseline"]\r
-                        }\r
-                    ],\r
-                    "permission": 6\r
-                }\r
-            ]\r
-        },\r
+                "resources": [\r
+                    {\r
+                        "href": "/a/led",\r
+                        "rel": "",\r
+                        "rt": ["oic.core"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 7\r
+            },\r
+            {\r
+                "aceid": 5,\r
+                "subject": {\r
+                    "uuid": "37373737-3737-3737-3737-373737373737"\r
+                },\r
+                "resources": [\r
+                    {\r
+                        "href": "/a/led",\r
+                        "rel": "",\r
+                        "rt": ["oic.core"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 6\r
+            }\r
+        ],\r
         "rowneruuid" : "31313131-3131-3131-3131-313131313131"\r
     },\r
     "pstat": {\r
         "dos": {"s": 3, "p": false},\r
         "isop": true,\r
-        "deviceuuid": "31313131-3131-3131-3131-313131313131",\r
         "rowneruuid": "31313131-3131-3131-3131-313131313131",\r
         "cm": 0,\r
         "tm": 0,\r

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
index 87196f9..4e2f84f 100644 (file)
Binary files a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat and b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server_justworks.dat differ

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 58d12de..88a6936 100644 (file)
--- 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
@@ -1,76 +1,135 @@
 {\r
     "acl": {\r
-        "aclist": {\r
-            "aces": [\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/res",\r
-                            "rt": ["oic.wk.res"],\r
-                            "if": ["oic.if.ll"],\r
-                            "rel": ""\r
-                        },\r
-                        {\r
-                            "href": "/oic/d",\r
-                            "rt": ["oic.wk.d"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"],\r
-                            "rel": ""\r
-                        },\r
+        "aclist2": [\r
+            {\r
+                "aceid": 1,\r
+                "subject": {\r
+                  "conntype": "anon-clear"\r
+                },\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
+                ],\r
+                "permission": 2\r
+            },\r
+            {\r
+                "aceid": 2,\r
+                "subject": {\r
+                  "conntype": "auth-crypt"\r
+                },\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
+                ],\r
+                "permission": 2\r
+            },\r
+            {\r
+                "aceid": 3,\r
+                "subject": {\r
+                  "conntype": "anon-clear"\r
+                },\r
+                "resources": [\r
+                    {\r
+                        "href": "/oic/sec/doxm",\r
+                        "rel": "",\r
+                        "rt": ["oic.r.doxm"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 6\r
+            },\r
+            {\r
+                "aceid": 4,\r
+                "subject": {\r
+                  "conntype": "auth-crypt"\r
+                },\r
+                "resources": [\r
+                    {\r
+                        "href": "/oic/sec/doxm",\r
+                        "rel": "",\r
+                        "rt": ["oic.r.doxm"],\r
+                        "if": ["oic.if.baseline"]\r
+                    }\r
+                ],\r
+                "permission": 6\r
+            },\r
+            {\r
+                "aceid": 5,\r
+                "subject": {\r
+                  "conntype": "anon-clear"\r
+                },\r
+                "resources": [\r
                         {\r
-                            "href": "/oic/p",\r
-                            "rt": ["oic.wk.p"],\r
-                            "if": ["oic.if.baseline", "oic.if.r"],\r
-                            "rel": ""\r
+                            "href": "/oic/sec/roles",\r
+                            "rel": "",\r
+                            "rt": ["oic.r.cred"],\r
+                            "if": ["oic.if.baseline"]\r
                         }\r
                     ],\r
-                    "permission": 2\r
+                "permission": 31\r
+            },\r
+            {\r
+                "aceid": 6,\r
+                "subject": {\r
+                  "conntype": "auth-crypt"\r
                 },\r
-                {\r
-                    "subjectuuid": "*",\r
-                    "resources": [\r
-                        {\r
-                            "href": "/oic/sec/doxm",\r
-                            "rt": ["oic.r.doxm"],\r
-                            "if": ["oic.if.baseline"],\r
-                            "rel": ""\r
-                        },\r
-                        {\r
-                            "href": "/oic/sec/pstat",\r
-                            "rt": ["oic.r.pstat"],\r
-                            "if": ["oic.if.baseline"],\r
-                            "rel": ""\r
-                        },\r
+                "resources": [\r
                         {\r
-                            "href": "/oic/sec/cred",\r
+                            "href": "/oic/sec/roles",\r
+                            "rel": "",\r
                             "rt": ["oic.r.cred"],\r
-                            "if": ["oic.if.baseline"],\r
-                            "rel": ""\r
+                            "if": ["oic.if.baseline"]\r
                         }\r
                     ],\r
-                    "permission": 6\r
-                }\r
-            ]\r
-        },\r
-        "rowneruuid": "6a757374-776f-726b-4465-765575696430"\r
+                "permission": 31\r
+            }\r
+        ],\r
+        "rowneruuid": "00000000-0000-0000-0000-000000000000"\r
     },\r
     "pstat": {\r
         "dos": {"s": 1, "p": false},\r
         "isop": false,\r
-        "deviceuuid": "6a757374-776f-726b-4465-765575696430",\r
         "cm": 2,\r
         "tm": 0,\r
         "om": 4,\r
         "sm": 4,\r
-        "rowneruuid": "6a757374-776f-726b-4465-765575696430"\r
+        "rowneruuid": "00000000-0000-0000-0000-000000000000"\r
     },\r
     "doxm": {\r
         "oxms": [0],\r
         "oxmsel": 0,\r
         "sct": 1,\r
         "owned": false,\r
-        "deviceuuid": "6a757374-776f-726b-4465-765575696430",\r
-        "devowneruuid": "",\r
-        "rowneruuid": "6a757374-776f-726b-4465-765575696430"\r
+        "deviceuuid": "12345678-1234-1234-1234-123456789012",\r
+        "devowneruuid": "00000000-0000-0000-0000-000000000000",\r
+        "rowneruuid": "00000000-0000-0000-0000-000000000000"\r
     }\r
 }\r