From 7014abb62b2c892ae0214f468878762fbd09c9f2 Mon Sep 17 00:00:00 2001 From: archane Date: Mon, 9 Jun 2025 23:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=A3=81=E5=89=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: archane Change-Id: I6c54a1a80a6ac89fac0f12656b586b829c0a5b6d --- .../service/data_share/common/scheduler_manager.cpp | 2 +- .../service/data_share/data_share_service_impl.cpp | 3 +-- .../service/data_share/data_share_service_stub.cpp | 13 +++++++------ .../published_data_subscriber_manager.cpp | 4 ++-- .../subscriber_managers/rdb_subscriber_manager.cpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp b/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp index 4a6a1131d..014b6490d 100644 --- a/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp +++ b/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp @@ -91,7 +91,7 @@ void SchedulerManager::Enable(const Key &key, int32_t userId, const DistributedD if (!TemplateManager::GetInstance().Get(key, userId, tpl) || tpl.scheduler_.empty() || tpl.scheduler_.find(REMIND_TIMER_FUNC) == std::string::npos) { ZLOGE("find template scheduler failed, %{public}s, %{public}" PRId64 ", %{public}s", - DistributedData::Anonymous::Change(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); + URIUtils::Anonymous(key.uri).c_str(), key.subscriberId, key.bundleName.c_str()); return; } bool isTimerStopped = false; 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 6c30e699c..97757d4da 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_impl.cpp +++ b/services/distributeddataservice/service/data_share/data_share_service_impl.cpp @@ -1168,12 +1168,11 @@ bool DataShareServiceImpl::VerifyPermission(const std::string &bundleName, const Security::AccessToken::HapTokenInfo tokenInfo; // Provider from ProxyData, which does not allow empty permissions and cannot be access without configured if (permission.empty()) { - ZLOGI("Permission empty! token:0x%{public}x, bundleName:%{public}s", tokenId, bundleName.c_str()); auto result = Security::AccessToken::AccessTokenKit::GetHapTokenInfo(tokenId, tokenInfo); if (result == Security::AccessToken::RET_SUCCESS && tokenInfo.bundleName == bundleName) { return true; } - ZLOGE("Permission denied!"); + ZLOGE("Permission denied! token:0x%{public}x, bundleName:%{public}s", tokenId, bundleName.c_str()); return false; } // If the permission is NO_PERMISSION, access is also allowed diff --git a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp index f9ef5f7dc..cd73d4328 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp +++ b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp @@ -27,6 +27,7 @@ #include "itypes_util.h" #include "log_print.h" #include "qos.h" +#include "uri_utils.h" #include "utils/anonymous.h" namespace OHOS { @@ -71,8 +72,8 @@ int32_t DataShareServiceStub::OnInsertEx(MessageParcel &data, MessageParcel &rep return IPC_STUB_INVALID_DATA_ERR; } auto [errCode, status] = InsertEx(uri, extUri, bucket); - ZLOGI("Insert uri:%{public}s, errCode:%{public}x, status:%{public}x", - DistributedData::Anonymous::Change(uri).c_str(), errCode, status); + ZLOGI("Insert uri:%{public}s, e:%{public}x, s:%{public}x", + URIUtils::Anonymous(uri).c_str(), errCode, status); if (!ITypesUtil::Marshal(reply, errCode, status)) { ZLOGE("Marshal errCode: 0x%{public}x, status: 0x%{public}x", errCode, status); return IPC_STUB_WRITE_PARCEL_ERR; @@ -92,8 +93,8 @@ int32_t DataShareServiceStub::OnUpdateEx(MessageParcel &data, MessageParcel &rep return IPC_STUB_INVALID_DATA_ERR; } auto [errCode, status] = UpdateEx(uri, extUri, predicate, bucket); - ZLOGI("Update uri:%{public}s, errCode:%{public}x, status:%{public}x", - DistributedData::Anonymous::Change(uri).c_str(), errCode, status); + ZLOGI("Update uri:%{public}s, e:%{public}x, s:%{public}x", + URIUtils::Anonymous(uri).c_str(), errCode, status); if (!ITypesUtil::Marshal(reply, errCode, status)) { ZLOGE("Marshal errCode: 0x%{public}x, status: 0x%{public}x", errCode, status); return IPC_STUB_WRITE_PARCEL_ERR; @@ -111,8 +112,8 @@ int32_t DataShareServiceStub::OnDeleteEx(MessageParcel &data, MessageParcel &rep return IPC_STUB_INVALID_DATA_ERR; } auto [errCode, status] = DeleteEx(uri, extUri, predicate); - ZLOGI("Delete uri:%{public}s, errCode:%{public}x, status:%{public}x", - DistributedData::Anonymous::Change(uri).c_str(), errCode, status); + ZLOGI("Delete uri:%{public}s, e:%{public}x, s:%{public}x", + URIUtils::Anonymous(uri).c_str(), errCode, status); if (!ITypesUtil::Marshal(reply, errCode, status)) { ZLOGE("Marshal errCode: 0x%{public}x, status: 0x%{public}x", errCode, status); return IPC_STUB_WRITE_PARCEL_ERR; diff --git a/services/distributeddataservice/service/data_share/subscriber_managers/published_data_subscriber_manager.cpp b/services/distributeddataservice/service/data_share/subscriber_managers/published_data_subscriber_manager.cpp index daa94de55..a7c7aa87d 100644 --- a/services/distributeddataservice/service/data_share/subscriber_managers/published_data_subscriber_manager.cpp +++ b/services/distributeddataservice/service/data_share/subscriber_managers/published_data_subscriber_manager.cpp @@ -97,7 +97,7 @@ int PublishedDataSubscriberManager::Disable(const PublishedDataKey &key, uint32_ }); if (!result) { ZLOGE("disable failed, uri is %{public}s, bundleName is %{public}s, subscriberId is %{public}" PRId64, - DistributedData::Anonymous::Change(key.key).c_str(), key.bundleName.c_str(), key.subscriberId); + URIUtils::Anonymous(key.key).c_str(), key.bundleName.c_str(), key.subscriberId); } return result ? E_OK : E_SUBSCRIBER_NOT_EXIST; } @@ -116,7 +116,7 @@ int PublishedDataSubscriberManager::Enable(const PublishedDataKey &key, uint32_t }); if (!result) { ZLOGE("enable failed, uri is %{public}s, bundleName is %{public}s, subscriberId is %{public}" PRId64, - DistributedData::Anonymous::Change(key.key).c_str(), key.bundleName.c_str(), key.subscriberId); + URIUtils::Anonymous(key.key).c_str(), key.bundleName.c_str(), key.subscriberId); } return result ? E_OK : E_SUBSCRIBER_NOT_EXIST; } diff --git a/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.cpp b/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.cpp index d5245715c..054513fdb 100644 --- a/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.cpp +++ b/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.cpp @@ -206,7 +206,7 @@ int RdbSubscriberManager::Disable(const Key &key, uint32_t firstCallerTokenId) } if (!result) { ZLOGE("disable failed, uri is %{public}s, bundleName is %{public}s, subscriberId is %{public}" PRId64, - DistributedData::Anonymous::Change(key.uri).c_str(), key.bundleName.c_str(), key.subscriberId); + URIUtils::Anonymous(key.uri).c_str(), key.bundleName.c_str(), key.subscriberId); } return result ? E_OK : E_SUBSCRIBER_NOT_EXIST; } @@ -241,7 +241,7 @@ int RdbSubscriberManager::Enable(const Key &key, std::shared_ptr contex } if (!result) { ZLOGE("enable failed, uri is %{public}s, bundleName is %{public}s, subscriberId is %{public}" PRId64, - DistributedData::Anonymous::Change(key.uri).c_str(), key.bundleName.c_str(), key.subscriberId); + URIUtils::Anonymous(key.uri).c_str(), key.bundleName.c_str(), key.subscriberId); } return result ? E_OK : E_SUBSCRIBER_NOT_EXIST; } -- Gitee