Skip to content

GitLab

I
iotivity-classic
Commit b8a50a0a authored by Yonggoo Kang's avatar Yonggoo Kang Committed by Randeep
Browse files
Options

Sync-up to Changed RAML spec v1.1 

Patch#1 : 1. Change "subject" to "subjectid"
          2. Add "rel" into "resources"
          3. Change "pubdata","privdata" to "data"
          4. Remove "didformat" from DOXM
          5. Fix subjectid on delete cred process
             (base64 -> canonical)
          6. Update sample json/dat files partially
             (client, justworks, randompin)
Patch#2 : Add missing file
Patch#3 : 1. Update db in security unittest
          2. Fix bug in CRED unittest
          3. Modify ReadCBIRFile function to use resource name
Patch#4 : Remove unnecessary files
Patch#5 : Change "*id" to "*uuid"
Patch#6 : Fix SVACE, Remove redundant comparison
Patch#7 : 1. Modify type of pstat->sm that multiple to single
          2. Replace tabs to spaces
Patch#8 : minor fix
Patch#9 : Modify SelectOperationMode function
Patch#10 : Remove unnecessary variable

NOTE : Please review only, do not merge.
       All of sample json/dat files should be updated after verify.

Change-Id: I97af41a99f7f898516f66c620facd2bedac949f3
Signed-off-by: default avatarYonggoo Kang <ygace.kang@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6223Reviewed-by: default avatarJongmin Choi <jminl.choi@samsung.com>
Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: default avatardongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep's avatarRandeep Singh <randeep.s@samsung.com>
parent 65878a47
Hide whitespace changes
Inline Side-by-side
Showing with 924 additions and 1042 deletions
resource/csdk/security/include/internal/srmresourcestrings.h 100644 → 100755
View file @ b8a50a0a
......@@ -129,10 +129,12 @@ extern const char * OIC_JSON_SPM_NAME;
extern const char * OIC_JSON_PDEVICE_ID_NAME;
extern const char * OIC_JSON_RLIST_NAME;
extern const char * OIC_JSON_HREF_NAME;
extern const char * OIC_JSON_REL_NAME;
extern const char * OIC_JSON_RT_NAME;
extern const char * OIC_JSON_IF_NAME;
extern const char * OIC_JSON_ROWNERID_NAME;
extern const char * OIC_JSON_ENCODING_NAME;
extern const char * OIC_JSON_DATA_NAME;
extern const char * OIC_JSON_EMPTY_STRING;
......
resource/csdk/security/provisioning/sample/oic_svr_db_client.json
View file @ b8a50a0a
{
"acl": {
"aclist":{
"aces":[
{
"subject": "*",
"resources": [
{
"href": "/oic/res",
"rt": "",
"if": ""
},
{
"href": "/oic/d",
"rt": "",
"if": ""
},
{
"href": "/oic/p",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rt": "",
"if": ""
},
{
"href": "/oic/ad",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/amacl",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subject": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rt": "",
"if": ""
} ,
{
"href": "/oic/sec/pstat",
"rt": "",
"if": ""
}
],
"permission": 2
}
]
},
"rownerid" : "61646D69-6E44-6576-6963-655575696430"
},
"pstat": {
"isop": true,
"cm": 2,
"tm": 0,
"om": 3,
"sm": [3],
"deviceid": "61646D69-6E44-6576-6963-655575696430",
"rownerid": "61646D69-6E44-6576-6963-655575696430"
},
"doxm": {
"oxms": [0],
"oxmsel": 0,
"sct": 1,
"owned": true,
"didformat": 0,
"deviceid": "61646D69-6E44-6576-6963-655575696430",
"dpc": false,
"devownerid": "61646D69-6E44-6576-6963-655575696430",
"rownerid": "61646D69-6E44-6576-6963-655575696430"
}
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/p",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/ad",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/amacl",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2
}
]
},
"rowneruuid" : "61646D69-6E44-6576-6963-655575696430"
},
"pstat": {
"isop": true,
"cm": 2,
"tm": 0,
"om": 3,
"sm": 3,
"deviceuuid": "61646D69-6E44-6576-6963-655575696430",
"rowneruuid": "61646D69-6E44-6576-6963-655575696430"
},
"doxm": {
"oxms": [0],
"oxmsel": 0,
"sct": 1,
"owned": true,
"deviceuuid": "61646D69-6E44-6576-6963-655575696430",
"dpc": false,
"devowneruuid": "61646D69-6E44-6576-6963-655575696430",
"rowneruuid": "61646D69-6E44-6576-6963-655575696430"
}
}
resource/csdk/security/provisioning/sample/oic_svr_db_prov_tool.dat deleted 100644 → 0
View file @ 65878a47
This diff was suppressed by a .gitattributes entry.
resource/csdk/security/provisioning/sample/oic_svr_db_prov_tool.json deleted 100644 → 0
View file @ 65878a47
{
"acl": {
"aclist":{
"aces":[
{
"subject": "*",
"resources": [
{
"href": "/oic/res",
"rt": "",
"if": ""
},
{
"href": "/oic/d",
"rt": "",
"if": ""
},
{
"href": "/oic/p",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rt": "",
"if": ""
},
{
"href": "/oic/ad",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subject": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rt": "",
"if": ""
} ,
{
"href": "/oic/sec/pstat",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/acl",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/cred",
"rt": "",
"if": ""
}
],
"permission": 7
}
]
},
"rownerid" : "61646D69-6E44-6576-6963-655575696430"
},
"pstat": {
"isop": true,
"cm": 2,
"tm": 0,
"om": 3,
"sm": [3],
"deviceid": "61646D69-6E44-6576-6963-655575696430",
"rownerid": "61646D69-6E44-6576-6963-655575696430"
},
"doxm": {
"oxms": [0],
"oxmsel": 0,
"sct": 1,
"owned": true,
"didformat": 0,
"deviceid": "61646D69-6E44-6576-6963-655575696430",
"dpc": false,
"devownerid": "61646D69-6E44-6576-6963-655575696430",
"rownerid": "61646D69-6E44-6576-6963-655575696430"
}
}
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
View file @ b8a50a0a
{
"acl": {
"aclist":{
"aces":[
{
"subject": "*",
"resources": [
{
"href": "/oic/res",
"rt": "",
"if": ""
},
{
"href": "/oic/res/d",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rt": "",
"if": ""
},
{
"href": "/oic/presence",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subject": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/pstat",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/acl",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/cred",
"rt": "",
"if": ""
}
],
"permission": 6
},
{
"subject": "*",
"resources": [
{
"href": "/oic/sec/pconf",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/dpairing",
"rt": "",
"if": ""
}
],
"permission": 6
}
]
},
"rownerid" : "6A757374-776F-726B-4465-765575696430"
},
"pstat": {
"isop": false,
"deviceid": "6A757374-776F-726B-4465-765575696430",
"rownerid": "6A757374-776F-726B-4465-765575696430",
"cm": 2,
"tm": 0,
"om": 3,
"sm": [3]
},
"doxm": {
"oxms": [0],
"oxmsel": 0,
"sct": 1,
"owned": false,
"didformat": 0,
"deviceid": "6A757374-776F-726B-4465-765575696430",
"devownerid": "",
"rownerid": "6A757374-776F-726B-4465-765575696430",
"dpc": true
}
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/res/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/presence",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/pstat",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/acl",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/cred",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 6
},
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/sec/pconf",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/dpairing",
"rel": "",
"rt": "",
"if": ""
}
],
"permission": 6
}
]
},
"rowneruuid" : "6A757374-776F-726B-4465-765575696430"
},
"pstat": {
"isop": false,
"deviceuuid": "6A757374-776F-726B-4465-765575696430",
"rowneruuid": "6A757374-776F-726B-4465-765575696430",
"cm": 2,
"tm": 0,
"om": 3,
"sm": 3
},
"doxm": {
"oxms": [0],
"oxmsel": 0,
"sct": 1,
"owned": false,
"deviceuuid": "6A757374-776F-726B-4465-765575696430",
"devowneruuid": "",
"rowneruuid": "6A757374-776F-726B-4465-765575696430",
"dpc": true
}
}
\ No newline at end of file
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
View file @ b8a50a0a
{
"acl": {
"aclist":{
"aces":[
{
"subject": "*",
"resources": [
{
"href": "/oic/res",
"rt": "",
"if": ""
},
{
"href": "/oic/res/d",
"rt": "",
"if": ""
},
{
"href": "/oic/res/types/d",
"rt": "",
"if": ""
},
{
"href": "/oic/presence",
"rt": "",
"if": ""
}
],
"permission": 2
},
{
"subject": "*",
"resources": [
{
"href": "/oic/sec/doxm",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/pstat",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/acl",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/cred",
"rt": "",
"if": ""
}
],
"permission": 6
},
{
"subject": "*",
"resources": [
{
"href": "/oic/sec/pconf",
"rt": "",
"if": ""
},
{
"href": "/oic/sec/dpairing",
"rt": "",
"if": ""
}
],
"permission": 6
}
]
},
"rownerid" : "72616E64-5069-6E44-6576-557569643030"
},
"pstat": {
"isop": false,
"deviceid": "72616E64-5069-6E44-6576-557569643030",
"rownerid": "72616E64-5069-6E44-6576-557569643030",
"cm": 2,
"tm": 0,
"om": 3,
"sm": [3]
},
"doxm": {
"oxms": [0,1],
"oxmsel": 0,
"sct": 1,
"owned": false,
"didformat": 0,
"deviceid": "72616E64-5069-6E44-6576-557569643030",
"devownerid": "",
"rownerid": "72616E64-5069-6E44-6576-557569643030",
"dpc": true
}
"aclist": {
"aces": [
{
"subjectuuid": "*",
"resources": [
{
"href": "/oic/res",
"rel": "",
"rt": "",
"if": ""
},
{
"href": "/oic/res/d",
"rel": "",