From c70e33d60c911e200e3d3e63dacd71016e74dfd9 Mon Sep 17 00:00:00 2001 From: yujann Date: Tue, 11 Jun 2024 19:02:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yujann --- frameworks/common/BUILD.gn | 52 ------------------- frameworks/sandbox_manager/BUILD.gn | 3 -- frameworks/test/BUILD.gn | 5 +- interfaces/innerkits/sandbox_manager/BUILD.gn | 5 +- .../innerkits/sandbox_manager/test/BUILD.gn | 1 - patches/patches.json | 5 ++ services/common/BUILD.gn | 3 -- services/sandbox_manager/BUILD.gn | 1 - .../sandbox_manager_event_subscriber.cpp | 2 +- .../cpp/src/service/policy_info_manager.cpp | 14 ++--- .../cpp/src/service/sandbox_manager_stub.cpp | 2 +- services/sandbox_manager/test/BUILD.gn | 5 +- .../sandbox_manager_service_fuzz.gni | 1 - 13 files changed, 18 insertions(+), 81 deletions(-) delete mode 100644 frameworks/common/BUILD.gn diff --git a/frameworks/common/BUILD.gn b/frameworks/common/BUILD.gn deleted file mode 100644 index 5e74a00..0000000 --- a/frameworks/common/BUILD.gn +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") -import("../../sandbox_manager.gni") - -config("sandbox_manager_common_cxx_public_config") { - visibility = [ ":*" ] - include_dirs = [ "include" ] -} - -ohos_shared_library("sandbox_manager_common_cxx") { - subsystem_name = "accesscontrol" - innerapi_tags = [ "platformsdk_indirect" ] - part_name = "sandbox_manager" - - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - branch_protector_ret = "pac_ret" - - public_configs = [ ":sandbox_manager_common_cxx_public_config" ] - - include_dirs = [ - "${sandbox_manager_path}/interfaces/innerkits/sandbox_manager/include", - "include", - ] - - sources = [] - - deps = [] - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - ] - - configs = [ "${sandbox_manager_path}/config:coverage_flags" ] - - cflags_cc = [ "-DHILOG_ENABLE" ] -} diff --git a/frameworks/sandbox_manager/BUILD.gn b/frameworks/sandbox_manager/BUILD.gn index 28b765e..415af5f 100644 --- a/frameworks/sandbox_manager/BUILD.gn +++ b/frameworks/sandbox_manager/BUILD.gn @@ -50,8 +50,5 @@ ohos_shared_library("sandbox_manager_communication_adapter_cxx") { "src/policy_info_vector_parcel.cpp", ] - dep = - [ "${sandbox_manager_path}/frameworks/common:sandbox_manager_common_cxx" ] - external_deps = [ "c_utils:utils" ] } diff --git a/frameworks/test/BUILD.gn b/frameworks/test/BUILD.gn index 9133b78..d51ea35 100644 --- a/frameworks/test/BUILD.gn +++ b/frameworks/test/BUILD.gn @@ -28,10 +28,7 @@ ohos_unittest("libsandbox_manager_communication_adapter_cxx_test") { sources = [ "unittest/sandbox_manager_parcel_test.cpp" ] - deps = [ - "${sandbox_manager_path}/frameworks/common:sandbox_manager_common_cxx", - "${sandbox_manager_path}/frameworks/sandbox_manager:sandbox_manager_communication_adapter_cxx", - ] + deps = [ "${sandbox_manager_path}/frameworks/sandbox_manager:sandbox_manager_communication_adapter_cxx" ] external_deps = [ "c_utils:utils", diff --git a/interfaces/innerkits/sandbox_manager/BUILD.gn b/interfaces/innerkits/sandbox_manager/BUILD.gn index 2acb478..48603bb 100644 --- a/interfaces/innerkits/sandbox_manager/BUILD.gn +++ b/interfaces/innerkits/sandbox_manager/BUILD.gn @@ -57,10 +57,7 @@ if (is_standard_system) { "src/sandbox_manager_proxy.cpp", ] - deps = [ - "${sandbox_manager_path}/frameworks/common:sandbox_manager_common_cxx", - "${sandbox_manager_path}/frameworks/sandbox_manager:sandbox_manager_communication_adapter_cxx", - ] + deps = [ "${sandbox_manager_path}/frameworks/sandbox_manager:sandbox_manager_communication_adapter_cxx" ] external_deps = [ "c_utils:utils", diff --git a/interfaces/innerkits/sandbox_manager/test/BUILD.gn b/interfaces/innerkits/sandbox_manager/test/BUILD.gn index ace8624..bc94d25 100644 --- a/interfaces/innerkits/sandbox_manager/test/BUILD.gn +++ b/interfaces/innerkits/sandbox_manager/test/BUILD.gn @@ -43,7 +43,6 @@ ohos_unittest("libsandbox_manager_sdk_test") { configs = [ "${sandbox_manager_path}/config:coverage_flags" ] deps = [ - "${sandbox_manager_path}/frameworks/common:sandbox_manager_common_cxx", "${sandbox_manager_path}/frameworks/sandbox_manager:sandbox_manager_communication_adapter_cxx", "../:libsandbox_manager_sdk", ] diff --git a/patches/patches.json b/patches/patches.json index 1e96301..753c159 100644 --- a/patches/patches.json +++ b/patches/patches.json @@ -9,6 +9,11 @@ "project":"startup_init", "path":"base/startup/init", "pr_url":"https://gitee.com/openharmony/startup_init/pulls/2827" + }, + { + "project":"security_selinux_adapter", + "path":"base/security/selinux_adapter", + "pr_url":"https://gitee.com/openharmony/security_selinux_adapter/pulls/4530" } ] } diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index e2489b9..5c5a890 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -41,9 +41,6 @@ ohos_shared_library("sandbox_manager_service_common") { cflags_cc = [ "-DHILOG_ENABLE" ] configs = [ "${sandbox_manager_path}/config:coverage_flags" ] - deps = - [ "${sandbox_manager_path}/frameworks/common:sandbox_manager_common_cxx" ] - external_deps = [ "c_utils:utils", "hilog:libhilog", diff --git a/services/sandbox_manager/BUILD.gn b/services/sandbox_manager/BUILD.gn index 2247d7e..8fe24a3 100644 --- a/services/sandbox_manager/BUILD.gn +++ b/services/sandbox_manager/BUILD.gn @@ -60,7 +60,6 @@ if (is_standard_system) { configs = [ "${sandbox_manager_path}/config:coverage_flags" ] deps = [ - "${sandbox_manager_path}/frameworks/common:sandbox_manager_common_cxx", "${sandbox_manager_path}/frameworks/sandbox_manager:sandbox_manager_communication_adapter_cxx", "${sandbox_manager_path}/services/common:sandbox_manager_service_common", "${sandbox_manager_path}/services/sandbox_manager:sandbox_manager_service.rc", diff --git a/services/sandbox_manager/main/cpp/src/sensitive/sandbox_manager_event_subscriber.cpp b/services/sandbox_manager/main/cpp/src/sensitive/sandbox_manager_event_subscriber.cpp index 47ff9ed..6b26eac 100644 --- a/services/sandbox_manager/main/cpp/src/sensitive/sandbox_manager_event_subscriber.cpp +++ b/services/sandbox_manager/main/cpp/src/sensitive/sandbox_manager_event_subscriber.cpp @@ -75,7 +75,7 @@ void SandboxManagerCommonEventSubscriber::OnReceiveEvent(const EventFwk::CommonE SANDBOXMANAGER_LOG_INFO(LABEL, "Receive event = %{public}s.", action.c_str()); if (action == EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_REMOVED || action == EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_FULLY_REMOVED) { - uint64_t tokenId = want.GetParams().GetIntParam("accessTokenId", 0); + uint64_t tokenId = static_cast(want.GetParams().GetIntParam("accessTokenId", 0)); if (tokenId == 0) { SANDBOXMANAGER_LOG_ERROR(LABEL, "Error tokenid = %{public}" PRIu64".", tokenId); return; diff --git a/services/sandbox_manager/main/cpp/src/service/policy_info_manager.cpp b/services/sandbox_manager/main/cpp/src/service/policy_info_manager.cpp index c9238b6..b1b23f3 100644 --- a/services/sandbox_manager/main/cpp/src/service/policy_info_manager.cpp +++ b/services/sandbox_manager/main/cpp/src/service/policy_info_manager.cpp @@ -60,7 +60,7 @@ int32_t PolicyInfoManager::AddPolicy(const uint64_t tokenId, const std::vector

