X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fsecurity%2Fsrc%2Fpstatresource.c;h=e32c86c5ccf30ba1d4103ce413ca278d26881568;hb=3c093548382bb2542c87a67e6e5fa32552c29cb3;hp=a5ec8ae4f298c41da73fc3680ffba6b611383f7e;hpb=cd34db38c82a503df15de84238fe7a7330241e99;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/security/src/pstatresource.c b/resource/csdk/security/src/pstatresource.c index a5ec8ae..e32c86c 100644 --- a/resource/csdk/security/src/pstatresource.c +++ b/resource/csdk/security/src/pstatresource.c @@ -24,6 +24,7 @@ #include "ocstack.h" #include "oic_malloc.h" #include "ocpayload.h" +#include "ocpayloadcbor.h" #include "payload_logging.h" #include "resourcemanager.h" #include "pstatresource.h" @@ -32,7 +33,7 @@ #include "srmresourcestrings.h" #include "srmutility.h" -#define TAG "SRM-PSTAT" +#define TAG "OIC_SRM_PSTAT" /** Default cbor payload size. This value is increased in case of CborErrorOutOfMemory. * The value of payload size is increased until reaching below max cbor size. */ @@ -214,7 +215,7 @@ OCStackResult PstatToCBORPayload(const OicSecPstat_t *pstat, uint8_t **payload, if (CborNoError == cborEncoderResult) { - *size = encoder.ptr - outPayload; + *size = cbor_encoder_get_buffer_size(&encoder, outPayload); *payload = outPayload; ret = OC_STACK_OK; } @@ -223,8 +224,9 @@ exit: { // reallocate and try again! OICFree(outPayload); + outPayload = NULL; // Since the allocated initial memory failed, double the memory. - cborLen += encoder.ptr - encoder.end; + cborLen += cbor_encoder_get_buffer_size(&encoder, encoder.end); cborEncoderResult = CborNoError; ret = PstatToCBORPayload(pstat, payload, &cborLen, writableOnly); if (OC_STACK_OK == ret) @@ -300,10 +302,6 @@ static OCStackResult CBORPayloadToPstatBin(const uint8_t *cborPayload, const siz OICFree(strUuid ); strUuid = NULL; - if (roParsed) - { - *roParsed = true; - } } else { @@ -363,6 +361,7 @@ static OCStackResult CBORPayloadToPstatBin(const uint8_t *cborPayload, const siz pstat->smLen = 1; pstat->sm = (OicSecDpom_t*)OICCalloc(pstat->smLen, sizeof(OicSecDpom_t)); + VERIFY_NON_NULL(TAG, pstat->sm, ERROR); cborFindResult = cbor_value_get_int(&pstatMap, &sm); VERIFY_CBOR_SUCCESS(TAG, cborFindResult, "Failed Finding SM."); pstat->sm[0] = (OicSecDpom_t)sm; @@ -377,6 +376,7 @@ static OCStackResult CBORPayloadToPstatBin(const uint8_t *cborPayload, const siz VERIFY_NON_NULL(TAG, gPstat, ERROR); pstat->smLen = gPstat->smLen; pstat->sm = (OicSecDpom_t*)OICCalloc(pstat->smLen, sizeof(OicSecDpom_t)); + VERIFY_NON_NULL(TAG, pstat->sm, ERROR); *pstat->sm = *gPstat->sm; cborFindResult = CborNoError; } @@ -390,11 +390,6 @@ static OCStackResult CBORPayloadToPstatBin(const uint8_t *cborPayload, const siz VERIFY_SUCCESS(TAG, OC_STACK_OK == ret, ERROR); OICFree(strUuid ); strUuid = NULL; - - if (roParsed) - { - *roParsed = true; - } } else { @@ -470,6 +465,30 @@ static bool ValidateQuery(const char * query) return (bInterfaceQry ? bInterfaceMatch: true); } +#ifdef MULTIPLE_OWNER +bool IsValidPstatAccessForSubOwner(const uint8_t *cborPayload, size_t size) +{ + OicSecPstat_t* pstat = NULL; + bool isValidPstat = true; + + OIC_LOG_BUFFER(DEBUG, TAG, cborPayload, size); + VERIFY_NON_NULL(TAG, cborPayload, ERROR); + VERIFY_SUCCESS(TAG, 0 != size, ERROR); + VERIFY_SUCCESS(TAG, OC_STACK_OK == CBORPayloadToPstat(cborPayload, size, &pstat), ERROR); + VERIFY_NON_NULL(TAG, pstat, ERROR); + + if (RESET & pstat->cm) + { + OIC_LOG(ERROR, TAG, "SubOwner can't reset the server."); + isValidPstat = false; + } + +exit: + DeletePstatBinData(pstat); + return isValidPstat; +} +#endif //MULTIPLE_OWNER + /** * The entity handler determines how to process a GET request. */ @@ -519,12 +538,13 @@ static OCEntityHandlerResult HandlePstatGetRequest (const OCEntityHandlerRequest * resource or create a new resource. * For pstat, it updates only tm and om. */ -static OCEntityHandlerResult HandlePstatPostRequest(const OCEntityHandlerRequest *ehRequest) +static OCEntityHandlerResult HandlePstatPostRequest(OCEntityHandlerRequest *ehRequest) { OCEntityHandlerResult ehRet = OC_EH_ERROR; OIC_LOG(INFO, TAG, "HandlePstatPostRequest processing POST request"); OicSecPstat_t *pstat = NULL; - static uint16_t prevMsgId = 0; + static uint16_t previousMsgId = 0; + bool isDuplicatedMsg = false; if (ehRequest->payload && NULL != gPstat) { @@ -539,6 +559,17 @@ static OCEntityHandlerResult HandlePstatPostRequest(const OCEntityHandlerRequest { bool validReq = false; + /* + * message ID is supported for CoAP over UDP only according to RFC 7252 + * So we should check message ID to prevent duplicate request handling in case of OC_ADAPTER_IP. + * In case of other transport adapter, duplicate message check is not required. + */ + if (OC_ADAPTER_IP == ehRequest->devAddr.adapter && + previousMsgId == ehRequest->messageID) + { + isDuplicatedMsg = true; + } + if (true == roParsed) { OIC_LOG(ERROR, TAG, "Not acceptable request because of read-only properties"); @@ -564,8 +595,8 @@ static OCEntityHandlerResult HandlePstatPostRequest(const OCEntityHandlerRequest } validReq = false; - //Currently, we dose not support the multiple service server driven yet. - if (pstat->om != MULTIPLE_SERVICE_SERVER_DRIVEN) + //Currently, IoTivity only supports Single Service Client Directed provisioning + if (pstat->om == SINGLE_SERVICE_CLIENT_DRIVEN) { if ((pstat->cm & RESET) && false == pstat->isOp) { @@ -607,6 +638,8 @@ static OCEntityHandlerResult HandlePstatPostRequest(const OCEntityHandlerRequest gPstat->om = pstat->om; gPstat->tm = pstat->tm; gPstat->cm = pstat->cm; + memcpy(&(gPstat->deviceID), &(pstat->deviceID), sizeof(OicUuid_t)); + memcpy(&(gPstat->rownerID), &(pstat->rownerID), sizeof(OicUuid_t)); // Convert pstat data into CBOR for update to persistent storage if (UpdatePersistentStorage(gPstat)) @@ -643,10 +676,20 @@ static OCEntityHandlerResult HandlePstatPostRequest(const OCEntityHandlerRequest const OicSecDoxm_t* doxm = GetDoxmResourceData(); if(doxm) { - if(!doxm->owned && prevMsgId != ehRequest->messageID) + if(!doxm->owned) { - RestoreDoxmToInitState(); - RestorePstatToInitState(); + OIC_LOG(WARNING, TAG, "The operation failed during handle DOXM request"); + + if (!isDuplicatedMsg) + { +#if defined (__WITH_TLS__) || defined(__WITH_DTLS__) + InvokeOtmEventHandler(ehRequest->devAddr.addr, ehRequest->devAddr.port, + NULL, OIC_OTM_ERROR); +#endif + RestoreDoxmToInitState(); + RestorePstatToInitState(); + OIC_LOG(WARNING, TAG, "DOXM will be reverted."); + } } } else @@ -656,7 +699,10 @@ static OCEntityHandlerResult HandlePstatPostRequest(const OCEntityHandlerRequest } else { - prevMsgId = ehRequest->messageID; + if(ehRequest->devAddr.adapter == OC_ADAPTER_IP) + { + previousMsgId = ehRequest->messageID; + } } // Send response payload to request originator @@ -874,3 +920,44 @@ OCStackResult GetPstatRownerId(OicUuid_t *rowneruuid) } return retVal; } + +OCStackResult SetPstatSelfOwnership(const OicUuid_t* newROwner) +{ + OCStackResult ret = OC_STACK_ERROR; + uint8_t *cborPayload = NULL; + size_t size = 0; + + if(NULL == gPstat) + { + ret = OC_STACK_NO_RESOURCE; + return ret; + } + + if( newROwner && (false == gPstat->isOp) && (true == (TAKE_OWNER && gPstat->cm)) ) + { + gPstat->cm = (OicSecDpm_t)(gPstat->cm & (~TAKE_OWNER)); + gPstat->isOp = true; + + memcpy(gPstat->deviceID.id, newROwner->id, sizeof(newROwner->id)); + memcpy(gPstat->rownerID.id, newROwner->id, sizeof(newROwner->id)); + + ret = PstatToCBORPayload(gPstat, &cborPayload, &size, false); + VERIFY_SUCCESS(TAG, OC_STACK_OK == ret, ERROR); + + ret = UpdateSecureResourceInPS(OIC_JSON_PSTAT_NAME, cborPayload, size); + VERIFY_SUCCESS(TAG, OC_STACK_OK == ret, ERROR); + + OICFree(cborPayload); + } + else + { + OIC_LOG(ERROR, TAG, "The state of PSTAT is not Ready For OTM"); + } + + return ret; + +exit: + OICFree(cborPayload); + return ret; +} +