Update to server .json and .db files to allow /p and /d access,

to address JIRA issue 1077.

The default oic_svr_db_server_justworks.json and .dat files, along
with _randompin.json and .dat, do not contain ACL entries to allow
access to /p and /d.  This may confuse vendors who will most likely
wish to change this behavior.  IoTivity should (by default) allow
access, and allow vendors to change to not allow it if they wish.

Note that /oic/res is accessible in the current version prior to
this fix; it is just /oic/p and /oic/d which are not accessible
until new ACLs are provisioned.

Change-Id: I0ca424dc73db366a5c8ceca3236887d90543286e
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.dat b/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.dat
index 0572a8c..bf440f2 100755 (executable)
Binary files a/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.dat and b/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.dat differ

diff --git a/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.json b/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.json
index f95349d..20062b4 100755 (executable)
--- a/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.json
+++ b/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_door.json
@@ -12,6 +12,18 @@
                             "if": ""\r
                         },\r
                         {\r
+                            "href": "/oic/d",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
+                            "href": "/oic/p",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
                             "href": "/oic/res/d",\r
                             "rel": "",\r
                             "rt": "",\r

diff --git a/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.dat b/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.dat
index 4bed096..59f65e5 100755 (executable)
Binary files a/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.dat and b/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.dat differ

diff --git a/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.json b/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.json
index a46d1b2..a7598d4 100755 (executable)
--- a/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.json
+++ b/resource/csdk/security/provisioning/ck_manager/sample/oic_svr_db_light.json
@@ -12,6 +12,18 @@
                             "if": ""\r
                         },\r
                         {\r
+                            "href": "/oic/d",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
+                            "href": "/oic/p",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
                             "href": "/oic/res/d",\r
                             "rel": "",\r
                             "rt": "",\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 3f27f59..3796ce7 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 0f73d7d..20f2c36 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
@@ -12,6 +12,18 @@
                             "if": ""
                         },
                         {
+                            "href": "/oic/d",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
+                            "href": "/oic/p",
+                            "rel": "",
+                            "rt": "",
+                            "if": ""
+                        },
+                        {
                             "href": "/oic/res/d",
                             "rel": "",
                             "rt": "",

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 097a938..4adbf4d 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 c7e20f1..59b56a7 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
@@ -1,5 +1,5 @@
 {\r
-    "acl": {
+    "acl": {\r
         "aclist": {\r
             "aces": [\r
                 {\r
@@ -10,6 +10,16 @@
                             "rel": "",\r
                             "rt": "",\r
                             "if": ""\r
+                        },{\r
+                            "href": "/oic/d",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },{\r
+                            "href": "/oic/p",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
                         },\r
                         {\r
                             "href": "/oic/res/d",\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 ef473a3..cfce7f8 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 7191503..dc595bd 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
@@ -1,5 +1,5 @@
 {\r
-    "acl": {
+    "acl": {\r
         "aclist": {\r
             "aces": [\r
                 {\r
@@ -12,6 +12,18 @@
                             "if": ""\r
                         },\r
                         {\r
+                            "href": "/oic/d",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
+                            "href": "/oic/p",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
                             "href": "/oic/res/d",\r
                             "rel": "",\r
                             "rt": "",\r
@@ -115,4 +127,4 @@
         "rowneruuid": "72616E64-5069-6E44-6576-557569643030",\r
         "dpc": true\r
     }\r
-}
+}\r

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client.json
index 721bf95..4b19514 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_client.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_client.json
@@ -105,4 +105,4 @@
         ],\r
         "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
     }\r
-}
\ No newline at end of file
+}\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 35364e8..43b7a1c 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 047cd47..588ac54 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
@@ -18,6 +18,18 @@
                             "if": ""\r
                         },\r
                         {\r
+                            "href": "/oic/p",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
+                            "href": "/oic/res/d",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
                             "href": "/oic/res/types/d",\r
                             "rel": "",\r
                             "rt": "",\r
@@ -85,4 +97,4 @@
         "rowneruuid": "64697265-6374-7061-6972-696e67446576",\r
         "dpc": false\r
     }\r
-}
\ No newline at end of file
+}\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 4f1831a..693c81d 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 9778537..920c945 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
@@ -12,6 +12,18 @@
                             "if": ""\r
                         },\r
                         {\r
+                            "href": "/oic/d",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
+                            "href": "/oic/p",\r
+                            "rel": "",\r
+                            "rt": "",\r
+                            "if": ""\r
+                        },\r
+                        {\r
                             "href": "/oic/res/d",\r
                             "rel": "",\r
                             "rt": "",\r
@@ -156,4 +168,4 @@
         ],\r
         "rowneruuid": "32323232-3232-3232-3232-323232323232"\r
     }\r
-}
\ No newline at end of file
+}\r