[IOT-2426] Update IPCA ElevatorServer files

Update the JSON and DAT files to comply with the recent security changes.

Change-Id: I8b5f70a4f3153b4000eba9f5569ed54bc28529e9
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20961
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

diff --git a/resource/IPCA/samples/ElevatorServer/ElevatorServerSecurityDB.dat b/resource/IPCA/samples/ElevatorServer/ElevatorServerSecurityDB.dat
index e9a5141..13f8131 100644 (file)
Binary files a/resource/IPCA/samples/ElevatorServer/ElevatorServerSecurityDB.dat and b/resource/IPCA/samples/ElevatorServer/ElevatorServerSecurityDB.dat differ

diff --git a/resource/IPCA/samples/ElevatorServer/ElevatorServerSecurityDB.json b/resource/IPCA/samples/ElevatorServer/ElevatorServerSecurityDB.json
index 786f505..7122110 100644 (file)
--- a/resource/IPCA/samples/ElevatorServer/ElevatorServerSecurityDB.json
+++ b/resource/IPCA/samples/ElevatorServer/ElevatorServerSecurityDB.json
@@ -1,73 +1,62 @@
-{
-    "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"]
-                        },
-                        {
-                            "href": "/oic/sec/cred",
-                            "rel": "",
-                            "rt": ["oic.r.cred"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 6
-                }
-            ]
-        },
-        "rowneruuid" : ""
-    },
-    "pstat": {
-        "isop": false,
-        "deviceuuid": "",
-        "rowneruuid": "",
-        "cm": 2,
-        "tm": 0,
-        "om": 4,
-        "sm": 4
-        },
-    "doxm": {
-        "oxms": [0,1,65280],
-        "oxmsel": 0,
-        "sct": 1,
-        "owned": false,
-        "deviceuuid": "",
-        "devowneruuid": "",
-        "rowneruuid": ""
-    }
-}
+{\r
+    "acl": {\r
+        "aclist2": [\r
+            {\r
+                "aceid": 1,\r
+                "subject": { "conntype": "anon-clear" },\r
+                "resources": [\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
+                ],\r
+                "permission": 2\r
+            },\r
+            {\r
+                "aceid": 2,\r
+                "subject": { "conntype": "auth-crypt" },\r
+                "resources": [\r
+                    { "href": "/oic/res" },\r
+                    { "href": "/oic/d" },\r
+                    { "href": "/oic/p"}\r
+                ],\r
+                "permission": 2\r
+            },\r
+            {\r
+                "aceid": 3,\r
+                "subject": { "conntype": "anon-clear" },\r
+                "resources": [\r
+                    { "href": "/oic/sec/doxm" }\r
+                ],\r
+                "permission": 14\r
+            },\r
+            {\r
+                "aceid": 4,\r
+                "subject": { "conntype": "auth-crypt" },\r
+                "resources": [\r
+                    { "href": "/oic/sec/doxm" },\r
+                    { "href": "/oic/sec/roles" }\r
+                ],\r
+                "permission": 14\r
+            }\r
+        ],\r
+        "rowneruuid": ""\r
+    },\r
+    "pstat": {\r
+        "dos": {"s": 1, "p": false},\r
+        "isop": false,\r
+        "cm": 2,\r
+        "tm": 0,\r
+        "om": 4,\r
+        "sm": 4,\r
+        "rowneruuid": ""\r
+    },\r
+    "doxm": {\r
+        "oxms": [0, 1, 65280],\r
+        "oxmsel": 0,\r
+        "sct": 1,\r
+        "owned": false,\r
+        "deviceuuid": "",\r
+        "devowneruuid": "",\r
+        "rowneruuid": ""\r
+    }\r
+}
\ No newline at end of file