From 45de3941e7e12e5626c5778291b3b0b5b445b747 Mon Sep 17 00:00:00 2001 From: Cuiziyuan Date: Thu, 28 Aug 2025 12:08:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E9=BB=84=E5=B7=AE=E5=BC=82=E6=B6=88?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cuiziyuan --- bundle.json | 3 +-- services/distributeddataservice/service/data_share/BUILD.gn | 1 - .../service/data_share/data_share_service_impl.cpp | 4 +--- .../service/data_share/data_share_service_impl.h | 1 - .../test/fuzztest/datashareserviceimpl_fuzzer/BUILD.gn | 1 + .../test/fuzztest/datashareservicestub_fuzzer/BUILD.gn | 2 +- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/bundle.json b/bundle.json index f726ee71c..8b8985701 100644 --- a/bundle.json +++ b/bundle.json @@ -94,8 +94,7 @@ "openssl", "json", "dmsfwk", - "data_object", - "init" + "data_object" ], "third_party": [ "libuv", diff --git a/services/distributeddataservice/service/data_share/BUILD.gn b/services/distributeddataservice/service/data_share/BUILD.gn index 788eceec2..f39ed7a35 100644 --- a/services/distributeddataservice/service/data_share/BUILD.gn +++ b/services/distributeddataservice/service/data_share/BUILD.gn @@ -130,7 +130,6 @@ ohos_source_set("data_share_service") { "hicollie:libhicollie", "hilog:libhilog", "hisysevent:libhisysevent", - "init:libbegetutil", "ipc:ipc_core", "json:nlohmann_json_static", "kv_store:datamgr_common", diff --git a/services/distributeddataservice/service/data_share/data_share_service_impl.cpp b/services/distributeddataservice/service/data_share/data_share_service_impl.cpp index 0b3e7c81b..75730097c 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_impl.cpp +++ b/services/distributeddataservice/service/data_share/data_share_service_impl.cpp @@ -60,7 +60,6 @@ #include "utils/anonymous.h" #include "xcollie.h" #include "log_debug.h" -#include "parameters.h" #include "dataproxy_handle_common.h" #include "proxy_data_manager.h" #include "datashare_observer.h" @@ -1144,8 +1143,7 @@ bool DataShareServiceImpl::VerifyAcrossAccountsPermission(int32_t currentUserId, if (currentUserId == 0 || currentUserId == visitedUserId) { return true; } - return system::GetBoolParameter(CONNECT_SUPPORT_CROSS_USER, false) && - PermitDelegate::VerifyPermission(acrossAccountsPermission, callerTokenId); + return PermitDelegate::VerifyPermission(acrossAccountsPermission, callerTokenId); } std::pair DataShareServiceImpl::ExecuteEx(const std::string &uri, const std::string &extUri, diff --git a/services/distributeddataservice/service/data_share/data_share_service_impl.h b/services/distributeddataservice/service/data_share/data_share_service_impl.h index 41b2965e5..c86cf2fa2 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_impl.h +++ b/services/distributeddataservice/service/data_share/data_share_service_impl.h @@ -160,7 +160,6 @@ private: static constexpr const char *PROXY_URI_SCHEMA = "datashareproxy"; static constexpr const char *EXT_URI_SCHEMA = "datashare://"; static constexpr const char *NO_PERMISSION = "noPermission"; - static constexpr const char *CONNECT_SUPPORT_CROSS_USER = "const.abilityms.connect_support_cross_user"; PublishStrategy publishStrategy_; GetDataStrategy getDataStrategy_; SubscribeStrategy subscribeStrategy_; diff --git a/services/distributeddataservice/service/test/fuzztest/datashareserviceimpl_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/datashareserviceimpl_fuzzer/BUILD.gn index baa4fa6ef..22cb65f5e 100644 --- a/services/distributeddataservice/service/test/fuzztest/datashareserviceimpl_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/datashareserviceimpl_fuzzer/BUILD.gn @@ -98,6 +98,7 @@ ohos_fuzztest("DataShareServiceImplFuzzTest") { "${data_service_path}/service/data_share/sys_event_subscriber.cpp", "${data_service_path}/service/kvdb/user_delegate.cpp", "${data_service_path}/service/permission/src/permit_delegate.cpp", + "${data_service_path}/service/permission/src/permission_validator.cpp", "datashareserviceimpl_fuzzer.cpp", ] diff --git a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn index 582498375..2b158d7b0 100644 --- a/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/datashareservicestub_fuzzer/BUILD.gn @@ -96,6 +96,7 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") { "${data_service_path}/service/data_share/sys_event_subscriber.cpp", "${data_service_path}/service/kvdb/user_delegate.cpp", "${data_service_path}/service/permission/src/permit_delegate.cpp", + "${data_service_path}/service/permission/src/permission_validator.cpp", "datashareservicestub_fuzzer.cpp", ] @@ -126,7 +127,6 @@ ohos_fuzztest("DataShareServiceStubFuzzTest") { "hilog:libhilog", "hisysevent:libhisysevent", "huks:libhukssdk", - "init:libbegetutil", "ipc:ipc_core", "kv_store:distributeddata_inner", "kv_store:distributeddb", -- Gitee