openharmony/msdp_device_status
1
0
Fork 0
mirror of https://gitee.com/openharmony/msdp_device_status synced 2024-11-27 01:30:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source 
Signed-off-by: yang123 <yangyanling13@huawei.com>
This commit is contained in:
yang123 2024-08-19 09:12:15 +00:00
parent b79b5c8a55
commit 68f309a720
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundle.json
View File

@ -60,7 +60,8 @@
"ylong_runtime",
"dfs_service",
"qos_manager",
"memmgr"
"memmgr",
"os_account"
],
"third_party": [
"libxml2",

4
intention/adapters/ddm_adapter/BUILD.gn
View File

@ -43,10 +43,14 @@ ohos_source_set("intention_ddm_adapter") {
deps = [
"${device_status_root_path}/intention/prototype:intention_prototype",
"${device_status_root_path}/utils/common:devicestatus_util",
"${device_status_root_path}/utils/ipc:devicestatus_ipc",
]
external_deps = [
"device_manager:devicemanagersdk",
"dsoftbus:softbus_client",
"os_account:libaccountkits",
"os_account:os_account_innerkits",
"hilog:libhilog",
]

35
intention/adapters/ddm_adapter/src/ddm_adapter_impl.cpp
View File

@ -18,6 +18,10 @@
#include <algorithm>
#include "devicestatus_define.h"
#include "i_dsoftbus_adapter.h"
#include "ipc_skeleton.h"
#include "ohos_account_kits.h"
#include "os_account_manager.h"
#include "utility.h"
#undef LOG_TAG
@ -28,7 +32,6 @@ namespace Msdp {
namespace DeviceStatus {
#define D_DEV_MGR DistributedHardware::DeviceManager::GetInstance()
constexpr size_t MAX_ONLINE_DEVICE_SIZE = 10000;
DDMAdapterImpl::~DDMAdapterImpl()
{
@ -125,20 +128,32 @@ int32_t DDMAdapterImpl::GetTrustedDeviceList(std::vector<DistributedHardware::Dm
bool DDMAdapterImpl::CheckSameAccountToLocal(const std::string &networkId)
{
CALL_INFO_TRACE;
std::vector<DistributedHardware::DmDeviceInfo> deviceList;
if (GetTrustedDeviceList(deviceList) != RET_OK) {
FI_HILOGE("GetTrustedDeviceList failed");
std::vector<int32_t> ids;
ErrCode ret = OHOS::AccountSA::OsAccountManager::QueryActiveOsAccountIds(ids);
if (ret != ERR_OK || ids.empty()) {
HILOGE("Get userId from active Os AccountIds fail, ret : %{public}d", ret);
return false;
}
if (deviceList.empty() || deviceList.size() > MAX_ONLINE_DEVICE_SIZE) {
FI_HILOGE("Trust device list size is invalid");
OHOS::AccountSA::OhosAccountInfo osAccountInfo;
ret = OHOS::AccountSA::OhosAccountKits::GetInstance().GetOhosAccountInfo(osAccountInfo);
if (ret != 0 || osAccountInfo.uid_ == "") {
HILOGE("Get accountId from Ohos account info fail, ret: %{public}d.", ret);
return false;
}
for (const auto &deviceInfo : deviceList) {
if (std::string(deviceInfo.networkId) == networkId) {
return (deviceInfo.authForm == DistributedHardware::DmAuthForm::IDENTICAL_ACCOUNT);
}
DistributedHardware::DmAccessCaller Caller = {
.accountId = osAccountInfo.uid_,
.networkId = IDSoftbusAdapter::GetLocalNetworkId();
.userId = ids[0],
.tokenId = IPCSkeleton::GetCallingUid(),
};
DistributedHardware::DmAccessCallee Callee = {
.networkId = networkId,
.peerId = "",
};
if (D_DEV_MGR.CheckIsSameAccount(Caller, Callee)) {
return true;
}
HILOGI("check same account fail, will try check access Group by hichain");
return false;
}