From 333df2714d4c6cc451b038dd9cd989264a60d1f2 Mon Sep 17 00:00:00 2001 From: Jongmin Choi Date: Fri, 24 Jun 2016 18:33:22 +0900 Subject: [PATCH] Fixed Security Resource Flags and Interface OCResourceProperty Fixed for Following Security Resources - doxm: OC_OBSERVABLE Removed - cred, pstat: changed from OC_RES_PROP_NONE to OC_SECURE Patch #2: OC_DISCOVERVABLE added to pstat Patch #4: oic.mi.def removed Change-Id: I35978a242636754977724045780af0082562b525 Signed-off-by: Jongmin Choi Reviewed-on: https://gerrit.iotivity.org/gerrit/8951 Tested-by: jenkins-iotivity Reviewed-by: Jongsung Lee Reviewed-by: Randeep Singh --- resource/csdk/security/include/internal/srmresourcestrings.h | 1 - resource/csdk/security/src/aclresource.c | 2 +- resource/csdk/security/src/amaclresource.c | 2 +- resource/csdk/security/src/credresource.c | 4 ++-- resource/csdk/security/src/crlresource.c | 2 +- resource/csdk/security/src/doxmresource.c | 4 ++-- resource/csdk/security/src/dpairingresource.c | 2 +- resource/csdk/security/src/pconfresource.c | 2 +- resource/csdk/security/src/pstatresource.c | 5 +++-- resource/csdk/security/src/srmresourcestrings.c | 1 - resource/csdk/security/src/svcresource.c | 2 +- resource/csdk/security/src/verresource.c | 2 +- resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp | 7 +++++++ 13 files changed, 21 insertions(+), 15 deletions(-) diff --git a/resource/csdk/security/include/internal/srmresourcestrings.h b/resource/csdk/security/include/internal/srmresourcestrings.h index c1900ac..c304887 100644 --- a/resource/csdk/security/include/internal/srmresourcestrings.h +++ b/resource/csdk/security/include/internal/srmresourcestrings.h @@ -25,7 +25,6 @@ extern const char * SVR_DB_FILE_NAME; extern const char * SVR_DB_DAT_FILE_NAME; -extern const char * OIC_MI_DEF; //AMACL extern const char * OIC_RSRC_TYPE_SEC_AMACL; diff --git a/resource/csdk/security/src/aclresource.c b/resource/csdk/security/src/aclresource.c index 381c82f..6151ebe 100644 --- a/resource/csdk/security/src/aclresource.c +++ b/resource/csdk/security/src/aclresource.c @@ -1096,7 +1096,7 @@ static OCStackResult CreateACLResource() ret = OCCreateResource(&gAclHandle, OIC_RSRC_TYPE_SEC_ACL, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_ACL_URI, ACLEntityHandler, NULL, diff --git a/resource/csdk/security/src/amaclresource.c b/resource/csdk/security/src/amaclresource.c index 372fe5a..d29187f 100644 --- a/resource/csdk/security/src/amaclresource.c +++ b/resource/csdk/security/src/amaclresource.c @@ -541,7 +541,7 @@ static OCStackResult CreateAmaclResource() { OCStackResult ret = OCCreateResource(&gAmaclHandle, OIC_RSRC_TYPE_SEC_AMACL, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_AMACL_URI, AmaclEntityHandler, NULL, diff --git a/resource/csdk/security/src/credresource.c b/resource/csdk/security/src/credresource.c index 35eff77..00e8e16 100644 --- a/resource/csdk/security/src/credresource.c +++ b/resource/csdk/security/src/credresource.c @@ -1254,11 +1254,11 @@ OCStackResult CreateCredResource() { OCStackResult ret = OCCreateResource(&gCredHandle, OIC_RSRC_TYPE_SEC_CRED, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_CRED_URI, CredEntityHandler, NULL, - OC_RES_PROP_NONE); + OC_SECURE); if (OC_STACK_OK != ret) { diff --git a/resource/csdk/security/src/crlresource.c b/resource/csdk/security/src/crlresource.c index d9f5caf..23781b7 100644 --- a/resource/csdk/security/src/crlresource.c +++ b/resource/csdk/security/src/crlresource.c @@ -373,7 +373,7 @@ static OCStackResult CreateCRLResource() { OCStackResult ret = OCCreateResource(&gCrlHandle, OIC_RSRC_TYPE_SEC_CRL, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_CRL_URI, CRLEntityHandler, NULL, diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c index 57280f3..33935a1 100644 --- a/resource/csdk/security/src/doxmresource.c +++ b/resource/csdk/security/src/doxmresource.c @@ -863,11 +863,11 @@ OCStackResult CreateDoxmResource() { OCStackResult ret = OCCreateResource(&gDoxmHandle, OIC_RSRC_TYPE_SEC_DOXM, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_DOXM_URI, DoxmEntityHandler, NULL, - OC_OBSERVABLE | OC_SECURE | + OC_SECURE | OC_DISCOVERABLE); if (OC_STACK_OK != ret) diff --git a/resource/csdk/security/src/dpairingresource.c b/resource/csdk/security/src/dpairingresource.c index f9c9897..d5b059b 100644 --- a/resource/csdk/security/src/dpairingresource.c +++ b/resource/csdk/security/src/dpairingresource.c @@ -657,7 +657,7 @@ OCStackResult CreateDpairingResource() ret = OCCreateResource(&gDpairHandle, OIC_RSRC_TYPE_SEC_DPAIRING, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_DPAIRING_URI, DpairingEntityHandler, NULL, diff --git a/resource/csdk/security/src/pconfresource.c b/resource/csdk/security/src/pconfresource.c index 828e943..990b6a2 100644 --- a/resource/csdk/security/src/pconfresource.c +++ b/resource/csdk/security/src/pconfresource.c @@ -1011,7 +1011,7 @@ OCStackResult CreatePconfResource() ret = OCCreateResource(&gPconfHandle, OIC_RSRC_TYPE_SEC_PCONF, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_PCONF_URI, PconfEntityHandler, NULL, diff --git a/resource/csdk/security/src/pstatresource.c b/resource/csdk/security/src/pstatresource.c index 75793c2..317991b 100644 --- a/resource/csdk/security/src/pstatresource.c +++ b/resource/csdk/security/src/pstatresource.c @@ -460,11 +460,12 @@ static OCEntityHandlerResult HandlePstatPostRequest(const OCEntityHandlerRequest { OCStackResult ret = OCCreateResource(&gPstatHandle, OIC_RSRC_TYPE_SEC_PSTAT, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_PSTAT_URI, PstatEntityHandler, NULL, - OC_RES_PROP_NONE); + OC_SECURE | + OC_DISCOVERABLE); if (OC_STACK_OK != ret) { diff --git a/resource/csdk/security/src/srmresourcestrings.c b/resource/csdk/security/src/srmresourcestrings.c index d363b30..2b435c8 100644 --- a/resource/csdk/security/src/srmresourcestrings.c +++ b/resource/csdk/security/src/srmresourcestrings.c @@ -23,7 +23,6 @@ const char * SVR_DB_FILE_NAME = "oic_svr_db.json"; const char * SVR_DB_DAT_FILE_NAME = "oic_svr_db.dat"; -const char * OIC_MI_DEF = "oic.mi.def"; //AMACL const char * OIC_RSRC_TYPE_SEC_AMACL = "oic.r.amacl"; diff --git a/resource/csdk/security/src/svcresource.c b/resource/csdk/security/src/svcresource.c index e927c94..9cb7f6b 100644 --- a/resource/csdk/security/src/svcresource.c +++ b/resource/csdk/security/src/svcresource.c @@ -414,7 +414,7 @@ static OCStackResult CreateSVCResource() { OCStackResult ret = OCCreateResource(&gSvcHandle, OIC_RSRC_TYPE_SEC_SVC, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_SVC_URI, SVCEntityHandler, NULL, diff --git a/resource/csdk/security/src/verresource.c b/resource/csdk/security/src/verresource.c index 0bd3f75..96afacc 100644 --- a/resource/csdk/security/src/verresource.c +++ b/resource/csdk/security/src/verresource.c @@ -281,7 +281,7 @@ OCStackResult CreateVerResource() { OCStackResult ret = OCCreateResource(&gVerHandle, OIC_RSRC_TYPE_SEC_VER, - OIC_MI_DEF, + OC_RSRVD_INTERFACE_DEFAULT, OIC_RSRC_VER_URI, VerEntityHandler, NULL, diff --git a/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp b/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp index 8f2c54f..5111cb4 100644 --- a/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp +++ b/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp @@ -53,6 +53,7 @@ static OCConnectivityType ocConnType; static char CRED_FILE_DEVOWNER[] = "oic_svr_db_client_devowner.dat"; static char CRED_FILE_NONDEVOWNER[] = "oic_svr_db_client_nondevowner.dat"; const char * OIC_RSRC_DOXM_URI = "/oic/sec/doxm"; +const char * OIC_RSRC_PSTAT_URI = "/oic/sec/pstat"; int gQuitFlag = 0; @@ -423,6 +424,12 @@ int parseClientResponse(OCClientResponse * clientResponse) res = res->next; continue; } + if (0 == strcmp(coapServerResource.c_str(),OIC_RSRC_PSTAT_URI)) + { + OIC_LOG(INFO,TAG,"Skip: pstat is secure virtual resource"); + res = res->next; + continue; + } if (res->secure) { OIC_LOG_V(INFO,TAG,"SECUREPORT: %d",res->port); -- 2.7.4