From: Hwankyu Jhun Date: Sun, 12 Jan 2025 23:50:41 +0000 (+0900) Subject: Revert "Add dev_wos build option for permissive mode" X-Git-Tag: accepted/tizen/unified/x/20250113.065042~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af7f69eefabbd9e8305f8b93f09854be5dbe09de;p=platform%2Fcore%2Fappfw%2Fdata-control.git Revert "Add dev_wos build option for permissive mode" This reverts commit 8337f57cf64ac98fe4ca4c0ddc7242d78829a021. Change-Id: I5187e2d65e1fc5b07dda57f41ce15192ff9bc605 Signed-off-by: Hwankyu Jhun --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ef52db1..0ad8df0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,13 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(data-control C) -IF(_TIZEN_FEATURE_SMACK_DISABLE) -MESSAGE(STATUS "[SMACK] Disable") -ADD_DEFINITIONS("-DTIZEN_FEATURE_SMACK_DISABLE") -ELSE(_TIZEN_FEATURE_SMACK_DISABLE) -MESSAGE(STATUS "[SMACK] Enable") -ENDIF(_TIZEN_FEATURE_SMACK_DISABLE) - SET(PREFIX ${CMAKE_INSTALL_PREFIX}) INCLUDE_DIRECTORIES ( diff --git a/packaging/data-control.spec b/packaging/data-control.spec index 5ac2961..954f277 100644 --- a/packaging/data-control.spec +++ b/packaging/data-control.spec @@ -63,12 +63,6 @@ Group: Application Framework/Libraries gcov objects of a data control library %endif -%if "%{?dev_wos}" == "1" -%define tizen_feature_smack_disable 1 -%else -%define tizen_feature_smack_disable 0 -%endif - %prep %setup -q @@ -80,15 +74,8 @@ export FFLAGS+=" -fprofile-arcs -ftest-coverage" export LDFLAGS+=" -lgcov" %endif -%if 0%{?tizen_feature_smack_disable} -_TIZEN_FEATURE_SMACK_DISABLE=ON -%endif - MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake -DFULLVER=%{version} \ - -DMAJORVER=${MAJORVER} \ - -D_TIZEN_FEATURE_SMACK_DISABLE:BOOL=${_TIZEN_FEATURE_SMACK_DISABLE} \ - . +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} # Call make instruction with smp support %__make %{?jobs:-j%jobs} diff --git a/src/data_control_internal.c b/src/data_control_internal.c index bd746a0..af834e3 100644 --- a/src/data_control_internal.c +++ b/src/data_control_internal.c @@ -2195,15 +2195,6 @@ int _dbus_signal_init(int *monitor_id, char *path, GDBusSignalCallback callback) return DATA_CONTROL_ERROR_NONE; } -static bool __is_smack_disabled(void) -{ -#ifdef TIZEN_FEATURE_SMACK_DISABLE - return true; -#else - return false; -#endif /* TIZEN_FEATURE_SMACK_DISABLE */ -} - int _check_privilege(privilege_type check_type) { cynara *p_cynara = NULL; @@ -2218,11 +2209,6 @@ int _check_privilege(privilege_type check_type) if (checked_privilege) return DATA_CONTROL_ERROR_NONE; - if (__is_smack_disabled()) { - checked_privilege = TRUE; - return DATA_CONTROL_ERROR_NONE; - } - ret = cynara_initialize(&p_cynara, NULL); if (ret != CYNARA_API_SUCCESS) { _LOGE("cannot init cynara [%d] failed!", ret); diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt index e5747f9..efc40f7 100644 --- a/tests/unit_tests/CMakeLists.txt +++ b/tests/unit_tests/CMakeLists.txt @@ -1,13 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) PROJECT(data_control_unittests C CXX) -IF(_TIZEN_FEATURE_SMACK_DISABLE) -MESSAGE(STATUS "[SMACK] Disable") -ADD_DEFINITIONS("-DTIZEN_FEATURE_SMACK_DISABLE") -ELSE(_TIZEN_FEATURE_SMACK_DISABLE) -MESSAGE(STATUS "[SMACK] Enable") -ENDIF(_TIZEN_FEATURE_SMACK_DISABLE) - INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(data_control_unittests REQUIRED gmock diff --git a/tests/unit_tests/src/test_data_control_map.cc b/tests/unit_tests/src/test_data_control_map.cc index 0dcc57f..10e43aa 100644 --- a/tests/unit_tests/src/test_data_control_map.cc +++ b/tests/unit_tests/src/test_data_control_map.cc @@ -83,7 +83,6 @@ extern gpointer __io_data; extern char* __request_type; TEST_F(DataControlMapTest, map_get_n) { -#ifndef TIZEN_FEATURE_SMACK_DISABLE EXPECT_CALL(GetMock(), cynara_initialize(_, _)). Times(3). @@ -100,23 +99,6 @@ TEST_F(DataControlMapTest, map_get_n) { WillOnce(Return(1)). WillOnce(Return(CYNARA_API_ACCESS_ALLOWED)). WillOnce(Return(1)); -#else - char* provider_appid = strdup("test_appid"); - EXPECT_NE(provider_appid, nullptr); - - bool is_trusted = true; - EXPECT_CALL(GetMock(), - pkgmgrinfo_appinfo_usr_get_datacontrol_trusted_info( - _, _, _, _, _)). - WillOnce(DoAll(SetArgPointee<3>(provider_appid), - SetArgPointee<4>(is_trusted), - Return(PMINFO_R_OK))); - - EXPECT_CALL(GetMock(), - pkgmgrinfo_pkginfo_compare_usr_app_cert_info(_, _, _, _)). - WillOnce(DoAll(SetArgPointee<3>(PMINFO_CERT_COMPARE_MATCH), - Return(PMINFO_R_OK))); -#endif int ret; int req; @@ -150,17 +132,15 @@ TEST_F(DataControlMapTest, map_test) { int handle_id = 0; char* access; char* app_id; + char* provider_appid; char* provider_id = nullptr; char* data_id = nullptr; + bool is_trusted = true; Bundle b; data_control_h provider; data_control_map_response_cb* map_cb; - data_control_bulk_data_h bulk_data_h; -#ifndef TIZEN_FEATURE_SMACK_DISABLE - char* provider_appid; - bool is_trusted = true; pkgmgrinfo_cert_compare_result_type_e res; -#endif + data_control_bulk_data_h bulk_data_h; EXPECT_CALL(GetMock(), appsvc_run_service(_, _, _, _)).WillOnce(Return(0)); @@ -197,12 +177,8 @@ TEST_F(DataControlMapTest, map_test) { map_cb->remove_cb = _data_control_map_remove_response_cb; app_id = strdup("test_appid"); - EXPECT_NE(app_id, nullptr); - access = strdup("readwrite"); - EXPECT_NE(app_id, nullptr); -#ifndef TIZEN_FEATURE_SMACK_DISABLE EXPECT_CALL(GetMock(), pkgmgrinfo_appinfo_usr_get_datacontrol_info( _, _, _, _, _)). @@ -226,11 +202,7 @@ TEST_F(DataControlMapTest, map_test) { cynara_creds_self_get_client(_, _)). WillOnce(Return(0)); - provider_appid = (char*)malloc(sizeof(char) * 11); - - ret = snprintf(provider_appid, 11, "%s", "test_appid"); - EXPECT_GT(ret, 0); - + provider_appid = strdup("test_appid"); EXPECT_CALL(GetMock(), pkgmgrinfo_appinfo_usr_get_datacontrol_trusted_info( _, _, _, _, _)). @@ -244,30 +216,6 @@ TEST_F(DataControlMapTest, map_test) { pkgmgrinfo_pkginfo_compare_usr_app_cert_info(_, _, _, _)). WillOnce(DoAll(SetArgPointee<3>(res), Return(PMINFO_R_OK))); -#else - - EXPECT_CALL(GetMock(), - pkgmgrinfo_appinfo_usr_get_datacontrol_info( - _, _, _, _, _)). - WillOnce(DoAll(SetArgPointee<3>(app_id), - SetArgPointee<4>(access), - Return(PMINFO_R_OK))); - - ret = data_control_map_register_response_cb(provider, map_cb, NULL); - EXPECT_EQ(ret, DATA_CONTROL_ERROR_NONE); - - EXPECT_CALL(GetMock(), - cynara_initialize(_, _)). - WillRepeatedly(Return(CYNARA_API_SUCCESS)); - - EXPECT_CALL(GetMock(), - cynara_check(_, _, _, _, _)). - WillRepeatedly(Return(CYNARA_API_ACCESS_ALLOWED)); - - EXPECT_CALL(GetMock(), - cynara_creds_self_get_client(_, _)). - WillOnce(Return(0)); -#endif ret = data_control_map_add(provider, "test_key", "test_value", &req_id); EXPECT_EQ(ret, DATA_CONTROL_ERROR_NONE); diff --git a/tests/unit_tests/src/test_main.cc b/tests/unit_tests/src/test_main.cc index c2eb730..e834f84 100644 --- a/tests/unit_tests/src/test_main.cc +++ b/tests/unit_tests/src/test_main.cc @@ -14,8 +14,21 @@ * limitations under the License. */ -#include +#include #include +#include + +extern "C" int __dlog_print(log_id_t log_id, int prio, const char* tag, + const char* fmt, ...) { + printf("%s:", tag); + va_list ap; + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + printf("\n"); + + return 0; +} int main(int argc, char** argv) { int ret = -1;