From d38dcf354852378bbd70dfb5d3747660a022c8c9 Mon Sep 17 00:00:00 2001 From: tengao-yu Date: Mon, 24 Oct 2022 15:38:01 +0800 Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9Adelete=20sensitive=20information?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tengao-yu --- .../app/src/kvstore_meta_manager.cpp | 3 ++- .../src/session_manager/route_head_handler_impl.cpp | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp index 92113fce..c1ea489c 100755 --- a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp +++ b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp @@ -41,6 +41,7 @@ #include "reporter.h" #include "serializable/serializable.h" #include "user_delegate.h" +#include "utils/anonymous.h" #include "utils/crypto.h" namespace OHOS { @@ -984,7 +985,7 @@ void KvStoreMetaManager::KvStoreMetaObserver::HandleChanges( for (const auto &entry : entries) { std::string key(entry.key.begin(), entry.key.end()); for (const auto &item : handlerMap_) { - ZLOGI("flag:%{public}d, key:%{public}s", flag, key.c_str()); + ZLOGI("flag:%{public}d, key:%{public}s", flag, Anonymous::Change(key).c_str()); if (key.find(item.first) == 0) { item.second(entry.key, entry.value, flag); } diff --git a/services/distributeddataservice/app/src/session_manager/route_head_handler_impl.cpp b/services/distributeddataservice/app/src/session_manager/route_head_handler_impl.cpp index 50d53599..6972190d 100644 --- a/services/distributeddataservice/app/src/session_manager/route_head_handler_impl.cpp +++ b/services/distributeddataservice/app/src/session_manager/route_head_handler_impl.cpp @@ -22,6 +22,7 @@ #include "log_print.h" #include "securec.h" #include "upgrade_manager.h" +#include "utils/anonymous.h" #include "utils/endian_converter.h" namespace OHOS::DistributedData { @@ -53,7 +54,9 @@ void RouteHeadHandlerImpl::Init() } SessionPoint localPoint { DeviceKvStoreImpl::GetLocalDeviceId(), std::stoi(userId_), appId_ }; session_ = SessionManager::GetInstance().GetSession(localPoint, deviceId_); - ZLOGD("valid session:%{public}s", Serializable::Marshall(session_).c_str()); + ZLOGD("valid session:appId:%{public}s, srcDevId:%{public}s, srcUser:%{public}u, trgDevId:%{public}s,", + session_.appId.c_str(), Anonymous::Change(session_.sourceDeviceId).c_str(), + session_.sourceUserId, Anonymous::Change(session_.targetDeviceId).c_str()); } DistributedDB::DBStatus RouteHeadHandlerImpl::GetHeadDataSize(uint32_t &headSize) @@ -183,7 +186,9 @@ bool RouteHeadHandlerImpl::ParseHeadData( // flip the local and peer ends SessionPoint local { .deviceId = session_.targetDeviceId, .appId = session_.appId }; SessionPoint peer { .deviceId = session_.sourceDeviceId, .userId = session_.sourceUserId, .appId = session_.appId }; - ZLOGI("validSession:%{public}s", Serializable::Marshall(session_).c_str()); + ZLOGD("valid session:appId:%{public}s, srcDevId:%{public}s, srcUser:%{public}u, trgDevId:%{public}s,", + session_.appId.c_str(), Anonymous::Change(session_.sourceDeviceId).c_str(), + session_.sourceUserId, Anonymous::Change(session_.targetDeviceId).c_str()); for (const auto &item : session_.targetUserIds) { local.userId = item; if (SessionManager::GetInstance().CheckSession(local, peer)) { @@ -280,4 +285,4 @@ bool RouteHeadHandlerImpl::UnPackDataBody(const uint8_t *data, uint32_t totalLen session_.appId.append(appId->appId, appIdLen); return true; } -} // namespace OHOS::DistributedData \ No newline at end of file +} // namespace OHOS::DistributedData -- Gitee