Remove codes to check permission

Change-Id: I79f889f352168ebddd8128565f70c664c7e0a503

diff --git a/src/wifi-aware-private.c b/src/wifi-aware-private.c
index 5e7541b..300aa4e 100644 (file)
--- a/src/wifi-aware-private.c
+++ b/src/wifi-aware-private.c
@@ -17,7 +17,6 @@
  */
 
 #include <glib.h>
-#include <cynara-client.h>
 #include <stdio.h>
 
 #include "wifi-aware.h"
@@ -101,9 +100,6 @@ static wifi_aware_s *g_wifi_aware = NULL;
 #define NETWORK_SET_PRIVILEGE "http://tizen.org/privilege/network.set"
 #define SMACK_LABEL_LEN 255
 
-static bool is_privilege_checked = false;
-static bool access_allowed = false;
-
 const char *_wifi_aware_convert_error_type_to_string(wifi_aware_error_e err)
 {
        switch (err) {
@@ -219,50 +215,6 @@ wifi_aware_error_e _wifi_aware_convert_nan_manager_error(int error)
        }
 }
 
-bool _wifi_aware_check_permission(void)
-{
-       FILE *fd;
-       int ret;
-       char smack_label[SMACK_LABEL_LEN + 1] = {0, };
-       char uid[10] = {0, };
-       char *client_session = "";
-       cynara *p_cynara;
-
-       if (is_privilege_checked) {
-               WIFI_AWARE_LOGI("permission was already checked: %d", access_allowed);
-               return access_allowed;
-       }
-
-       if (CYNARA_API_SUCCESS != cynara_initialize(&p_cynara, NULL))
-               return false;
-
-       bzero(smack_label, SMACK_LABEL_LEN + 1);
-
-       fd = fopen(PROC_ATTR_CURRENT_PATH, "r");
-       if (fd == NULL) {
-               cynara_finish(p_cynara);
-               return false;
-       }
-
-       ret = fread(smack_label, SMACK_LABEL_LEN, 1, fd);
-       if (ret < 0) {
-               fclose(fd);
-               cynara_finish(p_cynara);
-               return false;
-       }
-       fclose(fd);
-
-       snprintf(uid, sizeof(uid), "%d", getuid());
-       ret = cynara_check(p_cynara, smack_label, client_session, uid, NETWORK_SET_PRIVILEGE);
-       cynara_finish(p_cynara);
-
-       is_privilege_checked = true;
-       access_allowed = (ret == CYNARA_API_ACCESS_ALLOWED) ? true : false;
-
-       WIFI_AWARE_LOGI("permission checked[%s/%d]", NETWORK_SET_PRIVILEGE, access_allowed);
-       return access_allowed;
-}
-
 static void __session_set_requested(wifi_aware_session_h session_handle, bool requested)
 {
        wifi_aware_session_s *session = (wifi_aware_session_s *)session_handle;

diff --git a/src/wifi-aware.c b/src/wifi-aware.c
index dc9b930..8c26d61 100644 (file)
--- a/src/wifi-aware.c
+++ b/src/wifi-aware.c
@@ -64,7 +64,6 @@ API int wifi_aware_enable(wifi_aware_enabled_cb callback, void *user_data)
 
        __WIFI_AWARE_FUNC_ENTER__;
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
-       RET_VAL_IF(!_wifi_aware_check_permission(), WIFI_AWARE_ERROR_PERMISSION_DENIED, "Permission denied");
        RET_VAL_IF(!_wifi_aware_is_initialized(), WIFI_AWARE_ERROR_NOT_INITIALIZED, "Not initialized");
        RET_VAL_IF(_wifi_aware_is_enabled(), WIFI_AWARE_ERROR_ALREADY_ENABLED, "Already enabled");
 
@@ -290,7 +289,6 @@ API int wifi_aware_session_publish(wifi_aware_session_h session,
        int ret = WIFI_AWARE_ERROR_NONE;
 
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
-       RET_VAL_IF(!_wifi_aware_check_permission(), WIFI_AWARE_ERROR_PERMISSION_DENIED, "Permission denied");
        RET_VAL_IF(!_wifi_aware_is_initialized(), WIFI_AWARE_ERROR_NOT_INITIALIZED, "Not initialized");
        RET_VAL_IF(!_wifi_aware_is_enabled(), WIFI_AWARE_ERROR_INVALID_OPERATION, "Not enabled");
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
@@ -311,7 +309,6 @@ API int wifi_aware_session_update_publish(wifi_aware_session_h session,
        int ret = WIFI_AWARE_ERROR_NONE;
 
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
-       RET_VAL_IF(!_wifi_aware_check_permission(), WIFI_AWARE_ERROR_PERMISSION_DENIED, "Permission denied");
        RET_VAL_IF(!_wifi_aware_is_initialized(), WIFI_AWARE_ERROR_NOT_INITIALIZED, "Not initialized");
        RET_VAL_IF(!_wifi_aware_is_enabled(), WIFI_AWARE_ERROR_INVALID_OPERATION, "Not enabled");
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
@@ -488,7 +485,6 @@ API int wifi_aware_session_subscribe(wifi_aware_session_h session,
        int ret = WIFI_AWARE_ERROR_NONE;
 
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
-       RET_VAL_IF(!_wifi_aware_check_permission(), WIFI_AWARE_ERROR_PERMISSION_DENIED, "Permission denied");
        RET_VAL_IF(!_wifi_aware_is_initialized(), WIFI_AWARE_ERROR_NOT_INITIALIZED, "Not initialized");
        RET_VAL_IF(!_wifi_aware_is_enabled(), WIFI_AWARE_ERROR_INVALID_OPERATION, "Not enabled");
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
@@ -525,7 +521,6 @@ API int wifi_aware_session_update_subscribe(wifi_aware_session_h session,
        int ret = WIFI_AWARE_ERROR_NONE;
 
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
-       RET_VAL_IF(!_wifi_aware_check_permission(), WIFI_AWARE_ERROR_PERMISSION_DENIED, "Permission denied");
        RET_VAL_IF(!_wifi_aware_is_initialized(), WIFI_AWARE_ERROR_NOT_INITIALIZED, "Not initialized");
        RET_VAL_IF(!_wifi_aware_is_enabled(), WIFI_AWARE_ERROR_INVALID_OPERATION, "Not enabled");
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");
@@ -571,7 +566,6 @@ API int wifi_aware_session_send_message(wifi_aware_session_h session,
 {
        __WIFI_AWARE_FUNC_ENTER__;
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
-       RET_VAL_IF(!_wifi_aware_check_permission(), WIFI_AWARE_ERROR_PERMISSION_DENIED, "Permission denied");
        RET_VAL_IF(!_wifi_aware_is_initialized(), WIFI_AWARE_ERROR_NOT_INITIALIZED, "Not initialized");
        RET_VAL_IF(!_wifi_aware_is_enabled(), WIFI_AWARE_ERROR_INVALID_OPERATION, "Not enabled");
        RET_VAL_IF(session == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "wifi_aware_session_h is NULL");

diff --git a/tests/unittest/wifi-aware-unittest-fixture.h b/tests/unittest/wifi-aware-unittest-fixture.h
index d8c2469..72dac90 100644 (file)
--- a/tests/unittest/wifi-aware-unittest-fixture.h
+++ b/tests/unittest/wifi-aware-unittest-fixture.h
@@ -29,8 +29,9 @@ protected:
        {
                g_enabled = false;
                g_wifi_aware_supported = false;
-               system_info_get_platform_bool(WIFI_AWARE_FEATURE,
-                               &WifiAware::g_wifi_aware_supported);
+               if (system_info_get_platform_bool(WIFI_AWARE_FEATURE,
+                               &WifiAware::g_wifi_aware_supported) != SYSTEM_INFO_ERROR_NONE)
+                       ASSERT_TRUE(true) << "FAIL system_info_get_platform_bool";
                wifi_aware_initialize();
        }