Revise privileges

Change-Id: Ie9cea12661f993b9ca0d3b1764d7bdad98d4125e

diff --git a/common/ic-utils.c b/common/ic-utils.c
index 03d14d277e816d1871cc6ef5b696973149dd7deb..cb3d23f61acf36f0686a329f098f65bcd5aa9b27 100644 (file)
--- a/common/ic-utils.c
+++ b/common/ic-utils.c
@@ -26,10 +26,19 @@
 #include "ic-log.h"
 #include "ic-utils.h"
 
+
 #ifdef TZ_VER_3
 static int _ic_oic_feature_supported = -1;
 #endif
 
+// TODO: Can't access in user side daemon
+#if 0
+#ifdef TZ_VER_3
+static const char *IC_PRIV_FILE_NETWORK_GET = "/usr/share/iotcon/iotcon-network-get";
+static const char *IC_PRIV_FILE_INTERNET = "/usr/share/iotcon/iotcon-internet";
+#endif
+#endif
+
 static const char *IC_SYSTEM_INFO_PLATFORM_VERSION = "http://tizen.org/feature/platform.version";
 static const char *IC_SYSTEM_INFO_MANUF_NAME = "http://tizen.org/system/manufacturer";
 static const char *IC_SYSTEM_INFO_MODEL_NAME = "http://tizen.org/system/model_name";
@@ -41,13 +50,7 @@ static pthread_mutex_t icl_utils_mutex_ioty = PTHREAD_MUTEX_INITIALIZER;
 static __thread int icl_utils_pthread_oldstate;
 static __thread int icl_utils_mutex_count;
 
-// TODO: Can't access in user side daemon
-/*
-#ifdef TZ_VER_3
-static const char *IC_PRIV_FILE_NETWORK_GET = "/usr/share/iotcon/iotcon-network-get";
-static const char *IC_PRIV_FILE_INTERNET = "/usr/share/iotcon/iotcon-internet";
-#endif
-*/
+
 
 char* ic_utils_strdup(const char *src)
 {
@@ -64,6 +67,50 @@ char* ic_utils_strdup(const char *src)
        return dest;
 }
 
+bool ic_utils_check_permission(int permssion)
+{
+       return true;
+// TODO: Can't access file in user side daemon
+#if 0
+       int ret;
+       static int has_network_permission = -1;
+       static int has_internet_permission = -1;
+
+       /* check network.get privilege */
+       if (IC_PERMISSION_NETWORK_GET & permssion) {
+               if (-1 == has_network_permission) {
+                       ret = access(IC_PRIV_FILE_NETWORK_GET, R_OK);
+                       if (0 != ret) {
+                               ERR("Don't have http://tizen.org/privilege/network.get");
+                               has_network_permission = 0;
+                               return false;
+                       }
+                       has_network_permission = 1;
+               } else if (0 == has_network_permission) {
+                       ERR("Don't have http://tizen.org/privilege/network.get");
+                       return false;
+               }
+       }
+
+       /* check internet privilege */
+       if (IC_PERMISSION_INTERNET & permssion) {
+               if (-1 == has_internet_permission) {
+                       ret = access(IC_PRIV_FILE_INTERNET, R_OK);
+                       if (0 != ret) {
+                               ERR("Don't have http://tizen.org/privilege/internet");
+                               has_internet_permission = 0;
+                               return false;
+                       }
+                       has_internet_permission = 1;
+               } else if (0 == has_internet_permission) {
+                       ERR("Don't have http://tizen.org/privilege/internet");
+                       return false;
+               }
+       }
+       return true;
+#endif
+}
+
 bool ic_utils_check_oic_feature_supported()
 {
 #ifdef TZ_VER_3
@@ -143,39 +190,6 @@ int ic_utils_get_platform_info(OCPlatformInfo *platform_info)
        return IOTCON_ERROR_NONE;
 }
 