(checkPolicyRet); continue; } // find duplicate record (have same tokenId, path), delete it @@ -95,14 +95,14 @@ int32_t PolicyInfoManager::MatchSinglePolicy(const uint64_t tokenId, const Polic { int32_t checkPolicyRet = CheckPolicyValidity(policy); if (checkPolicyRet != SANDBOX_MANAGER_OK) { - result = checkPolicyRet; + result = static_cast(checkPolicyRet); return INVALID_PARAMTER; } // search records have same tokenId and depth <= input policy GenericValues conditions; GenericValues symbols; - uint64_t searchDepth = GetDepth(policy.path); + uint64_t searchDepth = static_cast(GetDepth(policy.path)); conditions.Put(PolicyFiledConst::FIELD_TOKENID, static_cast(tokenId)); symbols.Put(PolicyFiledConst::FIELD_TOKENID, std::string("=")); @@ -126,8 +126,8 @@ int32_t PolicyInfoManager::MatchSinglePolicy(const uint64_t tokenId, const Polic for (size_t i = 0; i < dbResultsSize; i++) { PolicyInfo referPolicy; referPolicy.path = dbResults[i].GetString(PolicyFiledConst::FIELD_PATH); - referPolicy.mode = dbResults[i].GetInt(PolicyFiledConst::FIELD_MODE); - uint64_t referDepth = dbResults[i].GetInt(PolicyFiledConst::FIELD_DEPTH); + referPolicy.mode = static_cast(dbResults[i].GetInt(PolicyFiledConst::FIELD_MODE)); + uint64_t referDepth = static_cast(dbResults[i].GetInt(PolicyFiledConst::FIELD_DEPTH)); PolicyInfo searchPolicy; searchPolicy.mode = policy.mode; @@ -174,7 +174,7 @@ int32_t PolicyInfoManager::RemovePolicy( for (size_t i = 0; i < policySize; i++) { int32_t checkPolicyRet = CheckPolicyValidity(policy[i]); if (checkPolicyRet != SANDBOX_MANAGER_OK) { - result[i] = checkPolicyRet; + result[i] = static_cast(checkPolicyRet); continue; } @@ -246,7 +246,7 @@ int32_t PolicyInfoManager::ExactFind(const uint64_t tokenId, const PolicyInfo &p return SANDBOX_MANAGER_DB_RETURN_EMPTY; } result.path = searchResults[0].GetString(PolicyFiledConst::FIELD_PATH); - result.mode = searchResults[0].GetInt(PolicyFiledConst::FIELD_MODE); + result.mode = static_cast(searchResults[0].GetInt(PolicyFiledConst::FIELD_MODE)); return SANDBOX_MANAGER_OK; } diff --git a/services/sandbox_manager/main/cpp/src/service/sandbox_manager_stub.cpp b/services/sandbox_manager/main/cpp/src/service/sandbox_manager_stub.cpp index e95a5ab..e017a0f 100644 --- a/services/sandbox_manager/main/cpp/src/service/sandbox_manager_stub.cpp +++ b/services/sandbox_manager/main/cpp/src/service/sandbox_manager_stub.cpp @@ -381,7 +381,7 @@ SandboxManagerStub::~SandboxManagerStub() bool SandboxManagerStub::CheckPermission(const uint64_t tokenId, const std::string &permission) { - uint32_t ret = Security::AccessToken::AccessTokenKit::VerifyAccessToken(tokenId, permission); + int32_t ret = Security::AccessToken::AccessTokenKit::VerifyAccessToken(tokenId, permission); if (ret == Security::AccessToken::PermissionState::PERMISSION_GRANTED) { SANDBOXMANAGER_LOG_INFO(LABEL, "Check permission token:%{public}" PRIu64" pass", tokenId); return true; diff --git a/services/sandbox_manager/test/BUILD.gn b/services/sandbox_manager/test/BUILD.gn index 04618ff..11e77fa 100644 --- a/services/sandbox_manager/test/BUILD.gn +++ b/services/sandbox_manager/test/BUILD.gn @@ -56,7 +56,6 @@ ohos_unittest("libsandbox_manager_service_standard_test") { cflags_cc = [ "-DHILOG_ENABLE" ] deps = [ - "${sandbox_manager_path}/frameworks/common:sandbox_manager_common_cxx", "${sandbox_manager_path}/frameworks/sandbox_manager:sandbox_manager_communication_adapter_cxx", "${sandbox_manager_path}/services/common:sandbox_manager_service_common", "${sandbox_manager_path}/services/sandbox_manager:sandbox_manager_service", @@ -105,8 +104,8 @@ ohos_unittest("libsandbox_manager_sqlite_mock_test") { "${sandbox_manager_path}/services/common/database/src/variant_value.cpp", "${sandbox_manager_path}/services/sandbox_manager/main/cpp/src/database/policy_field_const.cpp", "${sandbox_manager_path}/services/sandbox_manager/main/cpp/src/database/sandbox_manager_db.cpp", - "mock/src/sqlite_mock_test.cpp", "mock/src/sqlite3sym.cpp", + "mock/src/sqlite_mock_test.cpp", ] deps = [ @@ -129,5 +128,5 @@ group("unittest") { deps = [ ":libsandbox_manager_service_standard_test", ":libsandbox_manager_sqlite_mock_test", - ] + ] } diff --git a/test/fuzztest/services/sandbox_manager/sandbox_manager_service_fuzz.gni b/test/fuzztest/services/sandbox_manager/sandbox_manager_service_fuzz.gni index 678f720..f44d195 100644 --- a/test/fuzztest/services/sandbox_manager/sandbox_manager_service_fuzz.gni +++ b/test/fuzztest/services/sandbox_manager/sandbox_manager_service_fuzz.gni @@ -37,7 +37,6 @@ sandbox_manager_sources = [ ] sandbox_manager_deps = [ - "${sandbox_manager_path}/frameworks/common:sandbox_manager_common_cxx", "${sandbox_manager_path}/frameworks/sandbox_manager:sandbox_manager_communication_adapter_cxx", "${sandbox_manager_path}/interfaces/innerkits/sandbox_manager:libsandbox_manager_sdk", "${sandbox_manager_path}/services/common:sandbox_manager_service_common", -- Gitee