diff --git a/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h b/services/distributedhardwarefwkservice/include/accessmanager/access_manager.h index 67c3b4aae5dcea6f34d61b6535b20dcb101680bc..74d95716f2893c184f912dc43fb609623073b8f6 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 9efadd60c9360148fd6dc4e3ee2394d3e5fc99bc..496d89b95a5f56ef13f81b891fa1538e9d39b79f 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 9e70b5f4b3d96c05237ca5b46bf21a5d5f594793..c358d2029b06f58c6f31c7eb38f379eb6b7bc90e 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 2893f89ddc14fb0646f38bbed7df5533756f126d..2efeaadaef609f2e7cea5c0747bd1f907a424acd 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