[IOT-2384][CHP][SampleApp] Delete request not working in secure mode

Modify server ACE to provide full permission (0xF) so
that client can perform delete request as well

Change-Id: Iff3687505d8d3c27baac1b58ffd262bc7f10bb53
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20477
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

diff --git a/service/coap-http-proxy/samples/oic_svr_db_client_devowner.json b/service/coap-http-proxy/samples/oic_svr_db_client_devowner.json
index 3f6c2be..221f37a 100644 (file)
--- a/service/coap-http-proxy/samples/oic_svr_db_client_devowner.json
+++ b/service/coap-http-proxy/samples/oic_svr_db_client_devowner.json
@@ -1,65 +1,61 @@
-{
-    "acl": {
-        "aclist2": [
-            {
-                "aceid": 1,
-                "subject": {
-                  "conntype": "anon-clear"
-                },
-                "resources": [
-                    { "href": "/oic/res" },
-                    { "href": "/oic/d" },
-                    { "href": "/oic/p" },
-                    { "href": "/oic/sec/doxm" }
-                ],
-                "permission": 2
-            },
-            {
-                "aceid": 2,
-                "subject": {
-                  "conntype": "auth-crypt"
-                },
-                "resources": [
-                    { "href": "/oic/res" },
-                    { "href": "/oic/d" },
-                    { "href": "/oic/p" },
-                    { "href": "/oic/sec/doxm" }
-                ],
-                "permission": 2
-            }
-        ],
-        "rowneruuid" : "32323232-3232-3232-3232-323232323232"
-    },
-    "pstat": {
-        "dos": {"s": 3, "p": false},
-        "isop": true,
-        "rowneruuid": "32323232-3232-3232-3232-323232323232",
-        "cm": 0,
-        "tm": 0,
-        "om": 4,
-        "sm": 4
-        },
-    "doxm": {
-        "oxms": [0],
-        "oxmsel": 0,
-        "sct": 1,
-        "owned": true,
-        "deviceuuid": "32323232-3232-3232-3232-323232323232",
-        "devowneruuid": "32323232-3232-3232-3232-323232323232",
-        "rowneruuid": "32323232-3232-3232-3232-323232323232"
-    },
-    "cred": {
-        "creds": [
-            {
-                "credid": 1,
-                "subjectuuid": "31313131-3131-3131-3131-313131313131",
-                "credtype": 1,
-                "privatedata": {
-                    "data": "AAAAAAAAAAAAAAAA",
-                    "encoding": "oic.sec.encoding.raw"
-                }
-            }
-        ],
-        "rowneruuid": "32323232-3232-3232-3232-323232323232"
-    }
-}
+{\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
+                    { "href": "/oic/sec/doxm" }\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
+                    { "href": "/oic/sec/doxm" }\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
+        "rowneruuid": "32323232-3232-3232-3232-323232323232",\r
+        "cm": 0,\r
+        "tm": 0,\r
+        "om": 4,\r
+        "sm": 4\r
+        },\r
+    "doxm": {\r
+        "oxms": [0],\r
+        "oxmsel": 0,\r
+        "sct": 1,\r
+        "owned": true,\r
+        "deviceuuid": "32323232-3232-3232-3232-323232323232",\r
+        "devowneruuid": "32323232-3232-3232-3232-323232323232",\r
+        "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
+    },\r
+    "cred": {\r
+        "creds": [\r
+            {\r
+                "credid": 1,\r
+                "subjectuuid": "31313131-3131-3131-3131-313131313131",\r
+                "credtype": 1,\r
+                "privatedata": {\r
+                    "data": "AAAAAAAAAAAAAAAA",\r
+                    "encoding": "oic.sec.encoding.raw"\r
+                }\r
+            }\r
+        ],\r
+        "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
+    }\r
+}\r

diff --git a/service/coap-http-proxy/samples/oic_svr_db_server.dat b/service/coap-http-proxy/samples/oic_svr_db_server.dat
index 7b8e676..d1474e1 100644 (file)
Binary files a/service/coap-http-proxy/samples/oic_svr_db_server.dat and b/service/coap-http-proxy/samples/oic_svr_db_server.dat differ

diff --git a/service/coap-http-proxy/samples/oic_svr_db_server.json b/service/coap-http-proxy/samples/oic_svr_db_server.json
index bef7858..6002a7f 100644 (file)
--- a/service/coap-http-proxy/samples/oic_svr_db_server.json
+++ b/service/coap-http-proxy/samples/oic_svr_db_server.json
@@ -3,97 +3,42 @@
         "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
+                    { "href": "/oic/sec/doxm" }\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
+                    { "href": "/oic/sec/doxm" }\r
                 ],\r
                 "permission": 2\r
             },\r
             {\r
                 "aceid": 3,\r
-                "subject": {\r
-                    "uuid": "32323232-3232-3232-3232-323232323232"\r
-                },\r
-                "resources": [\r
-                    {\r
-                        "href": "*",\r
-                        "rel": "",\r
-                        "rt": ["*"],\r
-                        "if": ["*"]\r
-                    }\r
-                ],\r
-                "permission": 7\r
+                "subject": { "uuid": "32323232-3232-3232-3232-323232323232" },\r
+                "resources": [{ "wc": "*" }],\r
+                "permission": 15\r
             },\r
             {\r
                 "aceid": 4,\r
-                "subject": {\r
-                    "uuid": "31393139-3139-3139-3139-313931393139"\r
-                },\r
-                "resources": [\r
-                    {\r
-                        "href": "/a/led",\r
-                        "rel": "",\r
-                        "rt": ["oic.core"],\r
-                        "if": ["oic.if.baseline"]\r
-                    }\r
-                ],\r
+                "subject": { "uuid": "31393139-3139-3139-3139-313931393139" },\r
+                "resources": [{ "href": "/a/led" }],\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
+                "subject": { "uuid": "37373737-3737-3737-3737-373737373737" },\r
+                "resources": [{ "href": "/a/led" }],\r
                 "permission": 6\r
             }\r
         ],\r