From 541bb1157fa77d1657574288862aeef7cb934100 Mon Sep 17 00:00:00 2001 From: wangbaidong Date: Tue, 17 Jun 2025 17:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81=E5=9B=9E?= =?UTF-8?q?=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangbaidong --- .../include/authentication_v2/auth_manager.h | 1 + .../src/authentication/dm_auth_manager.cpp | 8 +++- .../src/authentication_v2/auth_manager.cpp | 19 ++++++-- test/unittest/UTTest_freeze_process.cpp | 46 +++++-------------- 4 files changed, 34 insertions(+), 40 deletions(-) diff --git a/services/implementation/include/authentication_v2/auth_manager.h b/services/implementation/include/authentication_v2/auth_manager.h index 1c5395dfe..518517a6a 100644 --- a/services/implementation/include/authentication_v2/auth_manager.h +++ b/services/implementation/include/authentication_v2/auth_manager.h @@ -151,6 +151,7 @@ private: void ParseUltrasonicSide(const JsonObject &jsonObject); void GetBindCallerInfo(); int32_t GetBindLevel(int32_t bindLevel); + void GetIsNeedJoinLnnParam(const std::map &bindParam); }; class AuthSrcManager : public AuthManager { diff --git a/services/implementation/src/authentication/dm_auth_manager.cpp b/services/implementation/src/authentication/dm_auth_manager.cpp index 9eaf1fa7f..5371c03a8 100644 --- a/services/implementation/src/authentication/dm_auth_manager.cpp +++ b/services/implementation/src/authentication/dm_auth_manager.cpp @@ -65,6 +65,8 @@ const int32_t STRTOLL_BASE_10 = 10; const int32_t MAX_PUT_SESSIONKEY_TIMEOUT = 100; //ms const int32_t SESSION_CLOSE_TIMEOUT = 2; const char* IS_NEED_JOIN_LNN = "IsNeedJoinLnn"; +constexpr const char* NEED_JOIN_LNN = "0"; +constexpr const char* NO_NEED_JOIN_LNN = "1"; // clone task timeout map const std::map TASK_TIME_OUT_MAP = { @@ -2043,9 +2045,13 @@ int32_t DmAuthManager::BindTarget(const std::string &pkgName, const PeerTargetId if (!DmRadarHelper::GetInstance().ReportDiscoverUserRes(info)) { LOGE("ReportDiscoverUserRes failed"); } + std::string isNeedJoinLnnStr; if (bindParam.find(IS_NEED_JOIN_LNN) != bindParam.end()) { - std::string isNeedJoinLnnStr = bindParam.at(IS_NEED_JOIN_LNN); + isNeedJoinLnnStr = bindParam.at(IS_NEED_JOIN_LNN); + } + if (isNeedJoinLnnStr == NEED_JOIN_LNN || isNeedJoinLnnStr == NO_NEED_JOIN_LNN) { isNeedJoinLnn_ = std::atoi(isNeedJoinLnnStr.c_str()); + LOGI("isNeedJoinLnn: %{public}d.", isNeedJoinLnn_); } if (pkgName.empty()) { LOGE("DmAuthManager::BindTarget failed, pkgName is empty."); diff --git a/services/implementation/src/authentication_v2/auth_manager.cpp b/services/implementation/src/authentication_v2/auth_manager.cpp index 8bd8aef10..69150a1a5 100644 --- a/services/implementation/src/authentication_v2/auth_manager.cpp +++ b/services/implementation/src/authentication_v2/auth_manager.cpp @@ -49,6 +49,8 @@ constexpr int32_t MAX_PIN_CODE = 999999; constexpr int32_t DM_ULTRASONIC_FORWARD = 0; constexpr int32_t DM_ULTRASONIC_REVERSE = 1; const char* IS_NEED_JOIN_LNN = "IsNeedJoinLnn"; +constexpr const char* NEED_JOIN_LNN = "0"; +constexpr const char* NO_NEED_JOIN_LNN = "1"; const char* DM_REJECT_KEY = "business_id_cast+_reject_event"; const char* DM_AUTH_DIALOG_REJECT = "is_auth_dialog_reject"; const char* DM_TIMESTAMP = "timestamp"; @@ -647,10 +649,7 @@ int32_t AuthManager::BindTarget(const std::string &pkgName, const PeerTargetId & if (!DmRadarHelper::GetInstance().ReportDiscoverUserRes(info)) { LOGE("ReportDiscoverUserRes failed"); } - if (bindParam.find(IS_NEED_JOIN_LNN) != bindParam.end()) { - std::string isNeedJoinLnnStr = bindParam.at(IS_NEED_JOIN_LNN); - context_->isNeedJoinLnn = std::atoi(isNeedJoinLnnStr.c_str()); - } + GetIsNeedJoinLnnParam(bindParam); if (pkgName.empty()) { LOGE("AuthManager::BindTarget failed, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -683,6 +682,18 @@ int32_t AuthManager::BindTarget(const std::string &pkgName, const PeerTargetId & return ret; } +void AuthManager::GetIsNeedJoinLnnParam(const std::map &bindParam) +{ + std::string isNeedJoinLnnStr; + if (bindParam.find(IS_NEED_JOIN_LNN) != bindParam.end()) { + isNeedJoinLnnStr = bindParam.at(IS_NEED_JOIN_LNN); + } + if (isNeedJoinLnnStr == NEED_JOIN_LNN || isNeedJoinLnnStr == NO_NEED_JOIN_LNN) { + context_->isNeedJoinLnn = std::atoi(isNeedJoinLnnStr.c_str()); + LOGI("isNeedJoinLnn: %{public}d.", context_->isNeedJoinLnn); + } +} + AuthSinkManager::AuthSinkManager(std::shared_ptr softbusConnector, std::shared_ptr hiChainConnector, std::shared_ptr listener, diff --git a/test/unittest/UTTest_freeze_process.cpp b/test/unittest/UTTest_freeze_process.cpp index 3e13b0441..22de14052 100644 --- a/test/unittest/UTTest_freeze_process.cpp +++ b/test/unittest/UTTest_freeze_process.cpp @@ -38,19 +38,7 @@ void FreezeProcessTest::TearDownTestCase() namespace { constexpr int64_t DATA_REFRESH_INTERVAL = 20 * 60; } -HWTEST_F(FreezeProcessTest, UpdateFreezeRecord_001, testing::ext::TestSize.Level0) -{ - int64_t nowTime = 1633072800 ; - BindFailedEvents bindFailedEventsCache; - bindFailedEventsCache.failedTimeStamps = {1633072700, 1633072800}; - bindFailedEventsCache.freezeTimeStamps = {1633072600}; - FreezeProcess freezeProcess; - freezeProcess.bindFailedEventsCache_ = bindFailedEventsCache; - int32_t result = freezeProcess.UpdateFreezeRecord(); - EXPECT_EQ(result, ERR_DM_FAILED); -} - -HWTEST_F(FreezeProcessTest, UpdateFreezeRecord_002, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, UpdateFreezeRecord, testing::ext::TestSize.Level0) { int64_t nowTime = 1633072800 ; BindFailedEvents bindFailedEventsCache; @@ -62,19 +50,7 @@ HWTEST_F(FreezeProcessTest, UpdateFreezeRecord_002, testing::ext::TestSize.Level EXPECT_EQ(result, ERR_DM_FAILED); } -HWTEST_F(FreezeProcessTest, UpdateFreezeRecord_003, testing::ext::TestSize.Level0) -{ - int64_t nowTime = 1633072800 ; - BindFailedEvents bindFailedEventsCache; - bindFailedEventsCache.failedTimeStamps = {1633072700}; - bindFailedEventsCache.freezeTimeStamps = {1633072600}; - FreezeProcess freezeProcess; - freezeProcess.bindFailedEventsCache_ = bindFailedEventsCache; - int32_t result = freezeProcess.UpdateFreezeRecord(); - EXPECT_EQ(result, ERR_DM_FAILED); -} - -HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_001, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_WhenJsonIsEmpty, testing::ext::TestSize.Level0) { std::string emptyResult = ""; BindFailedEvents bindFailedEventsObj; @@ -83,7 +59,7 @@ HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_001, testing::ext::Tes EXPECT_EQ(result, ERR_DM_FAILED); } -HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_002, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_WhenJsonIsInvalid, testing::ext::TestSize.Level0) { std::string invalidJsonResult = "invalid_json"; BindFailedEvents bindFailedEventsObj; @@ -92,7 +68,7 @@ HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_002, testing::ext::Tes EXPECT_EQ(result, ERR_DM_FAILED); } -HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_003, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_WhenFailedTimestampsExist, testing::ext::TestSize.Level0) { std::string validJsonResult = R"({"failedTimeStamps": [123456, 789012]})"; BindFailedEvents bindFailedEventsObj; @@ -105,7 +81,7 @@ HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_003, testing::ext::Tes EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps.size(), 0); } -HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_004, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_WhenFreezeTimestampsExist, testing::ext::TestSize.Level0) { std::string validJsonResult = R"({"freezeTimeStamps": [345678, 901234]})"; BindFailedEvents bindFailedEventsObj; @@ -118,7 +94,7 @@ HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_004, testing::ext::Tes EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps[1], 901234); } -HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_005, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_WhenAllExist, testing::ext::TestSize.Level0) { std::string validJsonResult = R"({"failedTimeStamps": [123456, 789012], "freezeTimeStamps": [345678, 901234]})"; @@ -134,7 +110,7 @@ HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_005, testing::ext::Tes EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps[1], 901234); } -HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_001, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_WhenJsonIsEmpty, testing::ext::TestSize.Level0) { std::string emptyResult = ""; DeviceFreezeState freezeStateObj; @@ -143,7 +119,7 @@ HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_001, testing::ext::Te EXPECT_EQ(result, ERR_DM_FAILED); } -HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_002, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_WhenJsonIsInvalid, testing::ext::TestSize.Level0) { std::string invalidJsonResult = "invalid_json"; DeviceFreezeState freezeStateObj; @@ -152,7 +128,7 @@ HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_002, testing::ext::Te EXPECT_EQ(result, ERR_DM_FAILED); } -HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_003, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_WhenStartTimestampsExist, testing::ext::TestSize.Level0) { std::string validJsonResult = "{\"startFreezeTimeStamp\":1234567890}"; DeviceFreezeState freezeStateObj; @@ -163,7 +139,7 @@ HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_003, testing::ext::Te EXPECT_EQ(freezeStateObj.stopFreezeTimeStamp, 0); } -HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_004, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_WhenStopTimestampsExist, testing::ext::TestSize.Level0) { std::string validJsonResult = "{\"stopFreezeTimeStamp\":9876543210}"; DeviceFreezeState freezeStateObj; @@ -174,7 +150,7 @@ HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_004, testing::ext::Te EXPECT_EQ(freezeStateObj.stopFreezeTimeStamp, 9876543210); } -HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_005, testing::ext::TestSize.Level0) +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_WhenAllExist, testing::ext::TestSize.Level0) { std::string validJsonResult = "{\"startFreezeTimeStamp\":1234567890,\"stopFreezeTimeStamp\":9876543210}"; DeviceFreezeState freezeStateObj; -- Gitee