From 1e436b1224967028da357421f65a40a72a8a192b Mon Sep 17 00:00:00 2001 From: l30054665 Date: Fri, 9 May 2025 10:39:59 +0800 Subject: [PATCH 1/5] auth Signed-off-by: l30054665 --- .../include/device_manager_service_impl.h | 2 -- .../src/device_manager_service_impl.cpp | 10 ---------- services/service/src/device_manager_service.cpp | 11 ++++++----- .../authenticate_device_service_impl_fuzzer.cpp | 1 - .../UTTest_device_manager_service_impl.cpp | 14 -------------- 5 files changed, 6 insertions(+), 32 deletions(-) diff --git a/services/implementation/include/device_manager_service_impl.h b/services/implementation/include/device_manager_service_impl.h index ada8d9966..e02c74a5a 100644 --- a/services/implementation/include/device_manager_service_impl.h +++ b/services/implementation/include/device_manager_service_impl.h @@ -127,8 +127,6 @@ public: int32_t ImportAuthCode(const std::string &pkgName, const std::string &authCode); - int32_t ExportAuthCode(std::string &authCode); - int32_t BindTarget(const std::string &pkgName, const PeerTargetId &targetId, const std::map &bindParam); diff --git a/services/implementation/src/device_manager_service_impl.cpp b/services/implementation/src/device_manager_service_impl.cpp index 326615429..1777b26d4 100644 --- a/services/implementation/src/device_manager_service_impl.cpp +++ b/services/implementation/src/device_manager_service_impl.cpp @@ -45,8 +45,6 @@ namespace { // One year 365 * 24 * 60 * 60 constexpr int32_t MAX_ALWAYS_ALLOW_SECONDS = 31536000; -constexpr int32_t MIN_PIN_CODE = 100000; -constexpr int32_t MAX_PIN_CODE = 999999; // New protocol field definition. To avoid dependency on the new protocol header file, // do not directly depend on the new protocol header file. constexpr int32_t MSG_TYPE_REQ_ACL_NEGOTIATE = 80; @@ -1310,14 +1308,6 @@ int32_t DeviceManagerServiceImpl::ImportAuthCode(const std::string &pkgName, con return authMgr->ImportAuthCode(pkgName, authCode); } -int32_t DeviceManagerServiceImpl::ExportAuthCode(std::string &authCode) -{ - int32_t ret = GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE); - authCode = std::to_string(ret); - LOGI("ExportAuthCode success, authCode: %{public}s.", GetAnonyString(authCode).c_str()); - return DM_OK; -} - static JsonObject GetExtraJsonObject(const std::map &bindParam) { std::string extra; diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 85fadd98c..090586074 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -83,6 +83,8 @@ namespace { constexpr const char* USER_STOP_BY_WIFI_TIMEOUT_TASK = "deviceManagerTimer:userStopByWifi"; constexpr const char* ACCOUNT_COMMON_EVENT_BY_WIFI_TIMEOUT_TASK = "deviceManagerTimer:accountCommonEventByWifi"; const int32_t USER_SWITCH_BY_WIFI_TIMEOUT_S = 2; + constexpr int32_t MIN_PIN_CODE = 100000; + constexpr int32_t MAX_PIN_CODE = 999999; } DeviceManagerService::~DeviceManagerService() @@ -1298,12 +1300,11 @@ int32_t DeviceManagerService::ExportAuthCode(std::string &authCode) LOGE("The caller: %{public}s is not in white list.", processName.c_str()); return ERR_DM_INPUT_PARA_INVALID; } - if (!IsDMServiceImplReady()) { - LOGE("ExportAuthCode failed, instance not init or init failed."); - return ERR_DM_NOT_INIT; - } LOGI("DeviceManagerService::ExportAuthCode begin."); - return dmServiceImpl_->ExportAuthCode(authCode); + int32_t ret = GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE); + authCode = std::to_string(ret); + LOGI("ExportAuthCode success, authCode: %{public}s.", GetAnonyString(authCode).c_str()); + return DM_OK; } void DeviceManagerService::UnloadDMServiceImplSo() diff --git a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/authenticate_device_service_impl_fuzzer.cpp b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/authenticate_device_service_impl_fuzzer.cpp index c53e1d157..a846643bf 100644 --- a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/authenticate_device_service_impl_fuzzer.cpp +++ b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/authenticate_device_service_impl_fuzzer.cpp @@ -149,7 +149,6 @@ void AuthenticateDeviceServiceImplFuzzTest(const uint8_t* data, size_t size) deviceManagerServiceImpl->GetGroupType(deviceList); deviceManagerServiceImpl->GetUdidHashByNetWorkId(str.c_str(), str); deviceManagerServiceImpl->ImportAuthCode(str, str); - deviceManagerServiceImpl->ExportAuthCode(str); deviceManagerServiceImpl->BindTarget(str, peerTargetId, bindParam); deviceManagerServiceImpl->UnRegisterCredentialCallback(str); deviceManagerServiceImpl->UnRegisterUiStateCallback(str); diff --git a/test/unittest/UTTest_device_manager_service_impl.cpp b/test/unittest/UTTest_device_manager_service_impl.cpp index b124f39a8..10c80c4ee 100644 --- a/test/unittest/UTTest_device_manager_service_impl.cpp +++ b/test/unittest/UTTest_device_manager_service_impl.cpp @@ -1262,20 +1262,6 @@ HWTEST_F(DeviceManagerServiceImplTest, ImportAuthCode_003, testing::ext::TestSiz EXPECT_EQ(ret, DM_OK); } -/** - * @tc.name: ExportAuthCode_001 - * @tc.type: FUNC - */ -HWTEST_F(DeviceManagerServiceImplTest, ExportAuthCode_001, testing::ext::TestSize.Level1) -{ - std::string authCode = "authCode"; - if (deviceManagerServiceImpl_ == nullptr) { - deviceManagerServiceImpl_ = std::make_shared(); - } - int32_t ret = deviceManagerServiceImpl_->ExportAuthCode(authCode); - EXPECT_EQ(ret, DM_OK); -} - /** * @tc.name: BindTarget_001 * @tc.type: FUNC -- Gitee From 0276d3058818c73ec3caa29f71e48db1c9a5af5f Mon Sep 17 00:00:00 2001 From: l30054665 Date: Fri, 9 May 2025 10:47:39 +0800 Subject: [PATCH 2/5] add Signed-off-by: l30054665 --- services/service/include/idevice_manager_service_impl.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/services/service/include/idevice_manager_service_impl.h b/services/service/include/idevice_manager_service_impl.h index 7825f6476..7c07f181c 100644 --- a/services/service/include/idevice_manager_service_impl.h +++ b/services/service/include/idevice_manager_service_impl.h @@ -182,13 +182,6 @@ public: */ virtual int32_t ImportAuthCode(const std::string &pkgName, const std::string &authCode) = 0; - /** - * @tc.name: IDeviceManagerServiceImpl::ExportAuthCode - * @tc.desc: ExportAuthCode - * @tc.type: FUNC - */ - virtual int32_t ExportAuthCode(std::string &authCode) = 0; - /** * @tc.name: IDeviceManagerServiceImpl::BindTarget * @tc.desc: BindTarget -- Gitee From 99126631ec70a72b4e0541ed4a1b5bea27779be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=9A?= Date: Fri, 9 May 2025 06:19:15 +0000 Subject: [PATCH 3/5] update services/service/src/device_manager_service.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李尚 --- services/service/src/device_manager_service.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 30281cfae..5642220d4 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -18,6 +18,7 @@ #include "cJSON.h" #include #include +#include #include "app_manager.h" #include "dm_constants.h" #include "dm_crypto.h" -- Gitee From 79cc70aa62d619a0c8d81f84cb80ac83b81271b5 Mon Sep 17 00:00:00 2001 From: l30054665 Date: Mon, 12 May 2025 15:01:43 +0800 Subject: [PATCH 4/5] neicun Signed-off-by: l30054665 --- services/service/src/device_manager_service.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 30281cfae..f8b149583 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -1304,9 +1304,11 @@ int32_t DeviceManagerService::ExportAuthCode(std::string &authCode) return ERR_DM_INPUT_PARA_INVALID; } LOGI("DeviceManagerService::ExportAuthCode begin."); +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) int32_t ret = GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE); authCode = std::to_string(ret); LOGI("ExportAuthCode success, authCode: %{public}s.", GetAnonyString(authCode).c_str()); +#endif return DM_OK; } -- Gitee From 607e252a9761a8fa037e7c71b83278df1c4f63c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=9A?= Date: Tue, 13 May 2025 01:44:57 +0000 Subject: [PATCH 5/5] update services/service/src/device_manager_service.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李尚 --- services/service/src/device_manager_service.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index f12681ce0..7c615b89e 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -18,7 +18,6 @@ #include "cJSON.h" #include #include -#include #include "app_manager.h" #include "dm_constants.h" #include "dm_crypto.h" -- Gitee