#include "RemoteEnrollee.h"
#include "EnrolleeResource.h"
+#include "CloudResource.h"
+#include "OCPlatform.h"
#include "ESException.h"
#include "logger.h"
+#include "OCResource.h"
+#include "oic_string.h"
#ifdef __WITH_DTLS__
#include "EnrolleeSecurity.h"
+#include "base64.h"
+#include "oic_malloc.h"
+#include "cacommon.h"
#endif //__WITH_DTLS
namespace OIC
{
- #define ES_REMOTE_ENROLLEE_TAG "ES_REMOTE_ENROLLEE"
-
namespace Service
{
- RemoteEnrollee::RemoteEnrollee(const WiFiOnboadingConnection& wifiOnboardingconn) :
- m_wifiOnboardingconn(wifiOnboardingconn)
+ static const char ES_BASE_RES_URI[] = "/oic/res";
+ #define ES_REMOTE_ENROLLEE_TAG "ES_REMOTE_ENROLLEE"
+ #define DISCOVERY_TIMEOUT 1
+
+ RemoteEnrollee::RemoteEnrollee(const std::shared_ptr< OC::OCResource > resource)
{
- m_requestCapabilityStatusCb = nullptr;
- m_currentESState = CurrentESState::ES_ONBOARDED;
- m_isSecured = m_wifiOnboardingconn.isSecured;
+ m_ocResource = resource;
+ m_enrolleeResource = std::make_shared<EnrolleeResource>(m_ocResource);
+ m_securityProvStatusCb = nullptr;
+ m_getConfigurationStatusCb = nullptr;
+ m_securityPinCb = nullptr;
+ m_secProvisioningDbPathCb = nullptr;
+ m_devicePropProvStatusCb = nullptr;
+ m_cloudPropProvStatusCb = nullptr;
+ m_connectRequestStatusCb = nullptr;
+
+ m_deviceId = resource->sid();
+ }
+
+ void RemoteEnrollee::onSecurityStatusHandlerCallback(
+ const std::shared_ptr< SecProvisioningStatus > status,
+ std::weak_ptr<RemoteEnrollee> this_ptr)
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG,"onSecurityStatusHandlerCallback");
+ std::shared_ptr<RemoteEnrollee> Ptr = this_ptr.lock();
+ if(Ptr)
+ {
+ Ptr->securityStatusHandler(status);
+ }
+ }
- m_remoteResource = std::make_shared< EnrolleeResource >(m_wifiOnboardingconn);
+ void RemoteEnrollee::securityStatusHandler(
+ const std::shared_ptr< SecProvisioningStatus > status) const
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "securityStatusHandlr IN");
+ OIC_LOG_V(INFO_PRIVATE, ES_REMOTE_ENROLLEE_TAG, "UUID = %s", status->getDeviceUUID().c_str());
+ OIC_LOG_V(INFO, ES_REMOTE_ENROLLEE_TAG, "ESResult = %d", status->getESResult());
- OIC_LOG ( DEBUG, ES_REMOTE_ENROLLEE_TAG, "Inside RemoteEnrollee constr");
+ if(status->getESResult() == ES_OK)
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "Ownership transfer is successfully done.");
+ m_securityProvStatusCb(status);
+ }
+ else
+ {
+ OIC_LOG(ERROR, ES_REMOTE_ENROLLEE_TAG, "Ownership transfer is failed.");
+ m_securityProvStatusCb(status);
+ }
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "securityStatusHandlr OUT");
}
-#ifdef __WITH_DTLS__
- ESResult RemoteEnrollee::registerSecurityCallbackHandler(SecurityPinCb securityPinCb,
- SecProvisioningDbPathCb secProvisioningDbPathCb)
+ ESOwnershipTransferData RemoteEnrollee::onSecurityStatusWithOptionHandlerCallback(
+ const std::shared_ptr< SecProvisioningStatus > status,
+ std::weak_ptr<RemoteEnrollee> this_ptr)
{
- // No need to check NULL for m_secProvisioningDbPathCB as this is not a mandatory
- // callback function. If m_secProvisioningDbPathCB is NULL, provisioning manager
- // in security layer will try to find the PDM.db file in the local path.
- // If PDM.db is found, the provisioning manager operations will succeed.
- // Otherwise all the provisioning manager operations will fail.
- m_secProvisioningDbPathCb = secProvisioningDbPathCb;
- m_securityPinCb = securityPinCb;
- return ES_OK;
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG,"onSecurityStatusWithOptionHandlerCallback");
+ std::shared_ptr<RemoteEnrollee> Ptr = this_ptr.lock();
+ if(Ptr)
+ {
+ return Ptr->securityStatusWithOptionHandler(status);
+ }
+ return ESOwnershipTransferData();
}
-#endif //__WITH_DTLS__
- void RemoteEnrollee::easySetupSecurityStatusCallback(
- std::shared_ptr< SecProvisioningStatus > secProvisioningStatus)
+ ESOwnershipTransferData RemoteEnrollee::securityStatusWithOptionHandler(
+ const std::shared_ptr< SecProvisioningStatus > status) const
{
- OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG, "easySetupStatusCallback status is, UUID = %s, "
- "Status = %d", secProvisioningStatus->getDeviceUUID().c_str(),
- secProvisioningStatus->getResult());
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "securityStatusWithOptionHandler IN");
+ OIC_LOG_V(INFO_PRIVATE, ES_REMOTE_ENROLLEE_TAG, "UUID = %s", status->getDeviceUUID().c_str());
+ OIC_LOG_V(INFO, ES_REMOTE_ENROLLEE_TAG, "ESResult = %d", status->getESResult());
- if(secProvisioningStatus->getResult() == ES_OK)
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "securityStatusWithOptionHandler OUT");
+ return m_securityProvStatusCbWithOption(status);
+ }
+
+ void RemoteEnrollee::onGetStatusHandlerCallback(
+ const std::shared_ptr< GetEnrolleeStatus > status,
+ std::weak_ptr<RemoteEnrollee> this_ptr)
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG,"onGetStatusHandlerCallback");
+ std::shared_ptr<RemoteEnrollee> Ptr = this_ptr.lock();
+ if(Ptr)
{
- OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "Ownership and ACL are successful. "
- "Continue with Network information provisioning");
+ Ptr->getStatusHandler(status);
+ }
+ }
+
+ void RemoteEnrollee::getStatusHandler(
+ const std::shared_ptr< GetEnrolleeStatus > status) const
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "getStatusHandler IN");
- m_currentESState = CurrentESState::ES_OWNED;
+ OIC_LOG_V(INFO, ES_REMOTE_ENROLLEE_TAG, "getStatusHandler = %d",
+ status->getESResult());
+ m_getStatusCb(status);
- OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Before ProvisionEnrollee");
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "getStatusHandler OUT");
+ }
- m_enrolleeSecStatusCb(secProvisioningStatus);
+ void RemoteEnrollee::onGetConfigurationStatusHandlerCallback(
+ const std::shared_ptr< GetConfigurationStatus > status,
+ std::weak_ptr<RemoteEnrollee> this_ptr)
+ {
+ OIC_LOG(INFO,ES_REMOTE_ENROLLEE_TAG,"onGetConfigurationStatusHandlerCallback");
+ std::shared_ptr<RemoteEnrollee> Ptr = this_ptr.lock();
+ if(Ptr)
+ {
+ Ptr->getConfigurationStatusHandler(status);
}
- else
+ }
+
+ void RemoteEnrollee::getConfigurationStatusHandler (
+ const std::shared_ptr< GetConfigurationStatus > status) const
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "getConfigurationStatusHandler IN");
+
+ OIC_LOG_V(INFO, ES_REMOTE_ENROLLEE_TAG,"GetConfigurationStatus = %d",
+ status->getESResult());
+ m_getConfigurationStatusCb(status);
+
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "getConfigurationStatusHandler OUT");
+ }
+
+ void RemoteEnrollee::onDevicePropProvisioningStatusHandlerCallback(
+ const std::shared_ptr< DevicePropProvisioningStatus > status,
+ std::weak_ptr<RemoteEnrollee> this_ptr)
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG,"onDevicePropProvisioningStatusHandlerCallback");
+ std::shared_ptr<RemoteEnrollee> Ptr = this_ptr.lock();
+ if(Ptr)
+ {
+ Ptr->devicePropProvisioningStatusHandler(status);
+ }
+ }
+
+ void RemoteEnrollee::devicePropProvisioningStatusHandler(
+ const std::shared_ptr< DevicePropProvisioningStatus > status) const
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "devicePropProvisioningStatusHandler IN");
+
+ OIC_LOG_V(INFO, ES_REMOTE_ENROLLEE_TAG, "DeviceProvStatus = %d", status->getESResult());
+ m_devicePropProvStatusCb(status);
+#ifdef __WITH_DTLS__
+ if( m_ocResource.get() != nullptr &&
+ !(m_ocResource->connectivityType() & CT_ADAPTER_GATT_BTLE) &&
+ ES_OK == status->getESResult() )
{
- OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "Ownership and ACL are fail");
+ // NOTE: Temporary patch
+ CAEndpoint_t endpoint = {.adapter = CA_ADAPTER_IP};
- m_enrolleeSecStatusCb(secProvisioningStatus);
+ OCDevAddr address = m_ocResource->getDevAddr();
+ OICStrcpy(endpoint.addr, MAX_ADDR_STR_SIZE, address.addr);
+ endpoint.port = address.port;
+
+ OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG, "HOST = %s", endpoint.addr);
+ OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG, "PORT = %u", endpoint.port);
+ CAcloseSslSession(&endpoint);
}
+#endif
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "devicePropProvisioningStatusHandler OUT");
}
- void RemoteEnrollee::InitRemoteEnrolleeStatusHandler (
- std::shared_ptr< InitRemoteEnrolleeStatus > initRemoteEnrolleeStatus)
+ void RemoteEnrollee::onCloudPropProvisioningStatusHandlerCallback(
+ const std::shared_ptr< CloudPropProvisioningStatus > status,
+ std::weak_ptr<RemoteEnrollee> this_ptr)
{
- OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Entering InitRemoteEnrolleeStatusHandler");
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG,"onCloudPropProvisioningStatusHandlerCallback");
+ std::shared_ptr<RemoteEnrollee> Ptr = this_ptr.lock();
+ if(Ptr)
+ {
+ Ptr->cloudPropProvisioningStatusHandler(status);
+ }
+ }
+
+ void RemoteEnrollee::cloudPropProvisioningStatusHandler (
+ const std::shared_ptr< CloudPropProvisioningStatus > status) const
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "cloudPropProvisioningStatusHandler IN");
+
+ OIC_LOG_V(INFO,ES_REMOTE_ENROLLEE_TAG,"CloudProvStatus = %d",
+ status->getESResult());
+ m_cloudPropProvStatusCb(status);
- OIC_LOG_V(DEBUG,ES_REMOTE_ENROLLEE_TAG,"initRemoteEnrolleeStatus = %d", initRemoteEnrolleeStatus->getESResult());
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "cloudPropProvisioningStatusHandler OUT");
+ }
- m_initRemoteEnrolleeStatusCb(initRemoteEnrolleeStatus);
+ void RemoteEnrollee::onConnectRequestStatusHandlerCallback(
+ const std::shared_ptr< ConnectRequestStatus > status,
+ std::weak_ptr<RemoteEnrollee> this_ptr)
+ {
+ OIC_LOG_V(DEBUG,ES_REMOTE_ENROLLEE_TAG,"onConnectRequestStatusHandlerCallback");
+ std::shared_ptr<RemoteEnrollee> Ptr = this_ptr.lock();
+ if(Ptr)
+ {
+ Ptr->connectRequestStatusHandler(status);
+ }
}
- void RemoteEnrollee::requestCapabilityStatusHandler (
- std::shared_ptr< RequestCapabilityStatus > requestCapabilityStatus)
+ void RemoteEnrollee::connectRequestStatusHandler(
+ const std::shared_ptr< ConnectRequestStatus > status) const
{
- OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Entering requestCapabilityStatusHandler");
+ OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "connectRequestStatusHandler IN");
- OIC_LOG_V(DEBUG,ES_REMOTE_ENROLLEE_TAG,"requestCapabilityStatus = %d", requestCapabilityStatus->getESResult());
+ OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG, "RequestConnectStatus = %d", status->getESResult());
+ m_connectRequestStatusCb(status);
- m_requestCapabilityStatusCb(requestCapabilityStatus);
+ OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "connectRequestStatusHandler OUT");
}
- void RemoteEnrollee::dataProvisioningStatusHandler(
- std::shared_ptr< ProvisioningStatus > provStatus)
+ void RemoteEnrollee::onDiscoveredCallback(const std::shared_ptr<OC::OCResource> resource,
+ std::weak_ptr<RemoteEnrollee> this_ptr)
{
- OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Entering dataprovisioningStatusHandler");
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG,"onDiscoveredCallback()");
+ std::shared_ptr<RemoteEnrollee> Ptr = this_ptr.lock();
+ if(Ptr)
+ {
+ Ptr->onDeviceDiscovered(resource);
+ }
+ }
- OIC_LOG_V(DEBUG,ES_REMOTE_ENROLLEE_TAG,"ProvStatus = %d", provStatus->getESResult());
+ void RemoteEnrollee::onDeviceDiscovered(std::shared_ptr<OC::OCResource> resource)
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "onDeviceDiscovered IN");
- if (provStatus->getESResult() == ES_OK)
+ try
{
- if (provStatus->getESState() >= ESState::ES_PROVISIONED_ALREADY)
+ if(resource)
{
- OIC_LOG_V(DEBUG,ES_REMOTE_ENROLLEE_TAG,"ProvStatus = %d", provStatus->getESResult());
- m_currentESState = CurrentESState::ES_PROVISIONED;
+ if(!(resource->connectivityType() & CT_ADAPTER_TCP))
+ {
+ std::string resourceURI;
+ std::string hostAddress;
+ std::string hostDeviceID;
+
+ // Get the resource URI
+ resourceURI = resource->uri();
+ OIC_LOG_V(INFO_PRIVATE, ES_REMOTE_ENROLLEE_TAG,
+ "URI of the resource: %s", resourceURI.c_str());
+
+ // Get the resource host address
+ hostAddress = resource->host();
+ OIC_LOG_V(INFO_PRIVATE, ES_REMOTE_ENROLLEE_TAG,
+ "Host address of the resource: %s", hostAddress.c_str());
+
+ hostDeviceID = resource->sid();
+ OIC_LOG_V(INFO_PRIVATE, ES_REMOTE_ENROLLEE_TAG,
+ "Host DeviceID of the resource: %s", hostDeviceID.c_str());
+
+ if(!m_deviceId.empty() && m_deviceId == hostDeviceID)
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "Find matched resource for cloud provisioning");
+ m_ocResource = resource;
+ m_discoveryResponse = true;
+ m_cond.notify_all();
+ }
+ }
}
}
- m_dataProvStatusCb(provStatus);
+ catch(std::exception& e)
+ {
+ OIC_LOG_V(INFO, ES_REMOTE_ENROLLEE_TAG,
+ "Exception in foundResource: %s", e.what());
+ }
- return;
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "onDeviceDiscovered OUT");
}
- void RemoteEnrollee::initRemoteEnrollee(InitRemoteEnrolleeStatusCb callback)
+ ESResult RemoteEnrollee::discoverResource()
{
- ESResult result = ES_ERROR;
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "discoverResource IN");
- if(!callback)
+ std::string query("");
+ query.append(ES_BASE_RES_URI);
+ query.append("?rt=");
+ query.append(OC_RSRVD_ES_RES_TYPE_EASYSETUP);
+
+ OIC_LOG_V(INFO, ES_REMOTE_ENROLLEE_TAG, "query = %s", query.c_str());
+
+ m_discoveryResponse = false;
+
+ onDeviceDiscoveredCb cb = std::bind(&RemoteEnrollee::onDiscoveredCallback,
+ std::placeholders::_1,
+ shared_from_this());
+
+ OCStackResult result = OC::OCPlatform::findResource("", query, CT_DEFAULT, cb);
+
+ if (result != OCStackResult::OC_STACK_OK)
{
- throw ESInvalidParameterException("Callback is empty");
+ OIC_LOG(ERROR, ES_REMOTE_ENROLLEE_TAG,
+ "Failed discoverResource");
+ return ES_ERROR;
}
- m_initRemoteEnrolleeStatusCb = callback;
+ std::unique_lock<std::mutex> lck(m_discoverymtx);
+ m_cond.wait_for(lck, std::chrono::seconds(DISCOVERY_TIMEOUT));
- if (m_remoteResource != nullptr)
+ if (!m_discoveryResponse)
{
- throw ESBadRequestException ("Already created");
+ OIC_LOG(ERROR, ES_REMOTE_ENROLLEE_TAG,
+ "Failed discoverResource because timeout");
+ return ES_ERROR;
}
- InitRemoteEnrolleeStatusCb initRemoteEnrolleeStatusCb = std::bind(
- &RemoteEnrollee::InitRemoteEnrolleeStatusHandler, this, std::placeholders::_1);
- m_remoteResource->registerInitRemoteEnrolleeStatusCallback(initRemoteEnrolleeStatusCb);
+ return ES_OK;
+ }
- result = m_remoteResource->constructResourceObject();
+ void RemoteEnrollee::provisionSecurity(const SecurityProvStatusCb callback)
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionSecurity IN");
+#ifdef __WITH_DTLS__
+ ESResult res = ESResult::ES_ERROR;
+ if(!callback)
+ {
+ throw ESInvalidParameterException("Callback is empty");
+ }
+ m_securityProvStatusCb = callback;
+
+ SecurityProvStatusCb securityProvStatusCb = std::bind(
+ &RemoteEnrollee::onSecurityStatusHandlerCallback,
+ std::placeholders::_1,
+ shared_from_this());
+ //TODO : DBPath is passed empty as of now. Need to take dbpath from application.
+ if(!m_localEnrolleeSecurity.get())
+ {
+ m_localEnrolleeSecurity = std::make_shared <EnrolleeSecurity> (m_ocResource);
+ }
- if (result == ES_ERROR)
+ res = m_localEnrolleeSecurity->provisionOwnership(NULL);
+
+ std::shared_ptr< SecProvisioningStatus > securityProvisioningStatus =
+ std::make_shared< SecProvisioningStatus >(m_localEnrolleeSecurity->getUUID(), res);
+ securityProvStatusCb(securityProvisioningStatus);
+#else
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG,"Mediator is unsecured built.");
+
+ if(!callback)
{
- OIC_LOG(ERROR,ES_REMOTE_ENROLLEE_TAG,
- "Failed to create device using constructResourceObject");
- throw ESBadRequestException ("Device not created");
+ throw ESInvalidParameterException("Callback is empty");
}
+ std::shared_ptr< SecProvisioningStatus > securityProvisioningStatus =
+ std::make_shared< SecProvisioningStatus >
+ ("", ESResult::ES_SEC_OPERATION_IS_NOT_SUPPORTED);
+ callback(securityProvisioningStatus);
+#endif
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionSecurity OUT");
}
- void RemoteEnrollee::startSecurityProvisioning(EnrolleeSecStatusCb callback)
+ void RemoteEnrollee::provisionSecurity(const SecurityProvStatusCbWithOption callback)
{
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionSecurity IN");
#ifdef __WITH_DTLS__
+ ESResult res = ESResult::ES_ERROR;
+ if(!callback)
+ {
+ throw ESInvalidParameterException("Callback is empty");
+ }
+ m_securityProvStatusCbWithOption = callback;
- m_enrolleeSecStatusCb = callback;
+ SecurityProvStatusCbWithOption securityProvStatusCbWithOption = std::bind(
+ &RemoteEnrollee::onSecurityStatusWithOptionHandlerCallback,
+ std::placeholders::_1,
+ shared_from_this());
- if (m_isSecured && m_currentESState < CurrentESState::ES_OWNED)
+ if(!m_localEnrolleeSecurity.get())
{
- EnrolleeSecStatusCb securityProvStatusCb = std::bind(
- &RemoteEnrollee::easySetupSecurityStatusCallback,
- this,
- std::placeholders::_1);
- //TODO : DBPath is passed empty as of now. Need to take dbpath from application.
- m_enrolleeSecurity = std::make_shared <EnrolleeSecurity> (m_remoteResource, "");
+ m_localEnrolleeSecurity = std::make_shared <EnrolleeSecurity> (m_ocResource);
+ }
- m_enrolleeSecurity->registerCallbackHandler(securityProvStatusCb,
- m_securityPinCb, m_secProvisioningDbPathCb);
+ res = m_localEnrolleeSecurity->provisionOwnership(securityProvStatusCbWithOption);
- try
- {
- EasySetupState easySetupState = m_enrolleeSecurity->performOwnershipTransfer();
- if (easySetupState == DEVICE_NOT_OWNED)
- {
- OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG,
- "performOwnershipTransfer returned : %d",
- easySetupState);
- return;
- }
- else if (easySetupState == DEVICE_OWNED)
- {
- OIC_LOG_V(DEBUG, ES_REMOTE_ENROLLEE_TAG,
- "performOwnershipTransfer returned : %d",
- easySetupState);
- OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Before ProvisionEnrollee");
- }
- }
- catch (OCException & e)
- {
- OIC_LOG_V(ERROR, ES_REMOTE_ENROLLEE_TAG,
- "Exception for performOwnershipTransfer : %s", e.reason().c_str());
- return ;
- }
+ std::shared_ptr< SecProvisioningStatus > securityProvisioningStatus =
+ std::make_shared< SecProvisioningStatus >(m_localEnrolleeSecurity->getUUID(), res);
+ securityProvStatusCbWithOption(securityProvisioningStatus);
+#else
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG,"Mediator is unsecured built.");
+
+ if(!callback)
+ {
+ throw ESInvalidParameterException("Callback is empty");
}
+ std::shared_ptr< SecProvisioningStatus > securityProvisioningStatus =
+ std::make_shared< SecProvisioningStatus >
+ ("", ESResult::ES_SEC_OPERATION_IS_NOT_SUPPORTED);
+ callback(securityProvisioningStatus);
#endif
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionSecurity OUT");
}
- void RemoteEnrollee::getCapabilityData(RequestCapabilityStatusCb callback)
+ void RemoteEnrollee::getStatus(const GetStatusCb callback)
{
- ESResult result = ES_ERROR;
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "getStatus IN");
if(!callback)
{
throw ESInvalidParameterException("Callback is empty");
}
- m_requestCapabilityStatusCb = callback;
-
- if (m_remoteResource == nullptr)
+ if (m_enrolleeResource == nullptr)
{
throw ESBadRequestException ("Device not created");
}
- RequestCapabilityStatusCb requestCapabilityStatusCb = std::bind(
- &RemoteEnrollee::requestCapabilityStatusHandler, this, std::placeholders::_1);
- m_remoteResource->registerCapabilityStatusCallback(requestCapabilityStatusCb);
- m_remoteResource->getCapabilityData();
+ m_getStatusCb = callback;
+
+ GetStatusCb getStatusCb = std::bind(
+ &RemoteEnrollee::onGetStatusHandlerCallback,
+ std::placeholders::_1,
+ shared_from_this());
+
+ m_enrolleeResource->registerGetStatusCallback(getStatusCb);
+ m_enrolleeResource->getStatus();
+
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "getStatus OUT");
}
- void RemoteEnrollee::startDataProvisioning(const ProvConfig& dataProvConfig, DataProvStatusCb callback)
+ void RemoteEnrollee::getConfiguration(const GetConfigurationStatusCb callback)
{
- OIC_LOG(DEBUG,ES_REMOTE_ENROLLEE_TAG,"Before ProvisionEnrollee");
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "getConfiguration IN");
+
+ if(!callback)
+ {
+ throw ESInvalidParameterException("Callback is empty");
+ }
+
+ if (m_enrolleeResource == nullptr)
+ {
+ throw ESBadRequestException ("Device not created");
+ }
- m_ProvConfig = dataProvConfig;
- m_dataProvStatusCb = callback;
+ m_getConfigurationStatusCb = callback;
- DataProvStatusCb dataProvStatusCb = std::bind(
- &RemoteEnrollee::dataProvisioningStatusHandler, this, std::placeholders::_1);
+ GetConfigurationStatusCb getConfigurationStatusCb = std::bind(
+ &RemoteEnrollee::onGetConfigurationStatusHandlerCallback,
+ std::placeholders::_1,
+ shared_from_this());
- m_remoteResource->registerProvStatusCallback(dataProvStatusCb);
- m_remoteResource->provisionEnrollee();
+ m_enrolleeResource->registerGetConfigurationStatusCallback(getConfigurationStatusCb);
+ m_enrolleeResource->getConfiguration();
+
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "getConfiguration OUT");
}
- void RemoteEnrollee::stopProvisioning()
+ void RemoteEnrollee::provisionDeviceProperties(const DeviceProp& deviceProp,
+ const DevicePropProvStatusCb callback)
{
- m_currentESState = CurrentESState::ES_UNKNOWN;
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionDeviceProperties IN");
+
+ if(!callback)
+ {
+ throw ESInvalidParameterException("Callback is empty");
+ }
+
+ m_devicePropProvStatusCb = callback;
+
+ if (m_enrolleeResource == nullptr)
+ {
+ throw ESBadRequestException ("Device not created");
+ }
+
+ DevicePropProvStatusCb devicePropProvStatusCb = std::bind(
+ &RemoteEnrollee::onDevicePropProvisioningStatusHandlerCallback,
+ std::placeholders::_1,
+ shared_from_this());
+
+ m_enrolleeResource->registerDevicePropProvStatusCallback(devicePropProvStatusCb);
+ m_enrolleeResource->provisionProperties(deviceProp);
- m_remoteResource->unprovisionEnrollee();
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionDeviceProperties OUT");
}
- bool RemoteEnrollee::isEnrolleeProvisioned()
+ void RemoteEnrollee::initCloudResource()
{
- if(m_currentESState >= CurrentESState::ES_PROVISIONED)
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "initCloudResource IN");
+
+ ESResult result = ES_ERROR;
+
+ result = discoverResource();
+
+ if (result == ES_ERROR)
{
- return true;
+ OIC_LOG(ERROR, ES_REMOTE_ENROLLEE_TAG,
+ "Failed to create resource object using discoverResource");
+ throw ESBadRequestException ("Resource object not created");
}
+
else
{
- return false;
+ if(m_ocResource != nullptr)
+ {
+ m_cloudResource = std::make_shared<CloudResource>(m_ocResource);
+ }
+ else
+ {
+ throw ESBadGetException ("Resource handle is invalid");
+ }
}
+
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "initCloudResource OUT");
}
- ProvConfig RemoteEnrollee::getProvConfig ()
+ void RemoteEnrollee::provisionCloudProperties(const CloudProp& cloudProp,
+ const CloudPropProvStatusCb callback)
{
- return m_ProvConfig;
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionCloudProperties w/o OCResource IN");
+
+ provisionCloudProperties(NULL, cloudProp, callback);
+
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionCloudProperties w/o OCResource OUT");
}
- WiFiOnboadingConnection RemoteEnrollee::getOnboardConn()
- {
- return m_wifiOnboardingconn;
- }
+ void RemoteEnrollee::provisionCloudProperties(const std::shared_ptr< OC::OCResource > resource,
+ const CloudProp& cloudProp,
+ const CloudPropProvStatusCb callback)
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionCloudProperties IN");
+
+ if(!callback)
+ {
+ throw ESInvalidParameterException("Callback is empty");
+ }
+
+ m_cloudPropProvStatusCb = callback;
+ if((cloudProp.getAuthCode().empty() && cloudProp.getAccessToken().empty()) ||
+ cloudProp.getAuthProvider().empty() ||
+ cloudProp.getCiServer().empty())
+ {
+ throw ESBadRequestException ("Invalid Cloud Provisiong Info.");
+ }
+
+ if(resource)
+ {
+ if(resource->getResourceTypes().at(0) != OC_RSRVD_ES_RES_TYPE_EASYSETUP ||
+ resource->connectivityType() & CT_ADAPTER_TCP)
+ {
+ OIC_LOG(ERROR, ES_REMOTE_ENROLLEE_TAG, "Given resource is not valid due to wrong rt or conntype");
+ throw ESInvalidParameterException("A given OCResource is wrong");
+ }
+
+ auto interfaces = resource->getResourceInterfaces();
+ bool isFound = false;
+ for(auto interface : interfaces)
+ {
+ if(interface.compare(BATCH_INTERFACE) == 0)
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "RemoteEnrollee object is succeessfully created");
+ OIC_LOG_V(INFO_PRIVATE, ES_REMOTE_ENROLLEE_TAG, "HOST: %s", resource->host().c_str());
+ OIC_LOG_V(INFO_PRIVATE, ES_REMOTE_ENROLLEE_TAG, "URI: %s", resource->uri().c_str());
+ OIC_LOG_V(INFO_PRIVATE, ES_REMOTE_ENROLLEE_TAG, "SID: %s", resource->sid().c_str());
+ OIC_LOG_V(INFO_PRIVATE, ES_REMOTE_ENROLLEE_TAG, "CONNECTIVITY: %d", resource->connectivityType());
+ isFound = true;
+ }
+ }
+
+ if(!isFound)
+ {
+ throw ESInvalidParameterException("A given OCResource has no batch interface");
+ }
+ }
+
+ try
+ {
+ if(resource == NULL)
+ {
+ initCloudResource();
+ }
+ else
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "Skip to find a provisioning resource");
+ m_ocResource = resource;
+ m_cloudResource = std::make_shared<CloudResource>(m_ocResource);
+ }
+ }
+ catch (const std::exception& e)
+ {
+ OIC_LOG_V(ERROR, ES_REMOTE_ENROLLEE_TAG,
+ "Exception caught in provisionCloudProperties = %s", e.what());
+
+ std::shared_ptr< CloudPropProvisioningStatus > provStatus = std::make_shared<
+ CloudPropProvisioningStatus >(ESResult::ES_ENROLLEE_DISCOVERY_FAILURE);
+ m_cloudPropProvStatusCb(provStatus);
+ return;
+ }
+#if defined(__WITH_DTLS__) && defined(__WITH_TLS__)
+ if(!(cloudProp.getCloudID().empty() && cloudProp.getCredID() <= 0))
+ {
+ ESResult res = ESResult::ES_ERROR;
+ if(!m_cloudEnrolleeSecurity.get())
+ {
+ m_cloudEnrolleeSecurity = std::make_shared <EnrolleeSecurity> (m_ocResource);
+ }
+
+
+ res = m_cloudEnrolleeSecurity->provisionSecurityForCloudServer(cloudProp.getCloudID(),
+ cloudProp.getCredID());
+
+ if(res != ESResult::ES_OK)
+ {
+ m_cloudResource = nullptr;
+ std::shared_ptr< CloudPropProvisioningStatus > provStatus = std::make_shared<
+ CloudPropProvisioningStatus >(res);
+ m_cloudPropProvStatusCb(provStatus);
+ return;
+ }
+ }
+ else
+ {
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "ACL and Cert. provisioning are skipped.");
+ }
+#endif //defined(__WITH_DTLS__) && defined(__WITH_TLS__)
+
+ if (m_cloudResource == nullptr)
+ {
+ throw ESBadRequestException ("Cloud Resource not created");
+ }
+
+ CloudPropProvStatusCb cloudPropProvStatusCb = std::bind(
+ &RemoteEnrollee::onCloudPropProvisioningStatusHandlerCallback,
+ std::placeholders::_1,
+ shared_from_this());
+
+ m_cloudResource->registerCloudPropProvisioningStatusCallback(cloudPropProvStatusCb);
+ m_cloudResource->provisionProperties(cloudProp);
+
+ OIC_LOG(INFO, ES_REMOTE_ENROLLEE_TAG, "provisionCloudProperties OUT");
+ }
+
+ void RemoteEnrollee::requestToConnect(const std::vector<ES_CONNECT_TYPE> &connectTypes, const ConnectRequestStatusCb callback)
+ {
+ OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "connect IN");
+
+ if(!callback)
+ {
+ throw ESInvalidParameterException("Callback is empty");
+ }
+
+ m_connectRequestStatusCb = callback;
+
+ ConnectRequestStatusCb connectRequestStatusCb = std::bind(
+ &RemoteEnrollee::onConnectRequestStatusHandlerCallback,
+ std::placeholders::_1,
+ shared_from_this());
+
+ m_enrolleeResource->registerConnectRequestStatusCallback(connectRequestStatusCb);
+ m_enrolleeResource->requestToConnect(connectTypes);
+
+ OIC_LOG(DEBUG, ES_REMOTE_ENROLLEE_TAG, "connect OUT");
+ }
}
}
+
+
projects / platform / upstream / iotivity.git / blobdiff