From 680fced74a3c90708cab9224af31d98bd97f8b3a Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Fri, 29 Nov 2024 10:59:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=AF=B9=E7=AB=AF=E9=80=80?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=EF=BC=8C=E6=9C=AC=E7=AB=AF=E6=94=B6=E5=88=B0?= =?UTF-8?q?=E5=B9=BF=E6=92=AD=E9=80=9A=E7=9F=A5=E5=88=A0=E9=99=A4=E5=AF=B9?= =?UTF-8?q?=E7=AB=AF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../include/accessmanager/access_manager.h | 6 +--- .../src/accessmanager/access_manager.cpp | 28 ---------------- .../accessmanager_fuzzer.cpp | 13 -------- .../accessmanager/access_manager_test.cpp | 33 ------------------- 4 files changed, 1 insertion(+), 79 deletions(-) diff --git a/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h b/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h index 67c3b4aa..74d95716 100644 --- a/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h +++ b/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h @@ -29,8 +29,7 @@ namespace OHOS { namespace DistributedHardware { class AccessManager : public std::enable_shared_from_this, public DmInitCallback, - public DeviceStateCallback, - public DevTrustChangeCallback { + public DeviceStateCallback { public: AccessManager(const AccessManager &) = delete; AccessManager &operator = (const AccessManager &) = delete; @@ -47,8 +46,6 @@ public: virtual void OnDeviceOffline(const DmDeviceInfo &deviceInfo) override; virtual void OnDeviceReady(const DmDeviceInfo &deviceInfo) override; virtual void OnDeviceChanged(const DmDeviceInfo &deviceInfo) override; - virtual void OnDeviceTrustChange(const std::string &peerudid, const std::string &peeruuid, - DmAuthForm authform) override; /* Send device online event which is already online */ void CheckTrustedDeviceOnline(); int32_t Dump(const std::vector &argsStr, std::string &result); @@ -58,7 +55,6 @@ private: int32_t UnRegisterDevStateCallback(); int32_t InitDeviceManager(); int32_t UnInitDeviceManager(); - int32_t RegDevTrustChangeCallback(); std::mutex accessMutex_; }; } // namespace DistributedHardware diff --git a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp index 9efadd60..496d89b9 100644 --- a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp +++ b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp @@ -60,10 +60,6 @@ int32_t AccessManager::Init() DHLOGE("RegisterDevStateCallback failed"); return ERR_DH_FWK_ACCESS_REGISTER_DM_FAILED; } - if (RegDevTrustChangeCallback() != DH_FWK_SUCCESS) { - DHLOGE("RegDevTrustChangeCallback failed"); - return ERR_DH_FWK_ACCESS_REGISTER_DM_FAILED; - } return DH_FWK_SUCCESS; } @@ -104,11 +100,6 @@ int32_t AccessManager::UnRegisterDevStateCallback() return DeviceManager::GetInstance().UnRegisterDevStateCallback(DH_FWK_PKG_NAME); } -int32_t AccessManager::RegDevTrustChangeCallback() -{ - return DeviceManager::GetInstance().RegDevTrustChangeCallback(DH_FWK_PKG_NAME, shared_from_this()); -} - void AccessManager::OnRemoteDied() { for (int32_t tryCount = 0; tryCount < DH_RETRY_INIT_DM_COUNT; ++tryCount) { @@ -188,25 +179,6 @@ void AccessManager::OnDeviceChanged(const DmDeviceInfo &deviceInfo) return; } -void AccessManager::OnDeviceTrustChange(const std::string &peerudid, const std::string &peeruuid, DmAuthForm authform) -{ - DHLOGI("Peerdevice logout, peerudid: %{public}s, peeruuid: %{public}s", GetAnonyString(peerudid).c_str(), - GetAnonyString(peeruuid).c_str()); - if (!IsIdLengthValid(peerudid) || !IsIdLengthValid(peeruuid)) { - return; - } - - if (authform != DmAuthForm::IDENTICAL_ACCOUNT) { - DHLOGE("Peer is not same account"); - return; - } - if (DeviceParamMgr::GetInstance().IsDeviceE2ESync()) { - DHLOGE("Is e2e device, doesn't need clear data"); - return; - } - DistributedHardwareManagerFactory::GetInstance().ClearRemoteDeviceMetaInfoData(peerudid, peeruuid); -} - void AccessManager::CheckTrustedDeviceOnline() { std::vector deviceList; diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp index 9e70b5f4..c358d202 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp @@ -51,18 +51,6 @@ void OnDeviceReadyFuzzTest(const uint8_t* data, size_t size) usleep(SLEEP_TIME_US); } - -void OnDeviceTrustChangeFuzzTest(const uint8_t* data, size_t size) -{ - if ((data == nullptr) || (size == 0)) { - return; - } - std::string peerudid(reinterpret_cast(data), size); - std::string peeruuid(reinterpret_cast(data), size); - DmAuthForm authform = DmAuthForm::INVALID_TYPE; - AccessManager::GetInstance()->OnDeviceTrustChange(peerudid, peeruuid, authform); - usleep(SLEEP_TIME_US); -} } } @@ -71,7 +59,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { /* Run your code on data */ OHOS::DistributedHardware::OnDeviceReadyFuzzTest(data, size); - OHOS::DistributedHardware::OnDeviceTrustChangeFuzzTest(data, size); return 0; } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index 2893f89d..2efeaada 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -216,39 +216,6 @@ HWTEST_F(AccessManagerTest, OnDeviceOffline_003, TestSize.Level0) EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); } -/** - * @tc.name: OnDeviceTrustChange_001 - * @tc.desc: Verify the OnDeviceTrustChange function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, OnDeviceTrustChange_001, TestSize.Level0) -{ - std::string peerudid = ""; - std::string peeruuid = ""; - DmAuthForm authform = DmAuthForm::IDENTICAL_ACCOUNT; - AccessManager::GetInstance()->OnDeviceTrustChange(peerudid, peeruuid, authform); - - peerudid = "peerudid_test"; - AccessManager::GetInstance()->OnDeviceTrustChange(peerudid, peeruuid, authform); - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); -} - -HWTEST_F(AccessManagerTest, OnDeviceTrustChange_002, TestSize.Level0) -{ - std::string peerudid = ""; - std::string peeruuid = "peeruuid_test"; - DmAuthForm authform = DmAuthForm::IDENTICAL_ACCOUNT; - AccessManager::GetInstance()->OnDeviceTrustChange(peerudid, peeruuid, authform); - - peerudid = "peerudid_test"; - AccessManager::GetInstance()->OnDeviceTrustChange(peerudid, peeruuid, authform); - - authform = DmAuthForm::INVALID_TYPE; - AccessManager::GetInstance()->OnDeviceTrustChange(peerudid, peeruuid, authform); - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); -} - /** * @tc.name: UnInit_001 * @tc.desc: Verify the UnInit function -- Gitee