-bool ic_utils_check_permission()
-{
-       return true;
-// TODO: Can't access file in user side daemon
-/*
-#ifdef TZ_VER_3
-       int ret;
-       static int have_permission = -1;
-
-       if (-1 == have_permission) {
-               ret = access(IC_PRIV_FILE_NETWORK_GET, R_OK);
-               if (0 != ret) {
-                       ERR("Permission denied(network.get)");
-                       have_permission = 0;
-                       return false;
-               }
-
-               ret = access(IC_PRIV_FILE_INTERNET, R_OK);
-               if (0 != ret) {
-                       ERR("Permission denied(internet)");
-                       have_permission = 0;
-                       return false;
-               }
-               have_permission = 1;
-       } else if (0 == have_permission) {
-               return false;
-       }
-       return true;
-#else
-       return true;
-#endif
-*/
-}
 
 static inline pthread_mutex_t* _utils_mutex_get(int type)
 {

diff --git a/common/ic-utils.h b/common/ic-utils.h
index dea05acb4c28667504f4bf8fed6e78143abbf2b0..6e52ff77e9efdf2d2dd1ce3f0e5d296d696bb526 100644 (file)
--- a/common/ic-utils.h
+++ b/common/ic-utils.h
@@ -21,11 +21,16 @@
 
 #define IC_EQUAL 0
 
+enum {
+       IC_PERMISSION_NETWORK_GET = (1 << 0),
+       IC_PERMISSION_INTERNET = (1 << 1),
+};
+
 char* ic_utils_strdup(const char *src);
+bool ic_utils_check_permission(int permssion);
 bool ic_utils_check_oic_feature_supported();
 int ic_utils_get_platform_info(OCPlatformInfo *platform_info);
 void ic_utils_free_platform_info(OCPlatformInfo *platform_info);
-bool ic_utils_check_permission();
 
 void ic_utils_mutex_lock(int type);
 void ic_utils_mutex_unlock(int type);

diff --git a/lib/icl-device.c b/lib/icl-device.c
index c91b59548ca6565dd963b29c0a79dce63af1ffa2..131bac806ee886067f3e62895815504f4b69afb3 100644 (file)
--- a/lib/icl-device.c
+++ b/lib/icl-device.c
@@ -60,7 +60,8 @@ API int iotcon_find_device_info(const char *host_address,
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
        switch (connectivity_type) {
@@ -138,7 +139,8 @@ API int iotcon_find_platform_info(const char *host_address,
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
        switch (connectivity_type) {

diff --git a/lib/icl-lite-resource.c b/lib/icl-lite-resource.c
index fcb5d63e7e146e7870986997bb78349645afc23e..8873d250e38d011a90299fb8229fafd0f4a9b705 100644 (file)
--- a/lib/icl-lite-resource.c
+++ b/lib/icl-lite-resource.c
@@ -42,7 +42,8 @@ API int iotcon_lite_resource_create(const char *uri_path,
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(false == icl_resource_check_uri_path(uri_path),
                        IOTCON_ERROR_INVALID_PARAMETER);
@@ -66,7 +67,8 @@ API int iotcon_lite_resource_destroy(iotcon_lite_resource_h resource)
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
 
        connectivity_type = resource->connectivity_type;
@@ -93,7 +95,8 @@ API int iotcon_lite_resource_update_state(iotcon_lite_resource_h resource,
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
 
        connectivity_type = resource->connectivity_type;

diff --git a/lib/icl-presence.c b/lib/icl-presence.c
index a9cbe57fa85879e109a077b3bd2ecc2f2dec818e..80092f719824ed3a6766461bdddc8e4f9b69e6d3 100644 (file)
--- a/lib/icl-presence.c
+++ b/lib/icl-presence.c
@@ -31,7 +31,8 @@ API int iotcon_start_presence(unsigned int time_to_live)
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
 
        if (0 == time_to_live)
                time_to_live = IC_PRESENCE_TTL_SECONDS_DEFAULT;
@@ -54,7 +55,8 @@ API int iotcon_stop_presence(void)
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
 
        ret = icl_ioty_stop_presence();
        if (IOTCON_ERROR_NONE != ret) {
@@ -77,7 +79,8 @@ API int iotcon_add_presence_cb(const char *host_address,
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == presence_handle, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(resource_type && (false == icl_resource_check_type(resource_type)),
@@ -116,7 +119,8 @@ API int iotcon_remove_presence_cb(iotcon_presence_h presence)
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == presence, IOTCON_ERROR_INVALID_PARAMETER);
 
        connectivity_type = presence->connectivity_type;

diff --git a/lib/icl-remote-resource-caching.c b/lib/icl-remote-resource-caching.c
index c1adbb1cf8a8a67e0ea9fb74cd305d54318c1e50..2e4c0cb49795015ec0b0ade83b042b53e9af7069 100644 (file)
--- a/lib/icl-remote-resource-caching.c
+++ b/lib/icl-remote-resource-caching.c
@@ -32,7 +32,8 @@ API int iotcon_remote_resource_start_caching(iotcon_remote_resource_h resource,
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (true == resource->is_found) {
@@ -67,7 +68,8 @@ API int iotcon_remote_resource_stop_caching(iotcon_remote_resource_h resource)
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
 
        INFO("Stop Caching");

diff --git a/lib/icl-remote-resource-crud.c b/lib/icl-remote-resource-crud.c
index 2f7bcab284cda6730f9c94ba0939ab0a3bd28157..d8bf4d2871fb3c9b15dfbd39a3b131d8e5236678 100644 (file)
--- a/lib/icl-remote-resource-crud.c
+++ b/lib/icl-remote-resource-crud.c
@@ -28,7 +28,8 @@ API int iotcon_remote_resource_get(iotcon_remote_resource_h resource,
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -67,7 +68,8 @@ API int iotcon_remote_resource_put(iotcon_remote_resource_h resource,
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
@@ -107,7 +109,8 @@ API int iotcon_remote_resource_post(iotcon_remote_resource_h resource,
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == repr, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
@@ -143,7 +146,8 @@ API int iotcon_remote_resource_delete(iotcon_remote_resource_h resource,
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -181,7 +185,8 @@ API int iotcon_remote_resource_observe_register(
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(resource->observe_handle, IOTCON_ERROR_ALREADY);
@@ -219,7 +224,8 @@ API int iotcon_remote_resource_observe_deregister(
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
 
        if (true == resource->is_found) {

diff --git a/lib/icl-remote-resource-monitoring.c b/lib/icl-remote-resource-monitoring.c
index 2e947528828c1d94be70a799a098f4a888ecb517..955ed3c122edcf766aff79eb216b846703970033 100644 (file)
--- a/lib/icl-remote-resource-monitoring.c
+++ b/lib/icl-remote-resource-monitoring.c
@@ -31,7 +31,8 @@ API int iotcon_remote_resource_start_monitoring(
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -67,7 +68,8 @@ API int iotcon_remote_resource_stop_monitoring(
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
 
        INFO("Stop Monitoring");

diff --git a/lib/icl-remote-resource.c b/lib/icl-remote-resource.c
index 7ddf2f6f93a55d36ded486f7bc4f08561342cfca..1c537052055b233cb988e242d1cfe55f7a5a942b 100644 (file)
--- a/lib/icl-remote-resource.c
+++ b/lib/icl-remote-resource.c
@@ -43,7 +43,8 @@ API int iotcon_find_resource(const char *host_address,
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(resource_type && (false == icl_resource_check_type(resource_type)),
                        IOTCON_ERROR_INVALID_PARAMETER);

diff --git a/lib/icl-resource.c b/lib/icl-resource.c
index bdbc5f84d283498416ed528b1b45890ea3aab5c9..8923568cfb248ec553b761f45a075e807f7ed412 100644 (file)
--- a/lib/icl-resource.c
+++ b/lib/icl-resource.c
@@ -114,7 +114,8 @@ API int iotcon_resource_create(const char *uri_path,
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == uri_path, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(false == icl_resource_check_uri_path(uri_path),
                        IOTCON_ERROR_INVALID_PARAMETER);
@@ -141,7 +142,8 @@ API int iotcon_resource_destroy(iotcon_resource_h resource)
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
 
        connectivity_type = resource->connectivity_type;
@@ -170,7 +172,8 @@ API int iotcon_resource_bind_interface(iotcon_resource_h resource,
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == iface, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -200,7 +203,8 @@ API int iotcon_resource_bind_type(iotcon_resource_h resource,
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == resource_type, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -243,7 +247,8 @@ API int iotcon_resource_bind_child_resource(iotcon_resource_h parent,
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == child, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(parent == child, IOTCON_ERROR_INVALID_PARAMETER);
@@ -270,7 +275,8 @@ API int iotcon_resource_unbind_child_resource(iotcon_resource_h parent,
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == parent, IOTCON_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == child, IOTCON_ERROR_INVALID_PARAMETER);
 
@@ -389,7 +395,8 @@ API int iotcon_resource_notify(iotcon_resource_h resource,
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resource, IOTCON_ERROR_INVALID_PARAMETER);
 
        connectivity_type = resource->connectivity_type;

diff --git a/lib/icl-response.c b/lib/icl-response.c
index 4001aea20a9edfc9eb685cfba4183c719ab42493..b7bc8e20d8c5f5328516b059d66d59497d8a77b7 100644 (file)
--- a/lib/icl-response.c
+++ b/lib/icl-response.c
@@ -169,7 +169,8 @@ API int iotcon_response_send(iotcon_response_h resp)
        int ret, connectivity_type;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission(IC_PERMISSION_INTERNET),
+                       IOTCON_ERROR_PERMISSION_DENIED);
        RETV_IF(NULL == resp, IOTCON_ERROR_INVALID_PARAMETER);
 
        connectivity_type = resp->connectivity_type;

diff --git a/lib/icl.c b/lib/icl.c
index d093443023adbb88e535287fc3fccb2362b73272..d6d57aaa5870f5cb415b1555f29f525c8096ee3a 100644 (file)
--- a/lib/icl.c
+++ b/lib/icl.c
@@ -32,7 +32,8 @@ API int iotcon_initialize()
        int ret;
 
        RETV_IF(false == ic_utils_check_oic_feature_supported(), IOTCON_ERROR_NOT_SUPPORTED);
-       RETV_IF(false == ic_utils_check_permission(), IOTCON_ERROR_PERMISSION_DENIED);
+       RETV_IF(false == ic_utils_check_permission((IC_PERMISSION_INTERNET|IC_PERMISSION_NETWORK_GET)),
+                       IOTCON_ERROR_PERMISSION_DENIED);
 
 #if !GLIB_CHECK_VERSION(2, 35, 0)
        g_type_init();

diff --git a/lib/include/iotcon-client.h b/lib/include/iotcon-client.h
index 838d1b9e3e90ded9bd38d7879eae199382852ffd..3ec03cd90c94f0b3fef27e414124600a0a7d6b99 100644 (file)
--- a/lib/include/iotcon-client.h
+++ b/lib/include/iotcon-client.h
@@ -84,7 +84,6 @@ typedef void (*iotcon_presence_cb)(iotcon_presence_h presence, iotcon_error_e er
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @remarks The length of @a resource_type should be less than or equal to 61.\n
@@ -128,7 +127,6 @@ int iotcon_add_presence_cb(const char *host_address,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] presence_handle The presence handle to be unsubscribed
@@ -351,7 +349,6 @@ typedef void (*iotcon_found_resource_cb)(iotcon_remote_resource_h resource,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @remarks The length of @a resource_type should be less than or equal to 61.\n
@@ -413,7 +410,6 @@ typedef void (*iotcon_device_info_cb)(iotcon_device_info_h device_info,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] host_address The host address of remote server
@@ -490,7 +486,6 @@ typedef void (*iotcon_platform_info_cb)(iotcon_platform_info_h platform_info,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] host_address The host address of remote server

diff --git a/lib/include/iotcon-lite-resource.h b/lib/include/iotcon-lite-resource.h
index 12540b20a83fb9cf3f59aa3cbfed10ea2c7821b8..07aef1212403df7ff3bf4b05924c381a2aa1a51f 100644 (file)
--- a/lib/include/iotcon-lite-resource.h
+++ b/lib/include/iotcon-lite-resource.h
@@ -175,7 +175,6 @@ typedef bool (*iotcon_lite_resource_post_request_cb)(iotcon_lite_resource_h reso
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @remarks @a uri_path length must be less than or equal 36.\n
@@ -213,7 +212,6 @@ int iotcon_lite_resource_create(const char *uri_path,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @remarks When a normal variable is used, there are only permission denied error.
@@ -237,7 +235,6 @@ int iotcon_lite_resource_destroy(iotcon_lite_resource_h resource);
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the lite resource
@@ -248,6 +245,7 @@ int iotcon_lite_resource_destroy(iotcon_lite_resource_h resource);
  * @retval #IOTCON_ERROR_NOT_SUPPORTED  Not supported
  * @retval #IOTCON_ERROR_INVALID_PARAMETER  Invalid parameter
  * @retval #IOTCON_ERROR_OUT_OF_MEMORY  Out of memory
+ * @retval #IOTCON_ERROR_PERMISSION_DENIED Permission denied
  *
  * @see iotcon_lite_resource_get_state()
  */

diff --git a/lib/include/iotcon-remote-resource.h b/lib/include/iotcon-remote-resource.h
index 2aa330f3e2bd474b4c40be51c6a2a463c92cf430..0c347017cc0916009ad6cdc8a419d8cbea178904 100644 (file)
--- a/lib/include/iotcon-remote-resource.h
+++ b/lib/include/iotcon-remote-resource.h
@@ -210,7 +210,6 @@ typedef void (*iotcon_remote_resource_observe_cb)(iotcon_remote_resource_h resou
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the resource
@@ -244,7 +243,6 @@ int iotcon_remote_resource_observe_register(iotcon_remote_resource_h resource,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the resource
@@ -298,7 +296,6 @@ typedef void (*iotcon_remote_resource_response_cb)(iotcon_remote_resource_h reso
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the resource
@@ -327,7 +324,6 @@ int iotcon_remote_resource_get(iotcon_remote_resource_h resource, iotcon_query_h
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the resource
@@ -360,7 +356,6 @@ int iotcon_remote_resource_put(iotcon_remote_resource_h resource,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the resource
@@ -393,7 +388,6 @@ int iotcon_remote_resource_post(iotcon_remote_resource_h resource,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the resource
@@ -444,7 +438,6 @@ typedef void (*iotcon_remote_resource_cached_representation_changed_cb)(
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the remote resource to be cached
@@ -455,10 +448,10 @@ typedef void (*iotcon_remote_resource_cached_representation_changed_cb)(
  * @retval #IOTCON_ERROR_NONE  Successful
  * @retval #IOTCON_ERROR_NOT_SUPPORTED  Not supported
  * @retval #IOTCON_ERROR_SYSTEM System error
- * @retval #IOTCON_ERROR_PERMISSION_DENIED Permission denied
  * @retval #IOTCON_ERROR_INVALID_PARAMETER  Invalid parameter
  * @retval #IOTCON_ERROR_ALREADY Already done
  * @retval #IOTCON_ERROR_OUT_OF_MEMORY  Out of memory
+ * @retval #IOTCON_ERROR_PERMISSION_DENIED Permission denied
  *
  * @see iotcon_remote_resource_stop_caching()
  * @see iotcon_remote_resource_cached_representation_changed_cb()
@@ -472,7 +465,6 @@ int iotcon_remote_resource_start_caching(iotcon_remote_resource_h resource,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the remote resource
@@ -515,7 +507,6 @@ typedef void (*iotcon_remote_resource_state_changed_cb)(iotcon_remote_resource_h
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the remote resource
@@ -528,6 +519,7 @@ typedef void (*iotcon_remote_resource_state_changed_cb)(iotcon_remote_resource_h
  * @retval #IOTCON_ERROR_INVALID_PARAMETER  Invalid parameter
  * @retval #IOTCON_ERROR_ALREADY  Already done
  * @retval #IOTCON_ERROR_OUT_OF_MEMORY  Out of memory
+ * @retval #IOTCON_ERROR_PERMISSION_DENIED Permission denied
  *
  * @see iotcon_remote_resource_stop_monitoring()
  * @see iotcon_remote_resource_state_changed_cb()
@@ -541,7 +533,6 @@ int iotcon_remote_resource_start_monitoring(iotcon_remote_resource_h resource,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the remote resource

diff --git a/lib/include/iotcon-resource.h b/lib/include/iotcon-resource.h
index 08b161a4af96280b5ee6df82077709c311696ebb..5f1d30ce0423172a7453c68bf4f99a7fcfbb4353 100644 (file)
--- a/lib/include/iotcon-resource.h
+++ b/lib/include/iotcon-resource.h
@@ -215,7 +215,6 @@ typedef void (*iotcon_request_handler_cb)(iotcon_resource_h resource,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @remarks @a uri_path length must be less than or equal 36.\n
@@ -261,7 +260,6 @@ int iotcon_resource_create(const char *uri_path,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @remarks When a normal variable is used, there are only permission denied error.
@@ -291,7 +289,6 @@ int iotcon_resource_destroy(iotcon_resource_h resource_handle);
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @remarks @a iface could be a value such as #IOTCON_INTERFACE_DEFAULT.
@@ -321,7 +318,6 @@ int iotcon_resource_bind_interface(iotcon_resource_h resource, const char *iface
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @remarks The length of @a resource_type should be less than or equal to 61.\n
@@ -383,7 +379,6 @@ int iotcon_resource_set_request_handler(iotcon_resource_h resource,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] parent The handle of the parent resource
@@ -413,7 +408,6 @@ int iotcon_resource_bind_child_resource(iotcon_resource_h parent,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] parent The handle of the parent resource
@@ -443,7 +437,6 @@ int iotcon_resource_unbind_child_resource(iotcon_resource_h parent,
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resource The handle of the resource

diff --git a/lib/include/iotcon-response.h b/lib/include/iotcon-response.h
index d54a4f6961e42c48b32edef56ded426e0ff66b9e..e34ebe337f045afcdbfa0f4b794a99a7b64ea077 100644 (file)
--- a/lib/include/iotcon-response.h
+++ b/lib/include/iotcon-response.h
@@ -351,7 +351,6 @@ int iotcon_response_set_options(iotcon_response_h resp, iotcon_options_h options
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @param[in] resp The handle of the response to send

diff --git a/lib/include/iotcon-server.h b/lib/include/iotcon-server.h
index d9ccef4f27e799460d3000ca6c12244833ed3916..74dc9958ea9225f0b716f95dffe4ecb3c1f66c25 100644 (file)
--- a/lib/include/iotcon-server.h
+++ b/lib/include/iotcon-server.h
@@ -52,7 +52,6 @@
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @remarks If @a time_to_live is 0, server will set default value as 60 seconds.\n
@@ -80,7 +79,6 @@ int iotcon_start_presence(unsigned int time_to_live);
  *
  * @since_tizen 3.0
  * @privlevel public
- * @privilege %http://tizen.org/privilege/network.get
  * @privilege %http://tizen.org/privilege/internet
  *
  * @return 0 on success, otherwise a negative error value.