From: Veeraj Khokale Date: Tue, 30 May 2017 09:48:22 +0000 (+0530) Subject: [IOT-2384][CHP][SampleApp] Delete request not working in secure mode X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f19002f60bc446cddf392ef94f4c4584d8f33d5;p=platform%2Fupstream%2Fiotivity.git [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 Reviewed-on: https://gerrit.iotivity.org/gerrit/20477 Tested-by: jenkins-iotivity Reviewed-by: Nathan Heldt-Sheller --- 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 --- 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" - } -} +{ + "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" + } +} 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 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 --- 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": [ { "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" }, + { "href": "/oic/sec/doxm" } ], "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" }, + { "href": "/oic/sec/doxm" } ], "permission": 2 }, { "aceid": 3, - "subject": { - "uuid": "32323232-3232-3232-3232-323232323232" - }, - "resources": [ - { - "href": "*", - "rel": "", - "rt": ["*"], - "if": ["*"] - } - ], - "permission": 7 + "subject": { "uuid": "32323232-3232-3232-3232-323232323232" }, + "resources": [{ "wc": "*" }], + "permission": 15 }, { "aceid": 4, - "subject": { - "uuid": "31393139-3139-3139-3139-313931393139" - }, - "resources": [ - { - "href": "/a/led", - "rel": "", - "rt": ["oic.core"], - "if": ["oic.if.baseline"] - } - ], + "subject": { "uuid": "31393139-3139-3139-3139-313931393139" }, + "resources": [{ "href": "/a/led" }], "permission": 7 }, { "aceid": 5, - "subject": { - "uuid": "37373737-3737-3737-3737-373737373737" - }, - "resources": [ - { - "href": "/a/led", - "rel": "", - "rt": ["oic.core"], - "if": ["oic.if.baseline"] - } - ], + "subject": { "uuid": "37373737-3737-3737-3737-373737373737" }, + "resources": [{ "href": "/a/led" }], "permission": 6 } ],