From 7a025969d8982a603c49c212a9cc174d95354f95 Mon Sep 17 00:00:00 2001 From: lihehe Date: Thu, 22 May 2025 17:29:33 +0800 Subject: [PATCH] fix distributed problems of privacy_service and token_sync Signed-off-by: lihehe Change-Id: Iefb61e36f62960dfeee0e934223a6b653fb7c849 --- services/privacymanager/sa_profile/3505.json | 2 +- .../tokensyncmanager/src/remote/soft_bus_manager.cpp | 9 +++------ .../src/service/token_sync_manager_stub.cpp | 4 ++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/services/privacymanager/sa_profile/3505.json b/services/privacymanager/sa_profile/3505.json index 73e5f1c57..d8f3c203d 100644 --- a/services/privacymanager/sa_profile/3505.json +++ b/services/privacymanager/sa_profile/3505.json @@ -6,7 +6,7 @@ "libpath": "libprivacy_manager_service.z.so", "run-on-create": true, "depend_time_out": 60000, - "distributed": true, + "distributed": false, "depend": [ 3503 ], "dump_level": 1 } diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp index 82cf5470a..af712a62a 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp @@ -161,9 +161,8 @@ bool SoftBusManager::CheckAndCopyStr(char* dest, uint32_t destLen, const std::st int32_t SoftBusManager::ServiceSocketInit() { - std::string serviceName = TOKEN_SYNC_SOCKET_NAME + "service"; char name[SOCKET_NAME_MAX_LEN + 1]; - if (!CheckAndCopyStr(name, SOCKET_NAME_MAX_LEN, serviceName)) { + if (!CheckAndCopyStr(name, SOCKET_NAME_MAX_LEN, TOKEN_SYNC_SOCKET_NAME)) { return ERROR_TRANSFORM_STRING_TO_CHAR; } @@ -324,15 +323,13 @@ void SoftBusManager::Destroy() int32_t SoftBusManager::InitSocketAndListener(const std::string& networkId, ISocketListener& listener) { - std::string clientName = TOKEN_SYNC_SOCKET_NAME + networkId; char name[SOCKET_NAME_MAX_LEN + 1]; - if (!CheckAndCopyStr(name, SOCKET_NAME_MAX_LEN, clientName)) { + if (!CheckAndCopyStr(name, SOCKET_NAME_MAX_LEN, TOKEN_SYNC_SOCKET_NAME)) { return ERROR_TRANSFORM_STRING_TO_CHAR; } - std::string serviceName = TOKEN_SYNC_SOCKET_NAME + "service"; char peerName[SOCKET_NAME_MAX_LEN + 1]; - if (!CheckAndCopyStr(peerName, SOCKET_NAME_MAX_LEN, serviceName)) { + if (!CheckAndCopyStr(peerName, SOCKET_NAME_MAX_LEN, TOKEN_SYNC_SOCKET_NAME)) { return ERROR_TRANSFORM_STRING_TO_CHAR; } diff --git a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp index 9c1ab2fd9..dcf5f4c82 100644 --- a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp +++ b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp @@ -34,6 +34,10 @@ int32_t TokenSyncManagerStub::OnRemoteRequest( uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { LOGI(ATM_DOMAIN, ATM_TAG, "%{public}s called, code: %{public}d", __func__, code); + if (!IPCSkeleton::IsLocalCalling()) { + LOGE(ATM_DOMAIN, ATM_TAG, "Unsupported rpc calling."); + return ERROR_IPC_REQUEST_FAIL; + } std::u16string descriptor = data.ReadInterfaceToken(); if (descriptor != ITokenSyncManager::GetDescriptor()) { LOGE(ATM_DOMAIN, ATM_TAG, "Get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str()); -- Gitee