diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md index 7a44a95c9963726fb5e8452b245e8441787de5b2..1ac680cbd6e34e07cfdb029049c5609105233586 100644 --- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md +++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -32,3 +32,7 @@ **TDD结果**: **XTS结果**: + +### L0新增用例自检结果 +- [ ] 是，有新增L0用例，且完成自检 +- [ ] 否 diff --git a/BUILD.gn b/BUILD.gn index ae7b066589c7faefea80b41ee16aa025c501f59e..8591cae424aeb4116841e13e518e52af8f3fbdcd 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -56,6 +56,14 @@ if (defined(ohos_lite)) { "services/service:devicemanagerservice", "services/softbuscache:dmdevicecache", ] + if (!is_lite_system && product_name != "qemu-arm-linux-min") { + deps += [ + "commondependency:devicemanagerdependencytest", + "radar:devicemanagerradartest", + "services/service:devicemanagerservicetest", + "utils:devicemanagerutilstest", + ] + } if (product_name != "qemu-arm-linux-min") { deps += [ "display/entry:DeviceManager_UI" ] } diff --git a/OAT.xml b/OAT.xml index c44c80974dafbb33b72de47ebba92f130c413368..df03b803c468eabd3b9ce50905bd9b77104b2940 100644 --- a/OAT.xml +++ b/OAT.xml @@ -67,21 +67,6 @@ Note:If the text contains special characters, please escape them according to th - - - - - - - - - - - - - - - diff --git a/bundle.json b/bundle.json index 6f03c8187d134548243b3432ab4e40f478c6cf72..b21b96d140450fb0d80e65916245bb1ac6ed1117 100644 --- a/bundle.json +++ b/bundle.json @@ -16,7 +16,8 @@ "syscap": ["SystemCapability.DistributedHardware.DeviceManager"], "features": [ "device_manager_no_interaction_auth", - "device_manager_feature_product" + "device_manager_feature_product", + "device_manager_enable_ets_frontend" ], "adapted_system_type": ["standard", "mini"], "rom": "2048KB", @@ -56,10 +57,12 @@ "power_manager", "safwk", "samgr", + "selinux_adapter", "resource_management", "wifi", "screenlock_mgr", - "mbedtls" + "mbedtls", + "runtime_core" ], "third_party": [] }, @@ -67,7 +70,8 @@ "group_type": { "base_group": [], "fwk_group": [ - "//foundation/distributedhardware/device_manager:device_manager_fwk" + "//foundation/distributedhardware/device_manager:device_manager_fwk", + "//foundation/distributedhardware/device_manager/interfaces/kits/taihe:devicemanager_ani" ], "service_group": [ "//foundation/distributedhardware/device_manager:device_manager", @@ -98,6 +102,27 @@ ], "header_base": "//foundation/distributedhardware/device_manager/interfaces/mini_tools_kits/native_cpp/include" } + }, { + "name": "//foundation/distributedhardware/device_manager/interfaces/cj/kits:cj_distributed_device_manager_ffi" + }, { + "type": "so", + "name": "//foundation/distributedhardware/device_manager/json:devicemanagerjson", + "header": { + "header_files": [ + "json_object.h" + ], + "header_base": "//foundation/distributedhardware/device_manager/json/include" + } + }, { + "type": "so", + "name": "//foundation/distributedhardware/device_manager/interfaces/kits/ndk:devicemanager_ndk", + "header": { + "header_files": [ + "oh_device_manager_err_code.h", + "oh_device_manager.h" + ], + "header_base": "//foundation/distributedhardware/device_manager/interfaces/kits/ndk/include" + } }], "test": [ "//foundation/distributedhardware/device_manager:device_manager_test" diff --git a/common/include/device_manager_ipc_interface_code.h b/common/include/device_manager_ipc_interface_code.h index 2205bb1d3cb3be9bae26a647160570ca746e88d5..87fd37a49462a65baf4609c41adcfe6b40cc0339 100644 --- a/common/include/device_manager_ipc_interface_code.h +++ b/common/include/device_manager_ipc_interface_code.h @@ -115,6 +115,12 @@ enum DMIpcCmdInterfaceCode { GET_SERVICEINFO_BYBUNDLENAME_PINEXCHANGETYPE, RESTORE_LOCAL_DEVICE_NAME, GET_DEVICE_NETWORK_ID_LIST, + UNREGISTER_PIN_HOLDER_CALLBACK, + GET_LOCAL_DEVICE_NAME, + CHECK_SRC_ACCESS_CONTROL, + CHECK_SINK_ACCESS_CONTROL, + CHECK_SRC_SAME_ACCOUNT, + CHECK_SINK_SAME_ACCOUNT, // Add ipc msg here IPC_MSG_BUTT }; diff --git a/common/include/dfx/standard/dm_hisysevent.h b/common/include/dfx/standard/dm_hisysevent.h index 4553087bdacc2ecc43f334a8823cd3492ea06e33..2b422e7b4f4a68d6e47b62392fd9d1ec1febfae8 100644 --- a/common/include/dfx/standard/dm_hisysevent.h +++ b/common/include/dfx/standard/dm_hisysevent.h @@ -18,9 +18,14 @@ #include +#ifndef DM_EXPORT +#define DM_EXPORT __attribute__ ((visibility ("default"))) +#endif // DM_EXPORT + namespace OHOS { namespace DistributedHardware { -void SysEventWrite(const std::string &status, int32_t eventType, const std::string &msg); +DM_EXPORT void SysEventWrite( + const std::string &status, int32_t eventType, const std::string &msg); } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DISTRIBUTED_DM_HISYSEVENT_H diff --git a/common/include/dfx/standard/dm_hitrace.h b/common/include/dfx/standard/dm_hitrace.h index f7347c392af955899d2e187fdb436dfac19195e5..260e8c57f2ab881bb85905c9b7aa3052b97e5dd2 100644 --- a/common/include/dfx/standard/dm_hitrace.h +++ b/common/include/dfx/standard/dm_hitrace.h @@ -18,10 +18,14 @@ #include +#ifndef DM_EXPORT +#define DM_EXPORT __attribute__ ((visibility ("default"))) +#endif // DM_EXPORT + namespace OHOS { namespace DistributedHardware { -void DmTraceStart(const std::string &msg); -void DmTraceEnd(); +DM_EXPORT void DmTraceStart(const std::string &msg); +DM_EXPORT void DmTraceEnd(); } // namespace DistributedHardware } // namespace OHOS #endif diff --git a/common/include/dm_anonymous.h b/common/include/dm_anonymous.h index 447e310d793acb48ebe953aa981d6d01e2108bd2..f6ba0fdd8172e1c08a518af7bbc5c31fe7599e2f 100644 --- a/common/include/dm_anonymous.h +++ b/common/include/dm_anonymous.h @@ -27,15 +27,16 @@ namespace DistributedHardware { extern const char* PRINT_LIST_SPLIT; extern const int32_t LIST_SPLIT_LEN; -std::string GetAnonyString(const std::string &value); +DM_EXPORT std::string GetAnonyString(const std::string &value); std::string GetAnonyStringList(const std::vector &values); std::string GetAnonyInt32(const int32_t value); std::string GetAnonyInt32List(const std::vector &values); bool IsNumberString(const std::string &inputString); bool IsString(const JsonItemObject &jsonObj, const std::string &key); -bool IsInt32(const JsonItemObject &jsonObj, const std::string &key); +DM_EXPORT bool IsInt32(const JsonItemObject &jsonObj, const std::string &key); bool IsUint32(const JsonItemObject &jsonObj, const std::string &key); bool IsInt64(const JsonItemObject &jsonObj, const std::string &key); +bool IsUint64(const JsonItemObject &jsonObj, const std::string &key); bool IsArray(const JsonItemObject &jsonObj, const std::string &key); bool IsBool(const JsonItemObject &jsonObj, const std::string &key); std::string ConvertMapToJsonString(const std::map ¶mMap); @@ -47,6 +48,7 @@ int64_t StringToInt64(const std::string &str, int32_t base); void VersionSplitToInt(const std::string &str, const char split, std::vector &numVec); bool CompareVecNum(const std::vector &srcVecNum, const std::vector &sinkVecNum); bool CompareVersion(const std::string &remoteVersion, const std::string &oldVersion); +bool GetVersionNumber(const std::string dmVersion, int32_t &versionNum); std::string ComposeStr(const std::string &pkgName, uint16_t subscribeId); std::string GetCallerPkgName(const std::string &pkgName); uint16_t GetSubscribeId(const std::string &pkgName); @@ -101,9 +103,11 @@ bool IsIdLengthValid(const std::string &inputID); bool IsMessageLengthValid(const std::string &inputMessage); bool IsValueExist(const std::multimap unorderedmap, const std::string &udid, int32_t userId); bool IsDmCommonNotifyEventValid(DmCommonNotifyEvent dmCommonNotifyEvent); -std::string SafetyDump(const JsonItemObject &jsonObj); +DM_EXPORT std::string SafetyDump(const JsonItemObject &jsonObj); std::string GetSubStr(const std::string &rawStr, const std::string &separator, int32_t index); bool IsJsonValIntegerString(const JsonItemObject &jsonObj, const std::string &key); +std::string GetAnonyJsonString(const std::string &value); +int64_t GetCurrentTimestamp(); } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DM_ANONYMOUS_H diff --git a/common/include/dm_cert.h b/common/include/dm_cert.h new file mode 100644 index 0000000000000000000000000000000000000000..5080ef8603a258794371a09acfc78e9ec7267d47 --- /dev/null +++ b/common/include/dm_cert.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#ifndef OHOS_DM_CERT_H +#define OHOS_DM_CERT_H + +#define DM_CERTS_COUNT 4 +#define UDID_BUF_LEN 65 +#define DM_CERTIFICATE_SIZE 8192 + +#include +#include + +#include "dm_random.h" + +namespace OHOS { +namespace DistributedHardware { +typedef struct DmBlob { + uint32_t size; + uint8_t *data; +} DmBlob; + +typedef struct DmCertChain { + DmBlob *cert; + uint32_t certCount; +} DmCertChain; +} // namespace DistributedHardware +} // namespace OHOS +#endif //OHOS_DM_CERT_H \ No newline at end of file diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index cbb3e2a6cd12a48ce89058e4d06c7b1901e583de..e888cde225c58344c6e0da51a09a42526f3c7075 100755 --- a/common/include/dm_constants.h +++ b/common/include/dm_constants.h @@ -20,136 +20,147 @@ #include "dm_error_type.h" +#ifndef DM_EXPORT +#define DM_EXPORT __attribute__ ((visibility ("default"))) +#endif // DM_EXPORT + namespace OHOS { namespace DistributedHardware { -extern const char* TAG_GROUP_ID; -extern const char* TAG_GROUP_NAME; -extern const char* TAG_REQUEST_ID; -extern const char* TAG_DEVICE_ID; -extern const char* TAG_AUTH_TYPE; -extern const char* TAG_CRYPTO_SUPPORT; -extern const char* TAG_VER; -extern const char* TAG_MSG_TYPE; -extern const char* DM_ITF_VER; -extern const char* DM_PKG_NAME; -extern const char* DM_SESSION_NAME; -extern const char* DM_PIN_HOLDER_SESSION_NAME; -extern const char* DM_SYNC_USERID_SESSION_NAME; -extern const char* DM_CAPABILITY_OSD; -extern const char* DM_CAPABILITY_APPROACH; -extern const char* DM_CAPABILITY_TOUCH; -extern const char* DM_CAPABILITY_CASTPLUS; -extern const char* DM_CAPABILITY_VIRTUAL_LINK; -extern const char* DM_CAPABILITY_SHARE; -extern const char* DM_CAPABILITY_WEAR; -extern const char* DM_CAPABILITY_OOP; -extern const char* DM_CREDENTIAL_TYPE; -extern const char* DM_CREDENTIAL_REQJSONSTR; -extern const char* DM_CREDENTIAL_RETURNJSONSTR; -extern const char* DEVICE_MANAGER_GROUPNAME; -extern const char* FIELD_CREDENTIAL_EXISTS; -extern const char* DM_TYPE_MINE; -extern const char* DM_TYPE_OH; -extern const char* TAG_SESSION_HEARTBEAT; +DM_EXPORT extern const char* TAG_GROUP_ID; +DM_EXPORT extern const char* TAG_GROUP_NAME; +DM_EXPORT extern const char* TAG_REQUEST_ID; +DM_EXPORT extern const char* TAG_DEVICE_ID; +DM_EXPORT extern const char* TAG_AUTH_TYPE; +DM_EXPORT extern const char* TAG_CRYPTO_SUPPORT; +DM_EXPORT extern const char* TAG_VER; +DM_EXPORT extern const char* TAG_MSG_TYPE; +DM_EXPORT extern const char* DM_ITF_VER; +DM_EXPORT extern const char* DM_PKG_NAME; +DM_EXPORT extern const char* DM_SESSION_NAME; +DM_EXPORT extern const char* DM_PIN_HOLDER_SESSION_NAME; +DM_EXPORT extern const char* DM_SYNC_USERID_SESSION_NAME; +DM_EXPORT extern const char* DM_CAPABILITY_OSD; +DM_EXPORT extern const char* DM_CAPABILITY_APPROACH; +DM_EXPORT extern const char* DM_CAPABILITY_OH_APPROACH; +DM_EXPORT extern const char* DM_CAPABILITY_TOUCH; +DM_EXPORT extern const char* DM_CAPABILITY_CASTPLUS; +DM_EXPORT extern const char* DM_CAPABILITY_VIRTUAL_LINK; +DM_EXPORT extern const char* DM_CAPABILITY_SHARE; +DM_EXPORT extern const char* DM_CAPABILITY_WEAR; +DM_EXPORT extern const char* DM_CAPABILITY_OOP; +DM_EXPORT extern const char* DM_CREDENTIAL_TYPE; +DM_EXPORT extern const char* DM_CREDENTIAL_REQJSONSTR; +DM_EXPORT extern const char* DM_CREDENTIAL_RETURNJSONSTR; +DM_EXPORT extern const char* DEVICE_MANAGER_GROUPNAME; +DM_EXPORT extern const char* FIELD_CREDENTIAL_EXISTS; +DM_EXPORT extern const char* DM_TYPE_MINE; +DM_EXPORT extern const char* DM_TYPE_OH; +DM_EXPORT extern const char* TAG_SESSION_HEARTBEAT; //The following constant are provided only for HiLink. -extern const char *EXT_PART; +DM_EXPORT extern const char *EXT_PART; // Auth -extern const char* AUTH_TYPE; -extern const char* APP_OPERATION; -extern const char* CUSTOM_DESCRIPTION; -extern const char* TOKEN; -extern const char* PIN_TOKEN; -extern const char* PIN_CODE_KEY; -extern const int32_t CHECK_AUTH_ALWAYS_POS; -extern const char AUTH_ALWAYS; -extern const char AUTH_ONCE; -extern const char* TAG_TARGET_DEVICE_NAME; -extern const int32_t INVALID_PINCODE; - +DM_EXPORT extern const char* AUTH_TYPE; +DM_EXPORT extern const char* APP_OPERATION; +DM_EXPORT extern const char* CUSTOM_DESCRIPTION; +DM_EXPORT extern const char* TOKEN; +DM_EXPORT extern const char* PIN_TOKEN; +DM_EXPORT extern const char* PIN_CODE_KEY; +DM_EXPORT extern const int32_t CHECK_AUTH_ALWAYS_POS; +DM_EXPORT extern const char AUTH_ALWAYS; +DM_EXPORT extern const char AUTH_ONCE; +DM_EXPORT extern const char* TAG_TARGET_DEVICE_NAME; +DM_EXPORT extern const int32_t MIN_PINCODE_SIZE; // HiChain -extern const int32_t SERVICE_INIT_TRY_MAX_NUM; +DM_EXPORT extern const int32_t SERVICE_INIT_TRY_MAX_NUM; constexpr int32_t DEVICE_UUID_LENGTH = 65; -extern const int32_t DEVICE_NETWORKID_LENGTH; -extern const int32_t GROUP_TYPE_INVALID_GROUP; -extern const int32_t GROUP_TYPE_IDENTICAL_ACCOUNT_GROUP; -extern const int32_t GROUP_TYPE_PEER_TO_PEER_GROUP; -extern const int32_t GROUP_TYPE_ACROSS_ACCOUNT_GROUP; -extern const int32_t GROUP_VISIBILITY_PUBLIC; -extern const int64_t MIN_REQUEST_ID; -extern const int64_t MAX_REQUEST_ID; -extern const int32_t AUTH_DEVICE_REQ_NEGOTIATE; -extern const int32_t AUTH_DEVICE_RESP_NEGOTIATE; -extern const int32_t DEVICEID_LEN; +DM_EXPORT extern const int32_t DEVICE_NETWORKID_LENGTH; +DM_EXPORT extern const int32_t GROUP_TYPE_INVALID_GROUP; +DM_EXPORT extern const int32_t GROUP_TYPE_IDENTICAL_ACCOUNT_GROUP; +DM_EXPORT extern const int32_t GROUP_TYPE_PEER_TO_PEER_GROUP; +DM_EXPORT extern const int32_t GROUP_TYPE_ACROSS_ACCOUNT_GROUP; +DM_EXPORT extern const int32_t GROUP_VISIBILITY_PUBLIC; +DM_EXPORT extern const int64_t MIN_REQUEST_ID; +DM_EXPORT extern const int64_t MAX_REQUEST_ID; +DM_EXPORT extern const int32_t AUTH_DEVICE_REQ_NEGOTIATE; +DM_EXPORT extern const int32_t AUTH_DEVICE_RESP_NEGOTIATE; +DM_EXPORT extern const int32_t DEVICEID_LEN; // Key of filter parameter -extern const char* FILTER_PARA_RANGE; -extern const char* FILTER_PARA_DEVICE_TYPE; -extern const char* FILTER_PARA_INCLUDE_TRUST; +DM_EXPORT extern const char* FILTER_PARA_RANGE; +DM_EXPORT extern const char* FILTER_PARA_DEVICE_TYPE; +DM_EXPORT extern const char* FILTER_PARA_INCLUDE_TRUST; // Connection address type -extern const char* CONN_ADDR_TYPE_ID; -extern const char* CONN_ADDR_TYPE_BR; -extern const char* CONN_ADDR_TYPE_BLE; -extern const char* CONN_ADDR_TYPE_USB; -extern const char* CONN_ADDR_TYPE_WLAN_IP; -extern const char* CONN_ADDR_TYPE_ETH_IP; +DM_EXPORT extern const char* CONN_ADDR_TYPE_ID; +DM_EXPORT extern const char* CONN_ADDR_TYPE_BR; +DM_EXPORT extern const char* CONN_ADDR_TYPE_BLE; +DM_EXPORT extern const char* CONN_ADDR_TYPE_USB; +DM_EXPORT extern const char* CONN_ADDR_TYPE_WLAN_IP; +DM_EXPORT extern const char* CONN_ADDR_TYPE_ETH_IP; +DM_EXPORT extern const char* CONN_ADDR_TYPE_NCM; // Softbus connection address type int -extern const int32_t CONNECTION_ADDR_USB; +DM_EXPORT extern const int32_t CONNECTION_ADDR_USB; // Parameter Key -extern const char* PARAM_KEY_META_TYPE; -extern const char* PARAM_KEY_TARGET_ID; -extern const char* PARAM_KEY_BR_MAC; -extern const char* PARAM_KEY_BLE_MAC; -extern const char* PARAM_KEY_WIFI_IP; -extern const char* PARAM_KEY_WIFI_PORT; -extern const char* PARAM_KEY_USB_IP; -extern const char* PARAM_KEY_USB_PORT; -extern const char* PARAM_KEY_AUTH_TOKEN; -extern const char* PARAM_KEY_AUTH_TYPE; -extern const char* PARAM_KEY_PIN_CODE; -extern const char* PARAM_KEY_APP_OPER; -extern const char* PARAM_KEY_APP_DESC; -extern const char* PARAM_KEY_BLE_UDID_HASH; +DM_EXPORT extern const char* PARAM_KEY_META_TYPE; +DM_EXPORT extern const char* PARAM_KEY_TARGET_ID; +DM_EXPORT extern const char* PARAM_KEY_BR_MAC; +DM_EXPORT extern const char* PARAM_KEY_BLE_MAC; +DM_EXPORT extern const char* PARAM_KEY_WIFI_IP; +DM_EXPORT extern const char* PARAM_KEY_WIFI_PORT; +DM_EXPORT extern const char* PARAM_KEY_USB_IP; +DM_EXPORT extern const char* PARAM_KEY_USB_PORT; +DM_EXPORT extern const char* PARAM_KEY_NCM_IP; +DM_EXPORT extern const char* PARAM_KEY_NCM_PORT; +DM_EXPORT extern const char* PARAM_KEY_AUTH_TOKEN; +DM_EXPORT extern const char* PARAM_KEY_AUTH_TYPE; +DM_EXPORT extern const char* PARAM_KEY_PIN_CODE; +DM_EXPORT extern const char* PARAM_KEY_APP_OPER; +DM_EXPORT extern const char* PARAM_KEY_APP_DESC; +DM_EXPORT extern const char* PARAM_KEY_BLE_UDID_HASH; constexpr const char* PARAM_KEY_CUSTOM_DATA = "CUSTOM_DATA"; -extern const char* PARAM_KEY_CONN_ADDR_TYPE; -extern const char* PARAM_KEY_PUBLISH_ID; -extern const char* PARAM_KEY_SUBSCRIBE_ID; -extern const char* PARAM_KEY_TARGET_PKG_NAME; -extern const char* PARAM_KEY_PEER_BUNDLE_NAME; -extern const char* PARAM_KEY_DISC_FREQ; -extern const char* PARAM_KEY_DISC_MEDIUM; -extern const char* PARAM_KEY_DISC_CAPABILITY; -extern const char* PARAM_KEY_DISC_MODE; -extern const char* PARAM_KEY_AUTO_STOP_ADVERTISE; -extern const char* PARAM_KEY_FILTER_OPTIONS; -extern const char* PARAM_KEY_BIND_EXTRA_DATA; -extern const char* PARAM_KEY_OS_TYPE; -extern const char* PARAM_KEY_OS_VERSION; -extern const char* PARAM_KEY_IS_SHOW_TRUST_DIALOG; -extern const char* PARAM_KEY_UDID; -extern const char* PARAM_KEY_UUID; -extern const char* DM_CONNECTION_DISCONNECTED; -extern const char* BIND_LEVEL; -extern const char* TOKENID; -extern const char* DM_BIND_RESULT_NETWORK_ID; -extern const char* PARAM_KEY_POLICY_STRATEGY_FOR_BLE; -extern const char* PARAM_KEY_POLICY_TIME_OUT; -extern const char* DEVICE_SCREEN_STATUS; -extern const char* PROCESS_NAME; -extern const char* PARAM_CLOSE_SESSION_DELAY_SECONDS; -extern const char* DM_AUTHENTICATION_TYPE; - -extern const char* PARAM_KEY_CONN_SESSIONTYPE; -extern const char* PARAM_KEY_HML_RELEASETIME; -extern const char* PARAM_KEY_HML_ENABLE_160M; -extern const char* PARAM_KEY_HML_ACTIONID; - -extern const char* CONN_SESSION_TYPE_HML; -extern const char* CONN_SESSION_TYPE_BLE; +DM_EXPORT extern const char* PARAM_KEY_CONN_ADDR_TYPE; +DM_EXPORT extern const char* PARAM_KEY_PUBLISH_ID; +DM_EXPORT extern const char* PARAM_KEY_SUBSCRIBE_ID; +DM_EXPORT extern const char* PARAM_KEY_TARGET_PKG_NAME; +DM_EXPORT extern const char* PARAM_KEY_PEER_BUNDLE_NAME; +DM_EXPORT extern const char* PARAM_KEY_DISC_FREQ; +DM_EXPORT extern const char* PARAM_KEY_DISC_MEDIUM; +DM_EXPORT extern const char* PARAM_KEY_DISC_CAPABILITY; +DM_EXPORT extern const char* PARAM_KEY_DISC_MODE; +DM_EXPORT extern const char* PARAM_KEY_AUTO_STOP_ADVERTISE; +DM_EXPORT extern const char* PARAM_KEY_FILTER_OPTIONS; +DM_EXPORT extern const char* PARAM_KEY_BIND_EXTRA_DATA; +DM_EXPORT extern const char* PARAM_KEY_OS_TYPE; +DM_EXPORT extern const char* PARAM_KEY_OS_VERSION; +DM_EXPORT extern const char* PARAM_KEY_IS_SHOW_TRUST_DIALOG; +DM_EXPORT extern const char* PARAM_KEY_UDID; +DM_EXPORT extern const char* PARAM_KEY_UUID; +DM_EXPORT extern const char* DM_CONNECTION_DISCONNECTED; +DM_EXPORT extern const char* BIND_LEVEL; +DM_EXPORT extern const char* TOKENID; +DM_EXPORT extern const char* DM_BIND_RESULT_NETWORK_ID; +DM_EXPORT extern const char* PARAM_KEY_POLICY_STRATEGY_FOR_BLE; +DM_EXPORT extern const char* PARAM_KEY_POLICY_TIME_OUT; +DM_EXPORT extern const char* DEVICE_SCREEN_STATUS; +DM_EXPORT extern const char* PROCESS_NAME; +DM_EXPORT extern const char* PARAM_CLOSE_SESSION_DELAY_SECONDS; +DM_EXPORT extern const char* DM_AUTHENTICATION_TYPE; + +DM_EXPORT extern const char* PARAM_KEY_CONN_SESSIONTYPE; +DM_EXPORT extern const char* PARAM_KEY_HML_RELEASETIME; +DM_EXPORT extern const char* PARAM_KEY_HML_ENABLE_160M; +DM_EXPORT extern const char* PARAM_KEY_HML_ACTIONID; + +DM_EXPORT extern const char* CONN_SESSION_TYPE_HML; +DM_EXPORT extern const char* CONN_SESSION_TYPE_BLE; +DM_EXPORT extern const char* UN_BIND_PARAM_UDID_KEY; + +DM_EXPORT extern const char* DM_BUSINESS_ID; + // screen state enum ScreenState { DM_SCREEN_UNKNOWN = -1, @@ -158,12 +169,25 @@ enum ScreenState { }; // errCode map -extern const std::map MAP_ERROR_CODE; +DM_EXPORT extern const std::map MAP_ERROR_CODE; // wise device -extern const int32_t MAX_DEVICE_PROFILE_SIZE; -const int32_t DEIVCE_NAME_MAX_BYTES = 100; +DM_EXPORT extern const int32_t MAX_DEVICE_PROFILE_SIZE; +const int32_t DEVICE_NAME_MAX_BYTES = 100; + +DM_EXPORT extern const char* ACL_IS_LNN_ACL_KEY; +DM_EXPORT extern const char* ACL_IS_LNN_ACL_VAL_TRUE; +DM_EXPORT extern const char* ACL_IS_LNN_ACL_VAL_FALSE; -extern const char* PICKER_PROXY_SPLIT; +extern const char* DM_VERSION_5_0_1; +extern const char* DM_VERSION_5_0_2; +extern const char* DM_VERSION_5_0_3; +extern const char* DM_VERSION_5_0_4; +extern const char* DM_VERSION_5_0_5; +extern const char* DM_VERSION_5_1_0; +extern const char* DM_VERSION_5_1_1; +extern const char* DM_CURRENT_VERSION; +extern const char* DM_ACL_AGING_VERSION; +extern const char* DM_VERSION_5_0_OLD_MAX; // Estimated highest version number of the old version } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_CONSTANTS_H \ No newline at end of file +#endif // OHOS_DM_CONSTANTS_H diff --git a/common/include/dm_error_type.h b/common/include/dm_error_type.h index 2d2b96fe2d4b863912ac2f8389b1d58c5bc6d74b..e06815c3ca4e5ac02f8e9e07dd58a9a928878de2 100644 --- a/common/include/dm_error_type.h +++ b/common/include/dm_error_type.h @@ -22,7 +22,7 @@ enum { DM_OK = 0, SOFTBUS_OK = 0, STOP_BIND = 1, - + DM_ALREADY_AUTHED = 2, /* Transfer to the other end device, not define specification error code */ ERR_DM_NOT_SYSTEM_APP = 202, ERR_DM_TIME_OUT = -20001, @@ -110,7 +110,7 @@ enum { ERR_DM_CRYPTO_OPT_FAILED = 96929822, ERR_DM_CRYPTO_PARA_INVALID = 96929823, ERR_DM_SECURITY_FUNC_FAILED = 96929824, - ERR_DM_MAX_SIZE_FAIL = 96929825, + ERR_DM_CALLBACK_REGISTER_FAILED = 96929825, ERR_DM_HILINKSVC_RSP_PARSE_FAILD = 96929826, ERR_DM_HILINKSVC_REPLY_FAILED = 96929827, ERR_DM_HILINKSVC_ICON_URL_EMPTY = 96929828, @@ -121,6 +121,28 @@ enum { ERR_DM_PROCESS_SESSION_KEY_FAILED = 96929833, ERR_DM_HILINKSVC_SCAS_CHECK_FAILED = 96929834, ERR_DM_FIND_NETWORKID_LIST_EMPTY = 96929835, + ERR_DM_GET_SESSION_KEY_FAILED = 96929836, + ERR_DM_QUADRUPLE_NOT_SAME = 96929837, + ERR_DM_NEXT_STATE_INVALID = 96929838, + ERR_DM_LOGIC_SESSION_CREATE_FAILED = 96929839, + ERR_DM_SESSION_CLOSED = 96929840, + ERR_DM_GET_LOCAL_USERID_FAILED = 969298341, + ERR_DM_CAPABILITY_NEGOTIATE_FAILED = 969298342, + ERR_DM_BIND_TRUST_TARGET = 969298343, + ERR_DM_BINDTARGET_SCREEN_LOCK = 969298344, + ERR_DM_NO_REPLAY = 969298345, + ERR_DM_GET_TOKENID_FAILED = 969298346, + ERR_DM_SHOW_CONFIRM_FAILED = 969298347, + ERR_DM_PARSE_MESSAGE_FAILED = 969298348, + ERR_DM_GET_BMS_FAILED = 969298349, + ERR_DM_DESERIAL_CERT_FAILED = 969298350, + ERR_DM_VERIFY_CERT_FAILED = 969298351, + ERR_DM_GET_PARAM_FAILED = 969298352, + ERR_DM_VERIFY_SAME_ACCOUNT_FAILED = 969298353, + ERR_DM_GET_BUNDLE_NAME_FAILED = 969298354, + ERR_DM_DEVICE_FROZEN = 969298355, + ERR_DM_SOCKET_IN_USED = 969298356, + ERR_DM_ANTI_DISTURB_MODE = 969298357, }; } // namespace DistributedHardware } // namespace OHOS diff --git a/common/include/dm_single_instance.h b/common/include/dm_single_instance.h index 7ecf417976c32c51fddd8c0ed2c8412b32361f1c..11da29f4e419ba03dba4ba2865aab6da158548e9 100644 --- a/common/include/dm_single_instance.h +++ b/common/include/dm_single_instance.h @@ -16,11 +16,15 @@ #ifndef OHOS_DM_SINGLE_INSTANCE_H #define OHOS_DM_SINGLE_INSTANCE_H +#ifndef DM_EXPORT +#define DM_EXPORT __attribute__ ((visibility ("default"))) +#endif // DM_EXPORT + namespace OHOS { namespace DistributedHardware { #define DM_DECLARE_SINGLE_INSTANCE_BASE(className) \ public: \ - static className &GetInstance(); \ + DM_EXPORT static className &GetInstance(); \ \ private: \ className(const className &) = delete; \ @@ -36,7 +40,7 @@ private: \ ~className() = default; #define DM_IMPLEMENT_SINGLE_INSTANCE(className) \ - className &className::GetInstance() \ + DM_EXPORT className &className::GetInstance() \ { \ static auto instance = new className(); \ return *instance; \ diff --git a/common/include/i_dm_auth_cert_ext.h b/common/include/i_dm_auth_cert_ext.h new file mode 100644 index 0000000000000000000000000000000000000000..fafda279c421563357281076ee117c98e5f000f8 --- /dev/null +++ b/common/include/i_dm_auth_cert_ext.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_I_DM_AUTH_CERT_EXT_H +#define OHOS_I_DM_AUTH_CERT_EXT_H + +#include "dm_cert.h" + +namespace OHOS { +namespace DistributedHardware { +class IDMAuthCertExt { +public: + virtual ~IDMAuthCertExt() = default; + virtual int32_t GenerateCertificate(DmCertChain &dmCertChain) = 0; + virtual int32_t VerifyCertificate(const DmCertChain &dmCertChain, const char *deviceIdHash) = 0; +}; + +using CreateDMAuthCertFuncPtr = IDMAuthCertExt *(*)(void); +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_I_DM_AUTH_CERT_EXT_H \ No newline at end of file diff --git a/common/include/ipc/model/ipc_common_param_req.h b/common/include/ipc/model/ipc_common_param_req.h index 139f74d9ba0e5ff5c1958c15703c54b9830eaba5..b5d8e6cb2bfe463bd5fa231be8caac3889ebe4b6 100644 --- a/common/include/ipc/model/ipc_common_param_req.h +++ b/common/include/ipc/model/ipc_common_param_req.h @@ -64,19 +64,19 @@ public: secondParam_ = secondParam; } - int64_t GetInt32Param() const + int32_t GetInt32Param() const { return int32Param_; } - void SetInt32Param(int64_t param) + void SetInt32Param(int32_t param) { int32Param_ = param; } private: std::string firstParam_; std::string secondParam_; - int64_t int32Param_ = 0; + int32_t int32Param_ = 0; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/common/include/ipc/model/ipc_get_local_device_name_rsp.h b/common/include/ipc/model/ipc_get_local_device_name_rsp.h new file mode 100644 index 0000000000000000000000000000000000000000..c97c21ac00bbc903db656ad9d5ccabb3e589a670 --- /dev/null +++ b/common/include/ipc/model/ipc_get_local_device_name_rsp.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_IPC_GET_LOCAL_DEVICE_NAME_RSP_H +#define OHOS_DM_IPC_GET_LOCAL_DEVICE_NAME_RSP_H + +#include "ipc_req.h" + +namespace OHOS { +namespace DistributedHardware { +class IpcGetLocalDeviceNameRsp : public IpcRsp { + DECLARE_IPC_MODEL(IpcGetLocalDeviceNameRsp); + +public: + + const std::string GetLocalDeviceName() const + { + return localDeviceName_; + } + + void SetLocalDeviceName(const std::string &localDeviceName) + { + localDeviceName_ = localDeviceName; + } + +private: + std::string localDeviceName_; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_IPC_GET_LOCAL_DEVICE_NAME_RSP_H diff --git a/common/src/dm_anonymous.cpp b/common/src/dm_anonymous.cpp index 0bf73567f010750bfb57fe9a1edc37ef4f86b9a2..69b50d5cc8a0cd625b1935df2a6dfb1db7c1dd49 100644 --- a/common/src/dm_anonymous.cpp +++ b/common/src/dm_anonymous.cpp @@ -16,6 +16,8 @@ #include "dm_anonymous.h" #include "dm_log.h" #include +#include + namespace OHOS { namespace DistributedHardware { namespace { @@ -156,6 +158,16 @@ bool IsInt64(const JsonItemObject &jsonObj, const std::string &key) return res; } +bool IsUint64(const JsonItemObject &jsonObj, const std::string &key) +{ + bool res = jsonObj.Contains(key) && jsonObj[key].IsNumberInteger() && jsonObj[key].Get() >= 0 && + jsonObj[key].Get() <= UINT64_MAX; + if (!res) { + LOGE("the key %{public}s in jsonObj is invalid.", key.c_str()); + } + return res; +} + bool IsArray(const JsonItemObject &jsonObj, const std::string &key) { bool res = jsonObj.Contains(key) && jsonObj[key].IsArray(); @@ -299,6 +311,24 @@ bool CompareVersion(const std::string &remoteVersion, const std::string &oldVers return CompareVecNum(remoteVersionVec, oldVersionVec); } +bool GetVersionNumber(const std::string dmVersion, int32_t &versionNum) +{ + LOGI("dmVersion %{public}s,", dmVersion.c_str()); + std::string number = ""; + std::istringstream iss(dmVersion); + std::string item = ""; + while (getline(iss, item, '.')) { + number += item; + } + LOGI("number %{public}s,", number.c_str()); + versionNum = atoi(number.c_str()); + if (versionNum <= 0) { + LOGE("convert failed, number: %{public}s,", number.c_str()); + return false; + } + return true; +} + std::string ComposeStr(const std::string &pkgName, uint16_t subscribeId) { std::string strTemp = pkgName + "#" + std::to_string(subscribeId); @@ -368,7 +398,7 @@ bool IsDmCommonNotifyEventValid(DmCommonNotifyEvent dmCommonNotifyEvent) return false; } -std::string SafetyDump(const JsonItemObject &jsonObj) +DM_EXPORT std::string SafetyDump(const JsonItemObject &jsonObj) { return jsonObj.Dump(); } @@ -409,5 +439,32 @@ bool IsJsonValIntegerString(const JsonItemObject &jsonObj, const std::string &ke } return true; } + +std::string GetAnonyJsonString(const std::string &value) +{ + if (value.empty()) { + return ""; + } + JsonObject paramJson(value); + if (paramJson.IsDiscarded()) { + return ""; + } + const std::set sensitiveKey = { "LOCALDEVICEID", "localAccountId", "networkId", "lnnPublicKey", + "transmitPublicKey", "DEVICEID", "deviceId", "keyValue", "deviceName", "REMOTE_DEVICE_NAME", "data" }; + + for (auto &element : paramJson.Items()) { + if (element.IsString() && sensitiveKey.find(element.Key()) != sensitiveKey.end()) { + paramJson[element.Key()] = GetAnonyString(element.Get()); + } + } + return paramJson.Dump(); +} + +int64_t GetCurrentTimestamp() +{ + auto now = std::chrono::system_clock::now(); + auto duration = std::chrono::duration_cast(now.time_since_epoch()); + return duration.count(); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/common/src/dm_constants.cpp b/common/src/dm_constants.cpp index 2f91c8ca548b0a9fb73c387c839a143d657829b5..73eee5e9c48dbb4fbd72ca726c2bb87022404878 100644 --- a/common/src/dm_constants.cpp +++ b/common/src/dm_constants.cpp @@ -32,6 +32,7 @@ const char* DM_PIN_HOLDER_SESSION_NAME = "ohos.distributedhardware.devicemanager const char* DM_SYNC_USERID_SESSION_NAME = "ohos.distributedhardware.devicemanager.syncuserid"; const char* DM_CAPABILITY_OSD = "osdCapability"; const char* DM_CAPABILITY_APPROACH = "approach"; +const char* DM_CAPABILITY_OH_APPROACH = "oh_approach"; const char* DM_CAPABILITY_TOUCH = "touch"; const char* DM_CAPABILITY_CASTPLUS = "castPlus"; const char* DM_CAPABILITY_VIRTUAL_LINK = "virtualLink"; @@ -61,7 +62,7 @@ const int32_t CHECK_AUTH_ALWAYS_POS = 0; const char AUTH_ALWAYS = '1'; const char AUTH_ONCE = '0'; const char* TAG_TARGET_DEVICE_NAME = "targetDeviceName"; -const int32_t INVALID_PINCODE = -1; +const int32_t MIN_PINCODE_SIZE = 6; // HiChain const int32_t SERVICE_INIT_TRY_MAX_NUM = 200; @@ -89,6 +90,7 @@ const char* CONN_ADDR_TYPE_BLE = "BLE_TYPE"; const char* CONN_ADDR_TYPE_USB = "USB_TYPE"; const char* CONN_ADDR_TYPE_WLAN_IP = "WLAN_IP_TYPE"; const char* CONN_ADDR_TYPE_ETH_IP = "ETH_IP_TYPE"; +const char* CONN_ADDR_TYPE_NCM = "NCM_TYPE"; // Softbus connection address type int const int32_t CONNECTION_ADDR_USB = 5; @@ -102,6 +104,8 @@ const char* PARAM_KEY_WIFI_IP = "WIFI_IP"; const char* PARAM_KEY_WIFI_PORT = "WIFI_PORT"; const char* PARAM_KEY_USB_IP = "USB_IP"; const char* PARAM_KEY_USB_PORT = "USB_PORT"; +const char* PARAM_KEY_NCM_IP = "NCM_IP"; +const char* PARAM_KEY_NCM_PORT = "NCM_PORT"; const char* PARAM_KEY_AUTH_TOKEN = "AUTH_TOKEN"; const char* PARAM_KEY_AUTH_TYPE = "AUTH_TYPE"; const char* PARAM_KEY_PIN_CODE = "PIN_CODE"; @@ -143,6 +147,9 @@ const char* PARAM_KEY_HML_ACTIONID = "hmlActionId"; const char* CONN_SESSION_TYPE_HML = "HML"; const char* CONN_SESSION_TYPE_BLE = "BLE"; +const char* UN_BIND_PARAM_UDID_KEY = "udidKey"; + +const char* DM_BUSINESS_ID = "business_id"; // errCode map const std::map MAP_ERROR_CODE = { @@ -155,7 +162,19 @@ const std::map MAP_ERROR_CODE = { // wise device const int32_t MAX_DEVICE_PROFILE_SIZE = 500; +const char* ACL_IS_LNN_ACL_KEY = "IsLnnAcl"; +const char* ACL_IS_LNN_ACL_VAL_TRUE = "true"; +const char* ACL_IS_LNN_ACL_VAL_FALSE = "false"; -const char* PICKER_PROXY_SPLIT = "_pickerProxy_"; +const char* DM_VERSION_5_0_1 = "5.0.1"; +const char* DM_VERSION_5_0_2 = "5.0.2"; +const char* DM_VERSION_5_0_3 = "5.0.3"; +const char* DM_VERSION_5_0_4 = "5.0.4"; +const char* DM_VERSION_5_0_5 = "5.0.5"; +const char* DM_VERSION_5_1_0 = "5.1.0"; +const char* DM_VERSION_5_1_1 = "5.1.1"; +const char* DM_CURRENT_VERSION = DM_VERSION_5_1_1; +const char* DM_ACL_AGING_VERSION = DM_VERSION_5_1_0; +const char* DM_VERSION_5_0_OLD_MAX = "5.0.99"; // Estimated highest version number of the old version } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/common/src/ipc/standard/ipc_model_codec.cpp b/common/src/ipc/standard/ipc_model_codec.cpp index 5790e45effa170e21ed328defcd97e96fcbefd85..e582e1bcd8eabac56fe5bb5dc5acecc1fcc225cf 100644 --- a/common/src/ipc/standard/ipc_model_codec.cpp +++ b/common/src/ipc/standard/ipc_model_codec.cpp @@ -23,6 +23,7 @@ namespace DistributedHardware { namespace { constexpr const char* UK_SEPARATOR = "#"; constexpr int32_t MAX_ICON_SIZE = 4 * 1024 * 1024; +constexpr uint32_t IPC_VECTOR_MAX_SIZE = 1000; } #define READ_HELPER_RET(parcel, type, out, failRet) \ @@ -93,8 +94,10 @@ bool IpcModelCodec::EncodeDmAccessCallee(const DmAccessCallee &callee, MessagePa bRet = (bRet && parcel.WriteString(callee.accountId)); bRet = (bRet && parcel.WriteString(callee.networkId)); bRet = (bRet && parcel.WriteString(callee.peerId)); + bRet = (bRet && parcel.WriteString(callee.pkgName)); bRet = (bRet && parcel.WriteInt32(callee.userId)); bRet = (bRet && parcel.WriteString(callee.extra)); + bRet = (bRet && parcel.WriteUint64(callee.tokenId)); return bRet; } @@ -376,6 +379,10 @@ bool IpcModelCodec::EncodeLocalServiceInfos(const std::vector IPC_VECTOR_MAX_SIZE) { + LOGE("num is Invalid value, num = %{public}u", num); + return false; + } for (uint32_t k = 0; k < num; k++) { DMLocalServiceInfo serviceInfo = serviceInfos[k]; bRet = EncodeLocalServiceInfo(serviceInfo, parcel); @@ -460,8 +467,8 @@ bool IpcModelCodec::DecodeStringVector(MessageParcel &parcel, std::vector MAX_DEVICE_PROFILE_SIZE) { - LOGE("num is Invalid value, num = %{public}zu", num); + if (num > IPC_VECTOR_MAX_SIZE) { + LOGE("num is Invalid value, num = %{public}u", num); return false; } for (uint32_t k = 0; k < num; k++) { diff --git a/commondependency/BUILD.gn b/commondependency/BUILD.gn index 615025355e0ca70367f2ff69cb607332b3d014b1..db0d575ddf1a628205d04c6b321db99f80f3fac6 100644 --- a/commondependency/BUILD.gn +++ b/commondependency/BUILD.gn @@ -13,6 +13,19 @@ import("//build/ohos.gni") import("//foundation/distributedhardware/device_manager/device_manager.gni") +config("cflags_config") { + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + "-ffunction-sections", + "-fdata-sections", + "-fvisibility=hidden", + "-Oz", + "-flto", + ] + ldflags = [ "-flto" ] +} ohos_shared_library("devicemanagerdependency") { branch_protector_ret = "pac_ret" @@ -36,6 +49,79 @@ ohos_shared_library("devicemanagerdependency") { "-Wl,-z,now", ] + configs = [ ":cflags_config" ] + + include_dirs = [ + "include", + "${common_path}/include", + "${innerkits_path}/native_cpp/include", + "${servicesimpl_path}/include/cryptomgr", + "${utils_path}/include/crypto", + ] + + sources = [ + "src/deviceprofile_connector.cpp", + "src/multiple_user_connector.cpp", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerdependency\"", + "LOG_DOMAIN=0xD004112", + ] + + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + "${utils_path}:devicemanagerutils", + ] + + external_deps = [ + "ability_base:want", + "c_utils:utils", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "eventhandler:libeventhandler", + "hilog:libhilog", + "init:libbegetutil", + "ipc:ipc_core", + "os_account:libaccountkits", + "samgr:samgr_proxy", + ] + + if (os_account_part_exists) { + defines += [ "OS_ACCOUNT_PART_EXISTS" ] + external_deps += [ "os_account:os_account_innerkits" ] + } + + subsystem_name = "distributedhardware" + + part_name = "device_manager" +} + +ohos_shared_library("devicemanagerdependencytest") { + branch_protector_ret = "pac_ret" + + sanitize = { + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + integer_overflow = true + ubsan = true + } + + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + ] + + ldflags = [ + "-Wl,-z,relro", + "-Wl,-z,now", + ] + include_dirs = [ "include", "${common_path}/include", @@ -57,6 +143,7 @@ ohos_shared_library("devicemanagerdependency") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${utils_path}:devicemanagerutils", ] @@ -65,7 +152,9 @@ ohos_shared_library("devicemanagerdependency") { "c_utils:utils", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", + "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", "os_account:libaccountkits", "samgr:samgr_proxy", diff --git a/commondependency/include/deviceprofile_connector.h b/commondependency/include/deviceprofile_connector.h index 3cff80ef815fbbcf19add3a6c73383952d2a579c..1aa8990e17a5031f78fa60426d4f400ebc7c6ec6 100644 --- a/commondependency/include/deviceprofile_connector.h +++ b/commondependency/include/deviceprofile_connector.h @@ -22,27 +22,39 @@ #include "dm_single_instance.h" #include "i_dp_inited_callback.h" #include "local_service_info.h" +#include "parameter.h" #include "trusted_device_info.h" +#include "json_object.h" enum AllowAuthType { ALLOW_AUTH_ONCE = 1, ALLOW_AUTH_ALWAYS = 2 }; -extern const uint32_t INVALIED_TYPE; -extern const uint32_t APP_PEER_TO_PEER_TYPE; -extern const uint32_t APP_ACROSS_ACCOUNT_TYPE; -extern const uint32_t DEVICE_PEER_TO_PEER_TYPE; -extern const uint32_t DEVICE_ACROSS_ACCOUNT_TYPE; -extern const uint32_t IDENTICAL_ACCOUNT_TYPE; - -extern const uint32_t DM_IDENTICAL_ACCOUNT; -extern const uint32_t DM_POINT_TO_POINT; -extern const uint32_t DM_ACROSS_ACCOUNT; -extern const uint32_t DM_INVALIED_BINDTYPE; -extern const uint32_t DEVICE; -extern const uint32_t SERVICE; -extern const uint32_t APP; +DM_EXPORT extern const uint32_t INVALIED_TYPE; +DM_EXPORT extern const uint32_t APP_PEER_TO_PEER_TYPE; +DM_EXPORT extern const uint32_t APP_ACROSS_ACCOUNT_TYPE; +DM_EXPORT extern const uint32_t SHARE_TYPE; +DM_EXPORT extern const uint32_t DEVICE_PEER_TO_PEER_TYPE; +DM_EXPORT extern const uint32_t DEVICE_ACROSS_ACCOUNT_TYPE; +DM_EXPORT extern const uint32_t IDENTICAL_ACCOUNT_TYPE; +DM_EXPORT extern const uint32_t SERVICE_PEER_TO_PEER_TYPE; +DM_EXPORT extern const uint32_t SERVICE_ACROSS_ACCOUNT_TYPE; + +DM_EXPORT extern const uint32_t DM_INVALIED_TYPE; +DM_EXPORT extern const uint32_t USER; +DM_EXPORT extern const uint32_t SERVICE; +DM_EXPORT extern const uint32_t APP; + +extern const char* TAG_PEER_BUNDLE_NAME; +DM_EXPORT extern const char* TAG_PEER_TOKENID; + +const uint32_t DM_IDENTICAL_ACCOUNT = 1; +const uint32_t DM_SHARE = 2; +const uint32_t DM_LNN = 3; +const uint32_t DM_POINT_TO_POINT = 256; +const uint32_t DM_ACROSS_ACCOUNT = 1282; +const int32_t DM_VERSION_INT_5_1_0 = 510; enum ProfileState { INACTIVE = 0, @@ -86,12 +98,38 @@ typedef struct DmAccessee { std::string trustDeviceName; } DmAccessee; +typedef struct DmAclIdParam { + std::string udid; + int32_t userId; + int64_t accessControlId; + int32_t skId; + std::string credId; +} DmAclIdParam; + typedef struct DmOfflineParam { uint32_t bindType; std::vector processVec; + std::vector credIdVec; + std::vector skIdVec; int32_t leftAclNumber; + int32_t peerUserId; + bool hasLnnAcl = false; + int64_t accessControlId; + // save the need unbind acl info + std::vector needDelAclInfos; + // save all the lnn acl between localdevid/localuserId -> remotedevid + std::vector allLnnAclInfos; + // save all the app or service acl between localdevid/localuserId -> remotedevid except the need del ones + std::vector allLeftAppOrSvrAclInfos; + // save all the user acl between localdevid/localuserId -> remotedevid + std::vector allUserAclInfos; } DmOfflineParam; +struct AclHashItem { + std::string version; + std::vector aclHashList; +}; + namespace OHOS { namespace DistributedHardware { class IDeviceProfileConnector { @@ -107,101 +145,176 @@ public: virtual int32_t HandleUserStop(int32_t stopUserId, const std::string &stopEventUdid) = 0; virtual int32_t HandleUserStop(int32_t stopUserId, const std::string &localUdid, const std::vector &acceptEventUdids) = 0; + virtual int32_t HandleAccountCommonEvent(const std::string &localUdid, const std::vector &deviceVec, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) = 0; }; class DeviceProfileConnector : public IDeviceProfileConnector { DM_DECLARE_SINGLE_INSTANCE(DeviceProfileConnector); public: - std::vector GetAccessControlProfile(); + DM_EXPORT DmOfflineParam FilterNeedDeleteACL(const std::string &localDeviceId, uint32_t localTokenId, + const std::string &remoteDeviceId, const std::string &extra); + DM_EXPORT std::vector + GetAccessControlProfile(); + DM_EXPORT DmOfflineParam HandleServiceUnBindEvent(int32_t remoteUserId, + const std::string &remoteUdid, const std::string &localUdid, int32_t tokenId); std::vector GetAccessControlProfileByUserId(int32_t userId); std::vector GetAclProfileByDeviceIdAndUserId( const std::string &deviceId, int32_t userId); - uint32_t CheckBindType(std::string peerUdid, std::string localUdid); - int32_t PutAccessControlList(DmAclInfo aclInfo, DmAccesser dmAccesser, DmAccessee dmAccessee); + DM_EXPORT uint32_t CheckBindType(std::string peerUdid, std::string localUdid); + DM_EXPORT int32_t PutAccessControlList(DmAclInfo aclInfo, DmAccesser dmAccesser, + DmAccessee dmAccessee); int32_t UpdateAccessControlList(int32_t userId, std::string &oldAccountId, std::string &newAccountId); - std::unordered_map GetAppTrustDeviceList(const std::string &pkgName, - const std::string &deviceId); - std::vector GetBindTypeByPkgName(std::string pkgName, std::string requestDeviceId, - std::string trustUdid); - uint64_t GetTokenIdByNameAndDeviceId(std::string pkgName, std::string requestDeviceId); - std::vector SyncAclByBindType(std::string pkgName, std::vector bindTypeVec, - std::string localDeviceId, std::string targetDeviceId); + DM_EXPORT std::unordered_map GetAppTrustDeviceList( + const std::string &pkgName, const std::string &deviceId); + DM_EXPORT std::vector GetBindTypeByPkgName(std::string pkgName, + std::string requestDeviceId, std::string trustUdid); + DM_EXPORT uint64_t GetTokenIdByNameAndDeviceId(std::string extra, std::string requestDeviceId); + DM_EXPORT std::vector SyncAclByBindType(std::string pkgName, + std::vector bindTypeVec, std::string localDeviceId, std::string targetDeviceId); int32_t GetDeviceAclParam(DmDiscoveryInfo discoveryInfo, bool &isOnline, int32_t &authForm); - bool DeleteAclForAccountLogOut(const std::string &localUdid, int32_t localUserId, - const std::string &peerUdid, int32_t peerUserId); - void DeleteAclForUserRemoved(std::string localUdid, int32_t userId); - void DeleteAclForRemoteUserRemoved(std::string peerUdid, int32_t peerUserId, std::vector &userIds); - DmOfflineParam DeleteAccessControlList(const std::string &pkgName, const std::string &localDeviceId, - const std::string &remoteDeviceId, int32_t bindLevel, const std::string &extra); - std::vector GetProcessInfoFromAclByUserId(const std::string &localDeviceId, - const std::string &targetDeviceId, int32_t userId); - bool CheckIdenticalAccount(int32_t userId, const std::string &accountId); - bool CheckSrcDevIdInAclForDevBind(const std::string &pkgName, const std::string &deviceId); - bool CheckSinkDevIdInAclForDevBind(const std::string &pkgName, const std::string &deviceId); - uint32_t DeleteTimeOutAcl(const std::string &deviceId); - int32_t GetTrustNumber(const std::string &deviceId); + + DM_EXPORT bool DeleteAclForAccountLogOut(const std::string &localUdid, + int32_t localUserId, const std::string &peerUdid, int32_t peerUserId, DmOfflineParam &offlineParam); + DM_EXPORT void DeleteAclForUserRemoved(std::string localUdid, int32_t userId, std::vector peerUdids, + std::multimap &peerUserIdMap, DmOfflineParam &offlineParam); + DM_EXPORT void DeleteAclForRemoteUserRemoved(std::string peerUdid, + int32_t peerUserId, std::vector &userIds, DmOfflineParam &offlineParam); + DM_EXPORT DmOfflineParam DeleteAccessControlList(const std::string &pkgName, + const std::string &localDeviceId, const std::string &remoteDeviceId, int32_t bindLevel, + const std::string &extra); + DM_EXPORT std::vector + GetProcessInfoFromAclByUserId(const std::string &localDeviceId, const std::string &targetDeviceId, + int32_t userId); + DM_EXPORT bool CheckSrcDevIdInAclForDevBind(const std::string &pkgName, + const std::string &deviceId); + DM_EXPORT bool CheckSinkDevIdInAclForDevBind(const std::string &pkgName, + const std::string &deviceId); + + DM_EXPORT uint32_t DeleteTimeOutAcl(const std::string &deviceId, DmOfflineParam &offlineParam); + DM_EXPORT int32_t GetTrustNumber(const std::string &deviceId); bool CheckDevIdInAclForDevBind(const std::string &pkgName, const std::string &deviceId); std::vector CompareBindType(std::vector profiles, std::string pkgName, std::vector &sinkBindType, std::string localDeviceId, std::string targetDeviceId); - int32_t IsSameAccount(const std::string &udid); - int32_t CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, - const DmAccessCallee &callee, const std::string &sinkUdid); - int32_t CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, - const DmAccessCallee &callee, const std::string &sinkUdid); - void DeleteAccessControlList(const std::string &udid); - int32_t GetBindLevel(const std::string &pkgName, const std::string &localUdid, - const std::string &udid, uint64_t &tokenId); + DM_EXPORT int32_t IsSameAccount(const std::string &udid); + DM_EXPORT bool CheckAccessControl(const DmAccessCaller &caller, + const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid); + DM_EXPORT bool CheckIsSameAccount(const DmAccessCaller &caller, + const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid); + DM_EXPORT void DeleteAccessControlList(const std::string &udid); + DM_EXPORT int32_t GetBindLevel(const std::string &pkgName, + const std::string &localUdid, const std::string &udid, uint64_t &tokenId); std::map GetDeviceIdAndBindLevel(std::vector userIds, const std::string &localUdid); - std::multimap GetDeviceIdAndUserId(int32_t userId, const std::string &accountId, - const std::string &localUdid); + DM_EXPORT std::vector GetDeviceIdAndUdidListByTokenId(const std::vector &userIds, + const std::string &localUdid, int32_t tokenId); + DM_EXPORT std::multimap GetDeviceIdAndUserId( + int32_t userId, const std::string &accountId, const std::string &localUdid); int32_t HandleAccountLogoutEvent(int32_t remoteUserId, const std::string &remoteAccountHash, const std::string &remoteUdid, const std::string &localUdid); - int32_t HandleDevUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, const std::string &localUdid); - OHOS::DistributedHardware::ProcessInfo HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, + + DM_EXPORT int32_t HandleDevUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, + const std::string &localUdid, DmOfflineParam &offlineParam); + DM_EXPORT DmOfflineParam HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, const std::string &localUdid); - OHOS::DistributedHardware::ProcessInfo HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, + DM_EXPORT DmOfflineParam HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, const std::string &localUdid, int32_t peerTokenId); - std::vector GetAllAccessControlProfile(); - void DeleteAccessControlById(int64_t accessControlId); - int32_t HandleUserSwitched(const std::string &localUdid, const std::vector &deviceVec, - int32_t currentUserId, int32_t beforeUserId); - int32_t HandleUserSwitched(const std::string &localUdid, const std::vector &deviceVec, - const std::vector &foregroundUserIds, const std::vector &backgroundUserIds); + DM_EXPORT std::vector + GetAllAccessControlProfile(); + DM_EXPORT std::vector GetAllAclIncludeLnnAcl(); + DM_EXPORT void DeleteAccessControlById(int64_t accessControlId); + DM_EXPORT int32_t HandleUserSwitched(const std::string &localUdid, + const std::vector &deviceVec, int32_t currentUserId, int32_t beforeUserId); + DM_EXPORT int32_t HandleUserSwitched(const std::string &localUdid, + const std::vector &deviceVec, const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds); bool CheckAclStatusAndForegroundNotMatch(const std::string &localUdid, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds); - void HandleUserSwitched(const std::vector &activeProfiles, - const std::vector &inActiveProfiles, - const std::vector &delActiveProfiles); - void HandleSyncForegroundUserIdEvent(const std::vector &remoteUserIds, const std::string &remoteUdid, + DM_EXPORT void HandleUserSwitched( + const std::vector &activeProfiles, + const std::vector &inActiveProfiles); + DM_EXPORT void HandleSyncForegroundUserIdEvent( + const std::vector &remoteUserIds, const std::string &remoteUdid, const std::vector &localUserIds, std::string &localUdid); std::vector GetOfflineProcessInfo(std::string &localUdid, const std::vector &localUserIds, const std::string &remoteUdid, const std::vector &remoteUserIds); - std::map GetUserIdAndBindLevel(const std::string &localUdid, const std::string &peerUdid); - void UpdateACL(std::string &localUdid, const std::vector &localUserIds, + DM_EXPORT std::map GetUserIdAndBindLevel( + const std::string &localUdid, const std::string &peerUdid); + DM_EXPORT void UpdateACL(std::string &localUdid, const std::vector &localUserIds, const std::string &remoteUdid, const std::vector &remoteFrontUserIds, - const std::vector &remoteBackUserIds); - std::multimap GetDevIdAndUserIdByActHash(const std::string &localUdid, - const std::string &peerUdid, int32_t peerUserId, const std::string &peerAccountHash); - std::multimap GetDeviceIdAndUserId(const std::string &localUdid, int32_t localUserId); - void HandleSyncBackgroundUserIdEvent(const std::vector &remoteUserIds, const std::string &remoteUdid, + const std::vector &remoteBackUserIds, DmOfflineParam &offlineParam); + DM_EXPORT std::multimap GetDevIdAndUserIdByActHash( + const std::string &localUdid, const std::string &peerUdid, int32_t peerUserId, + const std::string &peerAccountHash); + DM_EXPORT std::multimap GetDeviceIdAndUserId( + const std::string &localUdid, int32_t localUserId); + DM_EXPORT void HandleSyncBackgroundUserIdEvent( + const std::vector &remoteUserIds, const std::string &remoteUdid, const std::vector &localUserIds, std::string &localUdid); - void HandleDeviceUnBind(int32_t bindType, const std::string &peerUdid, + DM_EXPORT void HandleDeviceUnBind(int32_t bindType, const std::string &peerUdid, const std::string &localUdid, int32_t localUserId, const std::string &localAccountId); - int32_t SubscribeDeviceProfileInited(sptr dpInitedCallback); - int32_t UnSubscribeDeviceProfileInited(); - int32_t PutAllTrustedDevices(const std::vector &deviceInfos); - int32_t CheckDeviceInfoPermission(const std::string &localUdid, const std::string &peerDeviceId); - int32_t UpdateAclDeviceName(const std::string &udid, const std::string &newDeviceName); - int32_t PutLocalServiceInfo(const DistributedDeviceProfile::LocalServiceInfo &localServiceInfo); - int32_t DeleteLocalServiceInfo(const std::string &bundleName, int32_t pinExchangeType); - int32_t UpdateLocalServiceInfo(const DistributedDeviceProfile::LocalServiceInfo &localServiceInfo); - int32_t GetLocalServiceInfoByBundleNameAndPinExchangeType(const std::string &bundleName, - int32_t pinExchangeType, DistributedDeviceProfile::LocalServiceInfo &localServiceInfo); - int32_t PutSessionKey(const std::vector &sessionKeyArray, int32_t &sessionKeyId); + + DM_EXPORT int32_t DeleteSessionKey(int32_t userId, int32_t sessionKeyId); + DM_EXPORT int32_t SubscribeDeviceProfileInited( + sptr dpInitedCallback); + DM_EXPORT int32_t UnSubscribeDeviceProfileInited(); + DM_EXPORT int32_t PutAllTrustedDevices( + const std::vector &deviceInfos); + DM_EXPORT int32_t CheckDeviceInfoPermission(const std::string &localUdid, + const std::string &peerDeviceId); + DM_EXPORT int32_t UpdateAclDeviceName(const std::string &udid, + const std::string &newDeviceName); + DM_EXPORT int32_t PutLocalServiceInfo( + const DistributedDeviceProfile::LocalServiceInfo &localServiceInfo); + DM_EXPORT int32_t DeleteLocalServiceInfo(const std::string &bundleName, + int32_t pinExchangeType); + DM_EXPORT int32_t UpdateLocalServiceInfo( + const DistributedDeviceProfile::LocalServiceInfo &localServiceInfo); + DM_EXPORT int32_t GetLocalServiceInfoByBundleNameAndPinExchangeType( + const std::string &bundleName, int32_t pinExchangeType, + DistributedDeviceProfile::LocalServiceInfo &localServiceInfo); + DM_EXPORT int32_t PutSessionKey(int32_t userId, const std::vector &sessionKeyArray, + int32_t &sessionKeyId); int32_t HandleUserStop(int32_t stopUserId, const std::string &stopEventUdid); int32_t HandleUserStop(int32_t stopUserId, const std::string &localUdid, const std::vector &acceptEventUdids); - + DM_EXPORT std::string IsAuthNewVersion(int32_t bindLevel, std::string localUdid, std::string remoteUdid, + int32_t tokenId, int32_t userId); + std::vector GetAclProfileByDeviceIdAndUserId( + const std::string &deviceId, int32_t userId, const std::string &remoteDeviceId); + DM_EXPORT std::vector GetAclList(const std::string localUdid, + int32_t localUserId, const std::string remoteUdid, int32_t remoteUserId); + DM_EXPORT bool ChecksumAcl(DistributedDeviceProfile::AccessControlProfile &acl, + std::vector &acLStrList); + DM_EXPORT std::string AccessToStr(DistributedDeviceProfile::AccessControlProfile acl); + DM_EXPORT int32_t GetVersionByExtra(std::string &extraInfo, std::string &dmVersion); + DM_EXPORT void GetAllVerionAclMap(DistributedDeviceProfile::AccessControlProfile &acl, + std::map> &aclMap, std::string dmVersion = ""); + void GenerateAclHash(DistributedDeviceProfile::AccessControlProfile &acl, + std::map> &aclMap, const std::string &dmVersion); + DM_EXPORT int32_t CheckIsSameAccountByUdidHash(const std::string &udidHash); + DM_EXPORT int32_t GetAclListHashStr(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclListHash, std::string dmVersion = ""); + DM_EXPORT bool IsLnnAcl(const DistributedDeviceProfile::AccessControlProfile &profile); + DM_EXPORT void CacheAcerAclId(const DistributedDeviceProfile::AccessControlProfile &profile, + std::vector &aclInfos); + DM_EXPORT void CacheAceeAclId(const DistributedDeviceProfile::AccessControlProfile &profile, + std::vector &aclInfos); + DM_EXPORT void AclHashItemToJson(JsonItemObject &itemObject, const AclHashItem &value); + DM_EXPORT void AclHashVecToJson(JsonItemObject &itemObject, const std::vector &values); + DM_EXPORT void AclHashItemFromJson(const JsonItemObject &itemObject, AclHashItem &value); + DM_EXPORT void AclHashVecFromJson(const JsonItemObject &itemObject, std::vector &values); + void DeleteCacheAcl(std::vector delAclIdVec, + std::vector &profiles); + DM_EXPORT int32_t HandleAccountCommonEvent(const std::string &localUdid, const std::vector &deviceVec, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds); + DM_EXPORT bool CheckSrcAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); + DM_EXPORT bool CheckSinkAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); + DM_EXPORT bool CheckSrcIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); + DM_EXPORT bool CheckSinkIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); private: int32_t HandleDmAuthForm(DistributedDeviceProfile::AccessControlProfile profiles, DmDiscoveryInfo discoveryInfo); void GetParamBindTypeVec(DistributedDeviceProfile::AccessControlProfile profiles, std::string requestDeviceId, @@ -211,6 +324,10 @@ private: uint32_t index, std::string targetDeviceId); bool CheckAppLevelAccess(const DistributedDeviceProfile::AccessControlProfile &profile, const DmAccessCaller &caller, const DmAccessCallee &callee); + bool CheckSinkShareType(const DistributedDeviceProfile::AccessControlProfile &profile, + const int32_t &userId, const std::string &deviceId, const std::string &trustDeviceId, const int32_t &bindType); + std::unordered_map GetAuthFormMap(const std::string &pkgName, const std::string &deviceId, + const std::vector &profilesFilter, const int32_t &userId); int32_t GetAuthForm(DistributedDeviceProfile::AccessControlProfile profiles, const std::string &trustDev, const std::string &reqDev); int32_t CheckAuthForm(DmAuthForm form, DistributedDeviceProfile::AccessControlProfile profiles, @@ -233,13 +350,69 @@ private: std::vector GetAclProfileByUserId(const std::string &localUdid, int32_t userId, const std::string &remoteUdid); void DeleteSigTrustACL(DistributedDeviceProfile::AccessControlProfile profile, const std::string &remoteUdid, - const std::vector &remoteFrontUserIds, const std::vector &remoteBackUserIds); + const std::vector &remoteFrontUserIds, const std::vector &remoteBackUserIds, + DmOfflineParam &offlineParam); void UpdatePeerUserId(DistributedDeviceProfile::AccessControlProfile profile, std::string &localUdid, const std::vector &localUserIds, const std::string &remoteUdid, const std::vector &remoteFrontUserIds); bool CheckAclStatusNotMatch(const DistributedDeviceProfile::AccessControlProfile &profile, const std::string &localUdid, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds); + + void FilterNeedDeleteACLInfos(std::vector &profiles, + const std::string &localUdid, const uint32_t localTokenId, + const std::string &remoteUdid, const std::string &extra, DmOfflineParam &offlineParam); + bool FindLeftAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const std::string &remoteUdid, DmOfflineParam &offlineParam); + bool FindUserAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const std::string &remoteUdid, DmOfflineParam &offlineParam); + bool FindLnnAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const std::string &remoteUdid, DmOfflineParam &offlineParam); + bool FindTargetAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const uint32_t localTokenId, + const std::string &remoteUdid, const uint32_t peerTokenId, + DmOfflineParam &offlineParam); + bool FindTargetAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const int32_t remoteUserId, const std::string &remoteUdid, + const int32_t tokenId, const int32_t peerTokenId, DmOfflineParam &offlineParam); + bool FindTargetAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const int32_t remoteUserId, const std::string &remoteUdid, + const int32_t remoteTokenId, DmOfflineParam &offlineParam); + + std::string GetAppServiceAuthVersionInfo(std::string localUdid, std::string remoteUdid, int32_t tokenId, + int32_t userId, std::vector profiles); + std::string GetDeviceAuthVersionInfo(std::string localUdid, std::string remoteUdid, + std::vector profiles); + + void ParseExtra(const std::string &extra, uint64_t &peerTokenId, std::string &peerBundleName); + bool CacheLnnAcl(DistributedDeviceProfile::AccessControlProfile profile, const std::string &localUdid, + DmAclIdParam &dmAclIdParam); + void CheckLastLnnAcl(const std::string &localDeviceId, int32_t userId, const std::string &remoteDeviceId, + DmOfflineParam &offlineParam, std::vector &profiles); + bool CheckSrcAcuntAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid); + bool CheckSinkAcuntAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid); + bool CheckSrcShareAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid); + bool CheckSinkShareAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid); + bool CheckSrcP2PAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid); + bool CheckSinkP2PAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid); + bool CheckSinkUserP2PAcl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid); + bool CheckSinkAppOrServiceP2PAcl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid); }; extern "C" IDeviceProfileConnector *CreateDpConnectorInstance(); diff --git a/commondependency/include/multiple_user_connector.h b/commondependency/include/multiple_user_connector.h index ac9a105bb352de23663a0a8b366c693869d123b8..87837560234c6d233b9174ae0c307ef1ec0ad4fc 100644 --- a/commondependency/include/multiple_user_connector.h +++ b/commondependency/include/multiple_user_connector.h @@ -21,6 +21,11 @@ #include #include #include + +#ifndef DM_EXPORT +#define DM_EXPORT __attribute__ ((visibility ("default"))) +#endif // DM_EXPORT + namespace OHOS { namespace DistributedHardware { typedef struct DMAccountInfo { @@ -34,14 +39,14 @@ public: * @tc.desc: Get Current Account UserID of the Multiple User Connector * @tc.type: FUNC */ - static int32_t GetCurrentAccountUserID(void); + DM_EXPORT static int32_t GetCurrentAccountUserID(void); /** * @tc.name: MultipleUserConnector::SetSwitchOldUserId * @tc.desc: Set Switch Old UserId of the Multiple User Connector * @tc.type: FUNC */ - static void SetSwitchOldUserId(int32_t userId); + DM_EXPORT static void SetSwitchOldUserId(int32_t userId); /** * @tc.name: MultipleUserConnector::GetSwitchOldUserId @@ -55,7 +60,7 @@ public: * @tc.desc: Get Current AccountId of current user * @tc.type: FUNC */ - static std::string GetOhosAccountId(void); + DM_EXPORT static std::string GetOhosAccountId(void); /** * @brief Get the Ohos Account Id By Userid @@ -63,14 +68,22 @@ public: * @param userId the user id in which account login * @return std::string the account id */ - static std::string GetOhosAccountIdByUserId(int32_t userId); + DM_EXPORT static std::string GetOhosAccountIdByUserId(int32_t userId); + + /** + * @brief Get the Ohos Account Name By Userid + * + * @param userId the user id in which account login + * @return std::string the account name + */ + DM_EXPORT static std::string GetOhosAccountNameByUserId(int32_t userId); /** * @tc.name: MultipleUserConnector::SetSwitchOldAccountId * @tc.desc: Set Switch Old UserId of the Multiple User Connector * @tc.type: FUNC */ - static void SetSwitchOldAccountId(std::string accountId); + DM_EXPORT static void SetSwitchOldAccountId(std::string accountId); /** * @tc.name: MultipleUserConnector::GetSwitchOldAccountId @@ -78,7 +91,7 @@ public: * @tc.type: FUNC */ static std::string GetSwitchOldAccountId(void); - + /** * @tc.name: MultipleUserConnector::SetSwitchOldAccountName * @tc.desc: Set Switch Old AccountName of the Multiple User Connector @@ -91,7 +104,7 @@ public: * @tc.desc: Get Current AccountName of the Multiple User Connector * @tc.type: FUNC */ - static std::string GetOhosAccountName(void); + DM_EXPORT static std::string GetOhosAccountName(void); /** * @tc.name: MultipleUserConnector::GetSwitchOldAccountName @@ -99,21 +112,25 @@ public: * @tc.type: FUNC */ static std::string GetSwitchOldAccountName(void); - - static void SetAccountInfo(int32_t userId, DMAccountInfo dmAccountInfo); - static DMAccountInfo GetAccountInfoByUserId(int32_t userId); - static void DeleteAccountInfoByUserId(int32_t userId); - static void GetTokenIdAndForegroundUserId(uint32_t &tokenId, int32_t &userId); - static void GetCallerUserId(int32_t &userId); - static int32_t GetForegroundUserIds(std::vector &userVec); - static int32_t GetFirstForegroundUserId(void); - static int32_t GetBackgroundUserIds(std::vector &userIdVec); + DM_EXPORT static void SetAccountInfo(int32_t userId, DMAccountInfo dmAccountInfo); + DM_EXPORT static DMAccountInfo GetAccountInfoByUserId(int32_t userId); + DM_EXPORT static void DeleteAccountInfoByUserId(int32_t userId); + DM_EXPORT static void GetTokenId(uint32_t &tokenId); + DM_EXPORT static void GetTokenIdAndForegroundUserId(uint32_t &tokenId, + int32_t &userId); + DM_EXPORT static void GetCallerUserId(int32_t &userId); + DM_EXPORT static int32_t GetForegroundUserIds(std::vector &userVec); + DM_EXPORT static int32_t GetFirstForegroundUserId(void); + DM_EXPORT static int32_t GetBackgroundUserIds(std::vector &userIdVec); static int32_t GetAllUserIds(std::vector &userIdVec); - static std::string GetAccountNickName(int32_t userId); - static bool IsUserUnlocked(int32_t userId); - static void ClearLockedUser(std::vector &foregroundUserVec); - static void ClearLockedUser(std::vector &foregroundUserVec, std::vector &backgroundUserVec); - static DMAccountInfo GetCurrentDMAccountInfo(); + DM_EXPORT static std::string GetAccountNickName(int32_t userId); + DM_EXPORT static bool IsUserUnlocked(int32_t userId); + DM_EXPORT static void ClearLockedUser(std::vector &foregroundUserVec); + DM_EXPORT static void ClearLockedUser(std::vector &foregroundUserVec, + std::vector &backgroundUserVec); + DM_EXPORT static DMAccountInfo GetCurrentDMAccountInfo(); + DM_EXPORT static void GetCallingTokenId(uint32_t &tokenId); + DM_EXPORT static int32_t GetUserIdByDisplayId(uint64_t displayId); private: static int32_t oldUserId_; static std::string accountId_; diff --git a/commondependency/src/deviceprofile_connector.cpp b/commondependency/src/deviceprofile_connector.cpp index e4eb57b8f3b47706d01b13537523aa1326b44778..4b3a3b1dda40d5aa3b6c5316d630de34f47f3499 100644 --- a/commondependency/src/deviceprofile_connector.cpp +++ b/commondependency/src/deviceprofile_connector.cpp @@ -13,6 +13,8 @@ * limitations under the License. */ +#include + #include "deviceprofile_connector.h" #include "crypto_mgr.h" #include "dm_anonymous.h" @@ -28,23 +30,578 @@ using namespace OHOS::DistributedDeviceProfile; const uint32_t INVALIED_TYPE = 0; const uint32_t APP_PEER_TO_PEER_TYPE = 1; const uint32_t APP_ACROSS_ACCOUNT_TYPE = 2; -const uint32_t DEVICE_PEER_TO_PEER_TYPE = 3; -const uint32_t DEVICE_ACROSS_ACCOUNT_TYPE = 4; -const uint32_t IDENTICAL_ACCOUNT_TYPE = 5; - -const uint32_t DM_IDENTICAL_ACCOUNT = 1; -const uint32_t DM_POINT_TO_POINT = 256; -const uint32_t DM_ACROSS_ACCOUNT = 1282; -const uint32_t DM_INVALIED_BINDTYPE = 2048; -const uint32_t DEVICE = 1; +const uint32_t SHARE_TYPE = 3; +const uint32_t DEVICE_PEER_TO_PEER_TYPE = 4; +const uint32_t DEVICE_ACROSS_ACCOUNT_TYPE = 5; +const uint32_t IDENTICAL_ACCOUNT_TYPE = 6; +const uint32_t SERVICE_PEER_TO_PEER_TYPE = 7; +const uint32_t SERVICE_ACROSS_ACCOUNT_TYPE = 8; + + +const uint32_t DM_INVALIED_TYPE = 2048; const uint32_t SERVICE = 2; const uint32_t APP = 3; +const uint32_t USER = 1; constexpr uint32_t MAX_SESSION_KEY_LENGTH = 512; +const char* TAG_PEER_BUNDLE_NAME = "peerBundleName"; +const char* TAG_PEER_TOKENID = "peerTokenId"; +const char* TAG_ACL = "accessControlTable"; +const char* TAG_DMVERSION = "dmVersion"; +const char* TAG_ACL_HASH_KEY_VERSION = "aclVersion"; +const char* TAG_ACL_HASH_KEY_ACLHASHLIST = "aclHashList"; + namespace OHOS { namespace DistributedHardware { +namespace { +const int32_t DM_SUPPORT_ACL_AGING_VERSION_NUM = 1; +const std::string DM_VERSION_STR_5_1_0 = DM_VERSION_5_1_0; +const std::vector DM_SUPPORT_ACL_AGING_VERSIONS = {DM_VERSION_STR_5_1_0}; +} DM_IMPLEMENT_SINGLE_INSTANCE(DeviceProfileConnector); -std::vector DeviceProfileConnector::GetAccessControlProfile() +void PrintProfile(const AccessControlProfile &profile) +{ + uint32_t bindType = profile.GetBindType(); + uint32_t bindLevel = profile.GetBindLevel(); + + std::string acerDeviceId = profile.GetAccesser().GetAccesserDeviceId(); + int32_t acerUserId = profile.GetAccesser().GetAccesserUserId(); + std::string acerAccountId = profile.GetAccesser().GetAccesserAccountId(); + int32_t acerTokenId = static_cast(profile.GetAccesser().GetAccesserTokenId()); + std::string acerPkgName = profile.GetAccesser().GetAccesserBundleName(); + std::string acerCredId = profile.GetAccesser().GetAccesserCredentialIdStr(); + int32_t acerSkId = profile.GetAccesser().GetAccesserSessionKeyId(); + + std::string aceeDeviceId = profile.GetAccessee().GetAccesseeDeviceId(); + int32_t aceeUserId = profile.GetAccessee().GetAccesseeUserId(); + std::string aceeAccountId = profile.GetAccessee().GetAccesseeAccountId(); + int32_t aceeTokenId = static_cast(profile.GetAccessee().GetAccesseeTokenId()); + std::string aceePkgName = profile.GetAccessee().GetAccesseeBundleName(); + std::string aceeCredId = profile.GetAccessee().GetAccesseeCredentialIdStr(); + int32_t aceeSkId = profile.GetAccessee().GetAccesseeSessionKeyId(); + + LOGI("bindType %{public}d, bindLevel %{public}d, acerDeviceId %{public}s, acerUserId %{public}d," + "acerAccountId %{public}s, acerTokenId %{public}d, acerPkgName %{public}s, acerCredId %{public}s," + "acerSkId %{public}d, aceeDeviceId %{public}s, aceeUserId %{public}d, aceeAccountId %{public}s," + "aceeTokenId %{public}d, aceePkgName %{public}s, aceeCredId %{public}s, aceeSkId %{public}d.", + bindType, bindLevel, GetAnonyString(acerDeviceId).c_str(), acerUserId, GetAnonyString(acerAccountId).c_str(), + acerTokenId, acerPkgName.c_str(), GetAnonyString(acerCredId).c_str(), acerSkId, + GetAnonyString(aceeDeviceId).c_str(), aceeUserId, GetAnonyString(aceeAccountId).c_str(), aceeTokenId, + aceePkgName.c_str(), GetAnonyString(aceeCredId).c_str(), aceeSkId); +} + +std::string GetLocalDeviceId() +{ + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + return std::string(localDeviceId); +} + +DM_EXPORT int32_t DeviceProfileConnector::GetVersionByExtra(std::string &extraInfo, std::string &dmVersion) +{ + JsonObject extraInfoJson(extraInfo); + if (extraInfoJson.IsDiscarded()) { + LOGE("GetVersionByExtra extraInfoJson error"); + return ERR_DM_FAILED; + } + if (!extraInfoJson[TAG_DMVERSION].IsString()) { + LOGE("GetVersionByExtra PARAM_KEY_OS_VERSION error"); + return ERR_DM_FAILED; + } + dmVersion = extraInfoJson[TAG_DMVERSION].Get(); + return DM_OK; +} + +DM_EXPORT void DeviceProfileConnector::GetAllVerionAclMap(DistributedDeviceProfile::AccessControlProfile &acl, + std::map> &aclMap, std::string dmVersion) +{ + std::vector needGenVersions = {}; + // if not set version, send all support version acl hash + if (dmVersion.empty()) { + for (int32_t idx = 0; idx < DM_SUPPORT_ACL_AGING_VERSION_NUM; idx++) { + needGenVersions.push_back(DM_SUPPORT_ACL_AGING_VERSIONS[idx]); + } + } else if (std::find(DM_SUPPORT_ACL_AGING_VERSIONS.begin(), DM_SUPPORT_ACL_AGING_VERSIONS.end(), dmVersion) != + DM_SUPPORT_ACL_AGING_VERSIONS.end()) { + needGenVersions.push_back(dmVersion); + } else { + LOGE("dmVersion invalid, %{public}s", dmVersion.c_str()); + return; + } + + for (auto const &version : needGenVersions) { + GenerateAclHash(acl, aclMap, version); + } +} + +void DeviceProfileConnector::GenerateAclHash(DistributedDeviceProfile::AccessControlProfile &acl, + std::map> &aclMap, const std::string &dmVersion) +{ + int32_t versionNum = 0; + if (!GetVersionNumber(dmVersion, versionNum)) { + LOGE("GetAllVerionAclMap GetVersionNumber error"); + return; + } + std::string aclStr; + switch (versionNum) { + case DM_VERSION_INT_5_1_0: + aclStr = AccessToStr(acl); + break; + default: + LOGE("versionNum is invaild, ver: %{public}d", versionNum); + break; + } + if (aclStr.empty()) { + return; + } + auto iter = aclMap.find(dmVersion); + if (iter != aclMap.end()) { + aclMap[dmVersion].push_back(Crypto::Sha256(aclStr)); + } else { + std::vector aclStrVec; + aclStrVec.push_back(Crypto::Sha256(aclStr)); + aclMap[dmVersion] = aclStrVec; + } +} + +DM_EXPORT int32_t DeviceProfileConnector::GetAclListHashStr(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclListHash, std::string dmVersion) +{ + std::map> aclMap; + std::vector profiles = + DeviceProfileConnector::GetInstance().GetAllAclIncludeLnnAcl(); + for (auto &item : profiles) { + if (item.GetAccesser().GetAccesserDeviceId() == localDevUserInfo.deviceId && + item.GetAccesser().GetAccesserUserId() == localDevUserInfo.userId && + item.GetAccessee().GetAccesseeDeviceId() == remoteDevUserInfo.deviceId && + item.GetAccessee().GetAccesseeUserId() == remoteDevUserInfo.userId) { + GetAllVerionAclMap(item, aclMap, dmVersion); + continue; + } + if (item.GetAccesser().GetAccesserDeviceId() == remoteDevUserInfo.deviceId && + item.GetAccesser().GetAccesserUserId() == remoteDevUserInfo.userId && + item.GetAccessee().GetAccesseeDeviceId() == localDevUserInfo.deviceId && + item.GetAccessee().GetAccesseeUserId() == localDevUserInfo.userId) { + GetAllVerionAclMap(item, aclMap, dmVersion); + continue; + } + } + if (aclMap.empty()) { + LOGI("DeviceProfileConnector:: acl list is empty"); + } + std::vector aclStrVec; + for (auto &item : aclMap) { + aclStrVec.push_back({item.first, item.second}); + } + JsonObject allAclObj(JsonCreateType::JSON_CREATE_TYPE_ARRAY); + AclHashVecToJson(allAclObj, aclStrVec); + aclListHash = allAclObj.Dump(); + return DM_OK; +} + +DM_EXPORT void DeviceProfileConnector::AclHashItemToJson(JsonItemObject &itemObject, const AclHashItem &value) +{ + itemObject[TAG_ACL_HASH_KEY_VERSION] = value.version; + JsonObject hashList(JsonCreateType::JSON_CREATE_TYPE_ARRAY); + for (const auto &val : value.aclHashList) { + hashList.PushBack(val); + } + itemObject[TAG_ACL_HASH_KEY_ACLHASHLIST] = hashList.Dump(); +} + +DM_EXPORT void DeviceProfileConnector::AclHashVecToJson( + JsonItemObject &itemObject, const std::vector &values) +{ + for (const auto &val : values) { + JsonObject object; + AclHashItemToJson(object, val); + itemObject.PushBack(object.Dump()); + } +} + +DM_EXPORT void DeviceProfileConnector::AclHashItemFromJson(const JsonItemObject &itemObject, AclHashItem &value) +{ + value.version = itemObject[TAG_ACL_HASH_KEY_VERSION].Get(); + std::string hashListStr = itemObject[TAG_ACL_HASH_KEY_ACLHASHLIST].Get(); + JsonObject hashList; + hashList.Parse(hashListStr); + for (auto const &item : hashList.Items()) { + value.aclHashList.push_back(item.Get()); + } +} + +DM_EXPORT void DeviceProfileConnector::AclHashVecFromJson(const JsonItemObject &itemObject, + std::vector &values) +{ + for (auto const &item : itemObject.Items()) { + JsonObject object; + AclHashItem aclItem; + object.Parse(item.Get()); + AclHashItemFromJson(object, aclItem); + values.push_back(aclItem); + } +} + +DM_EXPORT bool DeviceProfileConnector::ChecksumAcl(DistributedDeviceProfile::AccessControlProfile &acl, + std::vector &acLStrList) +{ + std::string aclStr = AccessToStr(acl); + auto aclIter = find(acLStrList.begin(), acLStrList.end(), Crypto::Sha256(aclStr)); + return (aclIter != acLStrList.end()); +} + +DM_EXPORT std::string DeviceProfileConnector::AccessToStr(DistributedDeviceProfile::AccessControlProfile acl) +{ + std::string aclStr = ""; + DistributedDeviceProfile::Accesser accesser = acl.GetAccesser(); + aclStr += accesser.GetAccesserDeviceId(); + aclStr += std::to_string(accesser.GetAccesserUserId()); + aclStr += accesser.GetAccesserAccountId(); + aclStr += std::to_string(accesser.GetAccesserTokenId()); + aclStr += accesser.GetAccesserBundleName(); + aclStr += accesser.GetAccesserHapSignature(); + aclStr += std::to_string(accesser.GetAccesserBindLevel()); + aclStr += accesser.GetAccesserCredentialIdStr(); + aclStr += std::to_string(accesser.GetAccesserStatus()); + aclStr += std::to_string(accesser.GetAccesserSKTimeStamp()); + + DistributedDeviceProfile::Accessee accessee = acl.GetAccessee(); + aclStr += accessee.GetAccesseeDeviceId(); + aclStr += std::to_string(accessee.GetAccesseeUserId()); + aclStr += accessee.GetAccesseeAccountId(); + aclStr += std::to_string(accessee.GetAccesseeTokenId()); + aclStr += accessee.GetAccesseeBundleName(); + aclStr += accessee.GetAccesseeHapSignature(); + aclStr += std::to_string(accessee.GetAccesseeBindLevel()); + aclStr += accessee.GetAccesseeCredentialIdStr(); + aclStr += std::to_string(accessee.GetAccesseeStatus()); + aclStr += std::to_string(accessee.GetAccesseeSKTimeStamp()); + return aclStr; +} + +DM_EXPORT std::vector DeviceProfileConnector::GetAclList( + const std::string localUdid, int32_t localUserId, const std::string remoteUdid, int32_t remoteUserId) +{ + std::vector profiles = + DeviceProfileConnector::GetInstance().GetAllAclIncludeLnnAcl(); + std::vector aclList; + for (auto &item : profiles) { + if (item.GetAccesser().GetAccesserDeviceId() == localUdid && + item.GetAccesser().GetAccesserUserId() == localUserId && + item.GetAccessee().GetAccesseeDeviceId() == remoteUdid && + item.GetAccessee().GetAccesseeUserId() == remoteUserId) { + aclList.push_back(item); + continue; + } + if (item.GetAccesser().GetAccesserDeviceId() == remoteUdid && + item.GetAccesser().GetAccesserUserId() == remoteUserId && + item.GetAccessee().GetAccesseeDeviceId() == localUdid && + item.GetAccessee().GetAccesseeUserId() == localUserId) { + aclList.push_back(item); + continue; + } + } + if (aclList.empty()) { + LOGI("DeviceProfileConnector::GetAclList acl is empty"); + } + return aclList; +} + +DM_EXPORT std::string DeviceProfileConnector::IsAuthNewVersion(int32_t bindLevel, std::string localUdid, + std::string remoteUdid, int32_t tokenId, int32_t userId) +{ + LOGI("localUdid %{public}s, remoteUdid %{public}s, bindLevel %{public}d.", + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), bindLevel); + if (static_cast(bindLevel) > APP || static_cast(bindLevel) < USER) { + LOGE("Invalied bindlevel bindLevel=%{public}u.", bindLevel); + return ""; + } + std::vector profiles = GetAclProfileByDeviceIdAndUserId(localUdid, userId); + if (profiles.empty()) { + LOGE("Acl is empty."); + return ""; + } + switch (bindLevel) { + case APP: + case SERVICE: + return GetAppServiceAuthVersionInfo(localUdid, remoteUdid, tokenId, userId, profiles); + case USER: + return GetDeviceAuthVersionInfo(localUdid, remoteUdid, profiles); + default: + break; + } + return ""; +} + +std::string DeviceProfileConnector::GetAppServiceAuthVersionInfo(std::string localUdid, std::string remoteUdid, + int32_t tokenId, int32_t userId, std::vector profiles) +{ + for (auto &item : profiles) { + if (item.GetBindType() == DM_IDENTICAL_ACCOUNT || + (item.GetBindLevel() != APP && item.GetBindLevel() != SERVICE)) { + continue; + } + int32_t acerUserId = item.GetAccesser().GetAccesserUserId(); + int32_t aceeUserId = item.GetAccessee().GetAccesseeUserId(); + std::string acerDeviceId = item.GetAccesser().GetAccesserDeviceId(); + std::string aceeDeviceId = item.GetAccessee().GetAccesseeDeviceId(); + int32_t acerTokenId = static_cast(item.GetAccesser().GetAccesserTokenId()); + int32_t aceeTokenId = static_cast(item.GetAccessee().GetAccesseeTokenId()); + if (acerUserId == userId && acerTokenId == tokenId && + acerDeviceId == localUdid && aceeDeviceId == remoteUdid) { + return item.GetAccesser().GetAccesserExtraData(); + } + if (aceeUserId == userId && aceeTokenId == tokenId && + aceeDeviceId == localUdid && acerDeviceId == remoteUdid) { + return item.GetAccessee().GetAccesseeExtraData(); + } + } + return ""; +} + +std::string DeviceProfileConnector::GetDeviceAuthVersionInfo(std::string localUdid, std::string remoteUdid, + std::vector profiles) +{ + for (auto &item : profiles) { + if (item.GetBindType() == DM_IDENTICAL_ACCOUNT || item.GetBindLevel() != USER || IsLnnAcl(item)) { + continue; + } + std::string acerDeviceId = item.GetAccesser().GetAccesserDeviceId(); + std::string aceeDeviceId = item.GetAccessee().GetAccesseeDeviceId(); + if (acerDeviceId == localUdid && aceeDeviceId == remoteUdid) { + return item.GetAccesser().GetAccesserExtraData(); + } + if (aceeDeviceId == localUdid && acerDeviceId == remoteUdid) { + return item.GetAccessee().GetAccesseeExtraData(); + } + } + return ""; +} +DM_EXPORT DmOfflineParam DeviceProfileConnector::FilterNeedDeleteACL(const std::string &localDeviceId, + uint32_t localTokenId, const std::string &remoteDeviceId, const std::string &extra) +{ + LOGI("localDeviceId %{public}s, remoteDeviceId %{public}s", + GetAnonyString(localDeviceId).c_str(), GetAnonyString(remoteDeviceId).c_str()); + DmOfflineParam offlineParam; + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); + std::vector profiles = GetAclProfileByDeviceIdAndUserId(localDeviceId, userId, + remoteDeviceId); + if (profiles.empty()) { + LOGE("Acl is empty."); + return offlineParam; + } + + FilterNeedDeleteACLInfos(profiles, localDeviceId, localTokenId, remoteDeviceId, extra, offlineParam); + return offlineParam; +} + +void DeviceProfileConnector::CheckLastLnnAcl(const std::string &localDeviceId, int32_t localUserId, + const std::string &remoteDeviceId, DmOfflineParam &offlineParam, + std::vector &profiles) +{ + LOGI("profiles size: %{public}zu", profiles.size()); + if (profiles.size() == 1 && IsLnnAcl(profiles[0])) { + if (profiles[0].GetAccesser().GetAccesserDeviceId() == localDeviceId) { + CacheAcerAclId(profiles[0], offlineParam.needDelAclInfos); + } + if (profiles[0].GetAccessee().GetAccesseeDeviceId() == localDeviceId) { + CacheAceeAclId(profiles[0], offlineParam.needDelAclInfos); + } + offlineParam.hasLnnAcl = true; + } +} + +void DeviceProfileConnector::DeleteCacheAcl(std::vector delAclIdVec, + std::vector &profiles) +{ + for (auto delAclId : delAclIdVec) { + for (auto item = profiles.begin(); item != profiles.end();) { + if (delAclId == item->GetAccessControlId()) { + item = profiles.erase(item); + } else { + item++; + } + } + } +} + +void DeviceProfileConnector::ParseExtra(const std::string &extra, uint64_t &peerTokenId, std::string &peerBundleName) +{ + JsonObject extraInfoJson(extra); + if (extraInfoJson.IsDiscarded()) { + LOGE("ParseExtra extraInfoJson error"); + return; + } + if (!extraInfoJson[TAG_PEER_BUNDLE_NAME].IsString() || !extraInfoJson[TAG_PEER_TOKENID].IsNumberInteger()) { + LOGE("ParseExtra TAG_PEER_BUNDLE_NAME or TAG_PEER_TOKENID error"); + return; + } + peerTokenId = extraInfoJson[TAG_PEER_TOKENID].Get(); + peerBundleName = extraInfoJson[TAG_PEER_BUNDLE_NAME].Get(); +} + +bool DeviceProfileConnector::FindTargetAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const uint32_t localTokenId, + const std::string &remoteUdid, const uint32_t peerTokenId, + DmOfflineParam &offlineParam) +{ + bool isMatch = false; + int64_t acerTokenId = acl.GetAccesser().GetAccesserTokenId(); + int64_t aceeTokenId = acl.GetAccessee().GetAccesseeTokenId(); + std::string acerDeviceId = acl.GetAccesser().GetAccesserDeviceId(); + std::string aceeDeviceId = acl.GetAccessee().GetAccesseeDeviceId(); + // Process target match acl which need delete + if ((acerTokenId == static_cast(localTokenId)) && + (acerDeviceId == localUdid) && (aceeDeviceId == remoteUdid) && + (peerTokenId == 0 || (peerTokenId != 0 && aceeTokenId == static_cast(peerTokenId)))) { + ProcessInfo processInfo; + processInfo.pkgName = acl.GetAccesser().GetAccesserBundleName(); + processInfo.userId = acl.GetAccesser().GetAccesserUserId(); + offlineParam.processVec.push_back(processInfo); + CacheAcerAclId(acl, offlineParam.needDelAclInfos); + LOGI("Src del acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + isMatch = true; + } + + if ((aceeTokenId == static_cast(localTokenId)) && + (aceeDeviceId == localUdid) && (acerDeviceId == remoteUdid) && + (peerTokenId == 0 || (peerTokenId != 0 && acerTokenId == static_cast(peerTokenId)))) { + ProcessInfo processInfo; + processInfo.pkgName = acl.GetAccessee().GetAccesseeBundleName(); + processInfo.userId = acl.GetAccessee().GetAccesseeUserId(); + offlineParam.processVec.push_back(processInfo); + CacheAceeAclId(acl, offlineParam.needDelAclInfos); + LOGI("Sink del acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + isMatch = true; + } + return isMatch; +} + +bool DeviceProfileConnector::FindLnnAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const std::string &remoteUdid, DmOfflineParam &offlineParam) +{ + bool isMatch = false; + std::string acerDeviceId = acl.GetAccesser().GetAccesserDeviceId(); + std::string aceeDeviceId = acl.GetAccessee().GetAccesseeDeviceId(); + if (IsLnnAcl(acl) && acl.GetTrustDeviceId() == remoteUdid) { + if (acerDeviceId == localUdid && aceeDeviceId == remoteUdid) { + LOGI("Src lnn acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), + GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), acl.GetBindLevel()); + CacheAcerAclId(acl, offlineParam.allLnnAclInfos); + } + + if (aceeDeviceId == localUdid && acerDeviceId == remoteUdid) { + LOGI("Sink lnn acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + CacheAceeAclId(acl, offlineParam.allLnnAclInfos); + } + isMatch = true; + } + return isMatch; +} + +bool DeviceProfileConnector::FindUserAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const std::string &remoteUdid, DmOfflineParam &offlineParam) +{ + bool isMatch = false; + std::string acerDeviceId = acl.GetAccesser().GetAccesserDeviceId(); + std::string aceeDeviceId = acl.GetAccessee().GetAccesseeDeviceId(); + // process User Or SameAccount acl + if (acl.GetBindLevel() == USER || acl.GetBindType() == DM_IDENTICAL_ACCOUNT) { + if (acerDeviceId == localUdid && aceeDeviceId == remoteUdid) { + LOGI("Src User acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + CacheAcerAclId(acl, offlineParam.allUserAclInfos); + } + + if (aceeDeviceId == localUdid && acerDeviceId == remoteUdid) { + LOGI("Sink User acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + CacheAceeAclId(acl, offlineParam.allUserAclInfos); + } + isMatch = true; + } + return isMatch; +} + +bool DeviceProfileConnector::FindLeftAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const std::string &remoteUdid, DmOfflineParam &offlineParam) +{ + bool isMatch = false; + std::string acerDeviceId = acl.GetAccesser().GetAccesserDeviceId(); + std::string aceeDeviceId = acl.GetAccessee().GetAccesseeDeviceId(); + // process left service/app acl + if (acl.GetBindLevel() == SERVICE || acl.GetBindLevel() == APP) { + if (acerDeviceId == localUdid && aceeDeviceId == remoteUdid) { + LOGI("Src Left acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + CacheAcerAclId(acl, offlineParam.allLeftAppOrSvrAclInfos); + } + + if (aceeDeviceId == localUdid && acerDeviceId == remoteUdid) { + LOGI("Sink Left acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + CacheAceeAclId(acl, offlineParam.allLeftAppOrSvrAclInfos); + } + isMatch = true; + } + return isMatch; +} + +void DeviceProfileConnector::FilterNeedDeleteACLInfos( + std::vector &profiles, + const std::string &localUdid, const uint32_t localTokenId, + const std::string &remoteUdid, const std::string &extra, DmOfflineParam &offlineParam) +{ + uint64_t peerTokenId = 0; + std::string peerBundleName = ""; + ParseExtra(extra, peerTokenId, peerBundleName); + for (auto &item : profiles) { + if (item.GetTrustDeviceId() != remoteUdid) { + continue; + } + + // First, find need delete acl + if (FindTargetAcl(item, localUdid, localTokenId, remoteUdid, peerTokenId, offlineParam)) { + continue; + } + + // Second, find the LNN acl + if (FindLnnAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + + // Third, find the user or sameaccount acl, dertermine if report offline + if (FindUserAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + + // Fourth, find the left service/app acl, determine if del lnn acl + if (FindLeftAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + } +} + +DM_EXPORT std::vector DeviceProfileConnector::GetAccessControlProfile() { std::vector profiles; std::map queryParams; @@ -89,23 +646,52 @@ std::vector DeviceProfileConnector::GetAclProfileByDeviceI return aclProfileVec; } -std::unordered_map DeviceProfileConnector::GetAppTrustDeviceList(const std::string &pkgName, - const std::string &deviceId) +std::vector DeviceProfileConnector::GetAclProfileByDeviceIdAndUserId(const std::string &deviceId, + int32_t userId, const std::string &remoteDeviceId) +{ + std::vector aclProfileVec; + std::vector profiles = GetAllAclIncludeLnnAcl(); + for (auto &item : profiles) { + if ((item.GetAccesser().GetAccesserDeviceId() == deviceId && + item.GetAccesser().GetAccesserUserId() == userId && + item.GetAccessee().GetAccesseeDeviceId() == remoteDeviceId) || + (item.GetAccessee().GetAccesseeDeviceId() == deviceId && + item.GetAccessee().GetAccesseeUserId() == userId && + item.GetAccesser().GetAccesserDeviceId() == remoteDeviceId)) { + aclProfileVec.push_back(item); + } + } + return aclProfileVec; +} + +DM_EXPORT std::unordered_map DeviceProfileConnector::GetAppTrustDeviceList( + const std::string &pkgName, const std::string &deviceId) { - int32_t userId = MultipleUserConnector::GetFirstForegroundUserId(); - std::vector profiles = GetAclProfileByDeviceIdAndUserId(deviceId, userId); + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); + LOGI("localDeviceId: %{public}s, userId: %{public}d", GetAnonyString(deviceId).c_str(), userId); + std::vector profiles = GetAllAclIncludeLnnAcl(); std::vector profilesFilter = {}; for (auto &item : profiles) { - if ((item.GetAccesser().GetAccesserUserId() == userId && + if (!IsLnnAcl(item) && ((item.GetAccesser().GetAccesserUserId() == userId && item.GetAccesser().GetAccesserDeviceId() == deviceId) || (item.GetAccessee().GetAccesseeUserId() == userId && - item.GetAccessee().GetAccesseeDeviceId() == deviceId)) { + item.GetAccessee().GetAccesseeDeviceId() == deviceId))) { profilesFilter.push_back(item); } } + return GetAuthFormMap(pkgName, deviceId, profilesFilter, userId); +} + +std::unordered_map DeviceProfileConnector::GetAuthFormMap(const std::string &pkgName, + const std::string &deviceId, const std::vector &profilesFilter, + const int32_t &userId) +{ std::unordered_map deviceIdMap; for (auto &item : profilesFilter) { std::string trustDeviceId = item.GetTrustDeviceId(); + LOGI("trustDeviceId: %{public}s, status: %{public}d, acerUserId: %{public}d, aceeUserId: %{public}d", + GetAnonyString(trustDeviceId).c_str(), item.GetStatus(), item.GetAccesser().GetAccesserUserId(), + item.GetAccessee().GetAccesseeUserId()); if (trustDeviceId == deviceId || item.GetStatus() != ACTIVE) { continue; } @@ -116,6 +702,10 @@ std::unordered_map DeviceProfileConnector::GetAppTrustD continue; } if (deviceIdMap.find(trustDeviceId) == deviceIdMap.end()) { + if (CheckSinkShareType(item, userId, deviceId, trustDeviceId, bindType)) { + LOGI("GetAuthFormMap CheckSinkShareType true."); + continue; + } deviceIdMap[trustDeviceId] = static_cast(bindType); continue; } @@ -123,18 +713,44 @@ std::unordered_map DeviceProfileConnector::GetAppTrustD if (bindType == authForm) { continue; } - if (bindType == DmAuthForm::IDENTICAL_ACCOUNT) { + uint32_t highestBindType = CheckBindType(trustDeviceId, deviceId); + if (highestBindType == IDENTICAL_ACCOUNT_TYPE) { deviceIdMap[trustDeviceId] = DmAuthForm::IDENTICAL_ACCOUNT; continue; - } - if (bindType == DmAuthForm::PEER_TO_PEER && authForm == DmAuthForm::ACROSS_ACCOUNT) { + } else if (highestBindType == SHARE_TYPE) { + if (CheckSinkShareType(item, userId, deviceId, trustDeviceId, DmAuthForm::SHARE)) { + continue; + } + deviceIdMap[trustDeviceId] = DmAuthForm::SHARE; + continue; + } else if (highestBindType == DEVICE_PEER_TO_PEER_TYPE || highestBindType == APP_PEER_TO_PEER_TYPE || + highestBindType == SERVICE_PEER_TO_PEER_TYPE) { deviceIdMap[trustDeviceId] = DmAuthForm::PEER_TO_PEER; continue; + } else if (highestBindType == APP_ACROSS_ACCOUNT_TYPE || + highestBindType == DEVICE_ACROSS_ACCOUNT_TYPE || highestBindType == SERVICE_ACROSS_ACCOUNT_TYPE) { + deviceIdMap[trustDeviceId] = DmAuthForm::ACROSS_ACCOUNT; + continue; + } else { + LOGE("GetAuthFormMap highestBindType match failed."); + continue; } } return deviceIdMap; } +bool DeviceProfileConnector::CheckSinkShareType(const DistributedDeviceProfile::AccessControlProfile &profile, + const int32_t &userId, const std::string &deviceId, const std::string &trustDeviceId, const int32_t &bindType) +{ + if (profile.GetAccessee().GetAccesseeUserId() == userId && + profile.GetAccessee().GetAccesseeDeviceId() == deviceId && + profile.GetAccesser().GetAccesserDeviceId() == trustDeviceId && + bindType == DmAuthForm::SHARE) { + return true; + } + return false; +} + int32_t DeviceProfileConnector::GetDeviceAclParam(DmDiscoveryInfo discoveryInfo, bool &isOnline, int32_t &authForm) { std::vector profiles = GetAccessControlProfileByUserId(discoveryInfo.userId); @@ -145,7 +761,7 @@ int32_t DeviceProfileConnector::GetDeviceAclParam(DmDiscoveryInfo discoveryInfo, LOGE("get deviceIdHash by deviceId: %{public}s failed.", GetAnonyString(deviceIdHash).c_str()); continue; } - if (static_cast(deviceIdHash) != discoveryInfo.remoteDeviceIdHash || + if (IsLnnAcl(item) || static_cast(deviceIdHash) != discoveryInfo.remoteDeviceIdHash || (discoveryInfo.localDeviceId == item.GetAccesser().GetAccesserDeviceId() && discoveryInfo.userId != item.GetAccesser().GetAccesserUserId()) || (discoveryInfo.localDeviceId == item.GetAccessee().GetAccesseeDeviceId() && @@ -183,10 +799,14 @@ int32_t DeviceProfileConnector::GetDeviceAclParam(DmDiscoveryInfo discoveryInfo, int32_t DeviceProfileConnector::CheckAuthForm(DmAuthForm form, AccessControlProfile profiles, DmDiscoveryInfo discoveryInfo) { - if (profiles.GetBindLevel() == DEVICE || (profiles.GetBindLevel() == APP && discoveryInfo.pkgname == "")) { + if (IsLnnAcl(profiles)) { + return DmAuthForm::INVALID_TYPE; + } + if (profiles.GetBindLevel() == USER || ((profiles.GetBindLevel() == APP || profiles.GetBindLevel() == SERVICE) && + discoveryInfo.pkgname == "")) { return form; } - if (profiles.GetBindLevel() == APP) { + if (profiles.GetBindLevel() == APP || profiles.GetBindLevel() == SERVICE) { if (discoveryInfo.pkgname == profiles.GetAccesser().GetAccesserBundleName() && discoveryInfo.localDeviceId == profiles.GetAccesser().GetAccesserDeviceId()) { return form; @@ -208,19 +828,23 @@ int32_t DeviceProfileConnector::HandleDmAuthForm(AccessControlProfile profiles, return CheckAuthForm(DmAuthForm::PEER_TO_PEER, profiles, discoveryInfo); } if (profiles.GetBindType() == DM_ACROSS_ACCOUNT) { - return CheckAuthForm(DmAuthForm::ACROSS_ACCOUNT, profiles, discoveryInfo); + return CheckAuthForm(DmAuthForm::PEER_TO_PEER, profiles, discoveryInfo); + } + if (profiles.GetBindType() == DM_SHARE) { + return CheckAuthForm(DmAuthForm::SHARE, profiles, discoveryInfo); } return DmAuthForm::INVALID_TYPE; } -uint32_t DeviceProfileConnector::CheckBindType(std::string peerUdid, std::string localUdid) +DM_EXPORT uint32_t DeviceProfileConnector::CheckBindType(std::string peerUdid, + std::string localUdid) { std::vector filterProfiles = GetAclProfileByUserId(localUdid, MultipleUserConnector::GetFirstForegroundUserId(), peerUdid); LOGI("filterProfiles size is %{public}zu", filterProfiles.size()); uint32_t highestPriority = INVALIED_TYPE; for (auto &item : filterProfiles) { - if (peerUdid != item.GetTrustDeviceId()) { + if (IsLnnAcl(item) || peerUdid != item.GetTrustDeviceId()) { continue; } uint32_t priority = static_cast(GetAuthForm(item, peerUdid, localUdid)); @@ -238,21 +862,33 @@ int32_t DeviceProfileConnector::GetAuthForm(DistributedDeviceProfile::AccessCont profiles.GetBindType(), profiles.GetBindLevel()); uint32_t priority = INVALIED_TYPE; uint32_t bindType = profiles.GetBindType(); + switch (bindType) { case DM_IDENTICAL_ACCOUNT: priority = IDENTICAL_ACCOUNT_TYPE; break; + case DM_SHARE: + priority = SHARE_TYPE; + break; case DM_POINT_TO_POINT: - if (profiles.GetBindLevel() == DEVICE) { + if (profiles.GetBindLevel() == USER) { priority = DEVICE_PEER_TO_PEER_TYPE; - } else if (profiles.GetBindLevel() == APP) { + } + if (profiles.GetBindLevel() == SERVICE) { + priority = SERVICE_PEER_TO_PEER_TYPE; + } + if (profiles.GetBindLevel() == APP) { priority = APP_PEER_TO_PEER_TYPE; } break; case DM_ACROSS_ACCOUNT: - if (profiles.GetBindLevel() == DEVICE) { + if (profiles.GetBindLevel() == USER) { priority = DEVICE_ACROSS_ACCOUNT_TYPE; - } else if (profiles.GetBindLevel() == APP) { + } + if (profiles.GetBindLevel() == SERVICE) { + priority = SERVICE_ACROSS_ACCOUNT_TYPE; + } + if (profiles.GetBindLevel() == APP) { priority = APP_ACROSS_ACCOUNT_TYPE; } break; @@ -263,8 +899,8 @@ int32_t DeviceProfileConnector::GetAuthForm(DistributedDeviceProfile::AccessCont return priority; } -std::vector DeviceProfileConnector::GetBindTypeByPkgName(std::string pkgName, std::string requestDeviceId, - std::string trustUdid) +DM_EXPORT std::vector DeviceProfileConnector::GetBindTypeByPkgName( + std::string pkgName, std::string requestDeviceId, std::string trustUdid) { LOGI("Start requestDeviceId %{public}s, trustUdid %{public}s.", GetAnonyString(requestDeviceId).c_str(), GetAnonyString(trustUdid).c_str()); @@ -277,7 +913,7 @@ std::vector DeviceProfileConnector::GetBindTypeByPkgName(std::string pk GetAccessControlProfileByUserId(MultipleUserConnector::GetFirstForegroundUserId()); LOGI("AccessControlProfile size is %{public}zu", profiles.size()); for (auto &item : profiles) { - if (trustUdid != item.GetTrustDeviceId() || item.GetStatus() != ACTIVE) { + if (IsLnnAcl(item) || trustUdid != item.GetTrustDeviceId() || item.GetStatus() != ACTIVE) { continue; } GetParamBindTypeVec(item, requestDeviceId, bindTypeVec, trustUdid); @@ -285,10 +921,12 @@ std::vector DeviceProfileConnector::GetBindTypeByPkgName(std::string pk return bindTypeVec; } -uint64_t DeviceProfileConnector::GetTokenIdByNameAndDeviceId(std::string pkgName, std::string requestDeviceId) +DM_EXPORT uint64_t DeviceProfileConnector::GetTokenIdByNameAndDeviceId(std::string extra, std::string requestDeviceId) { - std::vector profiles = GetAccessControlProfile(); uint64_t peerTokenId = 0; + std::string pkgName = ""; + ParseExtra(extra, peerTokenId, pkgName); + std::vector profiles = GetAccessControlProfile(); for (auto &item : profiles) { if (item.GetAccesser().GetAccesserBundleName() == pkgName && item.GetAccesser().GetAccesserDeviceId() == requestDeviceId) { @@ -320,7 +958,7 @@ void DeviceProfileConnector::GetParamBindTypeVec(AccessControlProfile profile, s bindTypeVec.push_back(IDENTICAL_ACCOUNT_TYPE); break; case DM_POINT_TO_POINT: - if (profile.GetBindLevel() == DEVICE) { + if (profile.GetBindLevel() == USER) { bindTypeVec.push_back(DEVICE_PEER_TO_PEER_TYPE); } if (profile.GetBindLevel() == APP) { @@ -328,7 +966,7 @@ void DeviceProfileConnector::GetParamBindTypeVec(AccessControlProfile profile, s } break; case DM_ACROSS_ACCOUNT: - if (profile.GetBindLevel() == DEVICE) { + if (profile.GetBindLevel() == USER) { bindTypeVec.push_back(DEVICE_ACROSS_ACCOUNT_TYPE); } if (profile.GetBindLevel() == APP) { @@ -346,7 +984,8 @@ std::vector DeviceProfileConnector::CompareBindType(std::vector bindTypeIndex; for (uint32_t index = 0; index < profiles.size(); index++) { - if (profiles[index].GetTrustDeviceId() != targetDeviceId || profiles[index].GetStatus() != ACTIVE) { + if (IsLnnAcl(profiles[index]) || profiles[index].GetTrustDeviceId() != targetDeviceId || + profiles[index].GetStatus() != ACTIVE) { continue; } DmDiscoveryInfo paramInfo = { @@ -366,7 +1005,7 @@ void DeviceProfileConnector::ProcessBindType(AccessControlProfile profiles, std: bindTypeIndex.push_back(index); } if (profiles.GetBindType() == DM_POINT_TO_POINT) { - if (profiles.GetBindLevel() == DEVICE) { + if (profiles.GetBindLevel() == USER) { sinkBindType.push_back(DEVICE_PEER_TO_PEER_TYPE); bindTypeIndex.push_back(index); } @@ -384,7 +1023,7 @@ void DeviceProfileConnector::ProcessBindType(AccessControlProfile profiles, std: } } if (profiles.GetBindType() == DM_ACROSS_ACCOUNT) { - if (profiles.GetBindLevel() == DEVICE) { + if (profiles.GetBindLevel() == USER) { sinkBindType.push_back(DEVICE_ACROSS_ACCOUNT_TYPE); bindTypeIndex.push_back(index); } @@ -403,8 +1042,8 @@ void DeviceProfileConnector::ProcessBindType(AccessControlProfile profiles, std: } } -std::vector DeviceProfileConnector::SyncAclByBindType(std::string pkgName, std::vector bindTypeVec, - std::string localDeviceId, std::string targetDeviceId) +DM_EXPORT std::vector DeviceProfileConnector::SyncAclByBindType( + std::string pkgName, std::vector bindTypeVec, std::string localDeviceId, std::string targetDeviceId) { std::vector profiles = GetAccessControlProfileByUserId(MultipleUserConnector::GetFirstForegroundUserId()); @@ -431,6 +1070,8 @@ std::vector DeviceProfileConnector::SyncAclByBindType(std::string pkgNa return bindType; } + +DM_EXPORT std::vector DeviceProfileConnector::GetProcessInfoFromAclByUserId( const std::string &localDeviceId, const std::string &targetDeviceId, int32_t userId) { @@ -439,7 +1080,7 @@ std::vector DeviceProfileConnector::GetP LOGI("filterProfiles size is %{public}zu", filterProfiles.size()); std::vector processInfoVec; for (auto &item : filterProfiles) { - if (item.GetTrustDeviceId() != targetDeviceId) { + if (IsLnnAcl(item) || item.GetTrustDeviceId() != targetDeviceId) { continue; } std::string accesserUdid = item.GetAccesser().GetAccesserDeviceId(); @@ -495,12 +1136,13 @@ int32_t DeviceProfileConnector::PutAccessControlList(DmAclInfo aclInfo, DmAccess return ret; } -bool DeviceProfileConnector::DeleteAclForAccountLogOut(const std::string &localUdid, int32_t localUserId, - const std::string &peerUdid, int32_t peerUserId) +DM_EXPORT bool DeviceProfileConnector::DeleteAclForAccountLogOut( + const std::string &localUdid, int32_t localUserId, + const std::string &peerUdid, int32_t peerUserId, DmOfflineParam &offlineParam) { LOGI("localUdid %{public}s, localUserId %{public}d, peerUdid %{public}s, peerUserId %{public}d.", GetAnonyString(localUdid).c_str(), localUserId, GetAnonyString(peerUdid).c_str(), peerUserId); - std::vector profiles = GetAllAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); std::vector deleteProfiles; bool notifyOffline = false; bool isDelete = false; @@ -519,6 +1161,7 @@ bool DeviceProfileConnector::DeleteAclForAccountLogOut(const std::string &localU } deleteProfiles.push_back(item); notifyOffline = (item.GetStatus() == ACTIVE); + CacheAcerAclId(item, offlineParam.needDelAclInfos); continue; } if (accesserUdid == peerUdid && accesserUserId == peerUserId && @@ -528,60 +1171,75 @@ bool DeviceProfileConnector::DeleteAclForAccountLogOut(const std::string &localU } deleteProfiles.push_back(item); notifyOffline = (item.GetStatus() == ACTIVE); + CacheAceeAclId(item, offlineParam.needDelAclInfos); continue; } } if (!isDelete) { return false; } - for (const auto &item : deleteProfiles) { - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); - } return notifyOffline; } -void DeviceProfileConnector::DeleteAclForUserRemoved(std::string localUdid, int32_t userId) + +DM_EXPORT void DeviceProfileConnector::DeleteAclForUserRemoved(std::string localUdid, int32_t userId, + std::vector peerUdids, std::multimap &peerUserIdMap, + DmOfflineParam &offlineParam) { LOGI("localUdid %{public}s, userId %{public}d.", GetAnonyString(localUdid).c_str(), userId); - std::vector profiles = GetAccessControlProfileByUserId(userId); + std::vector profiles = GetAllAclIncludeLnnAcl(); for (const auto &item : profiles) { + if (find(peerUdids.begin(), peerUdids.end(), item.GetTrustDeviceId()) == peerUdids.end()) { + continue; + } std::string accesserUdid = item.GetAccesser().GetAccesserDeviceId(); std::string accesseeUdid = item.GetAccessee().GetAccesseeDeviceId(); int32_t accesserUserId = item.GetAccesser().GetAccesserUserId(); int32_t accesseeUserId = item.GetAccessee().GetAccesseeUserId(); - if ((accesserUdid == localUdid && accesserUserId == userId) || - (accesseeUdid == localUdid && accesseeUserId == userId)) { - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); + if (accesserUdid == localUdid && accesserUserId == userId) { + if (!IsValueExist(peerUserIdMap, accesseeUdid, accesseeUserId)) { + peerUserIdMap.insert(std::pair(accesseeUdid, accesseeUserId)); + } + CacheAcerAclId(item, offlineParam.needDelAclInfos); + continue; + } + if (accesseeUdid == localUdid && accesseeUserId == userId) { + if (!IsValueExist(peerUserIdMap, accesserUdid, accesserUserId)) { + peerUserIdMap.insert(std::pair(accesserUdid, accesserUserId)); + } + CacheAceeAclId(item, offlineParam.needDelAclInfos); + continue; } } } -void DeviceProfileConnector::DeleteAclForRemoteUserRemoved(std::string peerUdid, int32_t peerUserId, - std::vector &userIds) + +DM_EXPORT void DeviceProfileConnector::DeleteAclForRemoteUserRemoved( + std::string peerUdid, int32_t peerUserId, std::vector &userIds, DmOfflineParam &offlineParam) { LOGI("peerUdid %{public}s, peerUserId %{public}d.", GetAnonyString(peerUdid).c_str(), peerUserId); - std::vector profiles = GetAccessControlProfileByUserId(peerUserId); + std::vector profiles = GetAllAclIncludeLnnAcl(); for (const auto &item : profiles) { std::string accesserUdid = item.GetAccesser().GetAccesserDeviceId(); std::string accesseeUdid = item.GetAccessee().GetAccesseeDeviceId(); int32_t accesserUserId = item.GetAccesser().GetAccesserUserId(); int32_t accesseeUserId = item.GetAccessee().GetAccesseeUserId(); if (accesserUdid == peerUdid && accesserUserId == peerUserId) { - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); - if (item.GetBindLevel() == DEVICE) { + if (item.GetBindLevel() == USER) { userIds.push_back(accesseeUserId); } + CacheAceeAclId(item, offlineParam.needDelAclInfos); } if (accesseeUdid == peerUdid && accesseeUserId == peerUserId) { - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); - if (item.GetBindLevel() == DEVICE) { + if (item.GetBindLevel() == USER) { userIds.push_back(accesserUserId); } + CacheAcerAclId(item, offlineParam.needDelAclInfos); } } } -void DeviceProfileConnector::DeleteAccessControlList(const std::string &udid) +DM_EXPORT void DeviceProfileConnector::DeleteAccessControlList(const std::string &udid) { LOGI("Udid: %{public}s.", GetAnonyString(udid).c_str()); if (udid.empty()) { @@ -605,7 +1263,7 @@ DmOfflineParam DeviceProfileConnector::DeleteAccessControlList(const std::string pkgName.c_str(), GetAnonyString(localDeviceId).c_str(), GetAnonyString(remoteDeviceId).c_str(), bindLevel); DmOfflineParam offlineParam; offlineParam.bindType = INVALIED_TYPE; - if (static_cast(bindLevel) > APP || static_cast(bindLevel) < DEVICE) { + if (static_cast(bindLevel) > APP || static_cast(bindLevel) < USER) { LOGE("Invalied bindlevel."); return offlineParam; } @@ -626,7 +1284,7 @@ DmOfflineParam DeviceProfileConnector::DeleteAccessControlList(const std::string case SERVICE: DeleteServiceBindLevel(offlineParam, pkgName, profiles, localDeviceId, remoteDeviceId); break; - case DEVICE: + case USER: DeleteDeviceBindLevel(offlineParam, profiles, localDeviceId, remoteDeviceId); break; default: @@ -656,6 +1314,7 @@ void DeviceProfileConnector::DeleteAppBindLevel(DmOfflineParam &offlineParam, co processInfo.pkgName = item.GetAccesser().GetAccesserBundleName(); processInfo.userId = item.GetAccesser().GetAccesserUserId(); offlineParam.processVec.push_back(processInfo); + offlineParam.peerUserId = item.GetAccessee().GetAccesseeUserId(); LOGI("Src delete acl pkgName %{public}s, bindType %{public}d, localUdid %{public}s, remoteUdid %{public}s", pkgName.c_str(), item.GetBindType(), GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); @@ -671,7 +1330,8 @@ void DeviceProfileConnector::DeleteAppBindLevel(DmOfflineParam &offlineParam, co processInfo.pkgName = item.GetAccessee().GetAccesseeBundleName(); processInfo.userId = item.GetAccessee().GetAccesseeUserId(); offlineParam.processVec.push_back(processInfo); - LOGI("Sink delete acl pkgName %{public}s, bindType %{public}d, localUdid %{public}s, remoteUdid %{public}s", + offlineParam.peerUserId = item.GetAccesser().GetAccesserUserId(); + LOGI("Sink delete acl pkgName %{public}s, bindType %{public}u, localUdid %{public}s, remoteUdid %{public}s", pkgName.c_str(), item.GetBindType(), GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); continue; @@ -687,7 +1347,9 @@ void DeviceProfileConnector::DeleteAppBindLevel(DmOfflineParam &offlineParam, co LOGI("DeviceProfileConnector::DeleteAppBindLevel extra %{public}s", extra.c_str()); int32_t bindNums = 0; int32_t deleteNums = 0; - std::string peerBundleName = extra; + uint64_t peerTokenId = 0; + std::string peerBundleName; + ParseExtra(extra, peerTokenId, peerBundleName); for (auto &item : profiles) { if (item.GetTrustDeviceId() != remoteUdid || item.GetBindType() == DM_IDENTICAL_ACCOUNT || item.GetBindLevel() != APP) { @@ -705,6 +1367,7 @@ void DeviceProfileConnector::DeleteAppBindLevel(DmOfflineParam &offlineParam, co processInfo.pkgName = item.GetAccesser().GetAccesserBundleName(); processInfo.userId = item.GetAccesser().GetAccesserUserId(); offlineParam.processVec.push_back(processInfo); + offlineParam.peerUserId = item.GetAccessee().GetAccesseeUserId(); LOGI("Src delete acl pkgName %{public}s, bindType %{public}d, localUdid %{public}s, remoteUdid %{public}s", pkgName.c_str(), item.GetBindType(), GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); @@ -721,7 +1384,8 @@ void DeviceProfileConnector::DeleteAppBindLevel(DmOfflineParam &offlineParam, co processInfo.pkgName = item.GetAccessee().GetAccesseeBundleName(); processInfo.userId = item.GetAccessee().GetAccesseeUserId(); offlineParam.processVec.push_back(processInfo); - LOGI("Sink delete acl pkgName %{public}s, bindType %{public}d, localUdid %{public}s, remoteUdid %{public}s", + offlineParam.peerUserId = item.GetAccesser().GetAccesserUserId(); + LOGI("Sink delete acl pkgName %{public}s, bindType %{public}u, localUdid %{public}s, remoteUdid %{public}s", pkgName.c_str(), item.GetBindType(), GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); continue; @@ -744,7 +1408,7 @@ void DeviceProfileConnector::DeleteDeviceBindLevel(DmOfflineParam &offlineParam, item.GetAccessee().GetAccesseeDeviceId() == remoteUdid) { DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); deleteNums++; - offlineParam.bindType = DEVICE; + offlineParam.bindType = USER; LOGI("Src delete acl bindType %{public}d, localUdid %{public}s, remoteUdid %{public}s", item.GetBindType(), GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); continue; @@ -753,8 +1417,8 @@ void DeviceProfileConnector::DeleteDeviceBindLevel(DmOfflineParam &offlineParam, item.GetAccesser().GetAccesserDeviceId() == remoteUdid) { DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); deleteNums++; - offlineParam.bindType = DEVICE; - LOGI("Sink delete acl bindType %{public}d, localUdid %{public}s, remoteUdid %{public}s", item.GetBindType(), + offlineParam.bindType = USER; + LOGI("Sink delete acl bindType %{public}u, localUdid %{public}s, remoteUdid %{public}s", item.GetBindType(), GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); continue; } @@ -790,7 +1454,7 @@ void DeviceProfileConnector::DeleteServiceBindLevel(DmOfflineParam &offlineParam DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); deleteNums++; offlineParam.bindType = SERVICE; - LOGI("Sink delete acl pkgName %{public}s, bindType %{public}d, localUdid %{public}s, remoteUdid %{public}s", + LOGI("Sink delete acl pkgName %{public}s, bindType %{public}u, localUdid %{public}s, remoteUdid %{public}s", pkgName.c_str(), item.GetBindType(), GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); continue; @@ -823,13 +1487,14 @@ int32_t DeviceProfileConnector::UpdateAccessControlList(int32_t userId, std::str return DM_OK; } -bool DeviceProfileConnector::CheckSrcDevIdInAclForDevBind(const std::string &pkgName, const std::string &deviceId) +DM_EXPORT bool DeviceProfileConnector::CheckSrcDevIdInAclForDevBind( + const std::string &pkgName, const std::string &deviceId) { std::vector profiles = GetAccessControlProfile(); LOGI("AccessControlProfile size is %{public}zu", profiles.size()); for (auto &item : profiles) { if (item.GetTrustDeviceId() == deviceId && item.GetStatus() == ACTIVE && - item.GetBindLevel() == DEVICE && (item.GetAccessee().GetAccesseeBundleName() == pkgName || + item.GetBindLevel() == USER && (item.GetAccessee().GetAccesseeBundleName() == pkgName || item.GetAccesser().GetAccesserBundleName() == "") && item.GetAccessee().GetAccesseeUserId() == 0 && item.GetAccessee().GetAccesseeAccountId() == "") { return true; @@ -844,7 +1509,7 @@ bool DeviceProfileConnector::CheckSinkDevIdInAclForDevBind(const std::string &pk LOGI("AccessControlProfile size is %{public}zu", profiles.size()); for (auto &item : profiles) { if (item.GetTrustDeviceId() == deviceId && item.GetStatus() == ACTIVE && - item.GetBindLevel() == DEVICE && (item.GetAccesser().GetAccesserBundleName() == pkgName || + item.GetBindLevel() == USER && (item.GetAccesser().GetAccesserBundleName() == pkgName || item.GetAccesser().GetAccesserBundleName() == "") && item.GetAccesser().GetAccesserUserId() == 0 && item.GetAccesser().GetAccesserAccountId() == "") { return true; @@ -858,25 +1523,70 @@ bool DeviceProfileConnector::CheckDevIdInAclForDevBind(const std::string &pkgNam return (CheckSinkDevIdInAclForDevBind(pkgName, deviceId) || CheckSrcDevIdInAclForDevBind(pkgName, deviceId)); } -uint32_t DeviceProfileConnector::DeleteTimeOutAcl(const std::string &deviceId) + +DM_EXPORT uint32_t DeviceProfileConnector::DeleteTimeOutAcl(const std::string &deviceId, DmOfflineParam &offlineParam) { - std::vector profiles = GetAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); LOGI("AccessControlProfile size is %{public}zu", profiles.size()); uint32_t res = 0; + int32_t currentUserId = MultipleUserConnector::GetCurrentAccountUserID(); + std::string localUdid = GetLocalDeviceId(); + DmAclIdParam dmAclIdParam; for (auto &item : profiles) { if (item.GetTrustDeviceId() != deviceId || item.GetStatus() != ACTIVE) { continue; } - res++; + if (CacheLnnAcl(item, localUdid, dmAclIdParam)) { + continue; + } + res++; + std::string accesserUdid = item.GetAccesser().GetAccesserDeviceId(); + std::string accesseeUdid = item.GetAccessee().GetAccesseeDeviceId(); + int32_t accesserUserId = item.GetAccesser().GetAccesserUserId(); + int32_t accesseeUserId = item.GetAccessee().GetAccesseeUserId(); if (item.GetAuthenticationType() == ALLOW_AUTH_ONCE) { res--; - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); + if (accesserUserId == currentUserId && accesserUdid == localUdid && accesseeUdid == deviceId) { + CacheAcerAclId(item, offlineParam.needDelAclInfos); + offlineParam.peerUserId = item.GetAccessee().GetAccesseeUserId(); + } + if (accesseeUserId == currentUserId && accesseeUdid == localUdid && accesserUdid == deviceId) { + CacheAceeAclId(item, offlineParam.needDelAclInfos); + offlineParam.peerUserId = item.GetAccesser().GetAccesserUserId(); + } } } + if (res == 0) { + offlineParam.needDelAclInfos.push_back(dmAclIdParam); + } return res; } -int32_t DeviceProfileConnector::GetTrustNumber(const std::string &deviceId) + +bool DeviceProfileConnector::CacheLnnAcl(AccessControlProfile profile, const std::string &localUdid, + DmAclIdParam &dmAclIdParam) +{ + if (IsLnnAcl(profile)) { + if (profile.GetAccesser().GetAccesserDeviceId() == localUdid) { + dmAclIdParam.udid = profile.GetAccesser().GetAccesserDeviceId(); + dmAclIdParam.userId = profile.GetAccesser().GetAccesserUserId(); + dmAclIdParam.skId = profile.GetAccesser().GetAccesserSessionKeyId(); + dmAclIdParam.credId = profile.GetAccesser().GetAccesserCredentialIdStr(); + dmAclIdParam.accessControlId = profile.GetAccessControlId(); + } + if (profile.GetAccessee().GetAccesseeDeviceId() == localUdid) { + dmAclIdParam.udid = profile.GetAccessee().GetAccesseeDeviceId(); + dmAclIdParam.userId = profile.GetAccessee().GetAccesseeUserId(); + dmAclIdParam.skId = profile.GetAccessee().GetAccesseeSessionKeyId(); + dmAclIdParam.credId = profile.GetAccessee().GetAccesseeCredentialIdStr(); + dmAclIdParam.accessControlId = profile.GetAccessControlId(); + } + return true; + } + return false; +} + +DM_EXPORT int32_t DeviceProfileConnector::GetTrustNumber(const std::string &deviceId) { std::vector profiles = GetAccessControlProfile(); LOGI("AccessControlProfile size is %{public}zu", profiles.size()); @@ -889,12 +1599,12 @@ int32_t DeviceProfileConnector::GetTrustNumber(const std::string &deviceId) return trustNumber; } -int32_t DeviceProfileConnector::IsSameAccount(const std::string &udid) +DM_EXPORT int32_t DeviceProfileConnector::IsSameAccount(const std::string &udid) { std::vector profiles = GetAccessControlProfile(); for (auto &item : profiles) { if (item.GetTrustDeviceId() == udid && item.GetStatus() == ACTIVE) { - if (item.GetBindType() == DM_IDENTICAL_ACCOUNT) { // 同账号 + if (item.GetBindType() == DM_IDENTICAL_ACCOUNT) { LOGI("The udid %{public}s is identical bind.", GetAnonyString(udid).c_str()); return DM_OK; } @@ -903,6 +1613,24 @@ int32_t DeviceProfileConnector::IsSameAccount(const std::string &udid) return ERR_DM_FAILED; } +DM_EXPORT int32_t DeviceProfileConnector::CheckIsSameAccountByUdidHash(const std::string &udidHash) +{ + if (udidHash.empty()) { + LOGE("udidHash is empty!"); + return ERR_DM_INPUT_PARA_INVALID; + } + std::vector profiles = GetAccessControlProfile(); + for (auto &item : profiles) { + if (Crypto::GetUdidHash(item.GetTrustDeviceId()) == udidHash) { + if (item.GetBindType() == DM_IDENTICAL_ACCOUNT) { + LOGI("The udidHash %{public}s is identical bind.", GetAnonyString(udidHash).c_str()); + return DM_OK; + } + } + } + return ERR_DM_VERIFY_SAME_ACCOUNT_FAILED; +} + bool checkAccesserACL(AccessControlProfile& profile, const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) { @@ -961,11 +1689,16 @@ std::vector GetACLByDeviceIdAndUserId(std::vector(caller.tokenId), GetAnonyString(caller.accountId).c_str(), + GetAnonyString(sinkUdid).c_str(), callee.userId, callee.pkgName.c_str(), static_cast(callee.tokenId), + GetAnonyString(callee.accountId).c_str()); std::vector profiles = GetAllAccessControlProfile(); std::vector profilesFilter = GetACLByDeviceIdAndUserId(profiles, caller, srcUdid, callee, sinkUdid); @@ -975,23 +1708,6 @@ int32_t DeviceProfileConnector::CheckAccessControl(const DmAccessCaller &caller, continue; } if (SingleUserProcess(item, caller, callee)) { - return DM_OK; - } - } - return ERR_DM_FAILED; -} - -bool DeviceProfileConnector::CheckIdenticalAccount(int32_t userId, const std::string &accountId) -{ - std::vector profiles; - std::map queryParams; - queryParams[USERID] = std::to_string(userId); - queryParams[ACCOUNTID] = accountId; - if (DistributedDeviceProfileClient::GetInstance().GetAccessControlProfile(queryParams, profiles) != DM_OK) { - LOGE("DP GetAccessControlProfile failed."); - } - for (auto &item : profiles) { - if (item.GetBindType() == DM_IDENTICAL_ACCOUNT && item.GetStatus() == ACTIVE) { return true; } } @@ -1010,18 +1726,18 @@ bool DeviceProfileConnector::SingleUserProcess(const DistributedDeviceProfile::A ret = true; break; case DM_POINT_TO_POINT: - if (profile.GetBindLevel() == DEVICE || profile.GetBindLevel() == SERVICE) { + if (profile.GetBindLevel() == USER && !IsLnnAcl(profile)) { ret = true; - } else if (profile.GetBindLevel() == APP && + } else if ((profile.GetBindLevel() == APP || profile.GetBindLevel() == SERVICE) && (profile.GetAccesser().GetAccesserBundleName() == caller.pkgName || profile.GetAccessee().GetAccesseeBundleName() == caller.pkgName)) { ret = CheckAppLevelAccess(profile, caller, callee); } break; case DM_ACROSS_ACCOUNT: - if (profile.GetBindLevel() == DEVICE || profile.GetBindLevel() == SERVICE) { + if (profile.GetBindLevel() == USER && !IsLnnAcl(profile)) { ret = true; - } else if (profile.GetBindLevel() == APP && + } else if ((profile.GetBindLevel() == APP || profile.GetBindLevel() == SERVICE) && (profile.GetAccesser().GetAccesserBundleName() == caller.pkgName || profile.GetAccessee().GetAccesseeBundleName() == caller.pkgName)) { ret = CheckAppLevelAccess(profile, caller, callee); @@ -1040,10 +1756,10 @@ bool DeviceProfileConnector::CheckAppLevelAccess(const DistributedDeviceProfile: if (caller.tokenId == 0 || callee.tokenId == 0) { return true; } else { - if ((profile.GetAccesser().GetAccesserTokenId() == caller.tokenId && - profile.GetAccessee().GetAccesseeTokenId() == callee.tokenId) || - (profile.GetAccesser().GetAccesserTokenId() == callee.tokenId && - profile.GetAccessee().GetAccesseeTokenId() == caller.tokenId)) { + if ((static_cast(profile.GetAccesser().GetAccesserTokenId()) == caller.tokenId && + static_cast(profile.GetAccessee().GetAccesseeTokenId()) == callee.tokenId) || + (static_cast(profile.GetAccesser().GetAccesserTokenId()) == callee.tokenId && + static_cast(profile.GetAccessee().GetAccesseeTokenId()) == caller.tokenId)) { return true; } else { return false; @@ -1051,11 +1767,16 @@ bool DeviceProfileConnector::CheckAppLevelAccess(const DistributedDeviceProfile: } } -int32_t DeviceProfileConnector::CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, +DM_EXPORT bool DeviceProfileConnector::CheckIsSameAccount( + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) { - LOGI("DeviceProfileConnector::CheckIsSameAccount pkgName %{public}s, srcUdid %{public}s, sinkUdid %{public}s", - caller.pkgName.c_str(), GetAnonyString(srcUdid).c_str(), GetAnonyString(sinkUdid).c_str()); + LOGI("srcUdid %{public}s, srcUserId %{public}d, srcPkgName %{public}s, srcTokenId %{public}d," + "srcAccountId %{public}s, sinkUdid %{public}s, sinkUserId %{public}d, sinkPkgName %{public}s," + "sinkTokenId %{public}d, sinkAccountId %{public}s.", GetAnonyString(srcUdid).c_str(), caller.userId, + caller.pkgName.c_str(), static_cast(caller.tokenId), GetAnonyString(caller.accountId).c_str(), + GetAnonyString(sinkUdid).c_str(), callee.userId, callee.pkgName.c_str(), static_cast(callee.tokenId), + GetAnonyString(callee.accountId).c_str()); std::vector profiles = GetAllAccessControlProfile(); std::vector profilesFilter = GetACLByDeviceIdAndUserId(profiles, caller, srcUdid, callee, sinkUdid); @@ -1066,14 +1787,14 @@ int32_t DeviceProfileConnector::CheckIsSameAccount(const DmAccessCaller &caller, } if (item.GetBindType() == DM_IDENTICAL_ACCOUNT) { LOGI("The udid %{public}s is identical bind.", GetAnonyString(item.GetTrustDeviceId()).c_str()); - return DM_OK; + return true; } } - return ERR_DM_FAILED; + return false; } -int32_t DeviceProfileConnector::GetBindLevel(const std::string &pkgName, const std::string &localUdid, - const std::string &udid, uint64_t &tokenId) +DM_EXPORT int32_t DeviceProfileConnector::GetBindLevel(const std::string &pkgName, + const std::string &localUdid, const std::string &udid, uint64_t &tokenId) { LOGI("pkgName %{public}s, tokenId %{public}" PRId64", udid %{public}s.", pkgName.c_str(), tokenId, GetAnonyString(udid).c_str()); @@ -1110,6 +1831,9 @@ std::map DeviceProfileConnector::GetDeviceIdAndBindLevel(s std::vector profiles = GetAllAccessControlProfile(); std::map deviceIdMap; for (const auto &item : profiles) { + if (IsLnnAcl(item)) { + continue; + } if (find(userIds.begin(), userIds.end(), item.GetAccesser().GetAccesserUserId()) != userIds.end() && item.GetAccesser().GetAccesserDeviceId() == localUdid) { LOGI("Get Device Bind type localUdid %{public}s is src.", GetAnonyString(localUdid).c_str()); @@ -1126,8 +1850,49 @@ std::map DeviceProfileConnector::GetDeviceIdAndBindLevel(s return deviceIdMap; } -std::multimap DeviceProfileConnector::GetDeviceIdAndUserId(int32_t userId, - const std::string &accountId, const std::string &localUdid) +std::vector DeviceProfileConnector::GetDeviceIdAndUdidListByTokenId(const std::vector &userIds, + const std::string &localUdid, int32_t tokenId) +{ + if (userIds.empty() || localUdid.empty()) { + LOGE("userIds or localUdid is empty."); + return {}; + } + std::vector profiles = GetAllAccessControlProfile(); + std::map deviceIdMap; + std::vector udidList; + + for (const auto &item : profiles) { + if (IsLnnAcl(item)) { + continue; + } + + if (find(userIds.begin(), userIds.end(), item.GetAccesser().GetAccesserUserId()) != userIds.end() && + item.GetAccesser().GetAccesserDeviceId() == localUdid && + static_cast(item.GetAccesser().GetAccesserTokenId()) == tokenId) { + LOGI("Get Device Bind type localUdid %{public}s is src, tokenId %{public}s.", + GetAnonyString(localUdid).c_str(), GetAnonyInt32(tokenId).c_str()); + UpdateBindType(item.GetTrustDeviceId(), item.GetBindLevel(), deviceIdMap); + continue; + } + + if (find(userIds.begin(), userIds.end(), item.GetAccessee().GetAccesseeUserId()) != userIds.end() && + item.GetAccessee().GetAccesseeDeviceId() == localUdid && + static_cast(item.GetAccessee().GetAccesseeTokenId()) == tokenId) { + LOGI("Get Device Bind type localUdid %{public}s is sink, tokenId %{public}s.", + GetAnonyString(localUdid).c_str(), GetAnonyInt32(tokenId).c_str()); + UpdateBindType(item.GetTrustDeviceId(), item.GetBindLevel(), deviceIdMap); + continue; + } + } + + for (const auto &item : deviceIdMap) { + udidList.push_back(item.first); + } + return udidList; +} + +DM_EXPORT std::multimap DeviceProfileConnector::GetDeviceIdAndUserId( + int32_t userId, const std::string &accountId, const std::string &localUdid) { LOGI("localUdid %{public}s, userId %{public}d, accountId %{public}s.", GetAnonyString(localUdid).c_str(), userId, GetAnonyString(accountId).c_str()); @@ -1172,7 +1937,7 @@ int32_t DeviceProfileConnector::HandleAccountLogoutEvent(int32_t remoteUserId, remoteUserId, GetAnonyString(remoteAccountHash).c_str(), GetAnonyString(remoteUdid).c_str(), GetAnonyString(localUdid).c_str()); std::vector profiles = GetAccessControlProfileByUserId(remoteUserId); - int32_t bindType = DM_INVALIED_BINDTYPE; + int32_t bindType = DM_INVALIED_TYPE; for (const auto &item : profiles) { if (item.GetTrustDeviceId() != remoteUdid) { continue; @@ -1195,13 +1960,14 @@ int32_t DeviceProfileConnector::HandleAccountLogoutEvent(int32_t remoteUserId, return bindType; } -int32_t DeviceProfileConnector::HandleDevUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, - const std::string &localUdid) + +DM_EXPORT int32_t DeviceProfileConnector::HandleDevUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, + const std::string &localUdid, DmOfflineParam &offlineParam) { LOGI("RemoteUserId %{public}d, remoteUdid %{public}s, localUdid %{public}s.", remoteUserId, GetAnonyString(remoteUdid).c_str(), GetAnonyString(localUdid).c_str()); - std::vector profiles = GetAclProfileByDeviceIdAndUserId(remoteUdid, remoteUserId); - int32_t bindType = DM_INVALIED_BINDTYPE; + std::vector profiles = GetAclProfileByDeviceIdAndUserId(remoteUdid, remoteUserId, localUdid); + int32_t bindType = DM_INVALIED_TYPE; for (const auto &item : profiles) { if (item.GetTrustDeviceId() != remoteUdid) { continue; @@ -1210,87 +1976,224 @@ int32_t DeviceProfileConnector::HandleDevUnBindEvent(int32_t remoteUserId, const bindType = DM_IDENTICAL_ACCOUNT; continue; } - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); - bindType = std::min(bindType, static_cast(item.GetBindType())); + if (item.GetAccesser().GetAccesserDeviceId() == localUdid && + item.GetAccessee().GetAccesseeDeviceId() == remoteUdid) { + offlineParam.bindType = USER; + CacheAcerAclId(item, offlineParam.needDelAclInfos); + LOGI("Src delete acl bindType %{public}d, localUdid %{public}s, remoteUdid %{public}s", item.GetBindType(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); + bindType = std::min(bindType, static_cast(item.GetBindType())); + continue; + } + if (item.GetAccessee().GetAccesseeDeviceId() == localUdid && + item.GetAccesser().GetAccesserDeviceId() == remoteUdid) { + offlineParam.bindType = USER; + CacheAceeAclId(item, offlineParam.needDelAclInfos); + LOGI("Sink delete acl bindType %{public}u, localUdid %{public}s, remoteUdid %{public}s", item.GetBindType(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); + bindType = std::min(bindType, static_cast(item.GetBindType())); + continue; + } } return bindType; } -OHOS::DistributedHardware::ProcessInfo DeviceProfileConnector::HandleAppUnBindEvent(int32_t remoteUserId, + +DM_EXPORT DmOfflineParam DeviceProfileConnector::HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, const std::string &localUdid) { LOGI("RemoteUserId %{public}d, remoteUdid %{public}s, tokenId %{public}d, localUdid %{public}s.", remoteUserId, GetAnonyString(remoteUdid).c_str(), tokenId, GetAnonyString(localUdid).c_str()); - std::vector profiles = GetAccessControlProfile(); - ProcessInfo processInfo; - for (const auto &item : profiles) { - if (item.GetTrustDeviceId() != remoteUdid || item.GetBindType() == DM_IDENTICAL_ACCOUNT || - item.GetBindLevel() != APP) { + std::vector profiles = GetAclProfileByDeviceIdAndUserId(remoteUdid, remoteUserId, localUdid); + DmOfflineParam offlineParam; + if (profiles.empty()) { + LOGE("Acl is empty."); + return offlineParam; + } + for (auto &item : profiles) { + if (item.GetTrustDeviceId() != remoteUdid) { continue; } - if (item.GetAccesser().GetAccesserUserId() == remoteUserId && - item.GetAccesser().GetAccesserDeviceId() == remoteUdid && - static_cast(item.GetAccesser().GetAccesserTokenId()) == tokenId && - item.GetAccessee().GetAccesseeDeviceId() == localUdid) { - LOGI("Src device unbind."); - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); - processInfo.pkgName = item.GetAccessee().GetAccesseeBundleName(); - processInfo.userId = item.GetAccessee().GetAccesseeUserId(); + + // First, find need delete acl + if (FindTargetAcl(item, localUdid, remoteUserId, remoteUdid, tokenId, offlineParam)) { continue; } - if (item.GetAccessee().GetAccesseeUserId() == remoteUserId && - item.GetAccessee().GetAccesseeDeviceId() == remoteUdid && - static_cast(item.GetAccessee().GetAccesseeTokenId()) == tokenId && - item.GetAccesser().GetAccesserDeviceId() == localUdid) { - LOGI("Sink device unbind."); - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); - processInfo.pkgName = item.GetAccesser().GetAccesserBundleName(); - processInfo.userId = item.GetAccesser().GetAccesserUserId(); + + // Second, find the LNN acl + if (FindLnnAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + + // Third, find the user or sameaccount acl, dertermine if report offline + if (FindUserAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + + // Fourth, find the left service/app acl, determine if del lnn acl + if (FindLeftAcl(item, localUdid, remoteUdid, offlineParam)) { continue; } } - return processInfo; + return offlineParam; } -OHOS::DistributedHardware::ProcessInfo DeviceProfileConnector::HandleAppUnBindEvent(int32_t remoteUserId, +bool DeviceProfileConnector::FindTargetAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const int32_t remoteUserId, const std::string &remoteUdid, + const int32_t tokenId, const int32_t peerTokenId, DmOfflineParam &offlineParam) +{ + bool isMatch = false; + std::string acerDeviceId = acl.GetAccesser().GetAccesserDeviceId(); + std::string aceeDeviceId = acl.GetAccessee().GetAccesseeDeviceId(); + int32_t acerTokenId = static_cast(acl.GetAccesser().GetAccesserTokenId()); + int32_t aceeTokenId = static_cast(acl.GetAccessee().GetAccesseeTokenId()); + if (acl.GetAccesser().GetAccesserUserId() == remoteUserId && acerDeviceId == remoteUdid && + aceeDeviceId == localUdid && (acerTokenId == peerTokenId) && (aceeTokenId == tokenId)) { + ProcessInfo processInfo; + processInfo.pkgName = acl.GetAccessee().GetAccesseeBundleName(); + processInfo.userId = acl.GetAccessee().GetAccesseeUserId(); + offlineParam.processVec.push_back(processInfo); + CacheAceeAclId(acl, offlineParam.needDelAclInfos); + LOGI("Src del acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + isMatch = true; + } + if (acl.GetAccessee().GetAccesseeUserId() == remoteUserId && aceeDeviceId == remoteUdid && + acerDeviceId == localUdid && (aceeTokenId == peerTokenId) && (acerTokenId == tokenId)) { + ProcessInfo processInfo; + processInfo.pkgName = acl.GetAccesser().GetAccesserBundleName(); + processInfo.userId = acl.GetAccesser().GetAccesserUserId(); + offlineParam.processVec.push_back(processInfo); + CacheAcerAclId(acl, offlineParam.needDelAclInfos); + LOGI("Sink del acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + isMatch = true; + } + return isMatch; +} + +DM_EXPORT DmOfflineParam DeviceProfileConnector::HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, const std::string &localUdid, int32_t peerTokenId) { LOGI("RemoteUserId %{public}d, remoteUdid %{public}s, tokenId %{public}d, localUdid %{public}s.", remoteUserId, GetAnonyString(remoteUdid).c_str(), tokenId, GetAnonyString(localUdid).c_str()); - std::vector profiles = GetAccessControlProfile(); - ProcessInfo processInfo; - for (const auto &item : profiles) { - if (item.GetTrustDeviceId() != remoteUdid || item.GetBindType() == DM_IDENTICAL_ACCOUNT || - item.GetBindLevel() != APP) { + std::vector profiles = GetAclProfileByDeviceIdAndUserId(remoteUdid, remoteUserId, localUdid); + DmOfflineParam offlineParam; + if (profiles.empty()) { + LOGE("Acl is empty."); + return offlineParam; + } + for (auto &item : profiles) { + if (item.GetTrustDeviceId() != remoteUdid) { continue; } - if (item.GetAccesser().GetAccesserUserId() == remoteUserId && - item.GetAccesser().GetAccesserDeviceId() == remoteUdid && - static_cast(item.GetAccesser().GetAccesserTokenId()) == tokenId && - static_cast(item.GetAccessee().GetAccesseeTokenId()) == peerTokenId && - item.GetAccessee().GetAccesseeDeviceId() == localUdid) { - LOGI("Src device unbind."); - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); - processInfo.pkgName = item.GetAccessee().GetAccesseeBundleName(); - processInfo.userId = item.GetAccessee().GetAccesseeUserId(); + + // First, find need delete acl + if (FindTargetAcl(item, localUdid, remoteUserId, remoteUdid, tokenId, peerTokenId, offlineParam)) { continue; } - if (item.GetAccessee().GetAccesseeUserId() == remoteUserId && - item.GetAccessee().GetAccesseeDeviceId() == remoteUdid && - static_cast(item.GetAccessee().GetAccesseeTokenId()) == tokenId && - static_cast(item.GetAccesser().GetAccesserTokenId()) == peerTokenId && - item.GetAccesser().GetAccesserDeviceId() == localUdid) { - LOGI("Sink device unbind."); - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); - processInfo.pkgName = item.GetAccesser().GetAccesserBundleName(); - processInfo.userId = item.GetAccesser().GetAccesserUserId(); + + // Second, find the LNN acl + if (FindLnnAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + + // Third, find the user or sameaccount acl, dertermine if report offline + if (FindUserAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + + // Fourth, find the left service/app acl, determine if del lnn acl + if (FindLeftAcl(item, localUdid, remoteUdid, offlineParam)) { continue; } } - return processInfo; + return offlineParam; } -std::vector DeviceProfileConnector::GetAllAccessControlProfile() +bool DeviceProfileConnector::FindTargetAcl(const DistributedDeviceProfile::AccessControlProfile &acl, + const std::string &localUdid, const int32_t remoteUserId, const std::string &remoteUdid, + const int32_t remoteTokenId, DmOfflineParam &offlineParam) +{ + bool isMatch = false; + if (acl.GetAccesser().GetAccesserUserId() == remoteUserId && + acl.GetAccesser().GetAccesserDeviceId() == remoteUdid && + (static_cast(acl.GetAccesser().GetAccesserTokenId()) == remoteTokenId) && + acl.GetAccessee().GetAccesseeDeviceId() == localUdid) { + ProcessInfo processInfo; + processInfo.pkgName = acl.GetAccessee().GetAccesseeBundleName(); + processInfo.userId = acl.GetAccessee().GetAccesseeUserId(); + offlineParam.processVec.push_back(processInfo); + CacheAceeAclId(acl, offlineParam.needDelAclInfos); + LOGI("Src del acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + isMatch = true; + } + + if (acl.GetAccessee().GetAccesseeUserId() == remoteUserId && + acl.GetAccessee().GetAccesseeDeviceId() == remoteUdid && + (static_cast(acl.GetAccessee().GetAccesseeTokenId()) == remoteTokenId) && + acl.GetAccesser().GetAccesserDeviceId() == localUdid) { + ProcessInfo processInfo; + processInfo.pkgName = acl.GetAccesser().GetAccesserBundleName(); + processInfo.userId = acl.GetAccesser().GetAccesserUserId(); + offlineParam.processVec.push_back(processInfo); + CacheAcerAclId(acl, offlineParam.needDelAclInfos); + LOGI("Sink del acl aclId: %{public}" PRId64 ", localUdid %{public}s, remoteUdid %{public}s" + ", bindType %{public}d, bindLevel: %{public}d", acl.GetAccessControlId(), + GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), acl.GetBindType(), + acl.GetBindLevel()); + isMatch = true; + } + return isMatch; +} + +DmOfflineParam DeviceProfileConnector::HandleServiceUnBindEvent(int32_t remoteUserId, + const std::string &remoteUdid, const std::string &localUdid, int32_t tokenId) +{ + LOGI("RemoteUserId %{public}d, remoteUdid %{public}s, tokenId %{public}d, localUdid %{public}s.", + remoteUserId, GetAnonyString(remoteUdid).c_str(), tokenId, GetAnonyString(localUdid).c_str()); + std::vector profiles = GetAclProfileByDeviceIdAndUserId(remoteUdid, remoteUserId, localUdid); + DmOfflineParam offlineParam; + if (profiles.empty()) { + LOGE("Acl is empty."); + return offlineParam; + } + for (auto &item : profiles) { + if (item.GetTrustDeviceId() != remoteUdid) { + continue; + } + + // First, find need delete acl + if (FindTargetAcl(item, localUdid, remoteUserId, remoteUdid, tokenId, offlineParam)) { + continue; + } + + // Second, find the LNN acl + if (FindLnnAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + + // Third, find the user or sameaccount acl, dertermine if report offline + if (FindUserAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + + // Fourth, find the left service/app acl, determine if del lnn acl + if (FindLeftAcl(item, localUdid, remoteUdid, offlineParam)) { + continue; + } + } + return offlineParam; +} + +DM_EXPORT std::vector DeviceProfileConnector::GetAllAccessControlProfile() { std::vector profiles; if (DistributedDeviceProfileClient::GetInstance().GetAllAccessControlProfile(profiles) != DM_OK) { @@ -1299,22 +2202,32 @@ std::vector DeviceProfileConnector::GetAllAccessControlPro return profiles; } -void DeviceProfileConnector::DeleteAccessControlById(int64_t accessControlId) +DM_EXPORT std::vector DeviceProfileConnector::GetAllAclIncludeLnnAcl() +{ + std::vector profiles; + if (DistributedDeviceProfileClient::GetInstance().GetAllAclIncludeLnnAcl(profiles) != DM_OK) { + LOGE("DP failed."); + } + return profiles; +} + +DM_EXPORT void DeviceProfileConnector::DeleteAccessControlById( + int64_t accessControlId) { DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(accessControlId); } -int32_t DeviceProfileConnector::HandleUserSwitched(const std::string &localUdid, - const std::vector &deviceVec, int32_t currentUserId, int32_t beforeUserId) +DM_EXPORT int32_t DeviceProfileConnector::HandleUserSwitched( + const std::string &localUdid, const std::vector &deviceVec, int32_t currentUserId, + int32_t beforeUserId) { if (deviceVec.empty()) { LOGI("no remote device."); return DM_OK; } - std::vector profiles = GetAllAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); std::vector activeProfiles; std::vector inActiveProfiles; - std::vector delActiveProfiles; for (auto &item : profiles) { if (std::find(deviceVec.begin(), deviceVec.end(), item.GetTrustDeviceId()) == deviceVec.end()) { continue; @@ -1327,9 +2240,6 @@ int32_t DeviceProfileConnector::HandleUserSwitched(const std::string &localUdid, item.SetStatus(INACTIVE); inActiveProfiles.push_back(item); } - if (item.GetBindType() != DM_IDENTICAL_ACCOUNT) { - delActiveProfiles.push_back(item); - } continue; } if ((item.GetAccesser().GetAccesserDeviceId() == localUdid && @@ -1341,20 +2251,18 @@ int32_t DeviceProfileConnector::HandleUserSwitched(const std::string &localUdid, continue; } } - HandleUserSwitched(activeProfiles, inActiveProfiles, delActiveProfiles); + HandleUserSwitched(activeProfiles, inActiveProfiles); return DM_OK; } -void DeviceProfileConnector::HandleUserSwitched(const std::vector &activeProfiles, - const std::vector &inActiveProfiles, - const std::vector &delActiveProfiles) +DM_EXPORT void DeviceProfileConnector::HandleUserSwitched( + const std::vector &activeProfiles, + const std::vector &inActiveProfiles) { for (auto &item : inActiveProfiles) { DistributedDeviceProfileClient::GetInstance().UpdateAccessControlProfile(item); } - for (auto &item : delActiveProfiles) { - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(item.GetAccessControlId()); - } + for (auto &item : activeProfiles) { DistributedDeviceProfileClient::GetInstance().UpdateAccessControlProfile(item); } @@ -1381,12 +2289,13 @@ std::vector DeviceProfileConnector::GetAclProfileByUserId( return profilesTemp; } -void DeviceProfileConnector::HandleSyncForegroundUserIdEvent(const std::vector &remoteUserIds, - const std::string &remoteUdid, const std::vector &localUserIds, std::string &localUdid) +DM_EXPORT void DeviceProfileConnector::HandleSyncForegroundUserIdEvent( + const std::vector &remoteUserIds, const std::string &remoteUdid, + const std::vector &localUserIds, std::string &localUdid) { LOGI("localUdid %{public}s, remoteUdid %{public}s.", GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); - std::vector profiles = GetAllAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); for (auto &item : profiles) { if (item.GetAccesser().GetAccesserDeviceId() == localUdid && item.GetAccessee().GetAccesseeDeviceId() == remoteUdid && @@ -1417,6 +2326,9 @@ std::vector DeviceProfileConnector::GetOfflineProcessInfo(std::stri std::vector processInfos; int32_t bindLevel = 100; for (const auto &item : profiles) { + if (IsLnnAcl(item)) { + continue; + } ProcessInfo processInfo; std::string accesserUdid = item.GetAccesser().GetAccesserDeviceId(); std::string accesseeUdid = item.GetAccessee().GetAccesseeDeviceId(); @@ -1440,7 +2352,7 @@ std::vector DeviceProfileConnector::GetOfflineProcessInfo(std::stri processInfos.push_back(processInfo); } } - if (bindLevel == INVALIED_TYPE || bindLevel == DEVICE) { + if (bindLevel == INVALIED_TYPE || bindLevel == USER) { processInfos.clear(); for (const auto &item : localUserIds) { ProcessInfo processInfo; @@ -1452,14 +2364,17 @@ std::vector DeviceProfileConnector::GetOfflineProcessInfo(std::stri return processInfos; } -std::map DeviceProfileConnector::GetUserIdAndBindLevel(const std::string &localUdid, - const std::string &peerUdid) +DM_EXPORT std::map DeviceProfileConnector::GetUserIdAndBindLevel( + const std::string &localUdid, const std::string &peerUdid) { LOGI("localUdid %{public}s, peerUdid %{public}s.", GetAnonyString(localUdid).c_str(), GetAnonyString(peerUdid).c_str()); std::vector profiles = GetAllAccessControlProfile(); std::map userIdAndBindLevel; for (const auto &item : profiles) { + if (IsLnnAcl(item)) { + continue; + } std::string accesserUdid = item.GetAccesser().GetAccesserDeviceId(); std::string accesseeUdid = item.GetAccessee().GetAccesseeDeviceId(); int32_t accesserUserid = item.GetAccesser().GetAccesserUserId(); @@ -1483,23 +2398,25 @@ std::map DeviceProfileConnector::GetUserIdAndBindLevel(const s return userIdAndBindLevel; } -void DeviceProfileConnector::UpdateACL(std::string &localUdid, const std::vector &localUserIds, - const std::string &remoteUdid, const std::vector &remoteFrontUserIds, - const std::vector &remoteBackUserIds) +DM_EXPORT void DeviceProfileConnector::UpdateACL(std::string &localUdid, + const std::vector &localUserIds, const std::string &remoteUdid, + const std::vector &remoteFrontUserIds, const std::vector &remoteBackUserIds, + DmOfflineParam &offlineParam) { LOGI("localUdid %{public}s, remoteUdid %{public}s.", GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); - std::vector profiles = GetAllAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); for (auto item : profiles) { // deleta signal trust acl. - DeleteSigTrustACL(item, remoteUdid, remoteFrontUserIds, remoteBackUserIds); + DeleteSigTrustACL(item, remoteUdid, remoteFrontUserIds, remoteBackUserIds, offlineParam); // update identical account userId. UpdatePeerUserId(item, localUdid, localUserIds, remoteUdid, remoteFrontUserIds); } } void DeviceProfileConnector::DeleteSigTrustACL(AccessControlProfile profile, const std::string &remoteUdid, - const std::vector &remoteFrontUserIds, const std::vector &remoteBackUserIds) + const std::vector &remoteFrontUserIds, const std::vector &remoteBackUserIds, + DmOfflineParam &offlineParam) { LOGI("start."); std::string accesserUdid = profile.GetAccesser().GetAccesserDeviceId(); @@ -1509,13 +2426,13 @@ void DeviceProfileConnector::DeleteSigTrustACL(AccessControlProfile profile, con if (accesserUdid == remoteUdid && accesserUserid != 0 && accesserUserid != -1 && find(remoteFrontUserIds.begin(), remoteFrontUserIds.end(), accesserUserid) == remoteFrontUserIds.end() && find(remoteBackUserIds.begin(), remoteBackUserIds.end(), accesserUserid) == remoteBackUserIds.end()) { - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(profile.GetAccessControlId()); + CacheAcerAclId(profile, offlineParam.needDelAclInfos); return; } if (accesseeUdid == remoteUdid && accesseeUserid != 0 && accesseeUserid != -1 && find(remoteFrontUserIds.begin(), remoteFrontUserIds.end(), accesseeUserid) == remoteFrontUserIds.end() && find(remoteBackUserIds.begin(), remoteBackUserIds.end(), accesseeUserid) == remoteBackUserIds.end()) { - DistributedDeviceProfileClient::GetInstance().DeleteAccessControlProfile(profile.GetAccessControlId()); + CacheAceeAclId(profile, offlineParam.needDelAclInfos); return; } } @@ -1545,8 +2462,9 @@ void DeviceProfileConnector::UpdatePeerUserId(AccessControlProfile profile, std: } } -std::multimap DeviceProfileConnector::GetDevIdAndUserIdByActHash(const std::string &localUdid, - const std::string &peerUdid, int32_t peerUserId, const std::string &peerAccountHash) +DM_EXPORT std::multimap DeviceProfileConnector::GetDevIdAndUserIdByActHash( + const std::string &localUdid, const std::string &peerUdid, + int32_t peerUserId, const std::string &peerAccountHash) { LOGI("localUdid %{public}s, peerUdid %{public}s, peerUserId %{public}d, peerAccountHash %{public}s.", GetAnonyString(localUdid).c_str(), GetAnonyString(peerUdid).c_str(), peerUserId, peerAccountHash.c_str()); @@ -1587,8 +2505,8 @@ std::multimap DeviceProfileConnector::GetDevIdAndUserIdByA return deviceIdMap; } -std::multimap DeviceProfileConnector::GetDeviceIdAndUserId(const std::string &localUdid, - int32_t localUserId) +DM_EXPORT std::multimap DeviceProfileConnector::GetDeviceIdAndUserId( + const std::string &localUdid, int32_t localUserId) { LOGI("localUdid %{public}s, userId %{public}d.", GetAnonyString(localUdid).c_str(), localUserId); std::vector profiles = GetAllAccessControlProfile(); @@ -1614,12 +2532,13 @@ std::multimap DeviceProfileConnector::GetDeviceIdAndUserId return deviceIdMap; } -void DeviceProfileConnector::HandleSyncBackgroundUserIdEvent(const std::vector &remoteUserIds, - const std::string &remoteUdid, const std::vector &localUserIds, std::string &localUdid) +DM_EXPORT void DeviceProfileConnector::HandleSyncBackgroundUserIdEvent( + const std::vector &remoteUserIds, const std::string &remoteUdid, + const std::vector &localUserIds, std::string &localUdid) { LOGI("localUdid %{public}s, remoteUdid %{public}s.", GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str()); - std::vector profiles = GetAllAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); for (auto &item : profiles) { std::string accesserDeviceId = item.GetAccesser().GetAccesserDeviceId(); std::string accesseeDeviceId = item.GetAccessee().GetAccesseeDeviceId(); @@ -1632,9 +2551,6 @@ void DeviceProfileConnector::HandleSyncBackgroundUserIdEvent(const std::vector profiles = DeviceProfileConnector::GetInstance().GetAllAccessControlProfile(); @@ -1669,7 +2582,7 @@ void DeviceProfileConnector::HandleDeviceUnBind(int32_t bindType, const std::str } } -int32_t DeviceProfileConnector::SubscribeDeviceProfileInited( +DM_EXPORT int32_t DeviceProfileConnector::SubscribeDeviceProfileInited( sptr dpInitedCallback) { LOGI("In"); @@ -1686,7 +2599,7 @@ int32_t DeviceProfileConnector::SubscribeDeviceProfileInited( return DM_OK; } -int32_t DeviceProfileConnector::UnSubscribeDeviceProfileInited() +DM_EXPORT int32_t DeviceProfileConnector::UnSubscribeDeviceProfileInited() { LOGI("In"); int32_t ret = DistributedDeviceProfileClient::GetInstance().UnSubscribeDeviceProfileInited( @@ -1698,7 +2611,7 @@ int32_t DeviceProfileConnector::UnSubscribeDeviceProfileInited() return DM_OK; } -int32_t DeviceProfileConnector::PutAllTrustedDevices( +DM_EXPORT int32_t DeviceProfileConnector::PutAllTrustedDevices( const std::vector &deviceInfos) { LOGI("In deviceInfos.size:%{public}zu", deviceInfos.size()); @@ -1710,8 +2623,8 @@ int32_t DeviceProfileConnector::PutAllTrustedDevices( return DM_OK; } -int32_t DeviceProfileConnector::CheckDeviceInfoPermission(const std::string &localUdid, - const std::string &peerDeviceId) +DM_EXPORT int32_t DeviceProfileConnector::CheckDeviceInfoPermission( + const std::string &localUdid, const std::string &peerDeviceId) { LOGI("CheckDeviceInfoPermission Start."); int32_t localUserId = 0; @@ -1721,15 +2634,17 @@ int32_t DeviceProfileConnector::CheckDeviceInfoPermission(const std::string &loc std::string localAccountId = MultipleUserConnector::GetOhosAccountIdByUserId(localUserId); std::vector profiles = GetAccessControlProfileByUserId(localUserId); for (auto &item : profiles) { + if (IsLnnAcl(item)) { + continue; + } if (item.GetTrustDeviceId() == peerDeviceId) { - if (item.GetBindType() == DM_IDENTICAL_ACCOUNT || item.GetBindLevel() == DEVICE) { + if (item.GetBindType() == DM_IDENTICAL_ACCOUNT || item.GetBindLevel() == USER) { return DM_OK; } } int32_t profileUserId = item.GetAccesser().GetAccesserUserId(); if (item.GetAccesser().GetAccesserDeviceId() == localUdid && (profileUserId == localUserId || profileUserId == -1 || profileUserId == 0) && - item.GetAccesser().GetAccesserAccountId() == localAccountId && item.GetAccesser().GetAccesserTokenId() == localTokenId && item.GetAccessee().GetAccesseeDeviceId() == peerDeviceId) { return DM_OK; @@ -1737,7 +2652,6 @@ int32_t DeviceProfileConnector::CheckDeviceInfoPermission(const std::string &loc profileUserId = item.GetAccessee().GetAccesseeUserId(); if (item.GetAccessee().GetAccesseeDeviceId() == localUdid && (profileUserId == localUserId || profileUserId == -1 || profileUserId == 0) && - item.GetAccessee().GetAccesseeAccountId() == localAccountId && item.GetAccessee().GetAccesseeTokenId() == localTokenId && item.GetAccesser().GetAccesserDeviceId() == peerDeviceId) { return DM_OK; @@ -1804,6 +2718,8 @@ int32_t DeviceProfileConnector::UpdateLocalServiceInfo( int32_t DeviceProfileConnector::GetLocalServiceInfoByBundleNameAndPinExchangeType(const std::string &bundleName, int32_t pinExchangeType, DistributedDeviceProfile::LocalServiceInfo &localServiceInfo) { + LOGI("getLocalServiceInfo bundleName = %{public}s, pinExchangeType = %{public}d", + bundleName.c_str(), pinExchangeType); int32_t ret = DistributedDeviceProfileClient::GetInstance().GetLocalServiceInfoByBundleAndPinType(bundleName, pinExchangeType, localServiceInfo); if (ret != DM_OK) { @@ -1813,14 +2729,26 @@ int32_t DeviceProfileConnector::GetLocalServiceInfoByBundleNameAndPinExchangeTyp return DM_OK; } -int32_t DeviceProfileConnector::PutSessionKey(const std::vector &sessionKeyArray, int32_t &sessionKeyId) +int32_t DeviceProfileConnector::PutSessionKey(int32_t userId, const std::vector &sessionKeyArray, + int32_t &sessionKeyId) { if (sessionKeyArray.empty() || sessionKeyArray.size() > MAX_SESSION_KEY_LENGTH) { LOGE("SessionKey size invalid"); return ERR_DM_FAILED; } - uint32_t userId = static_cast(MultipleUserConnector::GetCurrentAccountUserID()); - int32_t ret = DistributedDeviceProfileClient::GetInstance().PutSessionKey(userId, sessionKeyArray, sessionKeyId); + int32_t ret = DistributedDeviceProfileClient::GetInstance().PutSessionKey(static_cast(userId), + sessionKeyArray, sessionKeyId); + if (ret != DM_OK) { + LOGE("failed: %{public}d", ret); + return ret; + } + return DM_OK; +} + +int32_t DeviceProfileConnector::DeleteSessionKey(int32_t userId, int32_t sessionKeyId) +{ + int32_t ret = + DistributedDeviceProfileClient::GetInstance().DeleteSessionKey(static_cast(userId), sessionKeyId); if (ret != DM_OK) { LOGE("failed: %{public}d", ret); return ret; @@ -1834,12 +2762,10 @@ bool DeviceProfileConnector::CheckAclStatusNotMatch(const DistributedDeviceProfi { if ((profile.GetAccesser().GetAccesserDeviceId() == localUdid && (find(backgroundUserIds.begin(), backgroundUserIds.end(), profile.GetAccesser().GetAccesserUserId()) != - backgroundUserIds.end()) && - (profile.GetStatus() == ACTIVE || profile.GetBindType() != DM_IDENTICAL_ACCOUNT)) || + backgroundUserIds.end()) && (profile.GetStatus() == ACTIVE)) || (profile.GetAccessee().GetAccesseeDeviceId() == localUdid && (find(backgroundUserIds.begin(), backgroundUserIds.end(), profile.GetAccessee().GetAccesseeUserId()) != - backgroundUserIds.end()) && - (profile.GetStatus() == ACTIVE || profile.GetBindType() != DM_IDENTICAL_ACCOUNT))) { + backgroundUserIds.end()) && (profile.GetStatus() == ACTIVE))) { return true; } if ((profile.GetAccesser().GetAccesserDeviceId() == localUdid && @@ -1856,7 +2782,7 @@ bool DeviceProfileConnector::CheckAclStatusNotMatch(const DistributedDeviceProfi bool DeviceProfileConnector::CheckAclStatusAndForegroundNotMatch(const std::string &localUdid, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) { - std::vector profiles = GetAllAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); LOGI("CheckAclStatusAndForegroundNotMatch profiles size is %{public}zu", profiles.size()); for (auto &item : profiles) { if (CheckAclStatusNotMatch(item, localUdid, foregroundUserIds, backgroundUserIds)) { @@ -1866,19 +2792,18 @@ bool DeviceProfileConnector::CheckAclStatusAndForegroundNotMatch(const std::stri return false; } -int32_t DeviceProfileConnector::HandleUserSwitched(const std::string &localUdid, - const std::vector &deviceVec, const std::vector &foregroundUserIds, - const std::vector &backgroundUserIds) +DM_EXPORT int32_t DeviceProfileConnector::HandleUserSwitched( + const std::string &localUdid, const std::vector &deviceVec, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) { LOGI("OnStart HandleUserSwitched"); if (deviceVec.empty()) { LOGI("no remote device."); return DM_OK; } - std::vector profiles = GetAllAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); std::vector activeProfiles; std::vector inActiveProfiles; - std::vector delActiveProfiles; for (auto &item : profiles) { if (std::find(deviceVec.begin(), deviceVec.end(), item.GetTrustDeviceId()) == deviceVec.end()) { continue; @@ -1893,9 +2818,6 @@ int32_t DeviceProfileConnector::HandleUserSwitched(const std::string &localUdid, item.SetStatus(INACTIVE); inActiveProfiles.push_back(item); } - if (item.GetBindType() != DM_IDENTICAL_ACCOUNT) { - delActiveProfiles.push_back(item); - } continue; } if ((item.GetAccesser().GetAccesserDeviceId() == localUdid && @@ -1909,13 +2831,13 @@ int32_t DeviceProfileConnector::HandleUserSwitched(const std::string &localUdid, continue; } } - HandleUserSwitched(activeProfiles, inActiveProfiles, delActiveProfiles); + HandleUserSwitched(activeProfiles, inActiveProfiles); return DM_OK; } int32_t DeviceProfileConnector::HandleUserStop(int32_t stopUserId, const std::string &stopEventUdid) { - std::vector profiles = GetAllAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); for (auto &item : profiles) { if ((item.GetAccesser().GetAccesserDeviceId() == stopEventUdid && item.GetAccesser().GetAccesserUserId() == stopUserId && item.GetStatus() == ACTIVE) || @@ -1935,7 +2857,7 @@ int32_t DeviceProfileConnector::HandleUserStop(int32_t stopUserId, const std::st LOGI("no remote device."); return DM_OK; } - std::vector profiles = GetAllAccessControlProfile(); + std::vector profiles = GetAllAclIncludeLnnAcl(); for (auto &item : profiles) { if (std::find(acceptEventUdids.begin(), acceptEventUdids.end(), item.GetTrustDeviceId()) == acceptEventUdids.end()) { @@ -1952,6 +2874,425 @@ int32_t DeviceProfileConnector::HandleUserStop(int32_t stopUserId, const std::st return DM_OK; } +DM_EXPORT bool DeviceProfileConnector::IsLnnAcl(const DistributedDeviceProfile::AccessControlProfile &profile) +{ + std::string extraData = profile.GetExtraData(); + if (extraData.empty()) { + return false; + } + + JsonObject extJson(extraData); + if (extJson.IsDiscarded() || !IsString(extJson, ACL_IS_LNN_ACL_KEY)) { + return false; + } + + std::string isLnnAclStr = extJson[ACL_IS_LNN_ACL_KEY].Get(); + std::string isLnnAclTrue = std::string(ACL_IS_LNN_ACL_VAL_TRUE); + return isLnnAclStr == isLnnAclTrue; +} + +DM_EXPORT void DeviceProfileConnector::CacheAcerAclId(const DistributedDeviceProfile::AccessControlProfile &profile, + std::vector &aclInfos) +{ + DmAclIdParam dmAclIdParam; + dmAclIdParam.udid = profile.GetAccesser().GetAccesserDeviceId(); + dmAclIdParam.userId = profile.GetAccesser().GetAccesserUserId(); + dmAclIdParam.skId = profile.GetAccesser().GetAccesserSessionKeyId(); + dmAclIdParam.credId = profile.GetAccesser().GetAccesserCredentialIdStr(); + dmAclIdParam.accessControlId = profile.GetAccessControlId(); + aclInfos.push_back(dmAclIdParam); +} + +DM_EXPORT void DeviceProfileConnector::CacheAceeAclId(const DistributedDeviceProfile::AccessControlProfile &profile, + std::vector &aclInfos) +{ + DmAclIdParam dmAclIdParam; + dmAclIdParam.udid = profile.GetAccessee().GetAccesseeDeviceId(); + dmAclIdParam.userId = profile.GetAccessee().GetAccesseeUserId(); + dmAclIdParam.skId = profile.GetAccessee().GetAccesseeSessionKeyId(); + dmAclIdParam.credId = profile.GetAccessee().GetAccesseeCredentialIdStr(); + dmAclIdParam.accessControlId = profile.GetAccessControlId(); + aclInfos.push_back(dmAclIdParam); +} + +DM_EXPORT int32_t DeviceProfileConnector::HandleAccountCommonEvent( + const std::string &localUdid, const std::vector &deviceVec, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) +{ + LOGI("HandleAccountCommonEvent start"); + if (deviceVec.empty()) { + LOGI("no remote device."); + return DM_OK; + } + std::vector profiles = GetAllAclIncludeLnnAcl(); + std::vector activeProfiles; + std::vector inActiveProfiles; + for (auto &item : profiles) { + if (std::find(deviceVec.begin(), deviceVec.end(), item.GetTrustDeviceId()) == deviceVec.end()) { + continue; + } + if ((item.GetAccesser().GetAccesserDeviceId() == localUdid && + (find(backgroundUserIds.begin(), backgroundUserIds.end(), + item.GetAccesser().GetAccesserUserId()) != backgroundUserIds.end()) && item.GetStatus() == ACTIVE) || + (item.GetAccessee().GetAccesseeDeviceId() == localUdid && + (find(backgroundUserIds.begin(), backgroundUserIds.end(), + item.GetAccessee().GetAccesseeUserId()) != backgroundUserIds.end()) && item.GetStatus() == ACTIVE)) { + item.SetStatus(INACTIVE); + inActiveProfiles.push_back(item); + continue; + } + if ((item.GetAccesser().GetAccesserDeviceId() == localUdid && + (find(foregroundUserIds.begin(), foregroundUserIds.end(), + item.GetAccesser().GetAccesserUserId()) != foregroundUserIds.end()) && item.GetStatus() == INACTIVE) || ( + item.GetAccessee().GetAccesseeDeviceId() == localUdid && + (find(foregroundUserIds.begin(), foregroundUserIds.end(), + item.GetAccessee().GetAccesseeUserId()) != foregroundUserIds.end()) && item.GetStatus() == INACTIVE)) { + item.SetStatus(ACTIVE); + activeProfiles.push_back(item); + continue; + } + } + for (auto &item : inActiveProfiles) { + DistributedDeviceProfileClient::GetInstance().UpdateAccessControlProfile(item); + } + for (auto &item : activeProfiles) { + DistributedDeviceProfileClient::GetInstance().UpdateAccessControlProfile(item); + } + return DM_OK; +} + +DM_EXPORT bool DeviceProfileConnector::CheckSrcAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + LOGI("srcUdid %{public}s, srcUserId %{public}d, srcPkgName %{public}s, srcTokenId %{public}d," + "srcAccountId %{public}s, sinkUdid %{public}s, sinkUserId %{public}d, sinkPkgName %{public}s," + "sinkTokenId %{public}d, sinkAccountId %{public}s.", GetAnonyString(srcUdid).c_str(), caller.userId, + caller.pkgName.c_str(), static_cast(caller.tokenId), GetAnonyString(caller.accountId).c_str(), + GetAnonyString(sinkUdid).c_str(), callee.userId, callee.pkgName.c_str(), static_cast(callee.tokenId), + GetAnonyString(callee.accountId).c_str()); + std::vector profiles = GetAllAccessControlProfile(); + std::string localUdid = GetLocalDeviceId(); + std::string trustUdid = (localUdid == srcUdid ? sinkUdid : srcUdid); + for (const auto &item : profiles) { + PrintProfile(item); + if (item.GetTrustDeviceId() != trustUdid || item.GetStatus() != ACTIVE) { + continue; + } + switch (item.GetBindType()) { + case DM_IDENTICAL_ACCOUNT: + if (CheckSrcAcuntAccessControl(item, caller, srcUdid, callee, sinkUdid)) { + return true; + } + break; + case DM_SHARE: + if (CheckSrcShareAccessControl(item, caller, srcUdid, callee, sinkUdid)) { + return true; + } + break; + case DM_POINT_TO_POINT: + case DM_ACROSS_ACCOUNT: + if (CheckSrcP2PAccessControl(item, caller, srcUdid, callee, sinkUdid)) { + return true; + } + break; + default: + break; + } + } + return false; +} + +bool DeviceProfileConnector::CheckSrcAcuntAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) +{ + std::string acerDeviceId = profile.GetAccesser().GetAccesserDeviceId(); + int32_t acerUserId = profile.GetAccesser().GetAccesserUserId(); + std::string acerAccountId = profile.GetAccesser().GetAccesserAccountId(); + + std::string aceeDeviceId = profile.GetAccessee().GetAccesseeDeviceId(); + int32_t aceeUserId = profile.GetAccessee().GetAccesseeUserId(); + std::string aceeAccountId = profile.GetAccessee().GetAccesseeAccountId(); + //bind type is identical account, accesser is caller, accessee is callee + if (srcUdid == acerDeviceId && caller.userId == acerUserId && caller.accountId == acerAccountId && + sinkUdid == aceeDeviceId && acerAccountId == aceeAccountId) { + return true; + } + //bind type is identical account, accessee is caller, accesser is callee + if (srcUdid == aceeDeviceId && caller.userId == aceeUserId && caller.accountId == aceeAccountId && + sinkUdid == acerDeviceId && acerAccountId == aceeAccountId) { + return true; + } + return false; +} + +bool DeviceProfileConnector::CheckSrcShareAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) +{ + std::string acerDeviceId = profile.GetAccesser().GetAccesserDeviceId(); + int32_t acerUserId = profile.GetAccesser().GetAccesserUserId(); + std::string acerAccountId = profile.GetAccesser().GetAccesserAccountId(); + + std::string aceeDeviceId = profile.GetAccessee().GetAccesseeDeviceId(); + + if (srcUdid == acerDeviceId && caller.userId == acerUserId && caller.accountId == acerAccountId && + sinkUdid == aceeDeviceId) { + return true; + } + return false; +} + +bool DeviceProfileConnector::CheckSrcP2PAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) +{ + std::string acerDeviceId = profile.GetAccesser().GetAccesserDeviceId(); + int32_t acerUserId = profile.GetAccesser().GetAccesserUserId(); + int32_t acerTokenId = static_cast(profile.GetAccesser().GetAccesserTokenId()); + std::string acerPkgName = profile.GetAccesser().GetAccesserBundleName(); + + std::string aceeDeviceId = profile.GetAccessee().GetAccesseeDeviceId(); + int32_t aceeUserId = profile.GetAccessee().GetAccesseeUserId(); + int32_t aceeTokenId = static_cast(profile.GetAccessee().GetAccesseeTokenId()); + std::string aceePkgName = profile.GetAccessee().GetAccesseeBundleName(); + + uint32_t bindLevel = profile.GetBindLevel(); + switch (bindLevel) { + case USER: + //bind level is user, accesser is caller, accessee is callee + if (srcUdid == acerDeviceId && caller.userId == acerUserId && sinkUdid == aceeDeviceId) { + return true; + } + //bind level is user, accessee is caller, accesser is callee + if (srcUdid == aceeDeviceId && caller.userId == aceeUserId && sinkUdid == acerDeviceId) { + return true; + } + break; + case SERVICE: + case APP: + //bind level is user, accesser is caller, accessee is callee + if (srcUdid == acerDeviceId && caller.userId == acerUserId && + static_cast(caller.tokenId) == acerTokenId && sinkUdid == aceeDeviceId) { + return true; + } + //bind level is user, accessee is caller, accesser is callee + if (srcUdid == aceeDeviceId && caller.userId == aceeUserId && + static_cast(caller.tokenId) == aceeTokenId && sinkUdid == acerDeviceId) { + return true; + } + break; + default: + LOGE("invalid bindLevel %{public}d.", bindLevel); + break; + } + return false; +} + +DM_EXPORT bool DeviceProfileConnector::CheckSinkAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + LOGI("srcUdid %{public}s, srcUserId %{public}d, srcPkgName %{public}s, srcTokenId %{public}d," + "srcAccountId %{public}s, sinkUdid %{public}s, sinkUserId %{public}d, sinkPkgName %{public}s," + "sinkTokenId %{public}d, sinkAccountId %{public}s.", GetAnonyString(srcUdid).c_str(), caller.userId, + caller.pkgName.c_str(), static_cast(caller.tokenId), GetAnonyString(caller.accountId).c_str(), + GetAnonyString(sinkUdid).c_str(), callee.userId, callee.pkgName.c_str(), static_cast(callee.tokenId), + GetAnonyString(callee.accountId).c_str()); + std::vector profiles = GetAllAccessControlProfile(); + std::string localUdid = GetLocalDeviceId(); + std::string trustUdid = (localUdid == srcUdid ? sinkUdid : srcUdid); + for (const auto &item : profiles) { + PrintProfile(item); + if (item.GetTrustDeviceId() != trustUdid || item.GetStatus() != ACTIVE) { + continue; + } + switch (item.GetBindType()) { + case DM_IDENTICAL_ACCOUNT: + if (CheckSinkAcuntAccessControl(item, caller, srcUdid, callee, sinkUdid)) { + return true; + } + break; + case DM_SHARE: + if (CheckSinkShareAccessControl(item, caller, srcUdid, callee, sinkUdid)) { + return true; + } + break; + case DM_POINT_TO_POINT: + case DM_ACROSS_ACCOUNT: + if (CheckSinkP2PAccessControl(item, caller, srcUdid, callee, sinkUdid)) { + return true; + } + break; + default: + break; + } + } + return false; +} + +bool DeviceProfileConnector::CheckSinkAcuntAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) +{ + std::string acerDeviceId = profile.GetAccesser().GetAccesserDeviceId(); + int32_t acerUserId = profile.GetAccesser().GetAccesserUserId(); + std::string acerAccountId = profile.GetAccesser().GetAccesserAccountId(); + + std::string aceeDeviceId = profile.GetAccessee().GetAccesseeDeviceId(); + int32_t aceeUserId = profile.GetAccessee().GetAccesseeUserId(); + std::string aceeAccountId = profile.GetAccessee().GetAccesseeAccountId(); + + //bind type is identical account, accesser is caller, accessee is callee + if (srcUdid == acerDeviceId && caller.userId == acerUserId && caller.accountId == acerAccountId && + sinkUdid == aceeDeviceId && callee.userId == aceeUserId && callee.accountId == aceeAccountId && + caller.accountId == callee.accountId) { + return true; + } + + //bind type is identical account, accessee is caller, accesser is callee + if (srcUdid == aceeDeviceId && caller.userId == aceeUserId && caller.accountId == aceeAccountId && + sinkUdid == acerDeviceId && callee.userId == acerUserId && callee.accountId == acerAccountId && + caller.accountId == callee.accountId) { + return true; + } + return false; +} + +bool DeviceProfileConnector::CheckSinkShareAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) +{ + std::string acerDeviceId = profile.GetAccesser().GetAccesserDeviceId(); + int32_t acerUserId = profile.GetAccesser().GetAccesserUserId(); + std::string acerAccountId = profile.GetAccesser().GetAccesserAccountId(); + + std::string aceeDeviceId = profile.GetAccessee().GetAccesseeDeviceId(); + int32_t aceeUserId = profile.GetAccessee().GetAccesseeUserId(); + std::string aceeAccountId = profile.GetAccessee().GetAccesseeAccountId(); + + if (srcUdid == acerDeviceId && caller.userId == acerUserId && caller.accountId == acerAccountId && + sinkUdid == aceeDeviceId && callee.userId == aceeUserId && callee.accountId == aceeAccountId) { + return true; + } + return false; +} + +bool DeviceProfileConnector::CheckSinkP2PAccessControl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) +{ + uint32_t bindLevel = profile.GetBindLevel(); + switch (bindLevel) { + case USER: + if (CheckSinkUserP2PAcl(profile, caller, srcUdid, callee, sinkUdid)) { + return true; + } + break; + case SERVICE: + case APP: + if (CheckSinkAppOrServiceP2PAcl(profile, caller, srcUdid, callee, sinkUdid)) { + return true; + } + break; + default: + LOGE("invalid bindLevel %{public}d.", bindLevel); + break; + } + return false; +} + +bool DeviceProfileConnector::CheckSinkUserP2PAcl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid) +{ + std::string acerDeviceId = profile.GetAccesser().GetAccesserDeviceId(); + int32_t acerUserId = profile.GetAccesser().GetAccesserUserId(); + + std::string aceeDeviceId = profile.GetAccessee().GetAccesseeDeviceId(); + int32_t aceeUserId = profile.GetAccessee().GetAccesseeUserId(); + //bind level is user, accesser is caller, accessee is callee + if (srcUdid == acerDeviceId && caller.userId == acerUserId && sinkUdid == aceeDeviceId && + callee.userId == aceeUserId) { + return true; + } + //bind level is user, accessee is caller, accesser is callee + if (srcUdid == aceeDeviceId && caller.userId == aceeUserId && sinkUdid == acerDeviceId && + callee.userId == acerUserId) { + return true; + } + return false; +} + +bool DeviceProfileConnector::CheckSinkAppOrServiceP2PAcl(const DistributedDeviceProfile::AccessControlProfile &profile, + const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, + const std::string &sinkUdid) +{ + std::string acerDeviceId = profile.GetAccesser().GetAccesserDeviceId(); + int32_t acerUserId = profile.GetAccesser().GetAccesserUserId(); + int32_t acerTokenId = static_cast(profile.GetAccesser().GetAccesserTokenId()); + + std::string aceeDeviceId = profile.GetAccessee().GetAccesseeDeviceId(); + int32_t aceeUserId = profile.GetAccessee().GetAccesseeUserId(); + int32_t aceeTokenId = static_cast(profile.GetAccessee().GetAccesseeTokenId()); + //bind level is app or service, accesser is caller, accessee is callee + if (srcUdid == acerDeviceId && caller.userId == acerUserId && + static_cast(caller.tokenId) == acerTokenId && sinkUdid == aceeDeviceId && + callee.userId == aceeUserId && static_cast(callee.tokenId) == aceeTokenId) { + return true; + } + //bind level is app or service, accessee is caller, accesser is callee + if (srcUdid == aceeDeviceId && caller.userId == aceeUserId && + static_cast(caller.tokenId) == aceeTokenId && sinkUdid == acerDeviceId && + callee.userId == acerUserId && static_cast(callee.tokenId) == acerTokenId) { + return true; + } + return false; +} + +DM_EXPORT bool DeviceProfileConnector::CheckSrcIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + LOGI("srcUdid %{public}s, srcUserId %{public}d, srcPkgName %{public}s, srcTokenId %{public}d," + "srcAccountId %{public}s, sinkUdid %{public}s, sinkUserId %{public}d, sinkPkgName %{public}s," + "sinkTokenId %{public}d, sinkAccountId %{public}s.", GetAnonyString(srcUdid).c_str(), caller.userId, + caller.pkgName.c_str(), static_cast(caller.tokenId), GetAnonyString(caller.accountId).c_str(), + GetAnonyString(sinkUdid).c_str(), callee.userId, callee.pkgName.c_str(), static_cast(callee.tokenId), + GetAnonyString(callee.accountId).c_str()); + std::vector profiles = GetAllAccessControlProfile(); + std::string localUdid = GetLocalDeviceId(); + std::string trustUdid = (localUdid == srcUdid ? sinkUdid : srcUdid); + for (const auto &item : profiles) { + PrintProfile(item); + if (item.GetTrustDeviceId() != trustUdid || item.GetStatus() != ACTIVE || + item.GetBindType() != DM_IDENTICAL_ACCOUNT) { + continue; + } + if (CheckSrcAcuntAccessControl(item, caller, srcUdid, callee, sinkUdid)) { + return true; + } + } + return false; +} + +DM_EXPORT bool DeviceProfileConnector::CheckSinkIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + LOGI("srcUdid %{public}s, srcUserId %{public}d, srcPkgName %{public}s, srcTokenId %{public}d," + "srcAccountId %{public}s, sinkUdid %{public}s, sinkUserId %{public}d, sinkPkgName %{public}s," + "sinkTokenId %{public}d, sinkAccountId %{public}s.", GetAnonyString(srcUdid).c_str(), caller.userId, + caller.pkgName.c_str(), static_cast(caller.tokenId), GetAnonyString(caller.accountId).c_str(), + GetAnonyString(sinkUdid).c_str(), callee.userId, callee.pkgName.c_str(), static_cast(callee.tokenId), + GetAnonyString(callee.accountId).c_str()); + std::vector profiles = GetAllAccessControlProfile(); + std::string localUdid = GetLocalDeviceId(); + std::string trustUdid = (localUdid == srcUdid ? sinkUdid : srcUdid); + for (const auto &item : profiles) { + PrintProfile(item); + if (item.GetTrustDeviceId() != trustUdid || item.GetStatus() != ACTIVE || + item.GetBindType() != DM_IDENTICAL_ACCOUNT) { + continue; + } + if (CheckSinkAcuntAccessControl(item, caller, srcUdid, callee, sinkUdid)) { + return true; + } + } + return false; +} + IDeviceProfileConnector *CreateDpConnectorInstance() { return &DeviceProfileConnector::GetInstance(); diff --git a/commondependency/src/multiple_user_connector.cpp b/commondependency/src/multiple_user_connector.cpp index 1c7a83a985fdb17953d6dd177936d9caece4ce42..4855dd1b1ad4e6d6ab1fa3dba2bd483638241c7c 100644 --- a/commondependency/src/multiple_user_connector.cpp +++ b/commondependency/src/multiple_user_connector.cpp @@ -56,7 +56,7 @@ int32_t MultipleUserConnector::GetCurrentAccountUserID(void) #endif } -std::string MultipleUserConnector::GetOhosAccountId(void) +DM_EXPORT std::string MultipleUserConnector::GetOhosAccountId(void) { #if (defined(__LITEOS_M__) || defined(LITE_DEVICE)) return ""; @@ -73,7 +73,7 @@ std::string MultipleUserConnector::GetOhosAccountId(void) #endif } -std::string MultipleUserConnector::GetOhosAccountIdByUserId(int32_t userId) +DM_EXPORT std::string MultipleUserConnector::GetOhosAccountIdByUserId(int32_t userId) { #if (defined(__LITEOS_M__) || defined(LITE_DEVICE)) (void)userId; @@ -92,7 +92,26 @@ std::string MultipleUserConnector::GetOhosAccountIdByUserId(int32_t userId) #endif } -std::string MultipleUserConnector::GetOhosAccountName(void) +DM_EXPORT std::string MultipleUserConnector::GetOhosAccountNameByUserId(int32_t userId) +{ +#if (defined(__LITEOS_M__) || defined(LITE_DEVICE)) + (void)userId; + return ""; +#elif OS_ACCOUNT_PART_EXISTS + OhosAccountInfo accountInfo; + ErrCode ret = OhosAccountKits::GetInstance().GetOsAccountDistributedInfo(userId, accountInfo); + if (ret != 0 || accountInfo.name_ == "") { + LOGE("error ret: %{public}d", ret); + return ""; + } + return accountInfo.name_; +#else + (void)userId; + return ""; +#endif +} + +DM_EXPORT std::string MultipleUserConnector::GetOhosAccountName(void) { #if (defined(__LITEOS_M__) || defined(LITE_DEVICE)) return ""; @@ -122,6 +141,15 @@ void MultipleUserConnector::GetTokenIdAndForegroundUserId(uint32_t &tokenId, int userId = GetFirstForegroundUserId(); } +DM_EXPORT void MultipleUserConnector::GetTokenId(uint32_t &tokenId) +{ +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + tokenId = OHOS::IPCSkeleton::GetCallingTokenID(); +#else + (void)tokenId; +#endif +} + void MultipleUserConnector::GetCallerUserId(int32_t &userId) { #if (defined(__LITEOS_M__) || defined(LITE_DEVICE)) @@ -140,7 +168,7 @@ void MultipleUserConnector::GetCallerUserId(int32_t &userId) #endif } -void MultipleUserConnector::SetSwitchOldUserId(int32_t userId) +DM_EXPORT void MultipleUserConnector::SetSwitchOldUserId(int32_t userId) { std::lock_guard lock(lock_); oldUserId_ = userId; @@ -152,7 +180,7 @@ int32_t MultipleUserConnector::GetSwitchOldUserId(void) return oldUserId_; } -void MultipleUserConnector::SetSwitchOldAccountId(std::string accountId) +DM_EXPORT void MultipleUserConnector::SetSwitchOldAccountId(std::string accountId) { std::lock_guard lock(lock_); accountId_ = accountId; @@ -176,13 +204,14 @@ std::string MultipleUserConnector::GetSwitchOldAccountName(void) return accountName_; } -void MultipleUserConnector::SetAccountInfo(int32_t userId, DMAccountInfo dmAccountInfo) +DM_EXPORT void MultipleUserConnector::SetAccountInfo(int32_t userId, + DMAccountInfo dmAccountInfo) { std::lock_guard lock(dmAccountInfoMaplock_); dmAccountInfoMap_[userId] = dmAccountInfo; } -DMAccountInfo MultipleUserConnector::GetAccountInfoByUserId(int32_t userId) +DM_EXPORT DMAccountInfo MultipleUserConnector::GetAccountInfoByUserId(int32_t userId) { DMAccountInfo dmAccountInfo; { @@ -196,7 +225,7 @@ DMAccountInfo MultipleUserConnector::GetAccountInfoByUserId(int32_t userId) return dmAccountInfo; } -void MultipleUserConnector::DeleteAccountInfoByUserId(int32_t userId) +DM_EXPORT void MultipleUserConnector::DeleteAccountInfoByUserId(int32_t userId) { std::lock_guard lock(dmAccountInfoMaplock_); LOGI("userId: %{public}d", userId); @@ -205,7 +234,8 @@ void MultipleUserConnector::DeleteAccountInfoByUserId(int32_t userId) } } -int32_t MultipleUserConnector::GetForegroundUserIds(std::vector &userVec) +DM_EXPORT int32_t MultipleUserConnector::GetForegroundUserIds( + std::vector &userVec) { #if (defined(__LITEOS_M__) || defined(LITE_DEVICE)) userVec.push_back(DEFAULT_OS_ACCOUNT_ID); @@ -239,7 +269,8 @@ int32_t MultipleUserConnector::GetFirstForegroundUserId(void) return userVec[0]; } -int32_t MultipleUserConnector::GetBackgroundUserIds(std::vector &userIdVec) +DM_EXPORT int32_t MultipleUserConnector::GetBackgroundUserIds( + std::vector &userIdVec) { #if (defined(__LITEOS_M__) || defined(LITE_DEVICE)) return DM_OK; @@ -301,7 +332,7 @@ int32_t MultipleUserConnector::GetAllUserIds(std::vector &userIdVec) #endif } -std::string MultipleUserConnector::GetAccountNickName(int32_t userId) +DM_EXPORT std::string MultipleUserConnector::GetAccountNickName(int32_t userId) { #if (defined(__LITEOS_M__) || defined(LITE_DEVICE)) return ""; @@ -335,7 +366,8 @@ bool MultipleUserConnector::IsUserUnlocked(int32_t userId) #endif } -void MultipleUserConnector::ClearLockedUser(std::vector &foregroundUserVec) +DM_EXPORT void MultipleUserConnector::ClearLockedUser( + std::vector &foregroundUserVec) { for (auto iter = foregroundUserVec.begin(); iter != foregroundUserVec.end();) { if (!IsUserUnlocked(*iter)) { @@ -346,8 +378,8 @@ void MultipleUserConnector::ClearLockedUser(std::vector &foregroundUser } } -void MultipleUserConnector::ClearLockedUser(std::vector &foregroundUserVec, - std::vector &backgroundUserVec) +DM_EXPORT void MultipleUserConnector::ClearLockedUser( + std::vector &foregroundUserVec, std::vector &backgroundUserVec) { for (auto iter = foregroundUserVec.begin(); iter != foregroundUserVec.end();) { if (!IsUserUnlocked(*iter)) { @@ -359,12 +391,40 @@ void MultipleUserConnector::ClearLockedUser(std::vector &foregroundUser } } -DMAccountInfo MultipleUserConnector::GetCurrentDMAccountInfo() +DM_EXPORT DMAccountInfo MultipleUserConnector::GetCurrentDMAccountInfo() { DMAccountInfo dmAccountInfo; dmAccountInfo.accountId = GetOhosAccountId(); dmAccountInfo.accountName = GetOhosAccountName(); return dmAccountInfo; } + +DM_EXPORT void MultipleUserConnector::GetCallingTokenId(uint32_t &tokenId) +{ +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + tokenId = OHOS::IPCSkeleton::GetCallingTokenID(); +#else + (void)tokenId; +#endif +} + +DM_EXPORT int32_t MultipleUserConnector::GetUserIdByDisplayId(uint64_t displayId) +{ + LOGI("displayId %{public}" PRIu64, displayId); + int32_t userId = -1; +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + if (displayId == -1) { + userId = GetFirstForegroundUserId(); + return userId; + } +#ifdef OS_ACCOUNT_PART_EXISTS + int32_t ret = OHOS::AccountSA::OsAccountManager::GetForegroundOsAccountLocalId(displayId, userId); + if (ret != DM_OK) { + LOGE("GetForegroundOsAccountLocalId failed ret %{public}d.", ret); + } +#endif // OS_ACCOUNT_PART_EXISTS +#endif + return userId; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/device_manager.gni b/device_manager.gni index d197e5b76926abddff618697c753db8a829a3649..8f859255c30640e8ea010e015fdf59afafeba95a 100644 --- a/device_manager.gni +++ b/device_manager.gni @@ -19,6 +19,7 @@ services_path = "${devicemanager_path}/services/service" servicesimpl_path = "${devicemanager_path}/services/implementation" softbuscache_parh = "${devicemanager_path}/services/softbuscache" innerkits_path = "${devicemanager_path}/interfaces/inner_kits" +mini_tools_kits_path = "${devicemanager_path}/interfaces/mini_tools_kits" hilog_path = "//base/hiviewdfx/hilog_lite/frameworks/featured" third_path = "//third_party/bounds_checking_function" dsoftbussdk_path = "//foundation/communication/dsoftbus/sdk" @@ -29,12 +30,15 @@ interfaces_path = "//foundation/communication/ipc/interfaces/innerkits" utils_lite_path = "//commonlibrary/utils_lite" c_utils_path = "//commonlibrary/c_utils/base/" fuzz_test_output_path = "device_manager/device_manager" +json_path = "${devicemanager_path}/json" #----------------------compilation options--------------------------# dm_ldflags = [ "-lpthread" ] declare_args() { + device_manager_enable_ets_frontend = true device_manager_no_interaction_auth = false device_manager_feature_product = "default" + use_nlohmann_json = true if (defined(global_parts_info) && defined(global_parts_info.account_os_account)) { @@ -85,4 +89,11 @@ declare_args() { } else { device_manager_common = true } + + if (defined(global_parts_info) && + defined(global_parts_info.msdp_spatial_awareness)) { + support_msdp = true + } else { + support_msdp = false + } } diff --git a/display/AppScope/app.json b/display/AppScope/app.json index 2dbc52d46037b89f5bd5cdf6a6f13804c1e9cdbf..efdc659459da42dac08f7572cc75390534c44b5c 100644 --- a/display/AppScope/app.json +++ b/display/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.devicemanagerui", "vendor": "example", - "versionCode": 1000037, - "versionName": "1.0.37", + "versionCode": 1000043, + "versionName": "1.0.43", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 10, diff --git a/display/AppScope/resources/base/profile/configuration.json b/display/AppScope/resources/base/profile/configuration.json new file mode 100644 index 0000000000000000000000000000000000000000..e4a0a9ff989d4f7f58bdbf9e0c50a20369b28f26 --- /dev/null +++ b/display/AppScope/resources/base/profile/configuration.json @@ -0,0 +1,5 @@ +{ + "configuration": { + "fontSizeScale": "followSystem" + } +} \ No newline at end of file diff --git a/display/entry/src/main/ets/UIExtAbility/ConfirmUIExtAbility.ets b/display/entry/src/main/ets/UIExtAbility/ConfirmUIExtAbility.ets index 6b5055fe7fd140b8cda6f32d6b8b9a847bc483c1..f181bc25d1b2a5e9590dcaf428acca54f71dd3b0 100644 --- a/display/entry/src/main/ets/UIExtAbility/ConfirmUIExtAbility.ets +++ b/display/entry/src/main/ets/UIExtAbility/ConfirmUIExtAbility.ets @@ -16,6 +16,7 @@ import UIExtensionAbility from '@ohos.app.ability.UIExtensionAbility' import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession' import Want from '@ohos.app.ability.Want'; import deviceInfo from '@ohos.deviceInfo'; +import { Configuration } from "@ohos.app.ability.Configuration"; const TAG: string = '[DeviceManagerUI:Confirm]==>' export default class ConfirmUIExtAbility extends UIExtensionAbility { @@ -39,6 +40,15 @@ export default class ConfirmUIExtAbility extends UIExtensionAbility { if (want.parameters.hostPkgLabel) { AppStorage.setOrCreate('hostPkgLabel', want.parameters.hostPkgLabel); } + if (want.parameters.isProxyBind) { + AppStorage.setOrCreate('isProxyBind', want.parameters.isProxyBind); + } + if (want.parameters.appUserData) { + AppStorage.setOrCreate('appUserData', want.parameters.appUserData); + } + if (want.parameters.title) { + AppStorage.setOrCreate('title', want.parameters.title); + } let param: Record = { 'session': session @@ -46,6 +56,8 @@ export default class ConfirmUIExtAbility extends UIExtensionAbility { let storage: LocalStorage = new LocalStorage(param); if (deviceInfo.deviceType === 'wearable') { session.loadContent('pages/ConfirmDialogWearable', storage); + } else if (deviceInfo.deviceType === 'tv') { + session.loadContent('pages/ConfirmDialogTv', storage); } else { session.loadContent('pages/ConfirmDialog', storage); } @@ -61,4 +73,9 @@ export default class ConfirmUIExtAbility extends UIExtensionAbility { extensionHostWindow.hideNonSecureWindows(false); console.log(TAG, `UIExtAbility onSessionDestroy`) } + + onConfigurationUpdate(newConfig: Configuration): void { + AppStorage.setOrCreate('fontSizeScale', newConfig.fontSizeScale); + console.info('test_log', `onConfigurationUpdate fontSizeScale: ${newConfig.fontSizeScale}`); + } } diff --git a/display/entry/src/main/ets/UIExtAbility/PincodeUIExtAbility.ets b/display/entry/src/main/ets/UIExtAbility/PincodeUIExtAbility.ets index ad4d9c6dde29584ee3ad044fa84716fa2b8b1a94..125515e18d3708fe09f0840c81faa5e203d91d5b 100644 --- a/display/entry/src/main/ets/UIExtAbility/PincodeUIExtAbility.ets +++ b/display/entry/src/main/ets/UIExtAbility/PincodeUIExtAbility.ets @@ -31,6 +31,8 @@ export default class InputUIExtAbility extends UIExtensionAbility { let storage: LocalStorage = new LocalStorage(param); if (deviceInfo.deviceType === 'wearable') { session.loadContent('pages/PinDialogWearable', storage); + } else if (deviceInfo.deviceType === 'tv') { + session.loadContent('pages/PinDialogTv', storage); } else { session.loadContent('pages/PinDialog', storage); } diff --git a/display/entry/src/main/ets/UIExtAbility/picker/DeviceSelectAbility.ets b/display/entry/src/main/ets/UIExtAbility/picker/DeviceSelectAbility.ets deleted file mode 100644 index 472482bb224854526fd065c477b1ae603f95e4d0..0000000000000000000000000000000000000000 --- a/display/entry/src/main/ets/UIExtAbility/picker/DeviceSelectAbility.ets +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import UIExtensionAbility from '@ohos.app.ability.UIExtensionAbility' -import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession' -import Want from '@ohos.app.ability.Want'; -const TAG = '[DeviceManagerUI:DeviceSelectAbility]==>'; - -export default class DeviceSelectAbility extends UIExtensionAbility { - onSessionCreate(want: Want, session: UIExtensionContentSession) { - console.log(TAG, `UIExtAbility onSessionCreate`) - if (want.parameters != undefined) { - if (want.parameters.title) { - AppStorage.setOrCreate('title', want.parameters.title); - } - if (want.parameters.customDescription) { - AppStorage.setOrCreate('customDescription', want.parameters.customDescription); - } - if (want.parameters.operation) { - AppStorage.setOrCreate('operation', want.parameters.operation); - } - if (want.parameters.bundleName) { - AppStorage.setOrCreate('bundleName', want.parameters.bundleName); - } - if (want.parameters.moduleName) { - AppStorage.setOrCreate('moduleName', want.parameters.moduleName); - } - if (want.parameters.abilityName) { - AppStorage.setOrCreate('abilityName', want.parameters.abilityName); - } - let callerBundleName: string = want.parameters?.['ohos.aafwk.param.callerBundleName'] as string; - AppStorage.setOrCreate('callerBundleName', callerBundleName); - } - let param: Record = { - 'session': session - } - let storage: LocalStorage = new LocalStorage(param); - session.loadContent('pages/picker/DeviceSelect', storage); - session.setWindowBackgroundColor('#00000000'); - let extensionHostWindow = session.getUIExtensionHostWindowProxy(); - extensionHostWindow.hideNonSecureWindows(true); - session.setWindowPrivacyMode(true); - AppStorage.setOrCreate('deviceSelectSession', session); - } - - onSessionDestroy(session: UIExtensionContentSession) { - let extensionHostWindow = session.getUIExtensionHostWindowProxy(); - extensionHostWindow.hideNonSecureWindows(false); - console.log(TAG, `UIExtAbility onSessionDestroy`) - } -} \ No newline at end of file diff --git a/display/entry/src/main/ets/common/constant.ts b/display/entry/src/main/ets/common/constant.ts index 82fd7671ccb2ea866097a0314354b85c78ee883f..0ba926f8b1f2b6a9bee47939286b42c6a3437210 100644 --- a/display/entry/src/main/ets/common/constant.ts +++ b/display/entry/src/main/ets/common/constant.ts @@ -33,4 +33,10 @@ export default class Constant { static isPC(): boolean { return (deviceInfo.deviceType === 'pc' || deviceInfo.deviceType === '2in1'); } + static isCar(): boolean { + return (deviceInfo.deviceType === 'car'); + } + static isTablet(): boolean { + return (deviceInfo.deviceType === 'tablet'); + } }; \ No newline at end of file diff --git a/display/entry/src/main/ets/pages/ConfirmDialog.ets b/display/entry/src/main/ets/pages/ConfirmDialog.ets index d29860af2eaa31980f04c824a5426d9f8ed22c3e..d9a163fce6edfb7ea15c1995ff63a41b5c9090e8 100644 --- a/display/entry/src/main/ets/pages/ConfirmDialog.ets +++ b/display/entry/src/main/ets/pages/ConfirmDialog.ets @@ -21,6 +21,7 @@ import display from '@ohos.display'; import mediaQuery from '@ohos.mediaquery'; import i18n from '@ohos.i18n'; import { KeyCode } from '@ohos.multimodalInput.keyCode'; +import window from '@ohos.window'; let dmClass: deviceManager.DeviceManager | null; let TAG = '[DeviceManagerUI:ConfirmDialog]==>'; @@ -33,6 +34,16 @@ const DEVICE_TYPE_2IN1: number = 0xA2F; const DEVICE_TYPE_PC: number = 0x0C; const CAST_PKG_NAME: string = 'CastEngineService'; +interface AppData { + hostPkgLabel: string; + bundleName: string; + bundleInfo: string; +} + +interface AppSendData { + bundleName: string; +} + @CustomDialog struct ConfirmCustomDialog { @State peerAppOperation: string = ''; @@ -44,35 +55,108 @@ struct ConfirmCustomDialog { @State isAvailableType: boolean = false; @State btnColor: ResourceColor = Color.Transparent; @State title: string = ''; - controller?: CustomDialogController; - isPC: boolean = false; + @State isProxy: boolean = false; + @State appDataList: AppData[] = []; + @State selectedAppDataList: AppSendData[] = []; + @State isFoldable: boolean = display.isFoldable(); + @State isFolded: display.FoldStatus = display.getFoldStatus(); + @State mLocalHeight: number = display.getDefaultDisplaySync().height; + @State currentOrientation: window.Orientation = window.Orientation.UNSPECIFIED; + @State marginValue: number = 0; + @State fontSizeScale: number = AppStorage.get('fontSizeScale') as number; + @State isPhone: boolean = false; + @State isPC: boolean = false; + @State isTablet: boolean = false; + @State isCar: boolean = false; + @State fontSize: string = ''; + @State textHeight: number = 0; + @State scrollHeight: number = 0; + @State buttonHeight: number = 0; + @State columnHeight: number = 0; + @State symbolHeight: number = 0; + @State extraInfo: string = ''; + + controller ?: CustomDialogController; + listener: mediaQuery.MediaQueryListener = mediaQuery.matchMediaSync('(orientation: landscape)'); + + private updateOrientation() { + let isPortrait: boolean = mediaQuery.matchMediaSync('(orientation: portrait)').matches; + this.currentOrientation = isPortrait ? window.Orientation.PORTRAIT : window.Orientation.LANDSCAPE; + console.info(`currentOrientation: ${this.currentOrientation}`); + } + + private updateFoldState() { + try { + this.isFolded = display.getFoldStatus(); + console.log('fold status:', this.isFolded); + } catch (err) { + console.error(`status update failed: ${err.message}`); + } + } aboutToAppear() { + this.updateOrientation(); + this.getDeviceType(); + this.appDataList = this.getAppDataList(); + + if (AppStorage.get('isProxyBind') != null) { + this.isProxy = AppStorage.get('isProxyBind') as boolean; + console.log('isProxy is ' + this.isProxy); + } + + if (!this.isPhone && this.isProxy) { + this.onCancel; + } + + if (AppStorage.get('title') != null) { + this.title = AppStorage.get('title') as string; + console.log('title is ' + this.title); + } + console.log(TAG + 'aboutToAppear execute PinCustomDialog') let context = getContext() as common.UIAbilityContext; + this.fontSizeScale = context.config?.fontSizeScale ?? 1; + console.log('=-= fontScale:' + this.fontSizeScale); + this.setMarginValue(); + if (AppStorage.get('deviceName') != null) { this.peerDeviceName = AppStorage.get('deviceName') as string; console.log('peerDeviceName is ' + this.peerDeviceName); } let customDescriptionStr: string = AppStorage.get('customDescriptionStr') as string; let hostPkgLabel: string = AppStorage.get('hostPkgLabel') as string; - if (hostPkgLabel === CAST_PKG_NAME) { - this.title = - context.resourceManager.getStringSync($r('app.string.dm_confirm_title_cast').id, this.peerDeviceName); - } else if (hostPkgLabel != null) { - this.title = context.resourceManager.getStringSync($r('app.string.dm_confirm_title_hap').id, hostPkgLabel, - this.peerDeviceName); - this.peerCustomDescription = context.resourceManager.getStringSync($r('app.string.dm_confirm_intention').id); - if (customDescriptionStr != undefined && customDescriptionStr != '') { - this.peerCustomDescription = this.peerDeviceName + customDescriptionStr; + if (this.isProxy) { + if (hostPkgLabel === CAST_PKG_NAME) { + this.peerCustomDescription = + context.resourceManager.getStringSync($r('app.string.dm_confirm_title_cast').id, this.peerDeviceName); + } else if (hostPkgLabel != null) { + this.peerCustomDescription = context.resourceManager.getStringSync($r('app.string.dm_confirm_proxy').id, + this.peerDeviceName); + } else { + let titleFirst: string = + context.resourceManager.getStringSync($r('app.string.dm_connect_device').id, this.peerDeviceName); + this.peerCustomDescription = + context.resourceManager.getStringSync($r('app.string.dm_is_trust_device').id, titleFirst); } } else { - let titleFirst: string = - context.resourceManager.getStringSync($r('app.string.dm_connect_device').id, this.peerDeviceName); - this.title = - context.resourceManager.getStringSync($r('app.string.dm_is_trust_device').id, titleFirst); - this.peerCustomDescription = context.resourceManager.getStringSync($r('app.string.dm_confirm_intention').id); + if (hostPkgLabel === CAST_PKG_NAME) { + this.title = + context.resourceManager.getStringSync($r('app.string.dm_confirm_title_cast').id, this.peerDeviceName); + } else if (hostPkgLabel != null) { + this.title = context.resourceManager.getStringSync($r('app.string.dm_confirm_title_hap').id, hostPkgLabel, + this.peerDeviceName); + this.peerCustomDescription = context.resourceManager.getStringSync($r('app.string.dm_confirm_intention').id); + if (customDescriptionStr != undefined && customDescriptionStr != '') { + this.peerCustomDescription = this.peerDeviceName + customDescriptionStr; + } + } else { + let titleFirst: string = + context.resourceManager.getStringSync($r('app.string.dm_connect_device').id, this.peerDeviceName); + this.title = + context.resourceManager.getStringSync($r('app.string.dm_is_trust_device').id, titleFirst); + this.peerCustomDescription = context.resourceManager.getStringSync($r('app.string.dm_confirm_intention').id); + } } if (AppStorage.get('deviceType') != null) { @@ -92,7 +176,21 @@ struct ConfirmCustomDialog { } }, 1000) console.log(TAG + 'deviceInfo.deviceType:' + deviceInfo.deviceType); - this.isPC = Constant.isPC(); + + this.listener.on('change', () => { + this.updateOrientation(); + }); + display.on('foldDisplayModeChange', () => { + this.updateFoldState(); + }); + } + + aboutToDisappear() { + if (this.listener) { + this.listener.off('change'); + } + display.off('foldDisplayModeChange'); + clearInterval(this.times); } onAllowOnce() { @@ -101,9 +199,13 @@ struct ConfirmCustomDialog { console.log('createDeviceManager is null') return } - + const param = { + 'appUserData': this.selectedAppDataList + }; + const jsonStr = JSON.stringify(param); console.log('allow once' + ACTION_ALLOW_AUTH_ONCE) - this.setUserOperation(ACTION_ALLOW_AUTH_ONCE) + console.log('param:' + jsonStr) + this.setUserAuthorization(ACTION_ALLOW_AUTH_ONCE, jsonStr) this.destruction() } @@ -113,9 +215,13 @@ struct ConfirmCustomDialog { console.log('createDeviceManager is null') return } - + const param = { + 'appUserData': this.selectedAppDataList + }; + const jsonStr = JSON.stringify(param); console.log('allow always' + ACTION_ALLOW_AUTH_ALWAYS) - this.setUserOperation(ACTION_ALLOW_AUTH_ALWAYS) + console.log('param:' + jsonStr) + this.setUserAuthorization(ACTION_ALLOW_AUTH_ALWAYS, jsonStr) this.destruction() } @@ -131,6 +237,60 @@ struct ConfirmCustomDialog { this.destruction() } + getAppDataList(): AppData[] { + try { + const jsonStr = AppStorage.get('appUserData') as string; + return JSON.parse(jsonStr) as AppData[]; + } catch (e) { + console.error('Failed to parse data:', e); + return []; + } + } + + getDeviceType(): void { + this.isPhone = Constant.isPhone(); + this.isPC = Constant.isPC(); + this.isTablet = Constant.isTablet(); + this.isCar = Constant.isCar(); + } + + setMarginValue(): void { + if ((this.fontSizeScale >= 1) && (this.fontSizeScale < 1.75)) { + if (this.fontSizeScale === 1) { + this.fontSize = '20vp'; + } else if (this.fontSizeScale === 1.15) { + this.fontSize = '23vp'; + } else if (this.fontSizeScale === 1.3) { + this.fontSize = '26vp'; + } else if (this.fontSizeScale === 1.45) { + this.fontSize = '29vp'; + } + this.marginValue = 0; + } else if (this.fontSizeScale === 1.75) { + this.fontSize = '35vp'; + this.marginValue = 5; + } else if (this.fontSizeScale === 2) { + this.fontSize = '40vp'; + this.marginValue = 9; + } else if (this.fontSizeScale === 3.2) { + this.fontSize = '40vp'; + this.marginValue = 13; + } + } + + setUserAuthorization(operation: number, param: string) { + console.log(TAG + 'setUserAuthorization: ' + operation) + if (dmClass == null) { + console.log(TAG + 'setUserAuthorization: ' + 'dmClass null') + return; + } + try { + dmClass.setUserOperation(operation, param); + } catch (error) { + console.log(TAG + 'dmClass setUserOperation failed') + } + } + setUserOperation(operation: number) { console.log(TAG + 'setUserOperation: ' + operation) if (dmClass == null) { @@ -145,12 +305,25 @@ struct ConfirmCustomDialog { } destruction() { - let session = AppStorage.get('ConfirmSession'); + let session = AppStorage.get('ConfirmSession'); if (session) { session.terminateSelf(); } } + private toggleSelection(app: AppData, index: number, checked: boolean) { + if (checked) { + if (!this.selectedAppDataList.some(item => item.bundleName === app.bundleName)) { + this.selectedAppDataList = [...this.selectedAppDataList, { bundleName: app.bundleName }]; + } + } else { + this.selectedAppDataList = this.selectedAppDataList.filter( + item => item.bundleName !== app.bundleName + ); + } + console.log('The currently selected data:', this.selectedAppDataList); + } + getImages(peerdeviceType: number): Resource { console.info('peerdeviceType is ' + peerdeviceType); if (peerdeviceType === deviceManager.DeviceType.SPEAKER) { @@ -191,18 +364,21 @@ struct ConfirmCustomDialog { .height(32) .fill($r('sys.color.ohos_id_color_activated')) Column() { - SymbolGlyph(this.getImages(this.peerDeviceType)) + SymbolGlyph(this.getImages(this.peerDeviceType)) .fontSize('20vp') .renderingStrategy(SymbolRenderingStrategy.MULTIPLE_OPACITY) .fontColor([$r('sys.color.ohos_id_color_primary_contrary')]) .offset({ x: 6, y: 6 }) } + .onAreaChange((o, n) => { + this.symbolHeight = n.height as number; + }) } - .visibility(this.isAvailableType ? Visibility.Visible : Visibility.None) - .margin({ bottom: 16, top: 24 }) + .visibility(this.isAvailableType ? Visibility.Visible : Visibility.None) + .margin({ top: 24, bottom: 15 }) } - - private isTibetanLanguages(): boolean { + + private isTibetanLanguages(): boolean { console.info(`${TAG} isTibetanLanguages in`); let locale = new Intl.Locale(i18n.System.getSystemLanguage()).toString(); console.info(`${TAG} isTibetanLanguages: ${locale}`); @@ -216,132 +392,1279 @@ struct ConfirmCustomDialog { breakpoints: { value: ['600vp', '840vp'] } }) { GridCol({ span: { xs: 4, sm: 4, md: this.isPC ? 6 : 4 }, offset: { sm: 2, md: this.isPC ? 9 : 4 } }) { - Column() { - this.Symbol(); - Column() { - Text(this.title) - .textAlign(TextAlign.Center) - .fontSize($r('sys.float.ohos_id_text_size_dialog_tittle')) - .fontWeight(FontWeight.Bold) - .fontColor($r('sys.color.ohos_id_color_text_primary')) - .minFontSize(12) - .maxFontSize($r('sys.float.ohos_id_text_size_dialog_tittle')) - .heightAdaptivePolicy(TextHeightAdaptivePolicy.LAYOUT_CONSTRAINT_FIRST) - .lineHeight(this.isTibetanLanguages() ? 22 : 0) - .textOverflow({ overflow: TextOverflow.Ellipsis }) - .width('auto') - .maxLines(2) - Text(this.peerCustomDescription) - .textAlign(TextAlign.Start) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) - .fontWeight(FontWeight.Regular) - .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize($r('sys.float.ohos_id_text_size_body2')) - .maxLines(2) - .width('auto') - .lineHeight(this.isTibetanLanguages() ? 22 : 0) - .margin({ top: 8 }) - .visibility(this.peerCustomDescription === '' ? Visibility.None : Visibility.Visible) - }.margin({ - top: this.isAvailableType ? 0 : 24, - bottom: 16, left: 24, right: 24 }) - - Column() { - Button($r('app.string.dm_allow_always')) - .margin({ bottom: 4 }) - .onClick(() => { - this.onAllowAlways(); - }) - .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) - .height(this.isTibetanLanguages() ? 'auto' : 40) - .width(this.isPC ? 250 : '100%') - .backgroundColor(this.btnColor) - .onHover((isHover?: boolean, event?: HoverEvent): void => { - if (isHover) { - this.btnColor = $r('sys.color.ohos_id_color_hover'); - } else { - this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + if (this.isProxy && this.isPhone) { + if (this.isFoldable) { + if (this.isFolded === display.FoldStatus.FOLD_STATUS_FOLDED) { + if (this.currentOrientation === window.Orientation.PORTRAIT) { + Column() { + this.Symbol(); + Column() { + Text(this.title) + .textAlign(TextAlign.Center) + .fontSize(this.fontSize) + .fontWeight(FontWeight.Bold) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .heightAdaptivePolicy(TextHeightAdaptivePolicy.LAYOUT_CONSTRAINT_FIRST) + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .textOverflow({ overflow: TextOverflow.None }) + .width('auto') + .maxLines(2) + } + .onAreaChange((o, n) => { + this.textHeight = n.height as number; + console.info('**textHeight**:${this.textHeight}') + }) + .margin({ + top: this.isAvailableType ? 0 : (24), + bottom: 15, left: 24, right: 24 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Column() { + Scroll(){ + Column(){ + Text(this.peerCustomDescription) + .textAlign(TextAlign.Center) + .fontColor($r('sys.color.font_primary')) + .fontSize($r('sys.float.Body_L')) + .width('auto') + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .margin({ + bottom: 12, left: 12, right: 12 + }) + .padding({ left: (this.isPC) ? 10 : 0, right: (this.isPC) ? 10 : 0 }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Stack(){ + List({ space: 0 }) { + ForEach(this.appDataList, (app: AppData, index: number) => { + ListItem() { + Row() { + Column() { + Column() { + Text(app.hostPkgLabel) + .fontSize($r('sys.float.Body_L')) + .fontColor($r('sys.color.font_primary')) + .textAlign(TextAlign.Start) + .maxLines(2) + .textOverflow({ overflow: TextOverflow.Ellipsis }) + .width('100%') + } + .margin({ top: this.marginValue, bottom: 2 }) + Column() { + Text(app.bundleInfo) + .fontSize($r('sys.float.Body_M')) + .fontColor($r('sys.color.font_secondary')) + .textAlign(TextAlign.Start) + .width('100%') + } + .margin({ bottom: this.marginValue }) + } + .layoutWeight(1) + .padding({ + right: 8 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + .margin({ + top: index === 0 ? 4 : 0, + bottom: index === (this.appDataList.length - 1) ? 4 : 0 + }) + + Checkbox({ name: app.hostPkgLabel, }) + .select(this.selectedAppDataList.some(item => item.bundleName === app.bundleName)) + .shape(CheckBoxShape.CIRCLE) + .size({ width: 20, height: 20 }) + .onChange((checked: boolean) => { + this.toggleSelection(app, index, checked); + }) + } + .width('100%') + .padding({ top: 11, bottom: 11, left: 12, right: 12 }) + } + }, (app: AppData) => app.hostPkgLabel) + } + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundColor($r('sys.color.comp_background_list_card')) + .width('100%') + .divider({ + strokeWidth: 1, + color: $r('sys.color.ohos_id_color_sub_background'), + startMargin: 12, + endMargin: 12 + }) + .edgeEffect(EdgeEffect.Spring) + } + } + .margin({ left: 12, right: 12 }) + } + .onAreaChange((o, n) => { + this.scrollHeight = n.height as number; + console.info('**scrollHeight**:${this.scrollHeight}') + }) + .constraintSize({ + maxHeight: (this.columnHeight - this.symbolHeight - this.buttonHeight - this.textHeight - 81) + }) + .onAreaChange((o, n) => { + this.scrollHeight = n.height as number; + }) + .scrollable(ScrollDirection.Vertical) + .scrollBar(BarState.On) + } + .margin({ bottom: 8}) + + Column() { + Button($r('app.string.dm_allow_always')) + .margin({ top: 0, bottom: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowAlways(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.string.dm_allow_this_time')) + .margin({ bottom: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowOnce(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.plural.dm_not_allow', this.secondsNum, this.secondsNum)) + .padding({ top: 8, bottom: 8 }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .defaultFocus(true) + .type(ButtonType.ROUNDED_RECTANGLE) + .onKeyEvent((event?: KeyEvent) => { + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Down) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + return; + } + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Up) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + this.onCancel(); + } + }) + .onClick(() => { + this.onCancel(); + }) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + } + .onAreaChange((o, n) => { + this.buttonHeight = n.height as number; + console.info(`**buttonHeight**:${this.buttonHeight}`) + }) + .margin({ + left: 16, + right: 16, + bottom: this.isPC ? 16 : 8 + }) } - }) - .stateStyles({ - pressed: { - .backgroundColor($r('sys.color.ohos_id_color_click_effect')) - }, - normal: { - .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + .margin({ + left: 16, right: 16, + }) + .height('auto') + .clip(true) + .backgroundColor($r('sys.color.mask_fourth')) + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundBlurStyle(BlurStyle.COMPONENT_ULTRA_THICK) + } else if (this.currentOrientation === window.Orientation.LANDSCAPE) { + Column(){ + this.Symbol(); + Scroll() { + Column() { + Column() { + Text(this.title) + .textAlign(TextAlign.Center) + .fontSize(this.fontSize) + .fontWeight(FontWeight.Bold) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .heightAdaptivePolicy(TextHeightAdaptivePolicy.LAYOUT_CONSTRAINT_FIRST) + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .textOverflow({ overflow: TextOverflow.None }) + .width('auto') + .maxLines(2) + } + .margin({ + top: this.isAvailableType ? 0 : 24, left: 12, right: 12, + bottom: 15 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Text(this.peerCustomDescription) + .textAlign(TextAlign.Center) + .fontColor($r('sys.color.font_primary')) + .fontSize($r('sys.float.Body_L')) + .width('auto') + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .margin({ + left: 12, + right: 12, + bottom: 12 + }) + .padding({ left: 20, right: 20 }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + List({ space: 0 }) { + ForEach(this.appDataList, (app: AppData, index: number) => { + ListItem() { + Row() { + Column() { + Column() { + Text(app.hostPkgLabel) + .fontSize($r('sys.float.Body_L')) + .fontColor($r('sys.color.font_primary')) + .textAlign(TextAlign.Start) + .maxLines(2) + .textOverflow({ overflow: TextOverflow.Ellipsis }) + .width('100%') + } + .margin({ top: this.marginValue, bottom: 2 }) + Column() { + Text(app.bundleInfo) + .fontSize($r('sys.float.Body_M')) + .fontColor($r('sys.color.font_secondary')) + .textAlign(TextAlign.Start) + .width('100%') + } + .margin({ bottom: this.marginValue }) + } + .layoutWeight(1) + .padding({ + right: 12 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + .margin({ + top: index === 0 ? 4 : 0, + bottom: index === (this.appDataList.length - 1) ? 4 : 0 + }) + + Checkbox({ name: app.hostPkgLabel, }) + .select(this.selectedAppDataList.some(item => item.bundleName === app.bundleName)) + .shape(CheckBoxShape.CIRCLE) + .size({ width: 20, height: 20 }) + .onChange((checked: boolean) => { + this.toggleSelection(app, index, checked); + }) + } + .width('100%') + .padding(12) + } + }, (app: AppData) => app.hostPkgLabel) + } + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundColor($r('sys.color.comp_background_list_card')) + .width('auto') + .divider({ + strokeWidth: 1, + color: $r('sys.color.ohos_id_color_sub_background'), + startMargin: 24, + endMargin: 24 + }) + .margin({ bottom: 4 }) + .edgeEffect(EdgeEffect.Spring) + .scrollBar(BarState.On) + + Button($r('app.string.dm_allow_always')) + .margin({ top: 4, bottom: 4, right: 4, left: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowAlways(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width(this.isPC ? 250 : '100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.string.dm_allow_this_time')) + .margin({ bottom: 4, right: 4, left: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowOnce(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width(this.isPC ? 250 : '100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.plural.dm_not_allow', this.secondsNum, this.secondsNum)) + .margin({ bottom: 8, right: 4, left: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .defaultFocus(true) + .onKeyEvent((event?: KeyEvent) => { + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Down) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + return; + } + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Up) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + this.onCancel(); + } + }) + .onClick(() => { + this.onCancel(); + }) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width(this.isPC ? 250 : '100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + } + .margin({ left: 12, right: 12 }) } - }) - Button($r('app.string.dm_allow_this_time')) - .margin({ bottom: 4 }) - .onClick(() => { - this.onAllowOnce(); - }) - .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) - .height(this.isTibetanLanguages() ? 'auto' : 40) - .width(this.isPC ? 250 : '100%') - .backgroundColor(this.btnColor) - .onHover((isHover?: boolean, event?: HoverEvent): void => { - if (isHover) { - this.btnColor = $r('sys.color.ohos_id_color_hover'); - } else { - this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + .layoutWeight(1) + .constraintSize({ + maxHeight: 'auto' + }) + .scrollable(ScrollDirection.Vertical) + .scrollBar(BarState.On) } - }) - .stateStyles({ - pressed: { - .backgroundColor($r('sys.color.ohos_id_color_click_effect')) - }, - normal: { - .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + .width(400) + .height(266) + .clip(true) + .backgroundColor($r('sys.color.mask_fourth')) + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundBlurStyle(BlurStyle.COMPONENT_ULTRA_THICK) + } + } else if (this.isFolded === display.FoldStatus.FOLD_STATUS_EXPANDED || + this.isFolded === display.FoldStatus.FOLD_STATUS_HALF_FOLDED) { + Column(){ + this.Symbol(); + Column() { + Text(this.title) + .textAlign(TextAlign.Center) + .fontSize(this.fontSize) + .fontWeight(FontWeight.Bold) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .heightAdaptivePolicy(TextHeightAdaptivePolicy.LAYOUT_CONSTRAINT_FIRST) + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .textOverflow({ overflow: TextOverflow.None }) + .width('auto') + .maxLines(2) } - }) - Button($r('app.plural.dm_not_allow', this.secondsNum, this.secondsNum)) - .margin({ left: 16, right: 16 }) - .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) - .defaultFocus(true) - .onKeyEvent((event?: KeyEvent) => { - if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Down) { - console.log(TAG + 'onKeyEvent eventType: ' + event?.type) - return; + .onAreaChange((o, n) => { + this.textHeight = n.height as number; + console.info('**textHeight**:${this.textHeight}') + }) + .margin({ + top: this.isAvailableType ? 0 : (24), + bottom: 15, left: 24, right: 24 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Column() { + Scroll() { + Column() { + Text(this.peerCustomDescription) + .textAlign(TextAlign.Center) + .fontColor($r('sys.color.font_primary')) + .fontSize($r('sys.float.Body_L')) + .width('auto') + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .margin({ + bottom: 12, left: 24, right: 24 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + Stack() { + List({ space: 0 }) { + ForEach(this.appDataList, (app: AppData, index: number) => { + ListItem() { + Row() { + Column() { + Column() { + Text(app.hostPkgLabel) + .fontSize($r('sys.float.Body_L')) + .fontColor($r('sys.color.font_primary')) + .textAlign(TextAlign.Start) + .maxLines(2) + .textOverflow({ overflow: TextOverflow.Ellipsis }) + .width('100%') + } + .margin({ top: this.marginValue, bottom: 2 }) + Column() { + Text(app.bundleInfo) + .fontSize($r('sys.float.Body_M')) + .fontColor($r('sys.color.font_secondary')) + .textAlign(TextAlign.Start) + .width('100%') + } + .margin({ bottom: this.marginValue }) + } + .layoutWeight(1) + .padding({ + right: 8 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + .margin({ + top: index === 0 ? 4 : 0, + bottom: index === (this.appDataList.length - 1) ? 4 : 0 + }) + + Checkbox({ name: app.hostPkgLabel, }) + .select(this.selectedAppDataList.some(item => item.bundleName === app.bundleName)) + .shape(CheckBoxShape.CIRCLE) + .size({ width: 20, height: 20 }) + .onChange((checked: boolean) => { + this.toggleSelection(app, index, checked); + }) + } + .width('100%') + .padding({ top: 11, bottom: 11, left: 12, right: 12 }) + } + }, (app: AppData) => app.hostPkgLabel) + } + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundColor($r('sys.color.comp_background_list_card')) + .width('100%') + .divider({ + strokeWidth: 1, + color: $r('sys.color.ohos_id_color_sub_background'), + startMargin: 24, + endMargin: 24 + }) + .edgeEffect(EdgeEffect.Spring) + } + } + .margin({ left: 12, right: 12 }) + } + .onAreaChange((o, n) => { + this.scrollHeight = n.height as number; + console.info('**scrollHeight**:${this.scrollHeight}') + }) + .constraintSize({ + maxHeight: (this.columnHeight - this.symbolHeight - this.buttonHeight - this.textHeight - 81) + }) + .scrollable(ScrollDirection.Vertical) + .scrollBar(BarState.On) } - if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Up) { - console.log(TAG + 'onKeyEvent eventType: ' + event?.type) - this.onCancel(); + .margin({ bottom: 8}) + + Column() { + Button($r('app.string.dm_allow_always')) + .margin({ top: 0, bottom: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowAlways(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.string.dm_allow_this_time')) + .margin({ bottom: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowOnce(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.plural.dm_not_allow', this.secondsNum, this.secondsNum)) + .padding({ top: 8, bottom: 8 }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .defaultFocus(true) + .type(ButtonType.ROUNDED_RECTANGLE) + .onKeyEvent((event?: KeyEvent) => { + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Down) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + return; + } + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Up) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + this.onCancel(); + } + }) + .onClick(() => { + this.onCancel(); + }) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') } - }) - .onClick(() => { - this.onCancel(); - }) - .height(this.isTibetanLanguages() ? 'auto' : 40) - .width(this.isPC ? 250 : '100%') - .backgroundColor(this.btnColor) - .onHover((isHover?: boolean, event?: HoverEvent): void => { - if (isHover) { - this.btnColor = $r('sys.color.ohos_id_color_hover'); - } else { - this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + .onAreaChange((o, n) => { + this.buttonHeight = n.height as number; + console.info('**buttonHeight**:${this.buttonHeight}') + }) + .margin({ + left: 16, + right: 16, + bottom: this.isPC ? 16 : 8 + }) + } + .width(400) + .height('auto') + .clip(true) + .backgroundColor($r('sys.color.mask_fourth')) + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundBlurStyle(BlurStyle.COMPONENT_ULTRA_THICK) + } + } else { + if (this.currentOrientation === window.Orientation.PORTRAIT) { + Column() { + this.Symbol(); + Column() { + Text(this.title) + .textAlign(TextAlign.Center) + .fontSize(this.fontSize) + .fontWeight(FontWeight.Bold) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .heightAdaptivePolicy(TextHeightAdaptivePolicy.LAYOUT_CONSTRAINT_FIRST) + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .textOverflow({ overflow: TextOverflow.None }) + .width('auto') + .maxLines(2) } - }) - .stateStyles({ - pressed: { - .backgroundColor($r('sys.color.ohos_id_color_click_effect')) - }, - normal: { - .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + .onAreaChange((o, n) => { + this.textHeight = n.height as number; + console.info(`**textHeight**:${this.textHeight}`) + }) + .margin({ + top: this.isAvailableType ? 0 : (24), + bottom: 15, left: 24, right: 24 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Column() { + Scroll(){ + Column(){ + Text(this.peerCustomDescription) + .textAlign(TextAlign.Center) + .fontColor($r('sys.color.font_primary')) + .fontSize($r('sys.float.Body_L')) + .width('auto') + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .margin({ + bottom: 12, left: 12, right: 12 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Stack(){ + List({ space: 0 }) { + ForEach(this.appDataList, (app: AppData, index: number) => { + ListItem() { + Row() { + Column() { + Column() { + Text(app.hostPkgLabel) + .fontSize($r('sys.float.Body_L')) + .fontColor($r('sys.color.font_primary')) + .textAlign(TextAlign.Start) + .maxLines(2) + .textOverflow({ overflow: TextOverflow.Ellipsis }) + .width('100%') + } + .margin({ top: this.marginValue, bottom: 2 }) + Column() { + Text(app.bundleInfo) + .fontSize($r('sys.float.Body_M')) + .fontColor($r('sys.color.font_secondary')) + .textAlign(TextAlign.Start) + .width('100%') + } + .margin({ bottom: this.marginValue }) + } + .layoutWeight(1) + .padding({ + right: 8 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + .margin({ + top: index === 0 ? 4 : 0, + bottom: index === (this.appDataList.length - 1) ? 4 : 0 + }) + + Checkbox({ name: app.hostPkgLabel, }) + .select(this.selectedAppDataList.some(item => item.bundleName === app.bundleName)) + .shape(CheckBoxShape.CIRCLE) + .size({ width: 20, height: 20 }) + .onChange((checked: boolean) => { + this.toggleSelection(app, index, checked); + }) + } + .width('100%') + .padding({ top: 11, bottom: 11, left: 12, right: 12 }) + } + }, (app: AppData) => app.hostPkgLabel) + } + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundColor($r('sys.color.comp_background_list_card')) + .width('100%') + .divider({ + strokeWidth: 1, + color: $r('sys.color.ohos_id_color_sub_background'), + startMargin: 12, + endMargin: 12 + }) + .edgeEffect(EdgeEffect.Spring) + } + } + .margin({ left: 12, right: 12 }) + } + .constraintSize({ + maxHeight: (this.columnHeight - this.symbolHeight - this.buttonHeight - this.textHeight - 82) + }) + .onAreaChange((o, n) => { + this.scrollHeight = n.height as number; + console.info(`**scrollHeight**:${this.scrollHeight}`) + }) + .scrollable(ScrollDirection.Vertical) + .scrollBar(BarState.On) } + .margin({ bottom: 8 }) + + Column() { + Button($r('app.string.dm_allow_always')) + .margin({ top: 0, bottom: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowAlways(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.string.dm_allow_this_time')) + .margin({ bottom: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowOnce(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.plural.dm_not_allow', this.secondsNum, this.secondsNum)) + .padding({ top: 8, bottom: 8 }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .defaultFocus(true) + .type(ButtonType.ROUNDED_RECTANGLE) + .onKeyEvent((event?: KeyEvent) => { + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Down) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + return; + } + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Up) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + this.onCancel(); + } + }) + .onClick(() => { + this.onCancel(); + }) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + } + .onAreaChange((o, n) => { + this.buttonHeight = n.height as number; + console.info(`**buttonHeight**:${this.buttonHeight}`) + }) + .margin({ + left: 16, + right: 16, + bottom: this.isPC ? 16 : 8 + }) + } + .margin({ + left: 16, right: 16, }) + .height('auto') + .clip(true) + .backgroundColor($r('sys.color.mask_fourth')) + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundBlurStyle(BlurStyle.COMPONENT_ULTRA_THICK) + } else if (this.currentOrientation === window.Orientation.LANDSCAPE) { + Column(){ + this.Symbol(); + Scroll() { + Column() { + Column() { + Text(this.title) + .textAlign(TextAlign.Center) + .fontSize(this.fontSize) + .fontWeight(FontWeight.Bold) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .heightAdaptivePolicy(TextHeightAdaptivePolicy.LAYOUT_CONSTRAINT_FIRST) + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .textOverflow({ overflow: TextOverflow.None }) + .width('auto') + .maxLines(2) + } + .margin({ + top: this.isAvailableType ? 0 : 24, left: 12, right: 12, + bottom: 15 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Text(this.peerCustomDescription) + .textAlign(TextAlign.Center) + .fontColor($r('sys.color.font_primary')) + .fontSize($r('sys.float.Body_L')) + .width('auto') + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .margin({ + left: 12, + right: 12, + bottom: 12 + }) + .padding({ left: 20, right: 20 }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + List({ space: 0 }) { + ForEach(this.appDataList, (app: AppData, index: number) => { + ListItem() { + Row() { + Column() { + Column() { + Text(app.hostPkgLabel) + .fontSize($r('sys.float.Body_L')) + .fontColor($r('sys.color.font_primary')) + .textAlign(TextAlign.Start) + .maxLines(2) + .textOverflow({ overflow: TextOverflow.Ellipsis }) + .width('100%') + } + .margin({ top: this.marginValue, bottom: 2 }) + Column() { + Text(app.bundleInfo) + .fontSize($r('sys.float.Body_M')) + .fontColor($r('sys.color.font_secondary')) + .textAlign(TextAlign.Start) + .width('100%') + } + .margin({ bottom: this.marginValue }) + } + .layoutWeight(1) + .padding({ + right: 12 + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + .margin({ + top: index === 0 ? 4 : 0, + bottom: index === (this.appDataList.length - 1) ? 4 : 0 + }) + + Checkbox({ name: app.hostPkgLabel, }) + .select(this.selectedAppDataList.some(item => item.bundleName === app.bundleName)) + .shape(CheckBoxShape.CIRCLE) + .size({ width: 20, height: 20 }) + .onChange((checked: boolean) => { + this.toggleSelection(app, index, checked); + }) + } + .width('100%') + .padding(12) + } + }, (app: AppData) => app.hostPkgLabel) + } + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundColor($r('sys.color.comp_background_list_card')) + .width('auto') + .divider({ + strokeWidth: 1, + color: $r('sys.color.ohos_id_color_sub_background'), + startMargin: 24, + endMargin: 24 + }) + .margin({ bottom: 4 }) + .edgeEffect(EdgeEffect.Spring) + .scrollBar(BarState.Off) + + Button($r('app.string.dm_allow_always')) + .margin({ top: 4, bottom: 4, right: 4, left: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowAlways(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width(this.isPC ? 250 : '100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.string.dm_allow_this_time')) + .margin({ bottom: 4, right: 4, left: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .onClick(() => { + this.onAllowOnce(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width(this.isPC ? 250 : '100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + + Button($r('app.plural.dm_not_allow', this.secondsNum, this.secondsNum)) + .margin({ bottom: 8, right: 4, left: 4 }) + .padding({ top: 8, bottom: 8 }) + .type(ButtonType.ROUNDED_RECTANGLE) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .defaultFocus(true) + .onKeyEvent((event?: KeyEvent) => { + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Down) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + return; + } + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Up) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + this.onCancel(); + } + }) + .onClick(() => { + this.onCancel(); + }) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width(this.isPC ? 250 : '100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + .accessibilityGroup(true) + .accessibilityLevel('yes') + } + .margin({ left: 12, right: 12 }) + } + .layoutWeight(1) + .constraintSize({ + maxHeight: 'auto' + }) + .scrollable(ScrollDirection.Vertical) + .scrollBar(BarState.On) + } + .width(400) + .height(266) + .clip(true) + .backgroundColor($r('sys.color.mask_fourth')) + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundBlurStyle(BlurStyle.COMPONENT_ULTRA_THICK) + } } - .margin({ - left: 16, - right: 16, - bottom: this.isPC ? 24 : 8 - }) + } else { + Column() { + this.Symbol(); + Column() { + Text(this.title) + .textAlign(TextAlign.Center) + .fontSize($r('sys.float.Title_S')) + .fontWeight(FontWeight.Bold) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .heightAdaptivePolicy(TextHeightAdaptivePolicy.LAYOUT_CONSTRAINT_FIRST) + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .textOverflow({ overflow: TextOverflow.None }) + .width('auto') + .maxLines(2) + } + .margin({ + top: this.isAvailableType ? 0 : 24, + bottom: 15, left: 24, right: 24 + }) + .width('100%') + Column() { + Text(this.peerCustomDescription) + .textAlign(TextAlign.Start) + .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontWeight(FontWeight.Regular) + .textOverflow({ overflow: TextOverflow.Ellipsis }) + .fontSize($r('sys.float.ohos_id_text_size_body2')) + .maxLines(2) + .width('auto') + .lineHeight(this.isTibetanLanguages() ? 22 : 0) + .margin({ top: 8 }) + .visibility(this.peerCustomDescription === '' ? Visibility.None : Visibility.Visible) + }.margin({ + top: this.isAvailableType ? 0 : 24, + bottom: 16, left: 24, right: 24 + }) + + Column() { + Button($r('app.string.dm_allow_always')) + .margin({ bottom: 4 }) + .padding({ top: 8, bottom: 8 }) + .onClick(() => { + this.onAllowAlways(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + Button($r('app.string.dm_allow_this_time')) + .margin({ bottom: 4 }) + .padding({ top: 8, bottom: 8 }) + .onClick(() => { + this.onAllowOnce(); + }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + Button($r('app.plural.dm_not_allow', this.secondsNum, this.secondsNum)) + .margin({ left: 16, right: 16 }) + .padding({ top: 8, bottom: 8 }) + .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .defaultFocus(true) + .onKeyEvent((event?: KeyEvent) => { + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Down) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + return; + } + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Up) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + this.onCancel(); + } + }) + .onClick(() => { + this.onCancel(); + }) + .height(this.isTibetanLanguages() ? 'auto' : (this.fontSizeScale > 1 ? 56 : 40)) + .width('100%') + .backgroundColor(this.btnColor) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = $r('sys.color.ohos_id_color_hover'); + } else { + this.btnColor = this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent; + } + }) + .stateStyles({ + pressed: { + .backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }, + normal: { + .backgroundColor(this.isPC ? $r('sys.color.ohos_id_color_button_normal') : Color.Transparent) + } + }) + } + .margin({ + left: 16, + right: 16, + bottom: this.isPC ? 24 : 8 + }) + } + .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) + .backgroundBlurStyle(BlurStyle.COMPONENT_ULTRA_THICK) + .margin({ left: $r('sys.float.ohos_id_dialog_margin_start'), right: $r('sys.float.ohos_id_dialog_margin_end') }) } - .borderRadius($r('sys.float.ohos_id_corner_radius_dialog')) - .backgroundBlurStyle(BlurStyle.COMPONENT_ULTRA_THICK) - .margin({ left: $r('sys.float.ohos_id_dialog_margin_start'), right: $r('sys.float.ohos_id_dialog_margin_end') }) } - }.constraintSize({ maxHeight: '90%' }) + } + .onAreaChange((o, n) => { + this.columnHeight = n.height as number; + console.info(`**columnHeight**:${this.columnHeight}`) + }) + .constraintSize({ maxHeight: (px2vp(this.mLocalHeight) - 28 - 39)*0.9 }) + .height('auto') } } @@ -351,11 +1674,11 @@ struct dialogPlusPage { dialogController: CustomDialogController = new CustomDialogController({ builder: ConfirmCustomDialog(), autoCancel: false, - onWillDismiss: ()=>{ + onWillDismiss: () => { this.onWillDismiss() }, alignment: DialogAlignment.Center, - offset: { dx: 0, dy: -20 }, + offset: { dx: 0, dy: 0 }, customStyle: true, maskColor: $r('sys.color.ohos_id_color_mask_thin') }); @@ -386,7 +1709,7 @@ struct dialogPlusPage { } onWillDismiss() { - console.log(TAG + 'onWillDismiss: ' + ACTION_CANCEL_AUTH) + console.log(TAG + 'onWillDismiss: ' + ACTION_CANCEL_AUTH) this.setUserOperation(ACTION_CANCEL_AUTH); this.destruction(); } @@ -432,4 +1755,4 @@ struct dialogPlusPage { build() { Column(this.dialogController.open()) } -} \ No newline at end of file +} diff --git a/display/entry/src/main/ets/pages/ConfirmDialogTv.ets b/display/entry/src/main/ets/pages/ConfirmDialogTv.ets new file mode 100644 index 0000000000000000000000000000000000000000..4b1cdfd7e1d6d72adfbd5354342b03e982e0969a --- /dev/null +++ b/display/entry/src/main/ets/pages/ConfirmDialogTv.ets @@ -0,0 +1,500 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import deviceManager from '@ohos.distributedHardware.deviceManager'; +import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession'; +import deviceInfo from '@ohos.deviceInfo'; +import Constant from '../common/constant'; +import common from '@ohos.app.ability.common'; +import display from '@ohos.display'; +import i18n from '@ohos.i18n'; +import { KeyCode } from '@ohos.multimodalInput.keyCode'; + +let dmClass: deviceManager.DeviceManager | null; +let TAG = '[DeviceManagerUI:ConfirmDialog]==>'; +const ACTION_ALLOW_AUTH_ONCE: number = 0; +const ACTION_CANCEL_AUTH: number = 1; +const ACTION_AUTH_CONFIRM_TIMEOUT: number = 2; +const ACTION_ALLOW_AUTH_ALWAYS: number = 6; +const MSG_CANCEL_CONFIRM_SHOW: number = 5; +const DEVICE_TYPE_2IN1: number = 0xA2F; +const DEVICE_TYPE_PC: number = 0x0C; +const CAST_PKG_NAME: string = 'CastEngineService'; + +@CustomDialog +struct ConfirmCustomDialog { + @State peerAppOperation: string = ''; + @State peerCustomDescription: string = ''; + @State peerDeviceName: string = ''; + @State peerDeviceType: number = 0; + @State secondsNum: number = 30; + @State times: number = 0; + @State firstButtonWidth: number = 1; + @State firstButtonHeight: number = 1; + @State secondButtonWidth: number = 1; + @State secondButtonHeight: number = 1; + @State thirdButtonWidth: number = 1; + @State thirdButtonHeight: number = 1; + @State isAvailableType: boolean = false; + @State btnColor: ResourceColor = Color.Transparent; + @State title: string = ''; + @State mLocalWidth: number = display.getDefaultDisplaySync().width; + controller?: CustomDialogController; + isPC: boolean = false; + aboutToAppear() { + console.log(TAG + 'aboutToAppear execute PinCustomDialog') + console.log(this.mLocalWidth + 'mLocalWidth') + let context = getContext() as common.UIAbilityContext; + + if (AppStorage.get('deviceName') != null) { + this.peerDeviceName = AppStorage.get('deviceName') as string + ' '; + console.log('peerDeviceName is ' + this.peerDeviceName); + } + let customDescriptionStr: string = AppStorage.get('customDescriptionStr') as string; + let hostPkgLabel: string = AppStorage.get('hostPkgLabel') as string; + if (hostPkgLabel === CAST_PKG_NAME) { + this.title = + context.resourceManager.getStringSync($r('app.string.dm_confirm_title_cast').id, this.peerDeviceName); + } else if (hostPkgLabel != null) { + this.title = context.resourceManager.getStringSync($r('app.string.dm_confirm_title_hap').id, hostPkgLabel, + this.peerDeviceName); + this.peerCustomDescription = context.resourceManager.getStringSync($r('app.string.dm_confirm_intention').id); + if (customDescriptionStr != undefined && customDescriptionStr != '') { + this.peerCustomDescription = this.peerDeviceName + customDescriptionStr; + } + } else { + let titleFirst: string = + context.resourceManager.getStringSync($r('app.string.dm_connect_device').id, this.peerDeviceName); + this.title = + context.resourceManager.getStringSync($r('app.string.dm_is_trust_device').id, titleFirst); + this.peerCustomDescription = context.resourceManager.getStringSync($r('app.string.dm_confirm_intention').id); + } + + if (AppStorage.get('deviceType') != null) { + this.peerDeviceType = AppStorage.get('deviceType') as number; + console.log('peerDeviceType is ' + this.peerDeviceType); + } + + this.times = setInterval(() => { + console.info('devicemanagerui confirm dialog run seconds:' + this.secondsNum); + this.secondsNum--; + if (this.secondsNum === 0) { + clearInterval(this.times); + this.times = 0; + this.setUserOperation(ACTION_AUTH_CONFIRM_TIMEOUT); + this.destruction(); + console.info('click cancel times run out'); + } + }, 1000) + console.log(TAG + 'deviceInfo.deviceType:' + deviceInfo.deviceType); + this.isPC = Constant.isPC(); + } + + onAllowOnce() { + console.log('allow once') + if (dmClass == null) { + console.log('createDeviceManager is null') + return + } + + console.log('allow once' + ACTION_ALLOW_AUTH_ONCE) + this.setUserOperation(ACTION_ALLOW_AUTH_ONCE) + this.destruction() + } + + onAllowAlways() { + console.log('allow always') + if (dmClass == null) { + console.log('createDeviceManager is null') + return + } + + console.log('allow always' + ACTION_ALLOW_AUTH_ALWAYS) + this.setUserOperation(ACTION_ALLOW_AUTH_ALWAYS) + this.destruction() + } + + onCancel() { + console.log('cancel') + if (dmClass == null) { + console.log('createDeviceManager is null') + return + } + + console.log('cancel' + ACTION_CANCEL_AUTH) + this.setUserOperation(ACTION_CANCEL_AUTH) + this.destruction() + } + + setUserOperation(operation: number) { + console.log(TAG + 'setUserOperation: ' + operation) + if (dmClass == null) { + console.log(TAG + 'setUserOperation: ' + 'dmClass null') + return; + } + try { + dmClass.setUserOperation(operation, 'extra'); + } catch (error) { + console.log(TAG + 'dmClass setUserOperation failed') + } + } + + destruction() { + let session = AppStorage.get('ConfirmSession'); + if (session) { + session.terminateSelf(); + } + } + + getImages(peerdeviceType: number): Resource { + console.info('peerdeviceType is ' + peerdeviceType); + if (peerdeviceType === deviceManager.DeviceType.SPEAKER) { + this.isAvailableType = true; + return $r('sys.symbol.soundai_fill'); + } else if (peerdeviceType === deviceManager.DeviceType.PHONE) { + this.isAvailableType = true; + return $r('sys.symbol.phone_fill_1'); + } else if (peerdeviceType === deviceManager.DeviceType.TABLET) { + this.isAvailableType = true; + return $r('sys.symbol.pad_fill'); + } else if (peerdeviceType === deviceManager.DeviceType.WEARABLE) { + this.isAvailableType = true; + return $r('sys.symbol.earphone_case_16896'); + } else if (peerdeviceType === deviceManager.DeviceType.CAR) { + this.isAvailableType = true; + return $r('sys.symbol.car_fill'); + } else if (peerdeviceType === deviceManager.DeviceType.TV) { + this.isAvailableType = true; + return $r('sys.symbol.smartscreen_fill'); + } else if (peerdeviceType === DEVICE_TYPE_PC) { + this.isAvailableType = true; + return $r('sys.symbol.matebook_fill'); + } else if (peerdeviceType === DEVICE_TYPE_2IN1) { + this.isAvailableType = true; + return $r('sys.symbol.matebook_fill'); + } else { + this.isAvailableType = false; + return $r('sys.symbol.unknown_device_fill'); + } + } + + @Builder + Symbol() { + Shape() { + Column() { + SymbolGlyph(this.getImages(this.peerDeviceType)) + .fontSize('70vp') + .renderingStrategy(SymbolRenderingStrategy.MULTIPLE_OPACITY) + .fontColor(['#E5FFFFFF']) + } + } + .visibility(this.isAvailableType ? Visibility.Visible : Visibility.None) + .margin({ bottom: '24vp', top: '24vp' }) + } + + private isTibetanLanguages(): boolean { + console.info(`${TAG} isTibetanLanguages in`); + let locale = new Intl.Locale(i18n.System.getSystemLanguage()).toString(); + console.info(`${TAG} isTibetanLanguages: ${locale}`); + return Constant.TIBETAN_LANGUAGES.includes(locale); + } + + build() { + GridRow({ + columns: { xs: 4, sm: 8, md: 24 }, + gutter: { x: 4 }, + breakpoints: { value: ['600vp', '840vp'] } + }) { + GridCol({ span: { xs: 4, sm: 4, md: 6 }, offset: { sm: 2, md: 9 } }) { + Column() { + this.Symbol(); + Column() { + Text(this.title) + .textAlign(TextAlign.Center) + .fontSize('16fp') + .fontWeight(FontWeight.Regular) + .fontColor('#E5FFFFFF') + .heightAdaptivePolicy(TextHeightAdaptivePolicy.LAYOUT_CONSTRAINT_FIRST) + .lineHeight(this.isTibetanLanguages() ? '22vp' : 0) + .textOverflow({ overflow: TextOverflow.Ellipsis }) + .width('auto') + .maxLines(2) + Text(this.peerCustomDescription) + .textAlign(TextAlign.Start) + .fontColor('#E5FFFFFF') + .fontWeight(FontWeight.Regular) + .textOverflow({ overflow: TextOverflow.Ellipsis }) + .fontSize('16vp') + .maxLines(2) + .width('auto') + .lineHeight(this.isTibetanLanguages() ? '22vp' : 0) + .margin({ top: '8vp' }) + .visibility(this.peerCustomDescription === '' ? Visibility.None : Visibility.Visible) + }.margin({ + top: this.isAvailableType ? 0 : '24vp', + bottom: '24vp', left: '24vp', right: '24vp' }) + + Column() { + Button($r('app.string.dm_allow_always')) + .margin({ bottom: '12vp' }) + .onClick(() => { + this.onAllowAlways(); + }) + .fontSize('18vp') + .fontColor('#E5FFFFFF') + .fontWeight(FontWeight.Medium) + .height(this.isTibetanLanguages() ? 'auto' : '40vp') + .width('100%') + .backgroundColor(this.btnColor) + .scale({x: this.firstButtonWidth, y: this.firstButtonHeight}) + .focusable(true) + .border({ + width: '0.5vp', + color: '#26ffffff' + }) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = '#4DFFFFFF'; + this.firstButtonWidth = 1.05; + this.firstButtonHeight = 1.05; + } else { + this.btnColor = '#33F1F3F5'; + this.firstButtonWidth = 1; + this.firstButtonHeight = 1; + } + }) + .stateStyles({ + pressed: { + .backgroundColor('#26FFFFFF') + }, + focused: { + .scale({x: 1.05, y: 1.05}) + .backgroundColor('#4DFFFFFF') + }, + normal: { + .backgroundColor('#33F1F3F5') + } + }) + Button($r('app.string.dm_allow_this_time')) + .margin({ bottom: '12vp' }) + .onClick(() => { + this.onAllowOnce(); + }) + .fontSize('18vp') + .fontColor('#E5FFFFFF') + .fontWeight(FontWeight.Medium) + .focusable(true) + .height(this.isTibetanLanguages() ? 'auto' : '40vp') + .width('100%') + .backgroundColor(this.btnColor) + .scale({x: this.secondButtonWidth, y: this.secondButtonHeight}) + .border({ + width: '0.5vp', + color: '#26ffffff' + }) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = '#4DFFFFFF'; + this.secondButtonWidth = 1.05; + this.secondButtonHeight = 1.05; + } else { + this.btnColor = '#33F1F3F5'; + this.secondButtonWidth = 1; + this.secondButtonHeight = 1; + } + }) + .stateStyles({ + pressed: { + .backgroundColor('#26FFFFFF') + }, + focused: { + .scale({x: 1.05, y: 1.05}) + .backgroundColor('#4DFFFFFF') + }, + normal: { + .backgroundColor('#33F1F3F5') + } + }) + Button($r('app.plural.dm_not_allow', this.secondsNum, this.secondsNum)) + .margin({ left: '16vp', right: '16vp' }) + .fontSize('18vp') + .fontColor('#E5FFFFFF') + .fontWeight(FontWeight.Medium) + .focusable(true) + .onKeyEvent((event?: KeyEvent) => { + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Down) { + console.log(TAG + 'onKeyEvent KEYCODE_HOME:' + event?.type) + return; + } + if (event?.keyCode == KeyCode.KEYCODE_HOME) { + console.log(TAG + 'onKeyEvent KEYCODE_HOME:' + event?.type) + this.onCancel(); + } + }) + .onClick(() => { + this.onCancel(); + }) + .height(this.isTibetanLanguages() ? 'auto' : '40vp') + .width('100%') + .backgroundColor(this.btnColor) + .scale({x: this.thirdButtonWidth, y: this.thirdButtonHeight}) + .border({ + width: '0.5vp', + color: '#26ffffff' + }) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = '#4DFFFFFF'; + this.thirdButtonWidth = 1.05; + this.thirdButtonHeight = 1.05; + } else { + this.btnColor = '#33F1F3F5'; + this.thirdButtonWidth = 1; + this.thirdButtonHeight = 1; + } + }) + .stateStyles({ + pressed: { + .backgroundColor('#26FFFFFF') + }, + focused: { + .scale({x: 1.05, y: 1.05}) + .backgroundColor('#4DFFFFFF') + }, + normal: { + .backgroundColor('#33F1F3F5') + } + }) + } + .margin({ + left: '24vp', + right: '24vp', + bottom: '24vp' + }) + } + .backgroundColor('#3C3C3C') + .borderRadius(16) + .border({ + width: '0.5', + color: '#26ffffff', + radius: '16vp' + }) + .margin({ left: $r('sys.float.ohos_id_dialog_margin_start'), right: $r('sys.float.ohos_id_dialog_margin_end') }) + .width(px2vp(this.mLocalWidth) * 0.36) + } + .onKeyPreIme((event:KeyEvent) => { + if (event?.keyCode === KeyCode.KEYCODE_MENU && event?.type === KeyType.Up) { + console.log(TAG + 'onKeyEvent KEYCODE_MENU:' + event?.type) + return true; + } + return false; + }) + .onKeyEvent((event?: KeyEvent) => { + if (event?.keyCode == KeyCode.KEYCODE_HOME) { + console.log(TAG + 'onKeyEvent KEYCODE_HOME:' + event?.type) + this.onCancel(); + } + }) + } + .constraintSize({ maxHeight: '80%' }) + } +} + +@Entry +@Component +struct dialogPlusPage { + dialogController: CustomDialogController = new CustomDialogController({ + builder: ConfirmCustomDialog(), + autoCancel: false, + onWillDismiss: ()=>{ + this.onWillDismiss() + }, + alignment: DialogAlignment.Center, + customStyle: true, + maskColor: ('#CC000000') + }); + + initStatue() { + if (dmClass) { + console.log(TAG + 'deviceManager exist') + return + } + deviceManager.createDeviceManager('com.ohos.devicemanagerui.confirm', + (err: Error, dm: deviceManager.DeviceManager) => { + if (err) { + console.log('createDeviceManager err:' + JSON.stringify(err) + ' --fail:' + JSON.stringify(dm)) + return + } + dmClass = dm + dmClass.on('uiStateChange', (data: Record) => { + console.log('uiStateChange executed, dialog closed' + JSON.stringify(data)) + let tmpStr: Record = JSON.parse(data.param) + let msg: number = tmpStr.uiStateMsg as number + if (msg === MSG_CANCEL_CONFIRM_SHOW) { + console.log('cancel confirm show.') + this.destruction() + return + } + }) + }) + } + + onWillDismiss() { + console.log(TAG + 'onWillDismiss: ' + ACTION_CANCEL_AUTH) + this.setUserOperation(ACTION_CANCEL_AUTH); + this.destruction(); + } + + setUserOperation(operation: number) { + console.log(TAG + 'setUserOperation: ' + operation) + if (dmClass == null) { + console.log(TAG + 'setUserOperation: ' + 'dmClass null') + return; + } + try { + dmClass.setUserOperation(operation, 'extra'); + } catch (error) { + console.log(TAG + 'dmClass setUserOperation failed') + } + } + + onPageShow() { + console.log('onPageShow') + this.initStatue() + } + + destruction() { + let session = AppStorage.get('ConfirmSession'); + if (session) { + session.terminateSelf(); + } + } + + aboutToDisappear() { + console.log(TAG + 'aboutToDisappear aboutToDisappear') + if (dmClass != null) { + try { + dmClass.off('uiStateChange'); + dmClass.release(); + } catch (error) { + console.log('dmClass release failed') + } + dmClass = null + } + } + + build() { + Column(this.dialogController.open()) + } +} \ No newline at end of file diff --git a/display/entry/src/main/ets/pages/InputPinDialog.ets b/display/entry/src/main/ets/pages/InputPinDialog.ets index 1add1ade8038e8d8036f05ca1124ec2b130d00ab..d3e58ec9ed494de5e534b502f988847a4d489e78 100644 --- a/display/entry/src/main/ets/pages/InputPinDialog.ets +++ b/display/entry/src/main/ets/pages/InputPinDialog.ets @@ -16,6 +16,7 @@ import deviceManager from '@ohos.distributedHardware.deviceManager'; import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession' import mediaquery from '@ohos.mediaquery'; import deviceInfo from '@ohos.deviceInfo'; +import display from '@ohos.display'; import inputMethod from '@ohos.inputMethod'; import Constant from '../common/constant'; import accessibility from '@ohos.accessibility'; @@ -43,16 +44,29 @@ struct InputCustomDialog { @State targetDeviceName: string = ''; @State model: string = MODEL_PIN; @State isPC: boolean = false; + @State isPhone: boolean = false; @State btnColor: ResourceColor = Color.Transparent; + @State mLocalHeight: number = display.getDefaultDisplaySync().height; listener: mediaquery.MediaQueryListener = mediaquery.matchMediaSync('(orientation: landscape)'); controller?: CustomDialogController; private scroller: Scroller = new Scroller(); onPortrait(mediaQueryResult: mediaquery.MediaQueryResult) { + this.mLocalHeight = display.getDefaultDisplaySync().height; + let heightRatio = px2vp(this.mLocalHeight) * 0.2; if (mediaQueryResult.matches as boolean) { - this.heightNum = 100; + if (this.isPhone) { + if (display.isFoldable() && + display.getFoldDisplayMode() === display.FoldDisplayMode.FOLD_DISPLAY_MODE_MAIN) { + this.heightNum = heightRatio; + } else if (!display.isFoldable()) { + this.heightNum = heightRatio; + } + } else { + this.heightNum = 300; + } } else { - this.heightNum = 800; + this.heightNum = 800; } } @@ -65,12 +79,18 @@ struct InputCustomDialog { aboutToAppear() { console.info(TAG + 'InputCustomDialog aboutToAppear'); this.isPC = Constant.isPC(); + this.isPhone = Constant.isPhone(); let ims = inputMethod.getSetting(); ims.on('imeShow', (info: Array) => { this.scroller.scrollTo({yOffset: 72, xOffset: 0}); }); - if (AppStorage.get('mediaQueryResult') != null && AppStorage.get('mediaQueryResult') as boolean) { - this.heightNum = 100; + if (AppStorage.get('mediaQueryResult') != null && AppStorage.get('mediaQueryResult') as boolean && this.isPhone) { + let heightRatio = px2vp(this.mLocalHeight) * 0.2; + if (display.isFoldable() && display.getFoldDisplayMode() === display.FoldDisplayMode.FOLD_DISPLAY_MODE_MAIN) { + this.heightNum = heightRatio; + } else if (!display.isFoldable()) { + this.heightNum = heightRatio; + } } if (AppStorage.get('targetDeviceName') != null) { this.targetDeviceName = AppStorage.get('targetDeviceName') as string; @@ -173,7 +193,7 @@ struct InputCustomDialog { } setUserOperation(operation: number, extra: string) { - console.log('setUserOperation: ' + operation + 'password' + extra); + console.log('setUserOperation: ' + operation); if (dmClass == null) { console.log('setUserOperation: ' + 'dmClass null'); return; diff --git a/display/entry/src/main/ets/pages/PinDialogTv.ets b/display/entry/src/main/ets/pages/PinDialogTv.ets new file mode 100644 index 0000000000000000000000000000000000000000..5ac070befd74739bdbcdcd5756b8834eb2de5eaf --- /dev/null +++ b/display/entry/src/main/ets/pages/PinDialogTv.ets @@ -0,0 +1,299 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import deviceManager from '@ohos.distributedHardware.deviceManager'; +import { BusinessError } from '@ohos.base'; +import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession'; +import deviceInfo from '@ohos.deviceInfo'; +import display from '@ohos.display'; +import Constant from '../common/constant'; +import i18n from '@ohos.i18n'; +import { KeyCode } from '@ohos.multimodalInput.keyCode'; + +let dmClass: deviceManager.DeviceManager | null; +let TAG = '[DeviceManagerUI:PinDialog]==>'; +const ACTION_CANCEL_PINCODE_DISPLAY: number = 3; +const MSG_CANCEL_PIN_CODE_SHOW: number = 2; + +@CustomDialog +struct PinCustomDialog { + @State pinCode: string = ''; + @State buttonWidth: number = 1; + @State buttonHeight: number = 1; + @State codeNum: number = 0; + @State pinCodeArr: Array = []; + @State btnColor: ResourceColor = Color.Transparent; + @State isPC: boolean = false; + @State mLocalWidth: number = display.getDefaultDisplaySync().width; + controller?: CustomDialogController + + cancel() { + console.log(TAG + 'destruction()'); + try { + console.log(TAG + 'pin dialog terminateSelf'); + let session = AppStorage.get('pinSession'); + if (session) { + session.terminateSelf(); + } + } catch (err) { + console.log(TAG + 'dialog cancel failed: ' + JSON.stringify(err)); + } + } + + aboutToAppear() { + console.log(TAG + 'aboutToAppear execute PinCustomDialog'); + this.isPC = Constant.isPC(); + this.pinCode = AppStorage.get('pinCode') as string; + this.pinCodeArr = this.pinCode.split(''); + console.log(TAG + 'this.pinCodeArr' + this.pinCodeArr); + } + + setUserOperation(operation: number) { + console.log(TAG + 'setUserOperation: ' + operation); + if (dmClass == null) { + console.log(TAG + 'setUserOperation: ' + 'dmClass null'); + return; + } + try { + dmClass.setUserOperation(operation, 'extra'); + } catch (error) { + console.log(TAG + 'dmClass setUserOperation failed'); + } + } + + private isTibetanLanguages(): boolean { + console.info(`${TAG} isTibetanLanguages in`); + let locale = new Intl.Locale(i18n.System.getSystemLanguage()).toString(); + console.info(`${TAG} isTibetanLanguages: ${locale}`); + return Constant.TIBETAN_LANGUAGES.includes(locale); + } + + build() { + GridRow({ + columns: { xs: 4, sm: 8, md: 24 }, + gutter: { x: '4vp' }, + breakpoints: { value: ['600vp', '840vp'] } + }) { + GridCol({ span: { xs: 4, sm: 4, md: 6 }, offset: { sm: 2, md: 9 } }) { + Column() { + Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Text($r('app.string.dm_connect_code')) + .fontSize('20fp') + .fontColor('#E5FFFFFF') + .fontWeight(FontWeight.Medium) + .lineHeight(this.isTibetanLanguages() ? '32.5vp' : 0) + .margin({ + left: '24vp', + right: '24vp' + }) + } + .margin({ bottom: '24vp', top: '24vp' }) + + Row() { + Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { + ForEach(this.pinCodeArr, (item: string, index: number) => { + Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { + Text(item) + .fontSize('30fp') + .fontColor('#E5FFFFFF') + .fontWeight(FontWeight.Medium) + }.width('24vp') + .height('100%') + .margin(index === this.pinCodeArr.length - 1 ? {} : { right: '16vp' }) + }) + } + .height('40vp') + .accessibilityText('[n1]' + this.pinCode + '[n0]') + } + .margin({ bottom: '24vp' }) + + Flex({ justifyContent: FlexAlign.Center }) { + Button($r('app.string.dm_cancel')) + .fontSize('18vp') + .fontWeight(FontWeight.Medium) + .fontColor('#E5FFFFFF') + .width('100%') + .height('40vp') + .backgroundColor(this.btnColor) + .scale({x: this.buttonWidth, y: this.buttonHeight}) + .border({ + width: '0.5vp', + color: '#26ffffff' + }) + .defaultFocus(true) + .onKeyEvent((event?: KeyEvent) => { + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Down) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + return; + } + if (event && event?.keyCode === KeyCode.KEYCODE_HOME && event?.type === KeyType.Up) { + console.log(TAG + 'onKeyEvent eventType: ' + event?.type) + if (this.controller) { + this.controller.close(); + } + this.cancel(); + this.setUserOperation(ACTION_CANCEL_PINCODE_DISPLAY); + } + }) + .onClick(() => { + if (this.controller) { + this.controller.close(); + } + this.cancel(); + this.setUserOperation(ACTION_CANCEL_PINCODE_DISPLAY); + }) + .onHover((isHover?: boolean, event?: HoverEvent): void => { + if (isHover) { + this.btnColor = '#F1F3F5'; + this.buttonWidth = 1.05; + this.buttonHeight = 1.05; + } else { + this.btnColor = '#33F1F3F5'; + this.buttonWidth = 1; + this.buttonHeight = 1; + } + }) + .stateStyles({ + pressed: { + .backgroundColor('#26FFFFFF') + }, + focused: { + .scale({x: 1.05, y: 1.05}) + .backgroundColor('#4DFFFFFF') + }, + normal: { + .backgroundColor('#33F1F3F5') + } + }) + }.margin({ + left: '24vp', + right: '24vp', + bottom: '24vp' }) + } + .backgroundColor('#3C3C3C') + .borderRadius('16vp') + .border({ + width: '0.5vp', + color: '#26ffffff', + radius: '16vp' + }) + .width(px2vp(this.mLocalWidth) * 0.36) + .margin({ left: $r('sys.float.ohos_id_dialog_margin_start'), right: $r('sys.float.ohos_id_dialog_margin_end') }) + } + } + .constraintSize({ maxHeight: '80%' }) + } +} + +@Entry +@Component +struct dialogPlusPage { + dialogController: CustomDialogController = new CustomDialogController({ + builder: PinCustomDialog(), + cancel: this.onCancel, + autoCancel: false, + onWillDismiss: ()=>{ + this.onWillDismiss() + }, + alignment: DialogAlignment.Center, + customStyle: true, + maskColor: '#CC000000' + }); + + onCancel() { + this.destruction(); + } + + onWillDismiss() { + console.log(TAG + 'onWillDismiss: ' + ACTION_CANCEL_PINCODE_DISPLAY) + this.setUserOperation(ACTION_CANCEL_PINCODE_DISPLAY); + this.destruction(); + } + + aboutToAppear() { + this.initStatue(); + console.log(TAG + 'aboutToAppear execute') + } + + aboutToDisappear() { + console.log(TAG + 'aboutToDisappear executed') + if (dmClass != null) { + try { + dmClass.off('uiStateChange') + try { + dmClass.release(); + } catch (err) { + let e: BusinessError = err as BusinessError; + console.error(TAG + 'release device manager errCode:' + e.code + ',errMessage:' + e.message); + } + } catch (error) { + console.log(TAG + 'dmClass release failed') + } + dmClass = null + } + } + + initStatue() { + if (dmClass) { + console.log(TAG + 'deviceManager exist'); + return; + } + deviceManager.createDeviceManager('com.ohos.devicemanagerui.pin', + (err: Error, dm: deviceManager.DeviceManager) => { + if (err) { + console.log('createDeviceManager err:' + JSON.stringify(err) + ' --fail:' + JSON.stringify(dm)) + return + } + dmClass = dm + dmClass.on('uiStateChange', (data: Record) => { + console.log('uiStateChange executed, dialog closed' + JSON.stringify(data)) + let tmpStr: Record = JSON.parse(data.param) + let msg: number = tmpStr.uiStateMsg as number + if (msg === MSG_CANCEL_PIN_CODE_SHOW) { + this.destruction() + } + }) + }); + } + + setUserOperation(operation: number) { + console.log(TAG + 'setUserOperation: ' + operation) + if (dmClass == null) { + console.log(TAG + 'setUserOperation: ' + 'dmClass null') + return; + } + try { + dmClass.setUserOperation(operation, 'extra'); + } catch (error) { + console.log(TAG + 'dmClass setUserOperation failed') + } + } + + destruction() { + console.log(TAG + 'destruction()'); + try { + console.log(TAG + 'pin dialog terminateSelf'); + let session = AppStorage.get('pinSession'); + if (session) { + session.terminateSelf(); + } + } catch (err) { + console.log(TAG + 'dialog cancel failed: ' + JSON.stringify(err)); + } + } + + build() { + Column(this.dialogController.open()) + } +} \ No newline at end of file diff --git a/display/entry/src/main/ets/pages/picker/DeviceSelect.ets b/display/entry/src/main/ets/pages/picker/DeviceSelect.ets deleted file mode 100644 index 6b014010ed9f6daf84eff9e2051f333d7433bd9f..0000000000000000000000000000000000000000 --- a/display/entry/src/main/ets/pages/picker/DeviceSelect.ets +++ /dev/null @@ -1,590 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import distributedDeviceManager from '@ohos.distributedDeviceManager'; -import { AsyncCallback, BusinessError, Callback, ErrorCallback } from '@ohos.base'; -import abilityAccessCtrl, { Context } from '@ohos.abilityAccessCtrl'; -import promptAction from '@ohos.promptAction'; -import UIExtensionContentSession from '@ohos.app.ability.UIExtensionContentSession'; -import mediaquery from '@ohos.mediaquery'; -import deviceInfo from '@ohos.deviceInfo'; -import Constant from '../../common/constant'; -import accessibility from '@ohos.accessibility'; -import common from '@ohos.app.ability.common'; -let anmDuration: number = 800; -let TAG = '[DeviceManagerUI:DeviceSelect]==>'; - -enum StatusType { - Unbound = 0, - TrustBinding = 1, - Binding = 2 -} - -let customData: Record = { - 'operation': '', - 'object': '', - 'qResp': 1 -}; - -let discoverParam: Record = { - 'discoverTargetType': 1, - 'CUSTOM_DATA': JSON.stringify(customData), - 'DISC_CAPABILITY': '' -}; -let filterOptions: Record = { - 'availableStatus': 0 -}; - -class Data { - public status?: StatusType = StatusType.Unbound - public device: distributedDeviceManager.DeviceBasicInfo = { - deviceId: '', - deviceName: '', - deviceType: '', - networkId: '', - extraData: '', - }; -} - -class DeviceStateData { - public action: distributedDeviceManager.DeviceStateChange = 0; - public device: distributedDeviceManager.DeviceBasicInfo = { - deviceId: '', - deviceName: '', - deviceType: '', - networkId: '', - extraData: '', - }; -} - -class Device { - public device: distributedDeviceManager.DeviceBasicInfo = { - deviceId: '', - deviceName: '', - deviceType: '', - networkId: '', - extraData: '', - } -} - -class CustomData { - public operation: string = ''; - public object: string = ''; - public displayName: string = ''; - public policyCode: number = 0; - public actionId: number = 0; -} - -class ExtraData { - public CUSTOM_DATA: string = '' -} - -class DeviceCallBack { - public deviceId: string = ''; - public deviceName: string = ''; - public bundlename: string = ''; - public moudlename: string = ''; - public ablityname: string = ''; -} - -class BindTargetData { - public deviceId: string = ''; -} - -@Entry -@Component -export struct Index { - @State showPhone: Visibility = Visibility.Visible; - @State showFlag: Visibility = Visibility.Visible; - @State deviceSelectSession : UIExtensionContentSession | undefined = undefined; - @State isAutoCancel: boolean = false; - @State deviceList: Data[] = []; - @State trustDeviceList: Data[] = []; - @State centerX: number = 0; - @State centerY: number = 0; - @State radius: number = 0; - @State deviceStateStatus: number = -1; - @State currentDevice: Data | undefined = undefined; - @State title: string | Resource = ''; - @State operation: string = ''; - @State customDescription: string | Resource = ''; - @State bundleName: string = ''; - @State moduleName: string = ''; - @State abilityName: string = ''; - @State isLandscape: boolean = true; - @State isListNum: number = 5; - @State discCapability: string = 'oop'; - @State networIdMatchLen: number = -1; - listener = mediaquery.matchMediaSync('(orientation: landscape)'); - dmInstance: distributedDeviceManager.DeviceManager | undefined = undefined; - context = getContext(this) as common.UIAbilityContext - bindParam: Record = {}; - scroller: Scroller = new Scroller() - - @Builder - CustomBuilder() { - Column() { - Stack() { - Image($r('app.media.iocn_phone_self')).width(54).draggable(false) - Image($r('app.media.phone')).width(30).draggable(false) - } - .width(54) - .height(54) - .borderRadius(54) - } - .width(68) - .height(92) - } - - cancel() { - this.dmInstance!.stopDiscovering(); - try { - console.log(TAG + 'terminateSelf'); - this.deviceSelectSession = AppStorage.get('deviceSelectSession'); - if (this.deviceSelectSession) { - this.deviceSelectSession.terminateSelf(); - } - } catch (err) { - console.log(TAG + 'dialog cancel failed: ' + JSON.stringify(err)); - } - } - - deviceStateChange() { - try { - this.dmInstance!.on('deviceStateChange', (data: DeviceStateData) => { - if (data.action == 0 || data.action == 1) { - let deviceInfoList: distributedDeviceManager.DeviceBasicInfo[] = - this.dmInstance!.getAvailableDeviceListSync(); - this.trustDeviceList = []; - deviceInfoList.forEach((item) => { - this.trustDeviceList.push({ device: item, status: StatusType.TrustBinding}) - for (let i = 0; i < this.deviceList.length; i++) { - let deviceItem = this.deviceList[i] - if (this.isDeviceBasicEqual(deviceItem, item)) { - this.deviceList[i].status = StatusType.TrustBinding - this.deviceList.push(new Data()) - this.deviceList.splice(this.deviceList.length - 1, 1) - } - } - }) - let currentItem = this.currentDevice as Data - if (currentItem && this.isDeviceEqual(currentItem, data)) { - this.sendData(data.device.deviceId, data.device.networkId, data.device.deviceName) - } - } - if (data.action == 2) { - this.deviceList = this.deviceList.filter((item) => !this.isDeviceEqual(item, data)) - } - }); - } catch (err) { - let e: BusinessError = err as BusinessError; - console.error('deviceStateChange errCode:' + e.code + ',errMessage:' + e.message); - } - } - - addProperty(data: Data) { - let extraDataStr: string = data.device.extraData == undefined ? '' : data.device.extraData - let extraData: ExtraData = JSON.parse(extraDataStr) - let customData: CustomData = JSON.parse(extraData.CUSTOM_DATA) - data.device.deviceName = customData.displayName - } - - devListInfo() { - try { - this.deviceStateChange() - let deviceInfoList: distributedDeviceManager.DeviceBasicInfo[] = - this.dmInstance!.getAvailableDeviceListSync(); - deviceInfoList.forEach((item) => { - this.trustDeviceList.push({ device: item, status: StatusType.TrustBinding }) - }) - - customData = { - 'operation': this.operation, - 'object': this.bundleName, - 'qResp': 1 - } - discoverParam = { - 'discoverTargetType': 1, - 'CUSTOM_DATA': JSON.stringify(customData), - 'DISC_CAPABILITY' : this.discCapability - } - this.dmInstance!.startDiscovering(discoverParam, filterOptions); - } catch (err) { - let e: BusinessError = err as BusinessError; - console.error('startDiscovering errCode:' + e.code + ',errMessage:' + e.message); - } - this.dmInstance!.on('discoverSuccess', (data: Data) => { - let arr: string[] = [] - let result = this.deviceList.find((item: Data) => { - return this.isDeviceDataEqual(item, data) - }) - if (!!result) { - return - } - this.deviceList.forEach((item) => { - arr.push(this.getMatchId(item.device.deviceId, item.device.networkId)) - }) - if (arr.indexOf(this.getMatchId(data.device.deviceId, data.device.networkId)) === -1) { - data.status = this.getStatusType(data) - this.deviceList.push(data) - } - }); - } - - getFullNetworkId(networkId: string | undefined): string { - let networkIdStr = networkId == undefined ? '' : networkId - let fullNetworkId = ''; - this.trustDeviceList.forEach((item) => { - if (this.getMatchId('', item.device.networkId) == this.getMatchId('', networkIdStr)) { - fullNetworkId = item.device.networkId; - } - }); - return fullNetworkId; - } - - getStatusType(data: Data): StatusType { - let isTrust = false; - this.trustDeviceList.forEach((item) => { - if (this.isDeviceDataEqual(item, data)) { - isTrust = true - } - }); - if (isTrust) { - return StatusType.TrustBinding - } - return StatusType.Unbound - } - - getMatchId(deviceId: string, networkId: string | undefined): string { - networkId = networkId == undefined ? '' : networkId; - if (this.discCapability == 'oop') { - this.networIdMatchLen = 8; - if (networkId.length > this.networIdMatchLen) { - return networkId.substring(0, this.networIdMatchLen) - } - return networkId - } - return deviceId; - } - - isDeviceEqual(device1: Data, device2: DeviceStateData): boolean { - return this.getMatchId(device1.device.deviceId, device1.device.networkId) == - this.getMatchId(device2.device.deviceId, device2.device.networkId); - } - - isDeviceBasicEqual(device1: Data, device2: distributedDeviceManager.DeviceBasicInfo): boolean { - return this.getMatchId(device1.device.deviceId, device1.device.networkId) == - this.getMatchId(device2.deviceId, device2.networkId); - } - - isDeviceDataEqual(device1: Data, device2: Data): boolean { - return this.getMatchId(device1.device.deviceId, device1.device.networkId) == - this.getMatchId(device2.device.deviceId, device2.device.networkId); - } - - initPickParms() { - if (AppStorage.get('title') != null) { - this.title = AppStorage.get('title') as string; - } - if (AppStorage.get('customDescription') != null) { - this.customDescription = AppStorage.get('customDescription') as string; - } - if (AppStorage.get('operation') != null) { - this.operation = AppStorage.get('operation') as string; - } - if (AppStorage.get('bundleName') != null) { - this.bundleName = AppStorage.get('callerBundleName') as string; - } - if (AppStorage.get('moduleName') != null) { - this.moduleName = AppStorage.get('moduleName') as string; - } - if (AppStorage.get('abilityName') != null) { - this.abilityName = AppStorage.get('abilityName') as string; - } - let bundleName = `com.ohos.devicemanagerui_pickerProxy_${this.bundleName}` - this.dmInstance = distributedDeviceManager.createDeviceManager(bundleName); - } - - calcPositionX(index: number): number { - let angle = -160 + (index * 160 / this.isListNum) - let radian = angle * Math.PI / 180 - return this.centerX + Math.cos(radian) * this.radius - } - - calcPositionY(index: number): number { - let angle = -160 + (index * 160 / this.isListNum) - let radian = angle * Math.PI / 180 - return this.centerY + Math.sin(radian) * this.radius - } - - sendData(deviceId: string, networkId: string | undefined, deviceName: string) { - this.deviceSelectSession = AppStorage.get('deviceSelectSession'); - let callBack: DeviceCallBack = { - deviceId: deviceId, - deviceName: deviceName, - bundlename: this.bundleName, - moudlename: this.moduleName, - ablityname: this.abilityName, - } - let fullNetworkId = this.getFullNetworkId(networkId) - console.info('sendData:' + JSON.stringify(callBack)); - this.deviceSelectSession.sendData({'deviceId' : deviceId, 'networkId' : fullNetworkId, 'deviceName' : deviceName}) - this.cancel() - } - - bindTarget(item: Data, index: number) { - this.currentDevice = item - if (item.status == 0) { - try { - this.bindParam = { - 'bindType': 1, - 'targetPkgName': 'xxxx', - 'appName': 'xxxx', - 'appOperation': 'xxxx', - 'customDescription': this.customDescription, - 'bundleName': this.bundleName, - 'context': this.context - }; - this.dmInstance!.bindTarget(item.device.deviceId, this.bindParam, - (err: BusinessError, data: BindTargetData) => { - if (err) { - console.error('======bindTarget errCode:' + err.code + ',errMessage:' + err.message); - return; - } - }); - } catch (err) { - let e: BusinessError = err as BusinessError; - console.error('bindTarget errCode:' + e.code + ',errMessage:' + e.message); - } - } else { - try { - this.dmInstance!.unbindTarget(item.device.deviceId); - this.deviceList[index].status = StatusType.Unbound - this.deviceList.push(new Data()) - this.deviceList.splice(this.deviceList.length - 1, 1) - } catch (err) { - let e: BusinessError = err as BusinessError; - console.error('unbindTarget errCode:' + e.code + ',errMessage:' + e.message); - } - } - } - - onPortrait(mediaQueryResult: mediaquery.MediaQueryResult) { - console.info('mediaQueryResult.matches:' + mediaQueryResult.matches) - if (mediaQueryResult.matches) { - this.isLandscape = true - this.isListNum = 8 - } else { - this.isLandscape = false - this.isListNum = 5 - } - } - - aboutToAppear(): void { - this.listener.on('change', this.onPortrait.bind(this)) - this.initPickParms() - this.deviceSelectSession = AppStorage.get('deviceSelectSession'); - this.devListInfo(); - } - - aboutToDisappear(): void { - this.listener.off('change', this.onPortrait) - } - - build() { - Column() { - Row() { - Text(this.title) - .fontSize(24) - .fontWeight(500) - .onClick(() => { - let arr: string[] = [] - this.deviceList.forEach((item) => { - arr.push(item.device.deviceId) - arr = Array.from(new Set(arr)) - }) - }) - Image($r('app.media.close')).width(40).height(40) - .onClick(() => { - this.cancel() - }) - }.justifyContent(FlexAlign.SpaceBetween) - .width('100%') - - if (this.deviceList.length <= this.isListNum) { - ForEach(this.deviceList, (item: Data, index: number) => { - Column() { - Stack() { - Image(item.status == StatusType.TrustBinding ? $r('app.media.icon_ball_online') : - $r('app.media.icon_ball')).width(54) - Image(item.device.deviceType == 'PHONE' ? $r('app.media.phone') : $r('app.media.icon_pad')).width(30) - } - .width(54) - .height(54) - .borderRadius(54) - - Text(item.device.deviceName) - .fontSize(12) - .textAlign(TextAlign.Center) - } - .width(68) - .height(92) - .position({ - x: this.calcPositionX(index) - 34, - y: this.calcPositionY(index) - 46 - }) - .onClick(() => { - if (item.status == StatusType.TrustBinding) { - this.sendData(item.device.deviceId, item.device.networkId, item.device.deviceName) - } - }) - .onDrop((event: DragEvent, extraParams?: string | undefined) => { - this.showPhone = Visibility.Visible - this.bindTarget(item, index) - console.info('======onDrop onDrop:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - }) - Column() { - Stack() { - Image($r('app.media.iocn_phone_self')).width(54).draggable(false) - Image($r('app.media.phone')).width(30).draggable(false) - } - .width(54) - .height(54) - .borderRadius(54) - - Text($r('app.string.local_machine')) - .fontSize(12) - .textAlign(TextAlign.Center) - } - .width(68) - .height(92) - .position({ - x: this.centerX - 34, - y: this.centerY - 46 - }) - .visibility(this.showPhone) - .draggable(true) - .onDragStart((event) => { - this.showPhone = Visibility.Hidden - console.info('======onDrop onDragStart:' + JSON.stringify(event)); - return this.CustomBuilder() - }) - .onDragEnter((event: DragEvent, extraParams?: string | undefined) => { - this.showPhone = Visibility.Hidden - console.info('======onDrop onDragEnter:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - .onDragMove((event: DragEvent, extraParams?: string | undefined) => { - console.info('======onDrop onDragMove:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - .onDrop((event: DragEvent, extraParams?: string | undefined) => { - console.info('======onDrop onDrop:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - .onDragEnd((event: DragEvent, extraParams?: string | undefined) => { - console.info('======onDrop onDragEnd:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - } else { - Grid(this.scroller) { - ForEach(this.deviceList, (item: Data, index: number) => { - GridItem() { - Column() { - Stack() { - Image(item.status == StatusType.TrustBinding ? $r('app.media.icon_ball_online') : - $r('app.media.icon_ball')).width(54).draggable(false) - Image(item.device.deviceType == 'PHONE' ? $r('app.media.phone') : $r('app.media.icon_pad')) - .width(30) - .draggable(false) - } - .width(54) - .height(54) - .borderRadius(54) - - Text(item.device.deviceName) - .fontSize(12) - .textAlign(TextAlign.Center) - } - .width(68) - .height(92) - .onClick(() => { - if (item.status == StatusType.TrustBinding) { - this.sendData(item.device.deviceId, item.device.networkId, item.device.deviceName) - } else { - this.bindTarget(item, index) - } - }) - } - .draggable(true) - .onDragStart((event) => { - console.info('======onDrop onDragStart:' + JSON.stringify(event)); - }) - .onDragEnter((event: DragEvent, extraParams?: string | undefined) => { - - console.info('======onDrop onDragEnter:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - .onDragMove((event: DragEvent, extraParams?: string | undefined) => { - console.info('======onDrop onDragMove:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - .onDrop((event: DragEvent, extraParams?: string | undefined) => { - console.info('======onDrop onDrop:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - .onDragEnd((event: DragEvent, extraParams?: string | undefined) => { - console.info('======onDrop onDragEnd:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - }) - } - .columnsTemplate('1fr 1fr 1fr 1fr 1fr') - .columnsGap(10) - .rowsGap(10) - .friction(0.6) - .enableScrollInteraction(true) - .supportAnimation(false) - .multiSelectable(false) - .edgeEffect(EdgeEffect.Spring) - .scrollBar(BarState.On) - .scrollBarColor(Color.Grey) - .scrollBarWidth(4) - .width('100%') - .layoutWeight(1) - } - } - .onDrop((event: DragEvent, extraParams?: string | undefined) => { - this.showPhone = Visibility.Visible - console.info('======onDrop onDrop:' + JSON.stringify(event), JSON.stringify(extraParams)); - }) - .width('100%') - .height('100%') - .backgroundColor(Color.White) - .borderRadius({ topLeft: 20, topRight: 20 }) - .padding({ bottom: 0, left: 10, right: 10 }) - .onClick(() => { - if (this.isAutoCancel) { - this.cancel(); - } - }) - .onAreaChange((oldValue, newValue) => { - this.centerX = Number(newValue.width) / 2 - if (this.isLandscape) { - this.radius = Number(newValue.height) - 90 - this.centerY = Number(newValue.height) - 20 - } else { - this.radius = Math.min(Number(newValue.width), Number(newValue.height)) * 0.4 - this.centerY = this.radius + 90 - } - }) - .visibility(this.showFlag) - .transition(TransitionEffect.OPACITY.animation({ duration: anmDuration }) - .combine(TransitionEffect.translate({ y: 100 }))) - - } -} \ No newline at end of file diff --git a/display/entry/src/main/module.json b/display/entry/src/main/module.json index c4d6963c456b2e5e84f75b2fcc2deb3929b0e39e..7b41ba5eaf724ae33bb85ef0d907b682f3b73568 100644 --- a/display/entry/src/main/module.json +++ b/display/entry/src/main/module.json @@ -67,15 +67,6 @@ "label": "$string:ServiceExtAbility_label", "exported": true, "type": "sysDialog/common" - }, - { - "name": "com.ohos.devicemanagerui.picker.DeviceSelectAbility", - "srcEntrance": "./ets/UIExtAbility/picker/DeviceSelectAbility.ets", - "description": "$string:ServiceExtAbility_desc", - "icon": "$media:icon", - "label": "$string:ServiceExtAbility_label", - "exported": true, - "type": "sysDialog/common" } ], "requestPermissions": [ diff --git a/display/entry/src/main/resources/ar/element/string.json b/display/entry/src/main/resources/ar/element/string.json index fbe2b4d875f39ce112e7a991fd183bc1e7e23435..0b72c0cf7d4c939344a0fca6faccb7823da43910 100644 --- a/display/entry/src/main/resources/ar/element/string.json +++ b/display/entry/src/main/resources/ar/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"الوثوق هذه المرة فقط", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/base/element/string.json b/display/entry/src/main/resources/base/element/string.json index 78000dff8417f29adbd21e8445b7c0094167e87e..a36d5e5ddcca8b9eaf55a1ab89deced00dab2629 100644 --- a/display/entry/src/main/resources/base/element/string.json +++ b/display/entry/src/main/resources/base/element/string.json @@ -33,9 +33,9 @@ }, { "name":"dm_allow_this_time", - "value":"Allow this time only", + "value":"Trust this time only", "attr":{ - "priority":"LT" + "priority":"translate" } }, { @@ -111,6 +111,10 @@ { "name":"dm_password_error", "value":"Incorrect password. Connection failed." + }, + { + "name":"dm_confirm_proxy", + "value":"%s requests to connect to this device. Please select the authorized service:" } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/base/media/background.png b/display/entry/src/main/resources/base/media/background.png deleted file mode 100644 index f939c9fa8cc8914832e602198745f592a0dfa34d..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/background.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/background_picker.png b/display/entry/src/main/resources/base/media/background_picker.png deleted file mode 100644 index 4c7a3509d2610a3749ffefab527ad247277a5c3e..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/background_picker.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/close.png b/display/entry/src/main/resources/base/media/close.png deleted file mode 100644 index c72a52014d43419fc7330db489e9685c7f65748d..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/close.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/foreground.png b/display/entry/src/main/resources/base/media/foreground.png deleted file mode 100644 index 4483ddad1f079e1089d685bd204ee1cfe1d01902..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/foreground.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/icon_background.png b/display/entry/src/main/resources/base/media/icon_background.png deleted file mode 100644 index e1492162570336840dc0337f2aa0dd9eec0a74d3..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/icon_background.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/icon_background_light.png b/display/entry/src/main/resources/base/media/icon_background_light.png deleted file mode 100644 index 5c9344358225c1a9a30cace297ffa31fab0a5dd4..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/icon_background_light.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/icon_ball.png b/display/entry/src/main/resources/base/media/icon_ball.png deleted file mode 100644 index f7eeaf1cb072513be6c9af52c8e477a20d05be81..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/icon_ball.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/icon_ball_online.png b/display/entry/src/main/resources/base/media/icon_ball_online.png deleted file mode 100644 index 5a5562cff051b78e51a55768556f528cadf57fdf..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/icon_ball_online.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/icon_pad.png b/display/entry/src/main/resources/base/media/icon_pad.png deleted file mode 100644 index 29b9a0607f76551203c2e6d325004f201390914d..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/icon_pad.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/img.png b/display/entry/src/main/resources/base/media/img.png deleted file mode 100644 index fb7633cf7c637d0631d04d2bfdb48947944298d0..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/img.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/img_select.png b/display/entry/src/main/resources/base/media/img_select.png deleted file mode 100644 index 35a077a9929d611dd91af9fcf2609de28954501f..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/img_select.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/iocn_phone_self.png b/display/entry/src/main/resources/base/media/iocn_phone_self.png deleted file mode 100644 index bf74b558b43a41bcb977ede8f93be8430fbcaa6f..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/iocn_phone_self.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/phone.png b/display/entry/src/main/resources/base/media/phone.png deleted file mode 100644 index 7f0e68f30a71c577223e3c3fd114afae5b399221..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/phone.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/startIcon.png b/display/entry/src/main/resources/base/media/startIcon.png deleted file mode 100644 index 205ad8b5a8a42e8762fbe4899b8e5e31ce822b8b..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/startIcon.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/media/status.png b/display/entry/src/main/resources/base/media/status.png deleted file mode 100644 index fff3a2d0045dafea80ffd0b85027edcea0ac3383..0000000000000000000000000000000000000000 Binary files a/display/entry/src/main/resources/base/media/status.png and /dev/null differ diff --git a/display/entry/src/main/resources/base/profile/main_pages.json b/display/entry/src/main/resources/base/profile/main_pages.json index 4b73c7b4f94e56a3193e1646baf4e69dca53b019..252a52ca92d458b42723e6b98a25a848f11b6017 100644 --- a/display/entry/src/main/resources/base/profile/main_pages.json +++ b/display/entry/src/main/resources/base/profile/main_pages.json @@ -4,9 +4,10 @@ "pages/PinDialog", "pages/InputPinDialog", "pages/BluetoothDialog", + "pages/ConfirmDialogTv", "pages/ConfirmDialogWearable", "pages/PinDialogWearable", - "pages/InputPinDialogWearable", - "pages/picker/DeviceSelect" + "pages/PinDialogTv", + "pages/InputPinDialogWearable" ] } diff --git a/display/entry/src/main/resources/be/element/plural.json b/display/entry/src/main/resources/be/element/plural.json new file mode 100644 index 0000000000000000000000000000000000000000..563d4ea0c1cd09fd45e098ad5c3c4579ab9e1178 --- /dev/null +++ b/display/entry/src/main/resources/be/element/plural.json @@ -0,0 +1,70 @@ +{ + "plural":[ + { + "name":"dm_incorrect_code", + "value":[ + { + "quantity":"one", + "value":"Няправільна. Засталося спроб: %d.", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"other", + "value":"Няправільна. Засталося спроб: %d.", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"few", + "value":"Няправільна. Засталося спроб: %d.", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"many", + "value":"Няправільна. Засталося спроб: %d.", + "attr":{ + "priority":"translate" + } + } + ] + }, + { + "name":"dm_not_allow", + "value":[ + { + "quantity":"other", + "value":"Не давяраць (%d)", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"one", + "value":"Не давяраць (%d)", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"few", + "value":"Не давяраць (%d)", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"many", + "value":"Не давяраць (%d)", + "attr":{ + "priority":"translate" + } + } + ] + } + ] +} diff --git a/display/entry/src/main/resources/be/element/string.json b/display/entry/src/main/resources/be/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..33b02f244f8a4bebf58dbfab965560f79b46c5ed --- /dev/null +++ b/display/entry/src/main/resources/be/element/string.json @@ -0,0 +1,60 @@ +{ + "string":[ + { + "name":"dm_allow_this_time", + "value":"Давяраць толькі гэтым разам", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_connect_code", + "value":"Код падключэння", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_confirm_title_hap", + "value":"Праграма «%1$s» на прыладзе %2$s запытвае доступ да гэтай прылады. Давяраць гэтай праграме?", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_cancel", + "value":"Адмяніць", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_enter_peer_connect_code", + "value":"Увядзіце код падключэння", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_confirm_intention", + "value":"Гэта неабходна для сінхранізацыі даных і ўзаемадзеяння паміж прыладамі.", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_allow_temp", + "value":"Гэтым разам давяраць", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_allow_always", + "value":"Заўсёды давяраць", + "attr":{ + "priority":"translate" + } + } + ] +} diff --git a/display/entry/src/main/resources/bg/element/string.json b/display/entry/src/main/resources/bg/element/string.json index 7aefc1f80badcbdc9f9a22de05cb0cc12cde96c9..60bdf089023bbaa4e8e27e35e5ddfe7f512de30d 100644 --- a/display/entry/src/main/resources/bg/element/string.json +++ b/display/entry/src/main/resources/bg/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Доверяване само този път", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/bn/element/string.json b/display/entry/src/main/resources/bn/element/string.json index 035cadae063e14278921b5d1fba38835549ac78d..e1d5cc79279887d1b2fbf1fb2f8f871509cfe8c6 100644 --- a/display/entry/src/main/resources/bn/element/string.json +++ b/display/entry/src/main/resources/bn/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"কেবল এবার আস্থা রাখুন", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/bo_CN/element/string.json b/display/entry/src/main/resources/bo_CN/element/string.json index 3b5e8dd456a2b2475b24e895528c997627e2cd2d..26422e69fe046be0ecdff76fbaea0d5478d56578 100644 --- a/display/entry/src/main/resources/bo_CN/element/string.json +++ b/display/entry/src/main/resources/bo_CN/element/string.json @@ -63,6 +63,13 @@ { "name":"dm_enter_peer_connect_code", "value":"ཕ་རོལ་སྣེའི་སྦྲེལ་མཐུད་ཨང་རྟགས་འཇུག་རོགས།" + }, + { + "name":"dm_allow_this_time", + "value":"ཐེངས་འདི་ཁོ་ནར་ཡིད་ཆེས།", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/cs/element/string.json b/display/entry/src/main/resources/cs/element/string.json index 61b75a3cbb01edcf1ae1b875125064cb6f8bdeba..11d7aaa12c3bdf4f8cbf8fe6041cd17d2eb43212 100644 --- a/display/entry/src/main/resources/cs/element/string.json +++ b/display/entry/src/main/resources/cs/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Pouze tentokrát důvěřovat", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/da/element/string.json b/display/entry/src/main/resources/da/element/string.json index d7fa111a06b3b2beff85b0e4b652eed7ff4706a6..fbddd3b1f24f20f7188f89fdb867b7ca68ba0729 100644 --- a/display/entry/src/main/resources/da/element/string.json +++ b/display/entry/src/main/resources/da/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Hav tillid kun denne gang", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/de/element/string.json b/display/entry/src/main/resources/de/element/string.json index 640d971275405a0364e86295c1f56f06792f08ed..8dcd1800f4822333cfce71410309911e9907909a 100644 --- a/display/entry/src/main/resources/de/element/string.json +++ b/display/entry/src/main/resources/de/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Nur dieses Mal vertrauen", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/el/element/string.json b/display/entry/src/main/resources/el/element/string.json index 33e36d5e5247cfaff74bc4d9cd54b20ced659bb4..1d7fbd5fae18be79a8bfaacf8f324620a6384ec9 100644 --- a/display/entry/src/main/resources/el/element/string.json +++ b/display/entry/src/main/resources/el/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Αξιόπιστο αυτήν τη φορά μόνο", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/en_GB/element/string.json b/display/entry/src/main/resources/en_GB/element/string.json index 95967e472fd71086777941bde62017b94ab6bfd1..baa3bb587bcc7e373feb47d6a518b9ae3d6c3785 100644 --- a/display/entry/src/main/resources/en_GB/element/string.json +++ b/display/entry/src/main/resources/en_GB/element/string.json @@ -48,6 +48,20 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Trust this time only", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_confirm_proxy", + "value":"%s requests to connect to this device. Please select the authorized service:", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/es/element/string.json b/display/entry/src/main/resources/es/element/string.json index b61280d33eb868853f20ff5f35cf6ecda8984b7c..fa8a907d8658551007ef13d820abf2055aebbe0d 100644 --- a/display/entry/src/main/resources/es/element/string.json +++ b/display/entry/src/main/resources/es/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Solo confiar esta vez", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/es_US/element/string.json b/display/entry/src/main/resources/es_US/element/string.json index 15b5fab8d72c455a28e7374906a6db3997ad979d..b8ee1383d1143d74932fd4e2360c848137d1b918 100644 --- a/display/entry/src/main/resources/es_US/element/string.json +++ b/display/entry/src/main/resources/es_US/element/string.json @@ -50,8 +50,11 @@ } }, { - "name":"local_machine", - "value":"local machine" + "name":"dm_allow_this_time", + "value":"Solo confiar esta vez", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/et/element/string.json b/display/entry/src/main/resources/et/element/string.json index 43a864f030fa38c08506096ca5656b8d3999abb0..48e4d9a476b51d830b686256a7007dbe6186ae56 100644 --- a/display/entry/src/main/resources/et/element/string.json +++ b/display/entry/src/main/resources/et/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Usalda ainult sel korral", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/fa/element/string.json b/display/entry/src/main/resources/fa/element/string.json index 3624e907a0e68663ced30b66620cd9048ace7375..456231b3c844b57180a6996b2de563a74b18104d 100644 --- a/display/entry/src/main/resources/fa/element/string.json +++ b/display/entry/src/main/resources/fa/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"فقط این بار مورداعتماد است", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/fi/element/string.json b/display/entry/src/main/resources/fi/element/string.json index 5e7deb7ffdc04f227262efb5950114853de82dc3..4c6cf42698a05487aa44fe214888e7c6e4785699 100644 --- a/display/entry/src/main/resources/fi/element/string.json +++ b/display/entry/src/main/resources/fi/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Luota vain tämän kerran", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/tl/element/plural.json b/display/entry/src/main/resources/fil/element/plural.json similarity index 100% rename from display/entry/src/main/resources/tl/element/plural.json rename to display/entry/src/main/resources/fil/element/plural.json diff --git a/display/entry/src/main/resources/tl/element/string.json b/display/entry/src/main/resources/fil/element/string.json similarity index 87% rename from display/entry/src/main/resources/tl/element/string.json rename to display/entry/src/main/resources/fil/element/string.json index 7e6c513032186c9a353ffc653338a790e4adf136..e637fa33100db157e19784ad1872deb1a8378468 100644 --- a/display/entry/src/main/resources/tl/element/string.json +++ b/display/entry/src/main/resources/fil/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Pagkatiwalaan sa oras na ito lamang", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/fr/element/string.json b/display/entry/src/main/resources/fr/element/string.json index 8b740a05ab2ad4ea4d8f56f3a08494eee3da91b1..d2afb3ebb780276e658d9e90cf214212ffadf469 100644 --- a/display/entry/src/main/resources/fr/element/string.json +++ b/display/entry/src/main/resources/fr/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Faire confiance cette fois uniquement", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/iw/element/plural.json b/display/entry/src/main/resources/he/element/plural.json similarity index 100% rename from display/entry/src/main/resources/iw/element/plural.json rename to display/entry/src/main/resources/he/element/plural.json diff --git a/display/entry/src/main/resources/iw/element/string.json b/display/entry/src/main/resources/he/element/string.json similarity index 88% rename from display/entry/src/main/resources/iw/element/string.json rename to display/entry/src/main/resources/he/element/string.json index 3217d397b6d5583e2df94bb4e89465efb4906949..fbc2960eecc9de83f5f671076ded37b796ead5ba 100644 --- a/display/entry/src/main/resources/iw/element/string.json +++ b/display/entry/src/main/resources/he/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"תן אמון רק הפעם", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/hi/element/string.json b/display/entry/src/main/resources/hi/element/string.json index 61e622c690cad42e6005b3cfed6cb6ea863c1b16..dfd025208ec1658a5585405ec6a3d113df5f96a3 100644 --- a/display/entry/src/main/resources/hi/element/string.json +++ b/display/entry/src/main/resources/hi/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"केवल इस बार भरोसा करें", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/hr/element/string.json b/display/entry/src/main/resources/hr/element/string.json index a4199315bd09169ca32ae98b05eec8349ed00bb7..77c631c9aeba0848cd9b4309bb224499d3a82ff8 100644 --- a/display/entry/src/main/resources/hr/element/string.json +++ b/display/entry/src/main/resources/hr/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Vjeruj samo ovaj put", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/hu/element/string.json b/display/entry/src/main/resources/hu/element/string.json index 1fdb0c568578d60e151c0ea610b16daf1c1399ef..aaff3fe83c6425ba61a254299c32b0aea86ee617 100644 --- a/display/entry/src/main/resources/hu/element/string.json +++ b/display/entry/src/main/resources/hu/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Csak most kezelje megbízhatóként", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/in/element/plural.json b/display/entry/src/main/resources/id/element/plural.json similarity index 100% rename from display/entry/src/main/resources/in/element/plural.json rename to display/entry/src/main/resources/id/element/plural.json diff --git a/display/entry/src/main/resources/in/element/string.json b/display/entry/src/main/resources/id/element/string.json similarity index 88% rename from display/entry/src/main/resources/in/element/string.json rename to display/entry/src/main/resources/id/element/string.json index 3b211eece143f48114285277f2cd4396cbfe8d16..45cbf219dba2aafaeee54b7133a28a41772d3f6d 100644 --- a/display/entry/src/main/resources/in/element/string.json +++ b/display/entry/src/main/resources/id/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Percayai kali ini saja", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/it/element/string.json b/display/entry/src/main/resources/it/element/string.json index e21e2bd04aa7bb3c050b0531e1ef82a0733ded9e..809bc8df5a60e8ebdfb920ab7906e38a7f0d57bf 100644 --- a/display/entry/src/main/resources/it/element/string.json +++ b/display/entry/src/main/resources/it/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Considera attendibile solo questa volta", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/ja/element/string.json b/display/entry/src/main/resources/ja/element/string.json index f9ce3a21f0c3ea616a224e8476621b5b1f2a870c..89eaff6326d06d7f308a7860529c6633710f61a0 100644 --- a/display/entry/src/main/resources/ja/element/string.json +++ b/display/entry/src/main/resources/ja/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"今回のみ信頼", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/ka_GE/element/plural.json b/display/entry/src/main/resources/ka/element/plural.json similarity index 100% rename from display/entry/src/main/resources/ka_GE/element/plural.json rename to display/entry/src/main/resources/ka/element/plural.json diff --git a/display/entry/src/main/resources/ka_GE/element/string.json b/display/entry/src/main/resources/ka/element/string.json similarity index 89% rename from display/entry/src/main/resources/ka_GE/element/string.json rename to display/entry/src/main/resources/ka/element/string.json index 48f01c40142c8dd9c2e41e25722c45392add35a1..7c9276768274fee6500e8db650f5a0db824ce2d9 100644 --- a/display/entry/src/main/resources/ka_GE/element/string.json +++ b/display/entry/src/main/resources/ka/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"ვენდოთ მხოლოდ ამჯერად", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/kk/element/plural.json b/display/entry/src/main/resources/kk/element/plural.json new file mode 100644 index 0000000000000000000000000000000000000000..6573c970dd99b641c79cd173fdbf7a03f06e4b93 --- /dev/null +++ b/display/entry/src/main/resources/kk/element/plural.json @@ -0,0 +1,42 @@ +{ + "plural":[ + { + "name":"dm_incorrect_code", + "value":[ + { + "quantity":"one", + "value":"Дұрыс емес. %d әрекет қалды.", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"other", + "value":"Дұрыс емес. %d әрекет қалды.", + "attr":{ + "priority":"translate" + } + } + ] + }, + { + "name":"dm_not_allow", + "value":[ + { + "quantity":"other", + "value":"Сенбеу (%d)", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"one", + "value":"Сенбеу (%d)", + "attr":{ + "priority":"translate" + } + } + ] + } + ] +} diff --git a/display/entry/src/main/resources/kk/element/string.json b/display/entry/src/main/resources/kk/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..5f49e14cdfd417d84aa9873d81378248cf222ef9 --- /dev/null +++ b/display/entry/src/main/resources/kk/element/string.json @@ -0,0 +1,60 @@ +{ + "string":[ + { + "name":"dm_allow_this_time", + "value":"Тек осы жолы сену", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_connect_code", + "value":"Байланыс коды", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_confirm_title_hap", + "value":"%1$s (%2$s дегенде) осы құрылғыға қатынасқысы келіп жатыр. Осы қолданбаға сенесіз бе?", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_cancel", + "value":"Бас тарту", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_enter_peer_connect_code", + "value":"Қосылым кодын енгізіңіз", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_confirm_intention", + "value":"Бұл құрылғылар арасында деректерді синхрондау және бірлесіп жұмыс істеу үшін қажет.", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_allow_temp", + "value":"Бұл жолы сену", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_allow_always", + "value":"Әрқашан сену", + "attr":{ + "priority":"translate" + } + } + ] +} diff --git a/display/entry/src/main/resources/km/element/plural.json b/display/entry/src/main/resources/km/element/plural.json new file mode 100644 index 0000000000000000000000000000000000000000..a95aa42c17802ecdc80c5e2c370607fe0c8c8be6 --- /dev/null +++ b/display/entry/src/main/resources/km/element/plural.json @@ -0,0 +1,28 @@ +{ + "plural":[ + { + "name":"dm_incorrect_code", + "value":[ + { + "quantity":"other", + "value":"មិនត្រឹមត្រូវ។ នៅសល់ការព្យាយាម %d ដងទៀត។", + "attr":{ + "priority":"translate" + } + } + ] + }, + { + "name":"dm_not_allow", + "value":[ + { + "quantity":"other", + "value":"កុំទុកចិត្ត (%d)", + "attr":{ + "priority":"translate" + } + } + ] + } + ] +} diff --git a/display/entry/src/main/resources/km/element/string.json b/display/entry/src/main/resources/km/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..bfacf6e76a30d87a5cc6a9958117257dfc7c8f26 --- /dev/null +++ b/display/entry/src/main/resources/km/element/string.json @@ -0,0 +1,60 @@ +{ + "string":[ + { + "name":"dm_allow_this_time", + "value":"ទុកចិត្តតែលើកនេះប៉ុណ្ណោះ", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_connect_code", + "value":"កូដតភ្ជាប់", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_confirm_title_hap", + "value":"%1$s នៅលើ %2$s ចង់ចូលប្រើឧបករណ៍នេះ។ ទុកចិត្តកម្មវិធីនេះឬ?", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_cancel", + "value":"បោះបង់", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_enter_peer_connect_code", + "value":"វាយបញ្ចូលកូដតភ្ជាប់", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_confirm_intention", + "value":"តម្រូវឱ្យមានវាសម្រាប់ការធ្វើសមកាលកម្មទិន្នន័យ និងការសហការឆ្លងឧបករណ៍។", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_allow_temp", + "value":"ទុកចិត្តលើកនេះ", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_allow_always", + "value":"ទុកចិត្តជានិច្ច", + "attr":{ + "priority":"translate" + } + } + ] +} diff --git a/display/entry/src/main/resources/ko/element/string.json b/display/entry/src/main/resources/ko/element/string.json index 570d2aa8d2bf613e92b66b201a2c71d7b981cfc2..7661cc7dc2321d3ae37d00d90dc1537cfc821694 100644 --- a/display/entry/src/main/resources/ko/element/string.json +++ b/display/entry/src/main/resources/ko/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"이번 한 번만 신뢰", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/lt/element/string.json b/display/entry/src/main/resources/lt/element/string.json index afc80f3a928940289368c4a475859e6ed6e8cce7..80618543a54228da48b780b9021eee4596e44124 100644 --- a/display/entry/src/main/resources/lt/element/string.json +++ b/display/entry/src/main/resources/lt/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Pasitikėti tik šį kartą", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/lv/element/string.json b/display/entry/src/main/resources/lv/element/string.json index 3217d8c3f7ce2f230dfc350320a0313862cf6d1b..2326c8bea053c8b38a46ab21cf8b1344ebd4b347 100644 --- a/display/entry/src/main/resources/lv/element/string.json +++ b/display/entry/src/main/resources/lv/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Uzticēties tikai šoreiz", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/mk/element/string.json b/display/entry/src/main/resources/mk/element/string.json index 97f08b199d089cb18d6c0c4fe372d5bc7ab90ea1..d14bdadcc3886449d83f58f21b21d16e0d9ceccb 100644 --- a/display/entry/src/main/resources/mk/element/string.json +++ b/display/entry/src/main/resources/mk/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Доверлив само овој пат", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/ms/element/string.json b/display/entry/src/main/resources/ms/element/string.json index d82475234c56ab096d5b033f6726fb779520381c..aa6e086818e975fe47d082e934eaf94e74e4e483 100644 --- a/display/entry/src/main/resources/ms/element/string.json +++ b/display/entry/src/main/resources/ms/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Percayai pada kali ini sahaja", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/my_MM/element/plural.json b/display/entry/src/main/resources/my/element/plural.json similarity index 100% rename from display/entry/src/main/resources/my_MM/element/plural.json rename to display/entry/src/main/resources/my/element/plural.json diff --git a/display/entry/src/main/resources/my_MM/element/string.json b/display/entry/src/main/resources/my/element/string.json similarity index 89% rename from display/entry/src/main/resources/my_MM/element/string.json rename to display/entry/src/main/resources/my/element/string.json index 83076ce2a26ab4fc2916257f122114498e205491..9a50d4315440cfbe7f3d79b9727dbcc64eee939c 100644 --- a/display/entry/src/main/resources/my_MM/element/string.json +++ b/display/entry/src/main/resources/my/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"ဤတစ်ကြိမ်သာ ယုံကြည်သည်", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/nb/element/string.json b/display/entry/src/main/resources/nb/element/string.json index 163768ff30c0aaff958c6401440499d9e2fe3e35..aa6a8a424ce33289a5eb1f862d51d07cad2bb185 100644 --- a/display/entry/src/main/resources/nb/element/string.json +++ b/display/entry/src/main/resources/nb/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Stol på kun denne gangen", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/nl/element/string.json b/display/entry/src/main/resources/nl/element/string.json index 0f50cb3a56348b19aa99a4579544e5736bdcb741..8b382909b61eb7517363e6fde0e152de6a2ecd86 100644 --- a/display/entry/src/main/resources/nl/element/string.json +++ b/display/entry/src/main/resources/nl/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Alleen dit keer vertrouwen", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/pl/element/string.json b/display/entry/src/main/resources/pl/element/string.json index 81d4df0a2c666262803a15e8d07065fb369485e2..3bb8756a7b8c4859e3c510f283265085f50b34f3 100644 --- a/display/entry/src/main/resources/pl/element/string.json +++ b/display/entry/src/main/resources/pl/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Zaufaj tylko tym razem", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/pt/element/string.json b/display/entry/src/main/resources/pt/element/string.json index 5f3e32f16f32db54e84c103f35bc1dacc82c04c0..0b37d269875e36d02722056a448ba35235e116f9 100644 --- a/display/entry/src/main/resources/pt/element/string.json +++ b/display/entry/src/main/resources/pt/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Confie apenas neste momento", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/pt_PT/element/string.json b/display/entry/src/main/resources/pt_PT/element/string.json index 8fdb8621796d72196fe6f150f2283451c4524659..aa3706f944f10e89a6da5f35566800a3e62749a2 100644 --- a/display/entry/src/main/resources/pt_PT/element/string.json +++ b/display/entry/src/main/resources/pt_PT/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Confiar apenas esta vez", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/ro/element/string.json b/display/entry/src/main/resources/ro/element/string.json index ca4051d5bb8ea2f0d4d48d3e8e89159acb16a0d4..8040a81a043485eaa2d275d2ca3feaf570b36ddc 100644 --- a/display/entry/src/main/resources/ro/element/string.json +++ b/display/entry/src/main/resources/ro/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Am încredere doar de data aceasta", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/ru/element/string.json b/display/entry/src/main/resources/ru/element/string.json index 1259dc54f2f7d4acd62b59f55ee9624ce5d46ac3..443a7bfd960ef02c50be552430e0f0a6fae7bf8e 100644 --- a/display/entry/src/main/resources/ru/element/string.json +++ b/display/entry/src/main/resources/ru/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Доверять только сейчас", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/sk/element/string.json b/display/entry/src/main/resources/sk/element/string.json index d1a01c4cff354643a1db17375df8c1af229887cc..04352a9a75bd25fad1da0b4cc2fb65cf98a07558 100644 --- a/display/entry/src/main/resources/sk/element/string.json +++ b/display/entry/src/main/resources/sk/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Dôverovať len teraz", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/sl/element/string.json b/display/entry/src/main/resources/sl/element/string.json index 87583c7a7c82bfdd783832fed4e4833c7d0fb945..e569c44c2966f34e74ef4c18f6cc7c6fee6574af 100644 --- a/display/entry/src/main/resources/sl/element/string.json +++ b/display/entry/src/main/resources/sl/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Zaupaj samo tokrat", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/sr_Latn/element/string.json b/display/entry/src/main/resources/sr_Latn/element/string.json index f0a62d0715065a9ee5d5c9381a2de410dac41fff..25a99c2e0e7eea4a78e90431152fc728179d974e 100644 --- a/display/entry/src/main/resources/sr_Latn/element/string.json +++ b/display/entry/src/main/resources/sr_Latn/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Smatraj pouzdanim samo ovog puta", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/sv/element/string.json b/display/entry/src/main/resources/sv/element/string.json index c5ba579b7b5ec2e6bbe975c49f0c8f978e1eeab9..0f3c4e1253b4197f4305c13b0c2ce8842344b056 100644 --- a/display/entry/src/main/resources/sv/element/string.json +++ b/display/entry/src/main/resources/sv/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Lita på endast denna gången", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/th/element/string.json b/display/entry/src/main/resources/th/element/string.json index 504fc121ef819d0e7268fc3e104aeb153b048545..27dc0bd8ac610c53b2783686462759fa46144265 100644 --- a/display/entry/src/main/resources/th/element/string.json +++ b/display/entry/src/main/resources/th/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"เชื่อถือเฉพาะครั้งนี้เท่านั้น", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/tr/element/string.json b/display/entry/src/main/resources/tr/element/string.json index 4ddd80422889590809aa74fbcb08786b8a3205be..3b5b0f4a564e8b25dacf177d366577ea8426356c 100644 --- a/display/entry/src/main/resources/tr/element/string.json +++ b/display/entry/src/main/resources/tr/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Sadece bu kez güven", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/ug/element/string.json b/display/entry/src/main/resources/ug/element/string.json index 88d86cb8aed9ccce832569346d49ec19767310f2..766f07990c789a16884deb0c51c3619863ceb9ab 100644 --- a/display/entry/src/main/resources/ug/element/string.json +++ b/display/entry/src/main/resources/ug/element/string.json @@ -63,6 +63,13 @@ { "name":"dm_enter_peer_connect_code", "value":"ئۇلاش كودى كىرگۈزۈڭ" + }, + { + "name":"dm_allow_this_time", + "value":"بۇ قېتىم ئىشىنىش", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/uk/element/string.json b/display/entry/src/main/resources/uk/element/string.json index 3963486da8d77709039d3b1203cb2732942d7a9a..078745689d342a656f35744ee8fa48e2e1e338f6 100644 --- a/display/entry/src/main/resources/uk/element/string.json +++ b/display/entry/src/main/resources/uk/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Довіряти лише цього разу", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/uz/element/plural.json b/display/entry/src/main/resources/uz/element/plural.json new file mode 100644 index 0000000000000000000000000000000000000000..691858f8e87d54a3de7b409874e36d89fe82348c --- /dev/null +++ b/display/entry/src/main/resources/uz/element/plural.json @@ -0,0 +1,42 @@ +{ + "plural":[ + { + "name":"dm_incorrect_code", + "value":[ + { + "quantity":"one", + "value":"Xato kiritildi. %d ta urinish qoldi.", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"other", + "value":"Xato kiritildi. %d ta urinish qoldi.", + "attr":{ + "priority":"translate" + } + } + ] + }, + { + "name":"dm_not_allow", + "value":[ + { + "quantity":"other", + "value":"Ishonchli emas (%d)", + "attr":{ + "priority":"translate" + } + }, + { + "quantity":"one", + "value":"Ishonchli emas (%d)", + "attr":{ + "priority":"translate" + } + } + ] + } + ] +} diff --git a/display/entry/src/main/resources/uz/element/string.json b/display/entry/src/main/resources/uz/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..25d416af46da666d1b0ab64dbc7e741ba2282dae --- /dev/null +++ b/display/entry/src/main/resources/uz/element/string.json @@ -0,0 +1,60 @@ +{ + "string":[ + { + "name":"dm_allow_this_time", + "value":"Faqat shu safar ishonish", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_connect_code", + "value":"Ulanish kodi", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_confirm_title_hap", + "value":"%2$s qurilmasidagi %1$s ilovasi ushbu qurilmaga kirmoqchi. Bu ilova ishonchlimi?", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_cancel", + "value":"Bekor qilish", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_enter_peer_connect_code", + "value":"Ulanish kodini kiriting", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_confirm_intention", + "value":"Bu qurilmalararo maʼlumot sinxronizatsiyasi va hamkorlik uchun zarur.", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_allow_temp", + "value":"Shu safar ishonchli", + "attr":{ + "priority":"translate" + } + }, + { + "name":"dm_allow_always", + "value":"Doim ishonchli", + "attr":{ + "priority":"translate" + } + } + ] +} diff --git a/display/entry/src/main/resources/vi/element/string.json b/display/entry/src/main/resources/vi/element/string.json index f7580574c5eefea5d9167324f77d5de821070757..b29492c79fc07020c04ce51174ca4580e2a06c80 100644 --- a/display/entry/src/main/resources/vi/element/string.json +++ b/display/entry/src/main/resources/vi/element/string.json @@ -48,6 +48,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"Chỉ tin tưởng lần này", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/zh_CN/element/string.json b/display/entry/src/main/resources/zh_CN/element/string.json index 9b8aa6ac6fa24ba0b1de5756804ea680fea74cd3..1595fce9e7d332d60714e8b1d1cd6af16d3765f0 100644 --- a/display/entry/src/main/resources/zh_CN/element/string.json +++ b/display/entry/src/main/resources/zh_CN/element/string.json @@ -33,7 +33,10 @@ }, { "name":"dm_allow_this_time", - "value":"仅本次信任" + "value":"仅本次信任", + "attr":{ + "priority":"translate" + } }, { "name":"dm_allow_always", @@ -110,8 +113,11 @@ "value":"密码错误，连接失败。" }, { - "name":"local_machine", - "value":"本机" + "name":"dm_confirm_proxy", + "value":"%s请求连接本机。请选择授权的业务：", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/zh_HK/element/string.json b/display/entry/src/main/resources/zh_HK/element/string.json index fc85c155266b23409464b340e16f6a9da7c85e30..aa1a5ec67b48b105a491cdb7c1ade69be57a2fda 100644 --- a/display/entry/src/main/resources/zh_HK/element/string.json +++ b/display/entry/src/main/resources/zh_HK/element/string.json @@ -61,7 +61,7 @@ }, { "name":"dm_confirm_intention", - "value":"用以進行數據同步及裝置之間的協同操作", + "value":"用於進行數據同步及裝置之間的協同操作", "attr":{ "priority":"LT" } @@ -84,6 +84,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"僅本次信任", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/zh_TW/element/string.json b/display/entry/src/main/resources/zh_TW/element/string.json index 9e9429166b0b1e3b6376d35f03360d0507752990..4934ad4aa21a35dcbb91e471111fa815e32a39c9 100644 --- a/display/entry/src/main/resources/zh_TW/element/string.json +++ b/display/entry/src/main/resources/zh_TW/element/string.json @@ -84,6 +84,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"dm_allow_this_time", + "value":"僅本次信任", + "attr":{ + "priority":"translate" + } } ] } \ No newline at end of file diff --git a/display/entry/src/main/resources/zz_ZX/element/string.json b/display/entry/src/main/resources/zz_ZX/element/string.json index 1fdf6a26cacf1810aa04c6f92a843dda896250ec..8a41e00b3ed18da6fad5f626afb8d2fd3c0fd8d5 100644 --- a/display/entry/src/main/resources/zz_ZX/element/string.json +++ b/display/entry/src/main/resources/zz_ZX/element/string.json @@ -83,6 +83,10 @@ { "name":"dm_password_error", "value":"[TS_958913]_Incorrect password. Connection failed." + }, + { + "name":"dm_allow_this_time", + "value":"[TS_1054456]_Trust this time only" } ] } \ No newline at end of file diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn index 93ef54845dd63f52cc7ceb80dcd8bc36e2bc14c1..728a937de9a01697abb9bd2695007fe80fa0a837 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -74,6 +74,7 @@ ohos_shared_library("devicemanagerext_pin_auth") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${servicesimpl_path}:devicemanagerserviceimpl", ] @@ -81,7 +82,6 @@ ohos_shared_library("devicemanagerext_pin_auth") { "ability_base:session_info", "ability_base:want", "ability_runtime:ability_manager", - "cJSON:cjson", "c_utils:utils", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", diff --git a/interfaces/cj/kits/BUILD.gn b/interfaces/cj/kits/BUILD.gn index 5a19c440b02719c89a7870b94fc1285ab2e400e7..1155e845dded3e4163623b00e2dd01a9e9e2167b 100644 --- a/interfaces/cj/kits/BUILD.gn +++ b/interfaces/cj/kits/BUILD.gn @@ -56,7 +56,10 @@ ohos_shared_library("cj_distributed_device_manager_ffi") { "src/device_manager_utils.cpp", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] defines = [ "HI_LOG_ENABLE", @@ -67,7 +70,6 @@ ohos_shared_library("cj_distributed_device_manager_ffi") { external_deps = [ "access_token:libtokenid_sdk", "bounds_checking_function:libsec_shared", - "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn index eb86d886ff8b79e827623f64058bd80ae8dcf776..2068a5585b19c581039241a6e5110ae529ed7035 100644 --- a/interfaces/inner_kits/native_cpp/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/BUILD.gn @@ -23,7 +23,6 @@ if (defined(ohos_lite)) { static_library("devicemanagersdk") { include_dirs = [ "${innerkits_path}/native_cpp/include/mini", - "//third_party/cJSON", "//kernel/liteos_m/kal/cmsis", "//utils/native/lite/include", "//kernel/liteos_m/kal/posix/include", @@ -51,6 +50,7 @@ if (defined(ohos_lite)) { "//commonlibrary/utils_lite:utils", "//foundation/systemabilitymgr/samgr_lite/samgr", "//third_party/bounds_checking_function:libsec_static", + "//third_party/cJSON:cjson", ] cflags = [ @@ -83,8 +83,8 @@ if (defined(ohos_lite)) { "${samgr_lite_path}/kits/registry", "${utils_lite_path}/include", "${utils_path}/include", + "${json_path}/include", "//third_party/bounds_checking_function/include", - "//third_party/json/include", "${interfaces_path}/c/ipc/include", "//foundation/distributedshedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", @@ -96,7 +96,6 @@ if (defined(ohos_lite)) { "${common_path}/src/dfx/lite/dm_hitrace.cpp", "${common_path}/src/dm_anonymous.cpp", "${common_path}/src/dm_constants.cpp", - "${common_path}/src/json_object.cpp", "${devicemanager_path}/radar/src/lite/dm_radar_helper.cpp", "${utils_path}/src/dm_random.cpp", "src/device_manager.cpp", @@ -118,6 +117,7 @@ if (defined(ohos_lite)) { ] deps = [ + "${json_path}:devicemanagerjson", "${utils_path}:devicemanagerutils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/security/device_auth/services:deviceauth_sdk", @@ -145,6 +145,7 @@ if (defined(ohos_lite)) { "${common_path}/include/dfx/standard", "${devicemanager_path}/radar/include", "${utils_path}/include", + "${json_path}/include", ] } @@ -175,7 +176,6 @@ if (defined(ohos_lite)) { "${common_path}/src/dm_constants.cpp", "${common_path}/src/ipc/standard/ipc_cmd_register.cpp", "${common_path}/src/ipc/standard/ipc_model_codec.cpp", - "${common_path}/src/json_object.cpp", "${devicemanager_path}/radar/src/dm_radar_helper.cpp", "${utils_path}/src/dm_random.cpp", "src/device_manager.cpp", @@ -200,6 +200,8 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004111", ] + deps = [ "${json_path}:devicemanagerjson" ] + external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", @@ -218,8 +220,6 @@ if (defined(ohos_lite)) { "samgr:samgr_proxy", ] - public_external_deps = [ "cJSON:cjson" ] - subsystem_name = "distributedhardware" part_name = "device_manager" diff --git a/interfaces/inner_kits/native_cpp/include/device_manager.h b/interfaces/inner_kits/native_cpp/include/device_manager.h index 0ea47be34bc83fbe14be8cee35db5716c974bf70..da0db3936076c2cece54906b35ba28a0a818fe77 100644 --- a/interfaces/inner_kits/native_cpp/include/device_manager.h +++ b/interfaces/inner_kits/native_cpp/include/device_manager.h @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { class DeviceManager { public: - static DeviceManager &GetInstance(); + DM_EXPORT static DeviceManager &GetInstance(); public: /** @@ -342,6 +342,12 @@ public: */ virtual int32_t GetLocalDeviceName(const std::string &pkgName, std::string &deviceName) = 0; + /** + * @brief Get local device name. + * @return Returns device name. + */ + virtual int32_t GetLocalDeviceName(std::string &deviceName) = 0; + /** * @brief Get local device type. * @param pkgName package name. @@ -608,15 +614,6 @@ public: virtual int32_t UnRegisterDeviceScreenStatusCallback(const std::string &pkgName) = 0; virtual int32_t GetDeviceScreenStatus(const std::string &pkgName, const std::string &networkId, int32_t &screenStatus) = 0; - - /** - * @brief Set Dn Policy - * @param pkgName package name. - * @param policy contain DM_POLICY_STRATEGY_FOR_BLE and DM_POLICY_TIMEOUT key and value. - * DM_POLICY_STRATEGY_FOR_BLE: Strategy BLE networking go-online policy, suppress or restore. - * DM_POLICY_TIMEOUT: Indicates the duration for suppressing ble networking. - * @return Returns 0 if success. - */ virtual int32_t SetDnPolicy(const std::string &pkgName, std::map &policy) = 0; virtual int32_t StopAuthenticateDevice(const std::string &pkgName) = 0; virtual int32_t GetNetworkIdByUdid(const std::string &pkgName, const std::string &udid, std::string &networkId) = 0; @@ -630,17 +627,9 @@ public: std::vector &deviceList) = 0; virtual int32_t RegisterAuthenticationType(const std::string &pkgName, const std::map &authParam) = 0; - - /** - * @brief Query the device list of same account. - * @param filterOptions query parameters. - * @param callback qeury result callback. - * @return Returns 0 if success. - */ virtual int32_t GetDeviceProfileInfoList(const std::string &pkgName, const DmDeviceProfileInfoFilterOptions &filterOptions, std::shared_ptr callback) = 0; - virtual int32_t GetDeviceIconInfo(const std::string &pkgName, const DmDeviceIconInfoFilterOptions &filterOptions, std::shared_ptr callback) = 0; virtual int32_t PutDeviceProfileInfoList(const std::string &pkgName, @@ -656,10 +645,15 @@ public: std::shared_ptr callback) = 0; virtual int32_t SetRemoteDeviceName(const std::string &pkgName, const std::string &deviceId, const std::string &deviceName, std::shared_ptr callback) = 0; - virtual int32_t RestoreLocalDeivceName(const std::string &pkgName) = 0; + virtual int32_t RestoreLocalDeviceName(const std::string &pkgName) = 0; virtual int32_t GetDeviceNetworkIdList(const std::string &bundleName, const NetworkIdQueryFilter &queryFilter, std::vector &networkIds) = 0; + virtual int32_t UnRegisterPinHolderCallback(const std::string &pkgName) = 0; + virtual bool CheckSrcAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) = 0; + virtual bool CheckSinkAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) = 0; + virtual bool CheckSrcIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) = 0; + virtual bool CheckSinkIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) = 0; }; } // namespace DistributedHardware } // namespace OHOS -#endif // DEVICE_MANAGER_H \ No newline at end of file +#endif // DEVICE_MANAGER_H diff --git a/interfaces/inner_kits/native_cpp/include/device_manager_impl.h b/interfaces/inner_kits/native_cpp/include/device_manager_impl.h index 510c9a54fd7c07a3a690a01738c85ce88a9f7f6e..863626aef135a41ee472de50ce98df36a35c596b 100644 --- a/interfaces/inner_kits/native_cpp/include/device_manager_impl.h +++ b/interfaces/inner_kits/native_cpp/include/device_manager_impl.h @@ -17,6 +17,7 @@ #define OHOS_DEVICE_MANAGER_IMPL_H #include "device_manager.h" +#include "device_manager_ipc_interface_code.h" #if !defined(__LITEOS_M__) #include "ipc_client_manager.h" #include "ipc_client_proxy.h" @@ -327,6 +328,7 @@ public: virtual int32_t GetLocalDeviceId(const std::string &pkgName, std::string &networkId) override; virtual int32_t GetLocalDeviceType(const std::string &pkgName, int32_t &deviceType) override; virtual int32_t GetLocalDeviceName(const std::string &pkgName, std::string &deviceName) override; + virtual int32_t GetLocalDeviceName(std::string &deviceName) override; virtual int32_t GetDeviceName(const std::string &pkgName, const std::string &networkId, std::string &deviceName) override; virtual int32_t GetDeviceType(const std::string &pkgName, @@ -429,9 +431,14 @@ public: std::shared_ptr callback) override; virtual int32_t SetRemoteDeviceName(const std::string &pkgName, const std::string &deviceId, const std::string &deviceName, std::shared_ptr callback) override; - virtual int32_t RestoreLocalDeivceName(const std::string &pkgName) override; + virtual int32_t RestoreLocalDeviceName(const std::string &pkgName) override; virtual int32_t GetDeviceNetworkIdList(const std::string &bundleName, const NetworkIdQueryFilter &queryFilter, std::vector &networkIds) override; + virtual int32_t UnRegisterPinHolderCallback(const std::string &pkgName) override; + virtual bool CheckSrcAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) override; + virtual bool CheckSinkAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) override; + virtual bool CheckSrcIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) override; + virtual bool CheckSinkIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) override; private: DeviceManagerImpl() = default; @@ -451,6 +458,8 @@ private: uint16_t GetSubscribeIdFromMap(const std::string &pkgName); void SyncCallbackToService(DmCommonNotifyEvent dmCommonNotifyEvent, const std::string &pkgName); int32_t GetAnonyLocalUdid(const std::string &pkgName, std::string &anonyUdid); + bool CheckAclByIpcCode(const DmAccessCaller &caller, const DmAccessCallee &callee, + const DMIpcCmdInterfaceCode &ipcCode); private: #if !defined(__LITEOS_M__) diff --git a/interfaces/inner_kits/native_cpp/include/dm_device_info.h b/interfaces/inner_kits/native_cpp/include/dm_device_info.h index 8a13dfc19f9728978056c9b92ca995458fe0a3df..32892edcc098ad633956e9c7e8c483bd482bd5e2 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_device_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_device_info.h @@ -24,6 +24,10 @@ #define DM_MAX_DEVICE_ID_LEN (97) #define DM_MAX_DEVICE_NAME_LEN (129) +#ifndef DM_EXPORT +#define DM_EXPORT __attribute__ ((visibility ("default"))) +#endif // DM_EXPORT + namespace OHOS { namespace DistributedHardware { /** @@ -145,6 +149,10 @@ typedef enum DmAuthForm { * Across Account Device auth. */ ACROSS_ACCOUNT = 2, + /** + * Share + */ + SHARE = 3, } DmAuthForm; /** @@ -308,6 +316,7 @@ typedef enum { BIT_NETWORK_TYPE_BLE, /**< BLE network type */ BIT_NETWORK_TYPE_BR, /**< BR network type */ BIT_NETWORK_TYPE_P2P, /**< P2P network type */ + BIT_NETWORK_TYPE_USB = 8, /**< USB network type */ BIT_NETWORK_TYPE_COUNT, /**< Invalid type */ } DmNetworkType; @@ -336,6 +345,7 @@ typedef enum { STATUS_DM_CLOSE_PIN_DISPLAY_UI = 11, STATUS_DM_SHOW_PIN_INPUT_UI = 12, STATUS_DM_CLOSE_PIN_INPUT_UI = 13, + STATUS_DM_SINK_AUTH_FINISH = 25, } DmAuthStatus; typedef enum { @@ -351,16 +361,16 @@ typedef enum { MAX = 9, } DmCommonNotifyEvent; -extern const char* DEVICE_TYPE_UNKNOWN_STRING; -extern const char* DEVICE_TYPE_PHONE_STRING; -extern const char* DEVICE_TYPE_PAD_STRING; -extern const char* DEVICE_TYPE_TV_STRING; -extern const char* DEVICE_TYPE_CAR_STRING; -extern const char* DEVICE_TYPE_WATCH_STRING; -extern const char* DEVICE_TYPE_WIFICAMERA_STRING; -extern const char* DEVICE_TYPE_PC_STRING; -extern const char* DEVICE_TYPE_SMART_DISPLAY_STRING; -extern const char* DEVICE_TYPE_2IN1_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_UNKNOWN_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_PHONE_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_PAD_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_TV_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_CAR_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_WATCH_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_WIFICAMERA_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_PC_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_SMART_DISPLAY_STRING; +DM_EXPORT extern const char* DEVICE_TYPE_2IN1_STRING; typedef struct DmAccessCaller { std::string accountId; @@ -375,6 +385,7 @@ typedef struct DmAccessCallee { std::string accountId; std::string networkId; std::string peerId; + std::string pkgName; int32_t userId; uint64_t tokenId = 0; std::string extra; @@ -446,6 +457,11 @@ typedef struct DMLocalServiceInfo { std::string description; std::string extraInfo; } DMLocalServiceInfo; + +typedef struct DevUserInfo { + std::string deviceId; + int32_t userId; +} DevUserInfo; } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DM_DEVICE_INFO_H \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/include/dm_device_profile_info.h b/interfaces/inner_kits/native_cpp/include/dm_device_profile_info.h index b110b91761bba2e8f405a1265e8a531444a7b509..21bde5a1eabd48704fc3c4913abf7102e1e352e9 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_device_profile_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_device_profile_info.h @@ -30,6 +30,14 @@ typedef struct DmProductInfo { std::string imageVersion = ""; } DmProductInfo; +typedef struct DmDeviceIconInfoFilterOptions { + std::string productId = ""; + std::string subProductId = ""; + std::string internalModel = ""; + std::string imageType = ""; + std::string specName = ""; +} DmDeviceIconInfoFilterOptions; + typedef struct DmDeviceIconInfo { std::string productId = ""; std::string subProductId = ""; @@ -40,6 +48,15 @@ typedef struct DmDeviceIconInfo { std::string version = ""; std::string url = ""; std::vector icon = {}; + + void InitByDmDeviceIconInfoFilterOptions(const DmDeviceIconInfoFilterOptions &filterOptions) + { + productId = filterOptions.productId; + subProductId = filterOptions.subProductId; + internalModel = filterOptions.internalModel; + imageType = filterOptions.imageType; + specName = filterOptions.specName; + } } DmDeviceIconInfo; typedef struct DmServiceProfileInfo { @@ -54,14 +71,6 @@ typedef struct DmDeviceProfileInfoFilterOptions { std::vector deviceIdList = {}; } DmDeviceProfileInfoFilterOptions; -typedef struct DmDeviceIconInfoFilterOptions { - std::string productId = ""; - std::string subProductId = ""; - std::string internalModel = ""; - std::string imageType = ""; - std::string specName = ""; -} DmDeviceIconInfoFilterOptions; - typedef struct DmDeviceProfileInfo { std::string deviceId = ""; std::string deviceSn = ""; diff --git a/interfaces/inner_kits/native_cpp/include/i_dm_bind_manager_ext_resident.h b/interfaces/inner_kits/native_cpp/include/i_dm_bind_manager_ext_resident.h index 4478d94cf343dd79e9a8d562221065a41c2d5b83..0302487105f9fb987c8b2ceec1f598870d9d9015 100644 --- a/interfaces/inner_kits/native_cpp/include/i_dm_bind_manager_ext_resident.h +++ b/interfaces/inner_kits/native_cpp/include/i_dm_bind_manager_ext_resident.h @@ -16,6 +16,9 @@ #ifndef OHOS_I_DM_BIND_MANAGER_EXT_RESIDENT_H #define OHOS_I_DM_BIND_MANAGER_EXT_RESIDENT_H +#include +#include + namespace OHOS { namespace DistributedHardware { class IDMBindManagerExtResident { diff --git a/interfaces/inner_kits/native_cpp/include/i_dm_check_api_white_list.h b/interfaces/inner_kits/native_cpp/include/i_dm_check_api_white_list.h new file mode 100644 index 0000000000000000000000000000000000000000..b420c6e548a325047b90e43f7d7de5a332f6ebdc --- /dev/null +++ b/interfaces/inner_kits/native_cpp/include/i_dm_check_api_white_list.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_I_DM_CHECK_API_WHITE_LIST_H +#define OHOS_I_DM_CHECK_API_WHITE_LIST_H + +#include "idevice_manager_service_listener.h" + +namespace OHOS { +namespace DistributedHardware { +class IDMCheckApiWhiteList { +public: + virtual ~IDMCheckApiWhiteList() = default; + virtual bool IsCallerInWhiteList(const std::string &bundleName, const std::string &funcName) = 0; +}; + +using CreateDMCheckApiWhiteListFuncPtr = IDMCheckApiWhiteList *(*)(void); +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_I_DM_CHECK_API_WHITE_LIST_H diff --git a/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext.h b/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext.h index 51e88f77077b31d6cd32a925e17e4059c372f047..cb4bb85bc260c8e3638704898fe98dfe3c505d4a 100644 --- a/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext.h +++ b/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext.h @@ -16,8 +16,12 @@ #ifndef OHOS_I_DM_SERVICE_IMPL_EXT_H #define OHOS_I_DM_SERVICE_IMPL_EXT_H +#include "dm_device_info.h" +#include "idevice_manager_service_listener.h" #include "i_dm_bind_manager_ext_resident.h" +#include + namespace OHOS { namespace DistributedHardware { class IDMServiceImplExt { @@ -73,7 +77,8 @@ public: * @tc.desc: AccountIdLogout * @tc.type: FUNC */ - virtual int32_t AccountIdLogout(int32_t userId, const std::string &oldAccountId) = 0; + virtual int32_t AccountIdLogout(int32_t userId, const std::string &oldAccountId, + const std::vector &peerUdids) = 0; /** * @tc.name: IDMServiceImplExt::HandleDeviceNotTrust * @tc.desc: HandleDeviceNotTrust @@ -101,6 +106,7 @@ public: virtual void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result) = 0; virtual void OnSessionClosed(const int32_t sessionId) = 0; virtual void OnBytesReceived(const int32_t sessionId, const std::string message) = 0; + virtual int32_t OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m) = 0; }; using CreateDMServiceImplExtFuncPtr = IDMServiceImplExt *(*)(void); diff --git a/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext_resident.h b/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext_resident.h index 5bd4accc4a1835b19179f4ad4ba87b3da3a98ce1..b1685ebeca2c6b5c34d65fec3faae73050fe0fde 100644 --- a/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext_resident.h +++ b/interfaces/inner_kits/native_cpp/include/i_dm_service_impl_ext_resident.h @@ -62,7 +62,8 @@ public: * @tc.desc: AccountIdLogout * @tc.type: FUNC */ - virtual int32_t AccountIdLogout(int32_t userId, const std::string &oldAccountId) = 0; + virtual int32_t AccountIdLogout(int32_t userId, const std::string &oldAccountId, + const std::vector &peerUdids) = 0; /** * @tc.name: IDMServiceImplExt::HandleDeviceNotTrust * @tc.desc: HandleDeviceNotTrust @@ -101,12 +102,16 @@ public: virtual int32_t PutDeviceProfileInfoList(const std::string &pkgName, const std::vector &deviceProfileInfoList) = 0; virtual std::vector GetDeviceNamePrefixs() = 0; - virtual void CheckRegisterInfoWithWise() = 0; + virtual void HandleNetworkConnected(int32_t networkStatus) = 0; virtual int32_t SetLocalDeviceName(const std::string &pkgName, const std::string &deviceName) = 0; virtual int32_t SetRemoteDeviceName(const std::string &pkgName, const std::string &deviceId, const std::string &deviceName) = 0; virtual int32_t GetDeviceProfileInfosFromLocalCache(const NetworkIdQueryFilter &queryFilter, std::vector &dmDeviceProfileInfos) = 0; + virtual int32_t RestoreLocalDeviceName() = 0; + virtual void ClearCacheWhenLogout(int32_t userId, const std::string &oldAccountId) = 0; + virtual int32_t OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m) = 0; + virtual void HandleScreenLockEvent(bool isLock) = 0; }; using CreateDMServiceExtResidentFuncPtr = IDMServiceImplExtResident *(*)(void); diff --git a/interfaces/inner_kits/native_cpp/include/idevice_manager_service_listener.h b/interfaces/inner_kits/native_cpp/include/idevice_manager_service_listener.h index 0673eef76849f3d2e8e072256004574adeb5e347..e85db72922df6703f92e12774e5625729423385e 100644 --- a/interfaces/inner_kits/native_cpp/include/idevice_manager_service_listener.h +++ b/interfaces/inner_kits/native_cpp/include/idevice_manager_service_listener.h @@ -171,6 +171,14 @@ public: const std::string &deviceName, int32_t code) = 0; virtual void OnSetRemoteDeviceNameResult(const ProcessInfo &processInfo, const std::string &deviceId, const std::string &deviceName, int32_t code) = 0; + + /** + * @brief Get the Local Display Device Name after privacy processed + * + * @return std::string the name without privacy info + */ + virtual std::string GetLocalDisplayDeviceNameForPrivacy() = 0; + virtual int32_t OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m) = 0; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h b/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h index c5b25bda65b61a5336c781c27e77e8dbec0da287..39a229cc8fa23bb023351d03ab785b694637c7ab 100644 --- a/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h +++ b/interfaces/inner_kits/native_cpp/include/notify/device_manager_notify.h @@ -75,21 +75,18 @@ public: int32_t RegisterGetDeviceProfileInfoListCallback(const std::string &pkgName, std::shared_ptr callback); - int32_t UnRegisterGetDeviceProfileInfoListCallback(const std::string &pkgName); void OnGetDeviceProfileInfoListResult(const std::string &pkgName, const std::vector &deviceProfileInfos, int32_t code); int32_t RegisterGetDeviceIconInfoCallback(const std::string &pkgName, const std::string &uk, std::shared_ptr callback); - int32_t UnRegisterGetDeviceIconInfoCallback(const std::string &pkgName, const std::string &uk); void OnGetDeviceIconInfoResult(const std::string &pkgName, const DmDeviceIconInfo &deviceIconInfo, int32_t code); int32_t RegisterSetLocalDeviceNameCallback(const std::string &pkgName, std::shared_ptr callback); - int32_t UnRegisterSetLocalDeviceNameCallback(const std::string &pkgName); void OnSetLocalDeviceNameResult(const std::string &pkgName, int32_t code); int32_t RegisterSetRemoteDeviceNameCallback(const std::string &pkgName, const std::string &deviceId, std::shared_ptr callback); - int32_t UnRegisterSetRemoteDeviceNameCallback(const std::string &pkgName, const std::string &deviceId); void OnSetRemoteDeviceNameResult(const std::string &pkgName, const std::string &deviceId, int32_t code); + void UnRegisterPinHolderCallback(const std::string &pkgName); public: static void DeviceInfoOnline(const DmDeviceInfo &deviceInfo, std::shared_ptr tempCbk); diff --git a/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp b/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp index 0d608a5a2de1f5202c16d5a61333e8b4eb969247..42aac4ed71cbc01f7c487d73137aab519696c4f1 100644 --- a/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp +++ b/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp @@ -15,7 +15,6 @@ #include "device_manager_impl.h" #include -#include "device_manager_ipc_interface_code.h" #include "device_manager_notify.h" #include "dm_anonymous.h" #include "dm_constants.h" @@ -46,6 +45,7 @@ #include "ipc_get_info_by_network_req.h" #include "ipc_get_info_by_network_rsp.h" #include "ipc_get_local_device_info_rsp.h" +#include "ipc_get_local_device_name_rsp.h" #include "ipc_get_local_display_device_name_req.h" #include "ipc_get_local_display_device_name_rsp.h" #include "ipc_get_localserviceinfo_rsp.h" @@ -839,7 +839,7 @@ int32_t DeviceManagerImpl::SetUserOperation(const std::string &pkgName, int32_t { if (pkgName.empty() || params.empty()) { LOGE("DeviceManager::SetUserOperation start, pkgName: %{public}s, params: %{public}s", pkgName.c_str(), - params.c_str()); + GetAnonyString(params).c_str()); return ERR_DM_INPUT_PARA_INVALID; } LOGI("Start, pkgName: %{public}s", pkgName.c_str()); @@ -1010,7 +1010,7 @@ int32_t DeviceManagerImpl::RequestCredential(const std::string &pkgName, const s "%{public}s", pkgName.c_str(), GetAnonyString(reqJsonStr).c_str()); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("start to RequestCredential."); + LOGI("start."); std::map requestParam; requestParam.emplace(DM_CREDENTIAL_TYPE, DM_TYPE_OH); requestParam.emplace(DM_CREDENTIAL_REQJSONSTR, reqJsonStr); @@ -1032,7 +1032,7 @@ int32_t DeviceManagerImpl::RequestCredential(const std::string &pkgName, const s return ret; } returnJsonStr = rsp->GetCredentialResult(); - LOGI("request device credential completed."); + LOGI("completed."); return DM_OK; } @@ -1043,7 +1043,7 @@ int32_t DeviceManagerImpl::ImportCredential(const std::string &pkgName, const st pkgName.c_str(), GetAnonyString(credentialInfo).c_str()); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("start to ImportCredential."); + LOGI("start."); std::map requestParam; requestParam.emplace(DM_CREDENTIAL_TYPE, DM_TYPE_OH); requestParam.emplace(DM_CREDENTIAL_REQJSONSTR, credentialInfo); @@ -1064,7 +1064,7 @@ int32_t DeviceManagerImpl::ImportCredential(const std::string &pkgName, const st LOGE("failed to get return errcode while import credential."); return ret; } - LOGI("import credential to device completed."); + LOGI("completed."); return DM_OK; } @@ -1075,7 +1075,7 @@ int32_t DeviceManagerImpl::DeleteCredential(const std::string &pkgName, const st pkgName.c_str(), GetAnonyString(deleteInfo).c_str()); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("start to DeleteCredential."); + LOGI("start."); std::map requestParam; requestParam.emplace(DM_CREDENTIAL_TYPE, DM_TYPE_OH); requestParam.emplace(DM_CREDENTIAL_REQJSONSTR, deleteInfo); @@ -1096,7 +1096,7 @@ int32_t DeviceManagerImpl::DeleteCredential(const std::string &pkgName, const st LOGE("failed to get return errcode while import credential."); return ret; } - LOGI("delete credential from device completed."); + LOGI("completed."); return DM_OK; } @@ -1125,7 +1125,7 @@ int32_t DeviceManagerImpl::RegisterCredentialCallback(const std::string &pkgName LOGE("RegisterCredentialCallback error: Failed with ret %{public}d", ret); return ret; } - LOGI("Completed, pkgName: %{public}s", pkgName.c_str()); + LOGI("Completed"); return DM_OK; } @@ -1455,6 +1455,24 @@ int32_t DeviceManagerImpl::GetLocalDeviceName(const std::string &pkgName, std::s return DM_OK; } +int32_t DeviceManagerImpl::GetLocalDeviceName(std::string &deviceName) +{ + std::shared_ptr req = std::make_shared(); + std::shared_ptr rsp = std::make_shared(); + int32_t ret = ipcClientProxy_->SendRequest(GET_LOCAL_DEVICE_NAME, req, rsp); + if (ret != DM_OK) { + LOGE("Send Request failed ret: %{public}d", ret); + return ERR_DM_IPC_SEND_REQUEST_FAILED; + } + ret = rsp->GetErrCode(); + if (ret != DM_OK) { + LOGE("Get local device name failed ret: %{public}d", ret); + return ret; + } + deviceName = rsp->GetLocalDeviceName(); + return DM_OK; +} + int32_t DeviceManagerImpl::GetLocalDeviceType(const std::string &pkgName, int32_t &deviceType) { LOGI("Start, pkgName : %{public}s", pkgName.c_str()); @@ -1511,7 +1529,7 @@ int32_t DeviceManagerImpl::BindDevice(const std::string &pkgName, int32_t bindTy LOGE("BindDevice error: Invalid para. pkgName : %{public}s", pkgName.c_str()); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("BindDevice start, pkgName: %{public}s", pkgName.c_str()); + LOGI("start, pkgName: %{public}s", pkgName.c_str()); JsonObject paramJson(bindParam); if (paramJson.IsDiscarded()) { LOGE("BindDevice bindParam %{public}s.", bindParam.c_str()); @@ -1584,7 +1602,6 @@ int32_t DeviceManagerImpl::UnBindDevice(const std::string &pkgName, const std::s req->SetPkgName(pkgName); req->SetDeviceId(deviceId); req->SetExtraInfo(extra); - LOGI("DeviceManagerImpl::UnBindDevice extra: %{public}s.", extra.c_str()); int32_t ret = ipcClientProxy_->SendRequest(UNBIND_DEVICE, req, rsp); if (ret != DM_OK) { LOGE("UnBindDevice error: Send Request failed ret: %{public}d", ret); @@ -1857,7 +1874,7 @@ int32_t DeviceManagerImpl::BindTarget(const std::string &pkgName, const PeerTarg LOGE("DeviceManagerImpl::BindTarget failed: input pkgName or targetId is empty."); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("DeviceManagerImpl::BindTarget start, pkgName: %{public}s", pkgName.c_str()); + LOGI("start, pkgName: %{public}s", pkgName.c_str()); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) bindParam[TOKENID] = std::to_string(OHOS::IPCSkeleton::GetSelfTokenID()); #endif @@ -1947,7 +1964,7 @@ int32_t DeviceManagerImpl::CheckAccessToTarget(uint64_t tokenId, const std::stri { (void)tokenId; (void)targetId; - LOGI("Start"); + LOGI("unsupport"); return ERR_DM_UNSUPPORTED_METHOD; } @@ -2122,11 +2139,11 @@ int32_t DeviceManagerImpl::DestroyPinHolder(const std::string &pkgName, const Pe int32_t DeviceManagerImpl::DpAclAdd(const int64_t accessControlId, const std::string &udid, const int32_t bindType) { - LOGI("Start."); if (bindType != IDENTICAL_ACCOUNT) { - LOGI("DeviceManagerImpl::DpAclAdd is not identical account"); + LOGI("not identical account"); return DM_OK; } + LOGI("Start."); std::shared_ptr req = std::make_shared(); std::shared_ptr rsp = std::make_shared(); req->SetStr(udid); @@ -2223,52 +2240,6 @@ bool DeviceManagerImpl::IsSameAccount(const std::string &netWorkId) return true; } -bool DeviceManagerImpl::CheckAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) -{ - LOGI("Start"); - std::shared_ptr req = std::make_shared(); - std::shared_ptr rsp = std::make_shared(); - req->SetAccessCaller(caller); - req->SetAccessCallee(callee); - int32_t ret = ipcClientProxy_->SendRequest(CHECK_ACCESS_CONTROL, req, rsp); - if (ret != DM_OK) { - DmRadarHelper::GetInstance().ReportDmBehavior(caller.pkgName, "CheckAccessControl", ret, anonyLocalUdid_); - LOGE("CheckAccessControl Send Request failed ret: %{public}d", ret); - return false; - } - ret = rsp->GetErrCode(); - if (ret != DM_OK) { - DmRadarHelper::GetInstance().ReportDmBehavior(caller.pkgName, "CheckAccessControl", ret, anonyLocalUdid_); - LOGE("CheckAccessControl Failed with ret: %{public}d", ret); - return false; - } - DmRadarHelper::GetInstance().ReportDmBehavior(caller.pkgName, "CheckAccessControl", DM_OK, anonyLocalUdid_); - return true; -} - -bool DeviceManagerImpl::CheckIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) -{ - LOGI("Start"); - std::shared_ptr req = std::make_shared(); - std::shared_ptr rsp = std::make_shared(); - req->SetAccessCaller(caller); - req->SetAccessCallee(callee); - int32_t ret = ipcClientProxy_->SendRequest(CHECK_SAME_ACCOUNT, req, rsp); - if (ret != DM_OK) { - DmRadarHelper::GetInstance().ReportDmBehavior(caller.pkgName, "CheckIsSameAccount", ret, anonyLocalUdid_); - LOGE("CheckIsSameAccount Send Request failed ret: %{public}d", ret); - return false; - } - ret = rsp->GetErrCode(); - if (ret != DM_OK) { - DmRadarHelper::GetInstance().ReportDmBehavior(caller.pkgName, "CheckIsSameAccount", ret, anonyLocalUdid_); - LOGE("CheckIsSameAccount Failed with ret: %{public}d", ret); - return false; - } - DmRadarHelper::GetInstance().ReportDmBehavior(caller.pkgName, "CheckIsSameAccount", DM_OK, anonyLocalUdid_); - return true; -} - int32_t DeviceManagerImpl::GetErrCode(int32_t errCode) { auto flag = MAP_ERROR_CODE.find(errCode); @@ -2296,7 +2267,6 @@ int32_t DeviceManagerImpl::ShiftLNNGear(const std::string &pkgName) LOGE("ShiftLNNGear error: Failed with ret %{public}d", ret); return ret; } - LOGI("Completed"); DmRadarHelper::GetInstance().ReportDmBehavior(pkgName, "ShiftLNNGear", DM_OK, anonyLocalUdid_); return DM_OK; } @@ -2642,13 +2612,14 @@ int32_t DeviceManagerImpl::GetDeviceProfileInfoList(const std::string &pkgName, ret = ipcClientProxy_->SendRequest(GET_DEVICE_PROFILE_INFO_LIST, req, rsp); if (ret != DM_OK) { LOGE("error: Send Request failed ret: %{public}d", ret); - DeviceManagerNotify::GetInstance().UnRegisterGetDeviceProfileInfoListCallback(pkgName); + DeviceManagerNotify::GetInstance().OnGetDeviceProfileInfoListResult(pkgName, {}, + ERR_DM_IPC_SEND_REQUEST_FAILED); return ERR_DM_IPC_SEND_REQUEST_FAILED; } ret = rsp->GetErrCode(); if (ret != DM_OK) { LOGE("error: Failed with ret %{public}d", ret); - DeviceManagerNotify::GetInstance().UnRegisterGetDeviceProfileInfoListCallback(pkgName); + DeviceManagerNotify::GetInstance().OnGetDeviceProfileInfoListResult(pkgName, {}, ret); return ret; } LOGI("Completed"); @@ -2673,16 +2644,24 @@ int32_t DeviceManagerImpl::GetDeviceIconInfo(const std::string &pkgName, ret = ipcClientProxy_->SendRequest(GET_DEVICE_ICON_INFO, req, rsp); if (ret != DM_OK) { LOGE("Send Request failed ret: %{public}d", ret); - DeviceManagerNotify::GetInstance().UnRegisterGetDeviceIconInfoCallback(pkgName, uk); + DmDeviceIconInfo deviceIconInfo; + deviceIconInfo.InitByDmDeviceIconInfoFilterOptions(filterOptions); + DeviceManagerNotify::GetInstance().OnGetDeviceIconInfoResult(pkgName, deviceIconInfo, + ERR_DM_IPC_SEND_REQUEST_FAILED); return ERR_DM_IPC_SEND_REQUEST_FAILED; } ret = rsp->GetErrCode(); if (ret != DM_OK) { LOGE("Failed with ret %{public}d", ret); - DeviceManagerNotify::GetInstance().UnRegisterGetDeviceIconInfoCallback(pkgName, uk); + DmDeviceIconInfo deviceIconInfo; + deviceIconInfo.InitByDmDeviceIconInfoFilterOptions(filterOptions); + DeviceManagerNotify::GetInstance().OnGetDeviceIconInfoResult(pkgName, deviceIconInfo, ret); return ret; } #endif + (void)pkgName; + (void)filterOptions; + (void)callback; return DM_OK; } @@ -2817,17 +2796,18 @@ int32_t DeviceManagerImpl::GetLocalServiceInfoByBundleNameAndPinExchangeType( int32_t DeviceManagerImpl::SetLocalDeviceName(const std::string &pkgName, const std::string &deviceName, std::shared_ptr callback) { - if (pkgName.empty() || deviceName.empty()) { - LOGE("param invalid, pkgName : %{public}s, deviceName = %{public}s", - pkgName.c_str(), GetAnonyString(deviceName).c_str()); - return ERR_DM_INPUT_PARA_INVALID; - } LOGI("Start, pkgName: %{public}s", pkgName.c_str()); int32_t ret = DeviceManagerNotify::GetInstance().RegisterSetLocalDeviceNameCallback(pkgName, callback); if (ret != DM_OK) { LOGE("Register Callback failed ret: %{public}d", ret); return ret; } + if (pkgName.empty() || deviceName.empty() || deviceName.size() > DEVICE_NAME_MAX_BYTES) { + LOGE("param invalid, pkgName=%{public}s, deviceName=%{public}s", + pkgName.c_str(), GetAnonyString(deviceName).c_str()); + DeviceManagerNotify::GetInstance().OnSetLocalDeviceNameResult(pkgName, ERR_DM_INPUT_PARA_INVALID); + return ERR_DM_INPUT_PARA_INVALID; + } std::shared_ptr req = std::make_shared(); std::shared_ptr rsp = std::make_shared(); req->SetPkgName(pkgName); @@ -2835,13 +2815,13 @@ int32_t DeviceManagerImpl::SetLocalDeviceName(const std::string &pkgName, const ret = ipcClientProxy_->SendRequest(SET_LOCAL_DEVICE_NAME, req, rsp); if (ret != DM_OK) { LOGE("error: Send Request failed ret: %{public}d", ret); - DeviceManagerNotify::GetInstance().UnRegisterSetLocalDeviceNameCallback(pkgName); + DeviceManagerNotify::GetInstance().OnSetLocalDeviceNameResult(pkgName, ERR_DM_IPC_SEND_REQUEST_FAILED); return ERR_DM_IPC_SEND_REQUEST_FAILED; } ret = rsp->GetErrCode(); if (ret != DM_OK) { LOGE("error: Failed with ret %{public}d", ret); - DeviceManagerNotify::GetInstance().UnRegisterSetLocalDeviceNameCallback(pkgName); + DeviceManagerNotify::GetInstance().OnSetLocalDeviceNameResult(pkgName, ret); return ret; } LOGI("Completed"); @@ -2851,38 +2831,41 @@ int32_t DeviceManagerImpl::SetLocalDeviceName(const std::string &pkgName, const int32_t DeviceManagerImpl::SetRemoteDeviceName(const std::string &pkgName, const std::string &deviceId, const std::string &deviceName, std::shared_ptr callback) { - if (pkgName.empty() || deviceName.empty()) { - LOGE("param invalid, pkgName : %{public}s, deviceName = %{public}s", - pkgName.c_str(), GetAnonyString(deviceName).c_str()); - return ERR_DM_INPUT_PARA_INVALID; - } LOGI("Start, pkgName: %{public}s", pkgName.c_str()); int32_t ret = DeviceManagerNotify::GetInstance().RegisterSetRemoteDeviceNameCallback(pkgName, deviceId, callback); if (ret != DM_OK) { LOGE("Register Callback failed ret: %{public}d", ret); return ret; } - std::shared_ptr req = std::make_shared(); + if (pkgName.empty() || deviceName.empty() || deviceName.size() > DEVICE_NAME_MAX_BYTES || deviceId.empty()) { + LOGE("param invalid, pkgName=%{public}s, deviceName=%{public}s, deviceId=%{public}s", + pkgName.c_str(), GetAnonyString(deviceName).c_str(), GetAnonyString(deviceId).c_str()); + DeviceManagerNotify::GetInstance().OnSetRemoteDeviceNameResult(pkgName, deviceId, ERR_DM_INPUT_PARA_INVALID); + return ERR_DM_INPUT_PARA_INVALID; + } + std::shared_ptr req = std::make_shared(); std::shared_ptr rsp = std::make_shared(); req->SetPkgName(pkgName); req->SetDeviceName(deviceName); + req->SetDeviceId(deviceId); ret = ipcClientProxy_->SendRequest(SET_REMOTE_DEVICE_NAME, req, rsp); if (ret != DM_OK) { LOGE("error: Send Request failed ret: %{public}d", ret); - DeviceManagerNotify::GetInstance().UnRegisterSetRemoteDeviceNameCallback(pkgName, deviceId); + DeviceManagerNotify::GetInstance().OnSetRemoteDeviceNameResult(pkgName, deviceId, + ERR_DM_IPC_SEND_REQUEST_FAILED); return ERR_DM_IPC_SEND_REQUEST_FAILED; } ret = rsp->GetErrCode(); if (ret != DM_OK) { LOGE("error: Failed with ret %{public}d", ret); - DeviceManagerNotify::GetInstance().UnRegisterSetRemoteDeviceNameCallback(pkgName, deviceId); + DeviceManagerNotify::GetInstance().OnSetRemoteDeviceNameResult(pkgName, deviceId, ret); return ret; } LOGI("Completed"); return DM_OK; } -int32_t DeviceManagerImpl::RestoreLocalDeivceName(const std::string &pkgName) +int32_t DeviceManagerImpl::RestoreLocalDeviceName(const std::string &pkgName) { if (pkgName.empty()) { LOGE("param invalid, pkgName : %{public}s", pkgName.c_str()); @@ -2926,5 +2909,86 @@ int32_t DeviceManagerImpl::GetDeviceNetworkIdList(const std::string &bundleName, LOGI("Completed"); return DM_OK; } + +int32_t DeviceManagerImpl::UnRegisterPinHolderCallback(const std::string &pkgName) +{ + if (pkgName.empty()) { + LOGE("error: Invalid para"); + return ERR_DM_INPUT_PARA_INVALID; + } + DeviceManagerNotify::GetInstance().UnRegisterPinHolderCallback(pkgName); + std::shared_ptr req = std::make_shared(); + req->SetPkgName(pkgName); + std::shared_ptr rsp = std::make_shared(); + + int32_t ret = ipcClientProxy_->SendRequest(UNREGISTER_PIN_HOLDER_CALLBACK, req, rsp); + if (ret != DM_OK) { + LOGI("Send Request failed ret: %{public}d", ret); + return ERR_DM_IPC_SEND_REQUEST_FAILED; + } + ret = rsp->GetErrCode(); + if (ret != DM_OK) { + LOGE("Failed with ret %{public}d", ret); + return ret; + } + return DM_OK; +} + +bool DeviceManagerImpl::CheckAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + LOGI("Start"); + return CheckAclByIpcCode(caller, callee, CHECK_ACCESS_CONTROL); +} + +bool DeviceManagerImpl::CheckIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + LOGI("Start"); + return CheckAclByIpcCode(caller, callee, CHECK_SAME_ACCOUNT); +} + + +bool DeviceManagerImpl::CheckSrcAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + LOGI("Start"); + return CheckAclByIpcCode(caller, callee, CHECK_SRC_ACCESS_CONTROL); +} + +bool DeviceManagerImpl::CheckSinkAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + LOGI("Start"); + return CheckAclByIpcCode(caller, callee, CHECK_SINK_ACCESS_CONTROL); +} + +bool DeviceManagerImpl::CheckSrcIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + LOGI("Start"); + return CheckAclByIpcCode(caller, callee, CHECK_SRC_SAME_ACCOUNT); +} + +bool DeviceManagerImpl::CheckSinkIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + LOGI("Start"); + return CheckAclByIpcCode(caller, callee, CHECK_SINK_SAME_ACCOUNT); +} + +bool DeviceManagerImpl::CheckAclByIpcCode(const DmAccessCaller &caller, const DmAccessCallee &callee, + const DMIpcCmdInterfaceCode &ipcCode) +{ + LOGI("start, ipcCode %{public}d.", static_cast(ipcCode)); + std::shared_ptr req = std::make_shared(); + std::shared_ptr rsp = std::make_shared(); + req->SetAccessCaller(caller); + req->SetAccessCallee(callee); + int32_t ret = ipcClientProxy_->SendRequest(ipcCode, req, rsp); + if (ret != DM_OK) { + DmRadarHelper::GetInstance().ReportDmBehavior(caller.pkgName, "CheckAclByIpcCode", ret, anonyLocalUdid_); + LOGE("CheckIsSameAccount Send Request failed ret: %{public}d", ret); + return false; + } + bool result = static_cast(rsp->GetErrCode()); + DmRadarHelper::GetInstance().ReportDmBehavior(caller.pkgName, "CheckAclByIpcCode", static_cast(result), + anonyLocalUdid_); + return result; +} } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/dm_service_load.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/dm_service_load.cpp index 9bf38b388b803a418c1d17bcedefcbb408c5cf7f..baf59b9a6b2e738c86602336786e8378075f735f 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/standard/dm_service_load.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/dm_service_load.cpp @@ -27,11 +27,11 @@ DM_IMPLEMENT_SINGLE_INSTANCE(DmServiceLoad); int32_t DmServiceLoad::LoadDMService(void) { - LOGI("LoadDMService start"); if (isDMServiceLoading_) { LOGI("DM service is loading."); return DM_OK; } + LOGI("start"); isDMServiceLoading_ = true; sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp index 342ab016133eb1a6a4d31f23f6e7af68823257da..f912db8d9b4b7a98b7e23f8ff8101002f7bfa4fc 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp @@ -42,12 +42,11 @@ void DmDeathRecipient::OnRemoteDied(const wptr &remote) int32_t IpcClientManager::ClientInit() { - LOGI("Start"); if (dmInterface_ != nullptr) { - LOGI("DeviceManagerService Already Init"); + LOGD("Already Init"); return DM_OK; } - + LOGI("Start"); auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { LOGE("Get SystemAbilityManager Failed"); @@ -68,7 +67,7 @@ int32_t IpcClientManager::ClientInit() LOGE("InitDeviceManagerService: AddDeathRecipient Failed"); } dmInterface_ = iface_cast(object); - LOGI("Completed"); + LOGD("Completed"); return DM_OK; } @@ -111,7 +110,7 @@ int32_t IpcClientManager::UnInit(const std::string &pkgName) LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("UnInit in, pkgName %{public}s", pkgName.c_str()); + LOGI("pkgName %{public}s", pkgName.c_str()); std::lock_guard autoLock(lock_); if (dmInterface_ == nullptr) { LOGE("DeviceManager not Init"); @@ -136,7 +135,7 @@ int32_t IpcClientManager::UnInit(const std::string &pkgName) } dmInterface_ = nullptr; } - LOGI("completed, pkgName: %{public}s", pkgName.c_str()); + LOGD("completed, pkgName: %{public}s", pkgName.c_str()); return DM_OK; } @@ -161,7 +160,7 @@ int32_t IpcClientManager::SendRequest(int32_t cmdCode, std::shared_ptr r int32_t IpcClientManager::OnDmServiceDied() { - LOGI("IpcClientManager::OnDmServiceDied begin"); + LOGI("begin"); { std::lock_guard autoLock(lock_); if (dmInterface_ == nullptr) { @@ -174,7 +173,7 @@ int32_t IpcClientManager::OnDmServiceDied() } dmInterface_ = nullptr; } - LOGI("IpcClientManager::OnDmServiceDied complete"); + LOGD("complete"); return DM_OK; } diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_cmd_parser.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_cmd_parser.cpp index 28680f6852e819535ad3a94dd177797821c64a86..a2e7cb3e1d9bf52842b98f1cce37635edd855e0d 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_cmd_parser.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_cmd_parser.cpp @@ -44,6 +44,7 @@ #include "ipc_get_info_by_network_rsp.h" #include "ipc_get_info_by_network_req.h" #include "ipc_get_local_device_info_rsp.h" +#include "ipc_get_local_device_name_rsp.h" #include "ipc_get_local_display_device_name_req.h" #include "ipc_get_local_display_device_name_rsp.h" #include "ipc_get_localserviceinfo_rsp.h" @@ -76,6 +77,31 @@ namespace DistributedHardware { namespace { const int32_t DM_MAX_TRUST_DEVICE_NUM = 200; } +int32_t SetRequest(const DMIpcCmdInterfaceCode &ipcCode, std::shared_ptr pBaseReq, MessageParcel &data) +{ + LOGI("start ipcCode %{public}d.", static_cast(ipcCode)); + CHECK_NULL_RETURN(pBaseReq, ERR_DM_FAILED); + std::shared_ptr pReq = std::static_pointer_cast(pBaseReq); + DmAccessCaller caller = pReq->GetAccessCaller(); + DmAccessCallee callee = pReq->GetAccessCallee(); + if (!IpcModelCodec::EncodeDmAccessCaller(caller, data)) { + LOGE("write caller failed"); + return ERR_DM_IPC_WRITE_FAILED; + } + if (!IpcModelCodec::EncodeDmAccessCallee(callee, data)) { + LOGE("write caller failed"); + return ERR_DM_IPC_WRITE_FAILED; + } + return DM_OK; +} + +int32_t ReadResponse(const DMIpcCmdInterfaceCode &ipcCode, MessageParcel &reply, std::shared_ptr pBaseRsp) +{ + LOGI("start ipcCode %{public}d.", static_cast(ipcCode)); + CHECK_NULL_RETURN(pBaseRsp, ERR_DM_FAILED); + pBaseRsp->SetErrCode(static_cast(reply.ReadBool())); + return DM_OK; +} ON_IPC_SET_REQUEST(REGISTER_DEVICE_MANAGER_LISTENER, std::shared_ptr pBaseReq, MessageParcel &data) { @@ -437,10 +463,12 @@ ON_IPC_CMD(SERVER_DEVICE_STATE_NOTIFY, MessageParcel &data, MessageParcel &reply IpcModelCodec::DecodeDmDeviceBasicInfo(data, dmDeviceBasicInfo); switch (deviceState) { case DEVICE_STATE_ONLINE: + LOGI("Online pkgName:%{public}s", pkgName.c_str()); DeviceManagerNotify::GetInstance().OnDeviceOnline(pkgName, dmDeviceInfo); DeviceManagerNotify::GetInstance().OnDeviceOnline(pkgName, dmDeviceBasicInfo); break; case DEVICE_STATE_OFFLINE: + LOGI("Offline pkgName:%{public}s", pkgName.c_str()); DeviceManagerNotify::GetInstance().OnDeviceOffline(pkgName, dmDeviceInfo); DeviceManagerNotify::GetInstance().OnDeviceOffline(pkgName, dmDeviceBasicInfo); break; @@ -449,6 +477,8 @@ ON_IPC_CMD(SERVER_DEVICE_STATE_NOTIFY, MessageParcel &data, MessageParcel &reply DeviceManagerNotify::GetInstance().OnDeviceChanged(pkgName, dmDeviceBasicInfo); break; case DEVICE_INFO_READY: + LOGI("OnDeviceReady in, pkgName:%{public}s, networkId: %{public}s.", + pkgName.c_str(), GetAnonyString(dmDeviceInfo.networkId).c_str()); DeviceManagerNotify::GetInstance().OnDeviceReady(pkgName, dmDeviceInfo); DeviceManagerNotify::GetInstance().OnDeviceReady(pkgName, dmDeviceBasicInfo); break; @@ -468,6 +498,7 @@ ON_IPC_CMD(SERVER_DEVICE_FOUND, MessageParcel &data, MessageParcel &reply) IpcModelCodec::DecodeDmDeviceInfo(data, dmDeviceInfo); DmDeviceBasicInfo devBasicInfo; IpcModelCodec::DecodeDmDeviceBasicInfo(data, devBasicInfo); + LOGD("pkgName:%{public}s, subscribeId:%{public}d.", GetAnonyString(pkgName).c_str(), (int32_t)subscribeId); DeviceManagerNotify::GetInstance().OnDeviceFound(pkgName, subscribeId, dmDeviceInfo); DeviceManagerNotify::GetInstance().OnDeviceFound(pkgName, subscribeId, devBasicInfo); reply.WriteInt32(DM_OK); @@ -1477,50 +1508,22 @@ ON_IPC_READ_RESPONSE(CHECK_API_PERMISSION, MessageParcel &reply, std::shared_ptr ON_IPC_SET_REQUEST(CHECK_ACCESS_CONTROL, std::shared_ptr pBaseReq, MessageParcel &data) { - CHECK_NULL_RETURN(pBaseReq, ERR_DM_FAILED); - std::shared_ptr pReq = std::static_pointer_cast(pBaseReq); - DmAccessCaller caller = pReq->GetAccessCaller(); - DmAccessCallee callee = pReq->GetAccessCallee(); - if (!IpcModelCodec::EncodeDmAccessCaller(caller, data)) { - LOGE("write caller failed"); - return ERR_DM_IPC_WRITE_FAILED; - } - if (!IpcModelCodec::EncodeDmAccessCallee(callee, data)) { - LOGE("write caller failed"); - return ERR_DM_IPC_WRITE_FAILED; - } - return DM_OK; + return SetRequest(CHECK_ACCESS_CONTROL, pBaseReq, data); } ON_IPC_READ_RESPONSE(CHECK_ACCESS_CONTROL, MessageParcel &reply, std::shared_ptr pBaseRsp) { - CHECK_NULL_RETURN(pBaseRsp, ERR_DM_FAILED); - pBaseRsp->SetErrCode(reply.ReadInt32()); - return DM_OK; + return ReadResponse(CHECK_ACCESS_CONTROL, reply, pBaseRsp); } ON_IPC_SET_REQUEST(CHECK_SAME_ACCOUNT, std::shared_ptr pBaseReq, MessageParcel &data) { - CHECK_NULL_RETURN(pBaseReq, ERR_DM_FAILED); - std::shared_ptr pReq = std::static_pointer_cast(pBaseReq); - DmAccessCaller caller = pReq->GetAccessCaller(); - DmAccessCallee callee = pReq->GetAccessCallee(); - if (!IpcModelCodec::EncodeDmAccessCaller(caller, data)) { - LOGE("write caller failed"); - return ERR_DM_IPC_WRITE_FAILED; - } - if (!IpcModelCodec::EncodeDmAccessCallee(callee, data)) { - LOGE("write caller failed"); - return ERR_DM_IPC_WRITE_FAILED; - } - return DM_OK; + return SetRequest(CHECK_SAME_ACCOUNT, pBaseReq, data); } ON_IPC_READ_RESPONSE(CHECK_SAME_ACCOUNT, MessageParcel &reply, std::shared_ptr pBaseRsp) { - CHECK_NULL_RETURN(pBaseRsp, ERR_DM_FAILED); - pBaseRsp->SetErrCode(reply.ReadInt32()); - return DM_OK; + return ReadResponse(CHECK_SAME_ACCOUNT, reply, pBaseRsp); } ON_IPC_SET_REQUEST(SHIFT_LNN_GEAR, std::shared_ptr pBaseReq, MessageParcel &data) @@ -1890,7 +1893,7 @@ ON_IPC_SET_REQUEST(UNREG_LOCALSERVICE_INFO, std::shared_ptr pBaseReq, Me } std::shared_ptr pReq = std::static_pointer_cast(pBaseReq); std::string bundleName = pReq->GetFirstParam(); - int64_t pinExchangeType = pReq->GetInt32Param(); + int32_t pinExchangeType = pReq->GetInt32Param(); if (!data.WriteString(bundleName)) { return ERR_DM_IPC_WRITE_FAILED; } @@ -2123,5 +2126,80 @@ ON_IPC_READ_RESPONSE(GET_DEVICE_NETWORK_ID_LIST, MessageParcel &reply, std::shar } return DM_OK; } + +ON_IPC_SET_REQUEST(UNREGISTER_PIN_HOLDER_CALLBACK, std::shared_ptr pBaseReq, MessageParcel &data) +{ + CHECK_NULL_RETURN(pBaseReq, ERR_DM_FAILED); + std::shared_ptr pReq = std::static_pointer_cast(pBaseReq); + std::string pkgName = pReq->GetPkgName(); + if (!data.WriteString(pkgName)) { + return ERR_DM_IPC_WRITE_FAILED; + } + return DM_OK; +} + +ON_IPC_READ_RESPONSE(UNREGISTER_PIN_HOLDER_CALLBACK, MessageParcel &reply, std::shared_ptr pBaseRsp) +{ + CHECK_NULL_RETURN(pBaseRsp, ERR_DM_FAILED); + std::shared_ptr pRsp = std::static_pointer_cast(pBaseRsp); + pRsp->SetErrCode(reply.ReadInt32()); + return DM_OK; +} + +ON_IPC_SET_REQUEST(GET_LOCAL_DEVICE_NAME, std::shared_ptr pBaseReq, MessageParcel &data) +{ + CHECK_NULL_RETURN(pBaseReq, ERR_DM_FAILED); + std::shared_ptr pReq = std::static_pointer_cast(pBaseReq); + return DM_OK; +} + +ON_IPC_READ_RESPONSE(GET_LOCAL_DEVICE_NAME, MessageParcel &reply, std::shared_ptr pBaseRsp) +{ + CHECK_NULL_RETURN(pBaseRsp, ERR_DM_FAILED); + std::shared_ptr pRsp = std::static_pointer_cast(pBaseRsp); + pRsp->SetErrCode(reply.ReadInt32()); + pRsp->SetLocalDeviceName(reply.ReadString()); + return DM_OK; +} + +ON_IPC_SET_REQUEST(CHECK_SRC_ACCESS_CONTROL, std::shared_ptr pBaseReq, MessageParcel &data) +{ + return SetRequest(CHECK_SRC_ACCESS_CONTROL, pBaseReq, data); +} + +ON_IPC_READ_RESPONSE(CHECK_SRC_ACCESS_CONTROL, MessageParcel &reply, std::shared_ptr pBaseRsp) +{ + return ReadResponse(CHECK_SRC_ACCESS_CONTROL, reply, pBaseRsp); +} + +ON_IPC_SET_REQUEST(CHECK_SINK_ACCESS_CONTROL, std::shared_ptr pBaseReq, MessageParcel &data) +{ + return SetRequest(CHECK_SINK_ACCESS_CONTROL, pBaseReq, data); +} + +ON_IPC_READ_RESPONSE(CHECK_SINK_ACCESS_CONTROL, MessageParcel &reply, std::shared_ptr pBaseRsp) +{ + return ReadResponse(CHECK_SINK_ACCESS_CONTROL, reply, pBaseRsp); +} + +ON_IPC_SET_REQUEST(CHECK_SRC_SAME_ACCOUNT, std::shared_ptr pBaseReq, MessageParcel &data) +{ + return SetRequest(CHECK_SRC_SAME_ACCOUNT, pBaseReq, data); +} + +ON_IPC_READ_RESPONSE(CHECK_SRC_SAME_ACCOUNT, MessageParcel &reply, std::shared_ptr pBaseRsp) +{ + return ReadResponse(CHECK_SRC_SAME_ACCOUNT, reply, pBaseRsp); +} + +ON_IPC_SET_REQUEST(CHECK_SINK_SAME_ACCOUNT, std::shared_ptr pBaseReq, MessageParcel &data) +{ + return SetRequest(CHECK_SINK_SAME_ACCOUNT, pBaseReq, data); +} + +ON_IPC_READ_RESPONSE(CHECK_SINK_SAME_ACCOUNT, MessageParcel &reply, std::shared_ptr pBaseRsp) +{ + return ReadResponse(CHECK_SINK_SAME_ACCOUNT, reply, pBaseRsp); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp b/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp index a2b1768de304d79fc1ce44d278e6b6052ef48c1d..278ebade4d53d5d46cd43c5f43211105821592bf 100644 --- a/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp +++ b/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp @@ -263,10 +263,10 @@ void DeviceManagerNotify::RegisterPinHolderCallback(const std::string &pkgName, void DeviceManagerNotify::OnRemoteDied() { - LOGW("DeviceManagerNotify::OnRemoteDied"); + LOGW("OnRemoteDied"); std::map> dmInitCallback = GetDmInitCallback(); for (auto iter : dmInitCallback) { - LOGI("DeviceManagerNotify::OnRemoteDied, pkgName:%{public}s", iter.first.c_str()); + LOGI("OnRemoteDied, pkgName:%{public}s", iter.first.c_str()); if (iter.second != nullptr) { iter.second->OnRemoteDied(); } @@ -279,13 +279,14 @@ void DeviceManagerNotify::OnDeviceOnline(const std::string &pkgName, const DmDev LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("Online with DmDeviceInfo, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); auto iter = deviceStateCallback_.find(pkgName); if (iter == deviceStateCallback_.end()) { - LOGE("OnDeviceOnline error, device state callback not register."); + if (deviceStatusCallback_.find(pkgName) == deviceStatusCallback_.end()) { + LOGE("OnDeviceOnline error, device state callback not register."); + } return; } tempCbk = iter->second; @@ -311,13 +312,14 @@ void DeviceManagerNotify::OnDeviceOnline(const std::string &pkgName, const DmDev LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("Online with DmDeviceBasicInfo, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); auto iter = deviceStatusCallback_.find(pkgName); if (iter == deviceStatusCallback_.end()) { - LOGE("Error, device status callback not register."); + if (deviceStateCallback_.find(pkgName) == deviceStateCallback_.end()) { + LOGE("Error, device status callback not register."); + } return; } tempCbk = iter->second; @@ -343,13 +345,14 @@ void DeviceManagerNotify::OnDeviceOffline(const std::string &pkgName, const DmDe LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("Offline with DmDeviceInfo, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); auto iter = deviceStateCallback_.find(pkgName); if (iter == deviceStateCallback_.end()) { - LOGE("Error, device state callback not register."); + if (deviceStatusCallback_.find(pkgName) == deviceStatusCallback_.end()) { + LOGE("Error, device state callback not register."); + } return; } tempCbk = iter->second; @@ -376,13 +379,14 @@ void DeviceManagerNotify::OnDeviceOffline(const std::string &pkgName, const DmDe LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("Offline with DmDeviceBasicInfo, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); auto iter = deviceStatusCallback_.find(pkgName); if (iter == deviceStatusCallback_.end()) { - LOGE("Error, device status callback not register."); + if (deviceStateCallback_.find(pkgName) == deviceStateCallback_.end()) { + LOGE("Error, device status callback not register."); + } return; } tempCbk = iter->second; @@ -414,7 +418,9 @@ void DeviceManagerNotify::OnDeviceChanged(const std::string &pkgName, const DmDe std::lock_guard autoLock(lock_); auto iter = deviceStateCallback_.find(pkgName); if (iter == deviceStateCallback_.end()) { - LOGE("OnDeviceChanged error, device state callback not register, pkgName:%{public}s", pkgName.c_str()); + if (deviceStatusCallback_.find(pkgName) == deviceStatusCallback_.end()) { + LOGE("error, device state callback not register, pkgName:%{public}s",pkgName.c_str()); + } return; } tempCbk = iter->second; @@ -446,7 +452,9 @@ void DeviceManagerNotify::OnDeviceChanged(const std::string &pkgName, const DmDe std::lock_guard autoLock(lock_); auto iter = deviceStatusCallback_.find(pkgName); if (iter == deviceStatusCallback_.end()) { - LOGE("OnDeviceChanged error, device state callback not register, pkgName:%{public}s", pkgName.c_str()); + if (deviceStateCallback_.find(pkgName) == deviceStateCallback_.end()) { + LOGE("error, device state callback not register, pkgName:%{public}s", pkgName.c_str()); + } return; } tempCbk = iter->second; @@ -478,7 +486,9 @@ void DeviceManagerNotify::OnDeviceReady(const std::string &pkgName, const DmDevi std::lock_guard autoLock(lock_); auto iter = deviceStateCallback_.find(pkgName); if (iter == deviceStateCallback_.end()) { - LOGE("OnDeviceReady error, device state callback not register, pkgName:%{public}s", pkgName.c_str()); + if (deviceStatusCallback_.find(pkgName) == deviceStatusCallback_.end()) { + LOGE("error, device state callback not register, pkgName:%{public}s", pkgName.c_str()); + } return; } tempCbk = iter->second; @@ -487,8 +497,6 @@ void DeviceManagerNotify::OnDeviceReady(const std::string &pkgName, const DmDevi LOGE("OnDeviceReady error, registered device state callback is nullptr, pkgName:%{public}s", pkgName.c_str()); return; } - LOGE("OnDeviceReady in, pkgName:%{public}s, networkId: %{public}s.", - pkgName.c_str(), GetAnonyString(deviceInfo.networkId).c_str()); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) ffrt::submit([=]() { DeviceInfoReady(deviceInfo, tempCbk); }); #else @@ -506,13 +514,14 @@ void DeviceManagerNotify::OnDeviceReady(const std::string &pkgName, const DmDevi LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("DeviceManagerNotify::OnDeviceReady with DmDeviceBasicInfo, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); auto iter = deviceStatusCallback_.find(pkgName); if (iter == deviceStatusCallback_.end()) { - LOGE("OnDeviceReady error, device status callback not register, pkgName:%{public}s", pkgName.c_str()); + if (deviceStateCallback_.find(pkgName) != deviceStateCallback_.end()) { + LOGE("error, device status callback not register, pkgName:%{public}s", pkgName.c_str()); + } return; } tempCbk = iter->second; @@ -535,8 +544,6 @@ void DeviceManagerNotify::OnDeviceReady(const std::string &pkgName, const DmDevi void DeviceManagerNotify::OnDeviceFound(const std::string &pkgName, uint16_t subscribeId, const DmDeviceInfo &deviceInfo) { - LOGD("pkgName:%{public}s, subscribeId:%{public}d.", - GetAnonyString(pkgName).c_str(), (int32_t)subscribeId); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return; @@ -552,8 +559,6 @@ void DeviceManagerNotify::OnDeviceFound(const std::string &pkgName, uint16_t sub void DeviceManagerNotify::OnDeviceFound(const std::string &pkgName, uint16_t subscribeId, const DmDeviceBasicInfo &deviceBasicInfo) { - LOGD("pkgName:%{public}s, subscribeId:%{public}d.", - GetAnonyString(pkgName).c_str(), (int32_t)subscribeId); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return; @@ -572,7 +577,7 @@ void DeviceManagerNotify::OnDiscoveryFailed(const std::string &pkgName, uint16_t LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("DeviceManagerNotify::OnDiscoveryFailed in, pkgName:%{public}s, subscribeId %{public}d, failed" + LOGE("in, pkgName:%{public}s, subscribeId %{public}d, failed" "reason %{public}d", pkgName.c_str(), (int32_t)subscribeId, failedReason); std::shared_ptr tempCbk = GetDiscoveryCallback(pkgName, subscribeId); if (tempCbk == nullptr) { @@ -603,7 +608,7 @@ void DeviceManagerNotify::OnPublishResult(const std::string &pkgName, int32_t pu LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("DeviceManagerNotify::OnPublishResult in, pkgName:%{public}s, publishId %{public}d, publishResult %{public}d", + LOGI("in, pkgName:%{public}s, publishId %{public}d, publishResult %{public}d", pkgName.c_str(), publishId, publishResult); std::shared_ptr tempCbk; { @@ -635,8 +640,7 @@ void DeviceManagerNotify::OnAuthResult(const std::string &pkgName, const std::st LOGE("Invalid para, pkgName: %{public}s, token: %{public}s", pkgName.c_str(), GetAnonyString(token).c_str()); return; } - LOGI("DeviceManagerNotify::OnAuthResult in, pkgName:%{public}s, status:%{public}d, reason:%{public}d", - pkgName.c_str(), status, reason); + LOGI("in, pkgName:%{public}s, status:%{public}d, reason:%{public}d", pkgName.c_str(), status, reason); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -677,7 +681,7 @@ void DeviceManagerNotify::OnUiCall(std::string &pkgName, std::string ¶mJson) LOGE("DeviceManagerNotify::OnUiCall error: Invalid parameter, pkgName: %{public}s", pkgName.c_str()); return; } - LOGI("DeviceManagerNotify::OnUiCall in, pkgName:%{public}s", pkgName.c_str()); + LOGI("in, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -701,7 +705,7 @@ void DeviceManagerNotify::OnCredentialResult(const std::string &pkgName, int32_t LOGE("DeviceManagerNotify::OnCredentialResult error: Invalid parameter, pkgName: %{public}s", pkgName.c_str()); return; } - LOGI("DeviceManagerNotify::OnCredentialResult in, pkgName:%{public}s, action:%{public}d", pkgName.c_str(), action); + LOGI("in, pkgName:%{public}s, action:%{public}d", pkgName.c_str(), action); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -756,7 +760,7 @@ void DeviceManagerNotify::OnBindResult(const std::string &pkgName, const PeerTar LOGE("Invalid para, pkgName: %{public}s.", pkgName.c_str()); return; } - LOGI("DeviceManagerNotify::OnBindResult in, pkgName:%{public}s, result:%{public}d", pkgName.c_str(), result); + LOGI("in, pkgName:%{public}s, result:%{public}d", pkgName.c_str(), result); std::shared_ptr tempCbk; { std::lock_guard autoLock(bindLock_); @@ -794,7 +798,7 @@ void DeviceManagerNotify::OnUnbindResult(const std::string &pkgName, const PeerT LOGE("Invalid para, pkgName: %{public}s.", pkgName.c_str()); return; } - LOGI("DeviceManagerNotify::OnUnbindResult in, pkgName:%{public}s, result:%{public}d", pkgName.c_str(), result); + LOGI("in, pkgName:%{public}s, result:%{public}d", pkgName.c_str(), result); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -832,7 +836,7 @@ void DeviceManagerNotify::OnPinHolderCreate(const std::string &pkgName, const st LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("DeviceManagerNotify::OnPinHolderCreate in, pkgName:%{public}s", pkgName.c_str()); + LOGI("in, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -856,7 +860,7 @@ void DeviceManagerNotify::OnPinHolderDestroy(const std::string &pkgName, DmPinTy LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("DeviceManagerNotify::OnPinHolderDestroy in, pkgName:%{public}s", pkgName.c_str()); + LOGI("in, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -879,7 +883,7 @@ void DeviceManagerNotify::OnCreateResult(const std::string &pkgName, int32_t res LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("DeviceManagerNotify::OnCreateResult in, pkgName:%{public}s", pkgName.c_str()); + LOGI("in, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -902,7 +906,7 @@ void DeviceManagerNotify::OnDestroyResult(const std::string &pkgName, int32_t re LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("DeviceManagerNotify::OnDestroyResult in, pkgName:%{public}s", pkgName.c_str()); + LOGI("in, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -926,7 +930,7 @@ void DeviceManagerNotify::OnPinHolderEvent(const std::string &pkgName, DmPinHold LOGE("Invalid parameter, pkgName is empty."); return; } - LOGI("DeviceManagerNotify::OnPinHolderEvent in, pkgName:%{public}s", pkgName.c_str()); + LOGI("in, pkgName:%{public}s", pkgName.c_str()); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -1028,7 +1032,7 @@ void DeviceManagerNotify::OnDeviceTrustChange(const std::string &pkgName, const tempCbk = iter->second; } if (tempCbk == nullptr) { - LOGE("OnDeviceReady error, registered device status callback is nullptr."); + LOGE("error, registered device status callback is nullptr."); return; } DmAuthForm dmAuthForm = static_cast(authForm); @@ -1170,7 +1174,7 @@ void DeviceManagerNotify::OnSinkBindResult(const std::string &pkgName, const Pee LOGE("Invalid para, pkgName: %{public}s.", pkgName.c_str()); return; } - LOGI("DeviceManagerNotify::OnSinkBindResult in, pkgName:%{public}s, result:%{public}d", pkgName.c_str(), result); + LOGI("in, pkgName:%{public}s, result:%{public}d", pkgName.c_str(), result); std::shared_ptr tempCbk; { std::lock_guard autoLock(lock_); @@ -1254,23 +1258,19 @@ int32_t DeviceManagerNotify::RegisterGetDeviceProfileInfoListCallback(const std: std::shared_ptr callback) { LOGI("In, pkgName: %{public}s.", pkgName.c_str()); + if (callback == nullptr || pkgName.empty()) { + LOGE("callback is null or pkgName is empty"); + return ERR_DM_CALLBACK_REGISTER_FAILED; + } std::lock_guard autoLock(bindLock_); if (getDeviceProfileInfoCallback_.size() > MAX_CONTAINER_SIZE) { LOGE("callback map size is more than max size"); - return ERR_DM_MAX_SIZE_FAIL; + return ERR_DM_CALLBACK_REGISTER_FAILED; } getDeviceProfileInfoCallback_[pkgName] = callback; return DM_OK; } -int32_t DeviceManagerNotify::UnRegisterGetDeviceProfileInfoListCallback(const std::string &pkgName) -{ - LOGI("In, pkgName: %{public}s.", pkgName.c_str()); - std::lock_guard autoLock(bindLock_); - getDeviceProfileInfoCallback_.erase(pkgName); - return DM_OK; -} - void DeviceManagerNotify::OnGetDeviceProfileInfoListResult(const std::string &pkgName, const std::vector &deviceProfileInfos, int32_t code) { @@ -1300,10 +1300,14 @@ int32_t DeviceManagerNotify::RegisterGetDeviceIconInfoCallback(const std::string std::shared_ptr callback) { LOGI("In, pkgName: %{public}s.", pkgName.c_str()); + if (callback == nullptr || pkgName.empty()) { + LOGE("callback is null or pkgName is empty"); + return ERR_DM_CALLBACK_REGISTER_FAILED; + } std::lock_guard autoLock(bindLock_); if (getDeviceIconInfoCallback_.size() > MAX_CONTAINER_SIZE) { LOGE("callback map size is more than max size"); - return ERR_DM_MAX_SIZE_FAIL; + return ERR_DM_CALLBACK_REGISTER_FAILED; } auto iter = getDeviceIconInfoCallback_.find(pkgName); if (iter == getDeviceIconInfoCallback_.end()) { @@ -1312,31 +1316,16 @@ int32_t DeviceManagerNotify::RegisterGetDeviceIconInfoCallback(const std::string } if (iter->second.size() > MAX_CONTAINER_SIZE) { LOGE("callback map for pkg size is more than max size"); - return ERR_DM_MAX_SIZE_FAIL; + return ERR_DM_CALLBACK_REGISTER_FAILED; } if (iter->second[uk].size() > MAX_CONTAINER_SIZE) { LOGE("callback set size is more than max size"); - return ERR_DM_MAX_SIZE_FAIL; + return ERR_DM_CALLBACK_REGISTER_FAILED; } iter->second[uk].insert(callback); return DM_OK; } -int32_t DeviceManagerNotify::UnRegisterGetDeviceIconInfoCallback(const std::string &pkgName, const std::string &uk) -{ - LOGI("In, pkgName: %{public}s", pkgName.c_str()); - std::lock_guard autoLock(bindLock_); - auto iter = getDeviceIconInfoCallback_.find(pkgName); - if (iter == getDeviceIconInfoCallback_.end()) { - return DM_OK; - } - iter->second.erase(uk); - if (iter->second.empty()) { - getDeviceIconInfoCallback_.erase(pkgName); - } - return DM_OK; -} - void DeviceManagerNotify::OnGetDeviceIconInfoResult(const std::string &pkgName, const DmDeviceIconInfo &deviceIconInfo, int32_t code) { @@ -1381,31 +1370,31 @@ int32_t DeviceManagerNotify::RegisterSetLocalDeviceNameCallback(const std::strin std::shared_ptr callback) { LOGI("In, pkgName: %{public}s.", pkgName.c_str()); + if (callback == nullptr || pkgName.empty()) { + LOGE("callback is null or pkgName is empty"); + return ERR_DM_CALLBACK_REGISTER_FAILED; + } std::lock_guard autoLock(bindLock_); if (setLocalDeviceNameCallback_.size() > MAX_CONTAINER_SIZE) { - LOGI("callback map size is more than max size"); - return ERR_DM_MAX_SIZE_FAIL; + LOGE("callback map size is more than max size"); + return ERR_DM_CALLBACK_REGISTER_FAILED; } setLocalDeviceNameCallback_[pkgName] = callback; return DM_OK; } -int32_t DeviceManagerNotify::UnRegisterSetLocalDeviceNameCallback(const std::string &pkgName) -{ - LOGI("In, pkgName: %{public}s.", pkgName.c_str()); - std::lock_guard autoLock(bindLock_); - setLocalDeviceNameCallback_.erase(pkgName); - return DM_OK; -} - int32_t DeviceManagerNotify::RegisterSetRemoteDeviceNameCallback(const std::string &pkgName, const std::string &deviceId, std::shared_ptr callback) { LOGI("In, pkgName: %{public}s.", pkgName.c_str()); + if (callback == nullptr || pkgName.empty() || deviceId.empty()) { + LOGE("callback is null or pkgName is empty or deviceId is empty"); + return ERR_DM_CALLBACK_REGISTER_FAILED; + } std::lock_guard autoLock(bindLock_); if (setRemoteDeviceNameCallback_.size() > MAX_CONTAINER_SIZE) { - LOGI("callback map size is more than max size"); - return ERR_DM_MAX_SIZE_FAIL; + LOGE("callback map size is more than max size"); + return ERR_DM_CALLBACK_REGISTER_FAILED; } auto iter = setRemoteDeviceNameCallback_.find(pkgName); if (iter == setRemoteDeviceNameCallback_.end()) { @@ -1413,29 +1402,13 @@ int32_t DeviceManagerNotify::RegisterSetRemoteDeviceNameCallback(const std::stri return DM_OK; } if (iter->second.size() > MAX_CONTAINER_SIZE) { - LOGI("callback map size is more than max size"); - return ERR_DM_MAX_SIZE_FAIL; + LOGE("callback map size is more than max size"); + return ERR_DM_CALLBACK_REGISTER_FAILED; } iter->second[deviceId] = callback; return DM_OK; } -int32_t DeviceManagerNotify::UnRegisterSetRemoteDeviceNameCallback(const std::string &pkgName, - const std::string &deviceId) -{ - LOGI("In, pkgName: %{public}s.", pkgName.c_str()); - std::lock_guard autoLock(bindLock_); - auto iter = setRemoteDeviceNameCallback_.find(pkgName); - if (iter == setRemoteDeviceNameCallback_.end()) { - return DM_OK; - } - iter->second.erase(deviceId); - if (iter->second.empty()) { - getDeviceIconInfoCallback_.erase(pkgName); - } - return DM_OK; -} - void DeviceManagerNotify::OnSetLocalDeviceNameResult(const std::string &pkgName, int32_t code) { if (pkgName.empty()) { @@ -1488,7 +1461,7 @@ void DeviceManagerNotify::OnSetRemoteDeviceNameResult(const std::string &pkgName } } if (tempCbks.empty()) { - LOGE("error, registered GetDeviceIconInfoResult callback is nullptr."); + LOGE("error, registered SetRemoteDeviceNameResult callback is empty."); return; } for (const auto &[key, callback] : tempCbks) { @@ -1497,5 +1470,15 @@ void DeviceManagerNotify::OnSetRemoteDeviceNameResult(const std::string &pkgName } } } + +void DeviceManagerNotify::UnRegisterPinHolderCallback(const std::string &pkgName) +{ + if (pkgName.empty()) { + LOGE("Invalid parameter, pkgName is empty."); + return; + } + std::lock_guard autoLock(lock_); + pinHolderCallback_.erase(pkgName); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/interfaces/kits/BUILD.gn b/interfaces/kits/BUILD.gn index d8a02b1a0ba34b050d0572963e9daeac8ec7755e..d3ec01fc9ee7613495620df330d0fab0b4e94140 100644 --- a/interfaces/kits/BUILD.gn +++ b/interfaces/kits/BUILD.gn @@ -19,6 +19,7 @@ group("devicemanager_native_js") { deps += [ "./js:devicemanager", "./js4.0:distributeddevicemanager", + "./ndk:devicemanager_ndk", ] } } diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 51ae9aeead49b8cdc0b8dcd77f043165ecac7d21..f24244d23639cf6b4597e920a5ed491feb58cdae 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -51,7 +51,10 @@ ohos_shared_library("devicemanager") { "src/native_devicemanager_js.cpp", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] defines = [ "HI_LOG_ENABLE", @@ -62,7 +65,6 @@ ohos_shared_library("devicemanager") { external_deps = [ "access_token:libtokenid_sdk", "bounds_checking_function:libsec_shared", - "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp index 2c619595fb5a930379105d7722054022e24c3b54..633b02b6b4baa9ea0b3dbf807bff94168efc9b96 100644 --- a/interfaces/kits/js/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js/src/native_devicemanager_js.cpp @@ -2084,6 +2084,8 @@ napi_value DeviceManagerNapi::GetTrustedDeviceList(napi_env env, napi_callback_i return CallDeviceList(env, info, deviceInfoListAsyncCallbackInfo); } else if (argc == DM_NAPI_ARGS_TWO) { return GetTrustedDeviceListByFilter(env, info, deviceInfoListAsyncCallbackInfo); + } else { + DeleteAsyncCallbackInfo(deviceInfoListAsyncCallbackInfo); } napi_get_undefined(env, &result); return result; diff --git a/interfaces/kits/js4.0/BUILD.gn b/interfaces/kits/js4.0/BUILD.gn index 93e058a6e24b8fe5df5f8a3c49bdcab540bfd765..d7bfd367bdbef51e1a915116e894d7925375456d 100644 --- a/interfaces/kits/js4.0/BUILD.gn +++ b/interfaces/kits/js4.0/BUILD.gn @@ -53,7 +53,10 @@ ohos_shared_library("distributeddevicemanager") { "src/native_devicemanager_js.cpp", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] defines = [ "HI_LOG_ENABLE", @@ -64,7 +67,6 @@ ohos_shared_library("distributeddevicemanager") { external_deps = [ "access_token:libtokenid_sdk", "bounds_checking_function:libsec_shared", - "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/js4.0/include/native_devicemanager_js.h b/interfaces/kits/js4.0/include/native_devicemanager_js.h index 980b7ff7dab9b34d09849f7cac285b3bdbfe5948..a26bd243797ed28e6e86d616796f3d376807ff1d 100644 --- a/interfaces/kits/js4.0/include/native_devicemanager_js.h +++ b/interfaces/kits/js4.0/include/native_devicemanager_js.h @@ -376,7 +376,7 @@ public: static napi_value JsGetLocalDisplayDeviceName(napi_env env, napi_callback_info info); static napi_value JsSetLocalDeviceName(napi_env env, napi_callback_info info); static napi_value JsSetRemoteDeviceName(napi_env env, napi_callback_info info); - static napi_value JsRestoreLocalDeivceName(napi_env env, napi_callback_info info); + static napi_value JsRestoreLocalDeviceName(napi_env env, napi_callback_info info); static napi_value JsGetDeviceNetworkIdList(napi_env env, napi_callback_info info); static DeviceManagerNapi *GetDeviceManagerNapi(std::string &bundleName); static void CreateDmCallback(napi_env env, std::string &bundleName, std::string &eventType); diff --git a/interfaces/kits/js4.0/src/dm_native_util.cpp b/interfaces/kits/js4.0/src/dm_native_util.cpp index 74a8516850871371e0b010ae49c413e00e60e239..e551b52804bc87d7ca8f473d7d68bdb439a3a15a 100644 --- a/interfaces/kits/js4.0/src/dm_native_util.cpp +++ b/interfaces/kits/js4.0/src/dm_native_util.cpp @@ -225,7 +225,7 @@ napi_value CreateBusinessError(napi_env env, int32_t errCode, bool isAsync) break; case ERR_DM_INPUT_PARA_INVALID: case ERR_DM_UNSUPPORTED_AUTH_TYPE: - case ERR_DM_MAX_SIZE_FAIL: + case ERR_DM_CALLBACK_REGISTER_FAILED: error = CreateErrorForCall(env, ERR_INVALID_PARAMS, ERR_MESSAGE_INVALID_PARAMS, isAsync); break; case ERR_DM_INIT_FAILED: @@ -682,7 +682,7 @@ void JsToDmDeviceIconInfoFilterOptions(const napi_env &env, const napi_value &ob JsObjectToString(env, object, "subProductId", subProductId, sizeof(subProductId)); info.subProductId = subProductId; char internalModel[DM_NAPI_BUF_LENGTH] = ""; - JsObjectToString(env, object, "internalModel", subProductId, sizeof(internalModel)); + JsObjectToString(env, object, "internalModel", internalModel, sizeof(internalModel)); info.internalModel = internalModel; char imageType[DM_NAPI_BUF_LENGTH] = ""; JsObjectToString(env, object, "imageType", imageType, sizeof(imageType)); @@ -810,7 +810,7 @@ bool JsToDmDeviceProfileInfos(const napi_env &env, const napi_value &jsObj, std: napi_value element; napi_get_element(env, jsObj, i, &element); DmDeviceProfileInfo devInfo; - if (JsToDmDeviceProfileInfo(env, jsObj, devInfo)) { + if (JsToDmDeviceProfileInfo(env, element, devInfo)) { devInfos.emplace_back(devInfo); } } diff --git a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp index 9420aae7057b9f6ae1e190f2e24bd16b8e58d31a..005d39c8af4c7f3d0108af28d51788c29f7b842b 100644 --- a/interfaces/kits/js4.0/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js4.0/src/native_devicemanager_js.cpp @@ -40,6 +40,14 @@ namespace { napi_value thisVar = nullptr; \ NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)) +#define CHECK_NULL_VOID_RET_LOG(ptr, fmt, ...) \ + do { \ + if ((ptr) == NULL) { \ + LOGE(fmt, ##__VA_ARGS__); \ + return; \ + } \ + } while (0) + const std::string DM_NAPI_EVENT_DEVICE_STATE_CHANGE = "deviceStateChange"; const std::string DM_NAPI_EVENT_DEVICE_DISCOVER_SUCCESS = "discoverSuccess"; const std::string DM_NAPI_EVENT_DEVICE_DISCOVER_FAIL = "discoverFail"; @@ -546,6 +554,7 @@ void DmNapiGetDeviceProfileInfoListCallback::OnResult(const std::vectorcode != DM_OK) { @@ -756,6 +766,7 @@ void DeviceManagerNapi::OnGetDeviceProfileInfoListCallbackResult(DeviceProfileIn void DeviceManagerNapi::OnGetDeviceIconInfoCallbackResult(DeviceIconInfoAsyncCallbackInfo *jsCallback) { LOGI("In"); + CHECK_NULL_VOID_RET_LOG(jsCallback, "jsCallback is nullptr"); napi_handle_scope scope; napi_open_handle_scope(env_, &scope); if (jsCallback->code != DM_OK) { @@ -775,6 +786,7 @@ void DeviceManagerNapi::OnGetDeviceIconInfoCallbackResult(DeviceIconInfoAsyncCal void DeviceManagerNapi::OnSetLocalDeviceNameCallbackResult(SetLocalDeviceNameAsyncCallbackInfo *jsCallback) { LOGI("In"); + CHECK_NULL_VOID_RET_LOG(jsCallback, "jsCallback is nullptr"); napi_handle_scope scope; napi_open_handle_scope(env_, &scope); if (jsCallback->code != DM_OK) { @@ -793,6 +805,7 @@ void DeviceManagerNapi::OnSetLocalDeviceNameCallbackResult(SetLocalDeviceNameAsy void DeviceManagerNapi::OnSetRemoteDeviceNameCallbackResult(SetRemoteDeviceNameAsyncCallbackInfo *jsCallback) { LOGI("In"); + CHECK_NULL_VOID_RET_LOG(jsCallback, "jsCallback is nullptr"); napi_handle_scope scope; napi_open_handle_scope(env_, &scope); if (jsCallback->code != DM_OK) { @@ -1333,6 +1346,8 @@ napi_value DeviceManagerNapi::GetAvailableDeviceList(napi_env env, napi_callback return nullptr; } return CallDeviceList(env, info, deviceBasicInfoListAsyncCallbackInfo); + } else { + DeleteAsyncCallbackInfo(deviceBasicInfoListAsyncCallbackInfo); } napi_get_undefined(env, &result); return result; @@ -1401,10 +1416,6 @@ napi_value DeviceManagerNapi::GetLocalDeviceId(napi_env env, napi_callback_info napi_value DeviceManagerNapi::GetLocalDeviceName(napi_env env, napi_callback_info info) { LOGI("GetLocalDeviceName in"); - if (DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { - CreateBusinessError(env, ERR_DM_NO_PERMISSION); - return nullptr; - } napi_value result = nullptr; napi_value thisVar = nullptr; std::string deviceName; @@ -2004,9 +2015,13 @@ napi_value DeviceManagerNapi::GetDeviceProfileInfoListPromise(napi_env env, (void)status; DeviceProfileInfosAsyncCallbackInfo *jsCallback = reinterpret_cast(data); - if (jsCallback->code != DM_OK) { - napi_value error = CreateBusinessError(env, jsCallback->code, false); - napi_reject_deferred(env, jsCallback->deferred, error); + if (jsCallback->code == ERR_DM_CALLBACK_REGISTER_FAILED) { + if (jsCallback->deferred != nullptr) { + napi_value error = CreateBusinessError(env, jsCallback->code, false); + napi_reject_deferred(env, jsCallback->deferred, error); + } else { + LOGE("jsCallback->deferred is null"); + } } napi_delete_async_work(env, jsCallback->asyncWork); delete jsCallback; @@ -2040,6 +2055,15 @@ napi_value DeviceManagerNapi::GetDeviceNetworkIdListPromise(napi_env env, if (jsCallback->code != DM_OK) { napi_value error = CreateBusinessError(env, jsCallback->code, false); napi_reject_deferred(env, jsCallback->deferred, error); + } else { + napi_value result = nullptr; + napi_create_array(env, &result); + for (uint32_t i = 0; i < jsCallback->deviceNetworkIds.size(); i++) { + napi_value element = nullptr; + napi_create_string_utf8(env, jsCallback->deviceNetworkIds[i].c_str(), NAPI_AUTO_LENGTH, &element); + napi_set_element(env, result, i, element); + } + napi_resolve_deferred(env, jsCallback->deferred, result); } napi_delete_async_work(env, jsCallback->asyncWork); delete jsCallback; @@ -2158,9 +2182,13 @@ napi_value DeviceManagerNapi::GetDeviceIconInfoPromise(napi_env env, DeviceIconI (void)status; DeviceIconInfoAsyncCallbackInfo *jsCallback = reinterpret_cast(data); - if (jsCallback->code != DM_OK) { - napi_value error = CreateBusinessError(env, jsCallback->code, false); - napi_reject_deferred(env, jsCallback->deferred, error); + if (jsCallback->code == ERR_DM_CALLBACK_REGISTER_FAILED) { + if (jsCallback->deferred != nullptr) { + napi_value error = CreateBusinessError(env, jsCallback->code, false); + napi_reject_deferred(env, jsCallback->deferred, error); + } else { + LOGE("jsCallback->deferred is null"); + } } napi_delete_async_work(env, jsCallback->asyncWork); delete jsCallback; @@ -2455,9 +2483,13 @@ napi_value DeviceManagerNapi::SetLocalDeviceNamePromise(napi_env env, (void)status; SetLocalDeviceNameAsyncCallbackInfo *jsCallback = reinterpret_cast(data); - if (jsCallback->code != DM_OK) { - napi_value error = CreateBusinessError(env, jsCallback->code, false); - napi_reject_deferred(env, jsCallback->deferred, error); + if (jsCallback->code == ERR_DM_CALLBACK_REGISTER_FAILED) { + if (jsCallback->deferred != nullptr) { + napi_value error = CreateBusinessError(env, jsCallback->code, false); + napi_reject_deferred(env, jsCallback->deferred, error); + } else { + LOGE("jsCallback->deferred is null"); + } } napi_delete_async_work(env, jsCallback->asyncWork); delete jsCallback; @@ -2497,9 +2529,13 @@ napi_value DeviceManagerNapi::SetRemoteDeviceNamePromise(napi_env env, (void)status; SetRemoteDeviceNameAsyncCallbackInfo *jsCallback = reinterpret_cast(data); - if (jsCallback->code != DM_OK) { - napi_value error = CreateBusinessError(env, jsCallback->code, false); - napi_reject_deferred(env, jsCallback->deferred, error); + if (jsCallback->code == ERR_DM_CALLBACK_REGISTER_FAILED) { + if (jsCallback->deferred != nullptr) { + napi_value error = CreateBusinessError(env, jsCallback->code, false); + napi_reject_deferred(env, jsCallback->deferred, error); + } else { + LOGE("jsCallback->deferred is null"); + } } napi_delete_async_work(env, jsCallback->asyncWork); delete jsCallback; @@ -2519,7 +2555,6 @@ napi_value DeviceManagerNapi::JsSetLocalDeviceName(napi_env env, napi_callback_i return nullptr; } GET_PARAMS(env, info, DM_NAPI_ARGS_ONE); - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, nullptr, &thisVar, nullptr)); if (!CheckArgsCount(env, argc >= DM_NAPI_ARGS_ONE, "Wrong number of arguments, required 1")) { return nullptr; } @@ -2533,9 +2568,9 @@ napi_value DeviceManagerNapi::JsSetLocalDeviceName(napi_env env, napi_callback_i if (!JsToStringAndCheck(env, argv[0], "deviceName", deviceName)) { return nullptr; } - if (deviceName.size() > DEIVCE_NAME_MAX_BYTES) { + if (deviceName.size() > DEVICE_NAME_MAX_BYTES) { LOGE("deviceName is too long"); - CreateBusinessError(env, ERR_DM_INIT_FAILED); + CreateBusinessError(env, ERR_DM_INPUT_PARA_INVALID); return nullptr; } auto *jsCallback = new SetLocalDeviceNameAsyncCallbackInfo(); @@ -2559,7 +2594,6 @@ napi_value DeviceManagerNapi::JsSetRemoteDeviceName(napi_env env, napi_callback_ return nullptr; } GET_PARAMS(env, info, DM_NAPI_ARGS_TWO); - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, nullptr, &thisVar, nullptr)); if (!CheckArgsCount(env, argc >= DM_NAPI_ARGS_TWO, "Wrong number of arguments, required 2")) { return nullptr; } @@ -2573,13 +2607,13 @@ napi_value DeviceManagerNapi::JsSetRemoteDeviceName(napi_env env, napi_callback_ if (!JsToStringAndCheck(env, argv[0], "deviceName", deviceName)) { return nullptr; } - if (deviceName.size() > DEIVCE_NAME_MAX_BYTES) { + if (deviceName.size() > DEVICE_NAME_MAX_BYTES) { LOGE("deviceName is too long"); - CreateBusinessError(env, ERR_DM_INIT_FAILED); + CreateBusinessError(env, ERR_DM_INPUT_PARA_INVALID); return nullptr; } std::string deviceId = ""; - if (!JsToStringAndCheck(env, argv[0], "deviceId", deviceName)) { + if (!JsToStringAndCheck(env, argv[1], "deviceId", deviceId)) { return nullptr; } auto *jsCallback = new SetRemoteDeviceNameAsyncCallbackInfo(); @@ -2596,7 +2630,7 @@ napi_value DeviceManagerNapi::JsSetRemoteDeviceName(napi_env env, napi_callback_ return SetRemoteDeviceNamePromise(env, jsCallback); } -napi_value DeviceManagerNapi::JsRestoreLocalDeivceName(napi_env env, napi_callback_info info) +napi_value DeviceManagerNapi::JsRestoreLocalDeviceName(napi_env env, napi_callback_info info) { LOGI("In"); if (!IsSystemApp()) { @@ -2613,7 +2647,7 @@ napi_value DeviceManagerNapi::JsRestoreLocalDeivceName(napi_env env, napi_callba napi_create_uint32(env, ERR_DM_POINT_NULL, &result); return result; } - int32_t ret = DeviceManager::GetInstance().RestoreLocalDeivceName(deviceManagerWrapper->bundleName_); + int32_t ret = DeviceManager::GetInstance().RestoreLocalDeviceName(deviceManagerWrapper->bundleName_); if (ret != 0) { LOGE("bundleName %{public}s failed, ret %{public}d", deviceManagerWrapper->bundleName_.c_str(), ret); @@ -2790,7 +2824,8 @@ napi_value DeviceManagerNapi::Init(napi_env env, napi_value exports) DECLARE_NAPI_FUNCTION("getLocalDisplayDeviceName", JsGetLocalDisplayDeviceName), DECLARE_NAPI_FUNCTION("setLocalDeviceName", JsSetLocalDeviceName), DECLARE_NAPI_FUNCTION("setRemoteDeviceName", JsSetRemoteDeviceName), - DECLARE_NAPI_FUNCTION("restoreLocalDeivceName", JsRestoreLocalDeivceName), + DECLARE_NAPI_FUNCTION("restoreLocalDeviceName", JsRestoreLocalDeviceName), + DECLARE_NAPI_FUNCTION("restoreLocalDeivceName", JsRestoreLocalDeviceName), DECLARE_NAPI_FUNCTION("getDeviceNetworkIdList", JsGetDeviceNetworkIdList), DECLARE_NAPI_FUNCTION("setHeartbeatPolicy", SetHeartbeatPolicy)}; @@ -2936,6 +2971,7 @@ void DmNapiGetDeviceIconInfoCallback::OnResult(const OHOS::DistributedHardware:: int32_t code) { LOGI("In code:%{public}d", code); + CHECK_NULL_VOID_RET_LOG(deferred_, "deferred_ is nullptr"); uv_loop_s *loop = nullptr; napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { @@ -2985,6 +3021,7 @@ void DmNapiGetDeviceIconInfoCallback::OnResult(const OHOS::DistributedHardware:: void DmNapiSetLocalDeviceNameCallback::OnResult(int32_t code) { LOGI("In code:%{public}d", code); + CHECK_NULL_VOID_RET_LOG(deferred_, "deferred_ is nullptr"); uv_loop_s *loop = nullptr; napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { @@ -3033,6 +3070,7 @@ void DmNapiSetLocalDeviceNameCallback::OnResult(int32_t code) void DmNapiSetRemoteDeviceNameCallback::OnResult(int32_t code) { LOGI("In code:%{public}d", code); + CHECK_NULL_VOID_RET_LOG(deferred_, "deferred_ is nullptr"); uv_loop_s *loop = nullptr; napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { diff --git a/interfaces/kits/ndk/BUILD.gn b/interfaces/kits/ndk/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..428baf69a66dce4dd5fbbb9984c5725ea5c38156 --- /dev/null +++ b/interfaces/kits/ndk/BUILD.gn @@ -0,0 +1,102 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") +} else { + import("//build/ohos.gni") +} +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +if (defined(ohos_lite)) { + if (ohos_kernel_type == "liteos_m") { + static_library("devicemanager_ndk") { + include_dirs = [] + + sources = [] + + deps = [] + + cflags = [ + "-Wall", + "-O2", + "-std=c99", + "-Wdate-time", + "-Wextra", + "-Wfloat-equal", + ] + cflags_cc = cflags + } + } else { + shared_library("devicemanager_ndk") { + include_dirs = [] + + sources = [] + + defines = [ + "LITE_DEVICE", + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanager_ndk\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [] + } + } +} else { + ohos_shared_library("devicemanager_ndk") { + branch_protector_ret = "pac_ret" + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + } + + include_dirs = [ + "include", + "${common_path}/include", + "${common_path}/include/ipc", + "${innerkits_path}/native_cpp/include", + ] + sources = [ + "src/dm_client.cpp", + "src/oh_device_manager.cpp", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanager_ndk\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${utils_path}:devicemanagerutils", + ] + + external_deps = [ + "c_utils:utils", + "eventhandler:libeventhandler", + "hilog:libhilog", + "ipc:ipc_core", + ] + + relative_install_dir = "ndk" + subsystem_name = "distributedhardware" + part_name = "device_manager" + output_extension = "so" + } +} diff --git a/interfaces/kits/ndk/include/dm_client.h b/interfaces/kits/ndk/include/dm_client.h new file mode 100644 index 0000000000000000000000000000000000000000..1201d76c2f18cd50e9e2a7ad3ae50944b632a2c1 --- /dev/null +++ b/interfaces/kits/ndk/include/dm_client.h @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_NDK_DM_CLIENT_H +#define OHOS_NDK_DM_CLIENT_H + +#include +#include +#include "device_manager_callback.h" + +namespace OHOS { +namespace DistributedHardware { +class DmClient { +public: + static DmClient &GetInstance(); +public: + int32_t Init(); + int32_t UnInit(); + int32_t ReInit(); + int32_t GetLocalDeviceName(std::string &deviceName); +private: + std::mutex initMtx_; + std::string pkgName_ = ""; + std::shared_ptr dmInitCallback_; + +class InitCallback : public DmInitCallback { +public: + void OnRemoteDied() override; +}; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_NDK_DM_CLIENT_H diff --git a/interfaces/kits/ndk/include/oh_device_manager.h b/interfaces/kits/ndk/include/oh_device_manager.h new file mode 100644 index 0000000000000000000000000000000000000000..e4218188e250cef70bcdb723de803a746735aa90 --- /dev/null +++ b/interfaces/kits/ndk/include/oh_device_manager.h @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup DeviceManager + * @{ + * + * @brief Provides APIs to obtain information about trusted devices and local devices. + * + * @since 20 + */ + +/** + * @file oh_device_manager.h + * + * @brief Provides APIs of the DeviceManager module. + * + * @kit DistributedServiceKit + * @library libdevicemanager_ndk.so + * @syscap SystemCapability.DistributedHardware.DeviceManager + * + * @since 20 + */ + +#ifndef OH_DEVICE_MANAGER_H +#define OH_DEVICE_MANAGER_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Get local device name. + * + * @param localDeviceName This is an output parameter. It indicates the address pointer of the localDeviceName. + * You need to manually release space resources after using. + * @param len This is an output parameter. Length of the localDeviceName. + * @return Returns the status code of the execution. For detail, see {@link DeviceManager_ErrorCode}. + * Returns {@link ERR_OK}, The operation is successful. + * Returns {@link DM_ERR_FAILED}, Failed to execute the function. + * Returns {@link DM_ERR_OBTAIN_SERVICE}, Failed to obtain devicemanager service. + * Returns {@link DM_ERR_OBTAIN_BUNDLE_NAME}, Failed to obtain the bundleName. + * @since 20 + */ +int32_t OH_DeviceManager_GetLocalDeviceName(char **localDeviceName, unsigned int &len); + +#ifdef __cplusplus +}; +#endif + +/** @} */ +#endif \ No newline at end of file diff --git a/interfaces/kits/ndk/include/oh_device_manager_err_code.h b/interfaces/kits/ndk/include/oh_device_manager_err_code.h new file mode 100644 index 0000000000000000000000000000000000000000..cd33a88fe48a2c2ef4941a88bf754679d633f343 --- /dev/null +++ b/interfaces/kits/ndk/include/oh_device_manager_err_code.h @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @addtogroup DeviceManager + * @{ + * + * @brief Provides APIs to obtain information about trusted devices and local devices. + * + * @since 20 + */ + +/** + * @file oh_device_manager_err_code.h + * + * @brief Declaration error code information. + * + * @kit DistributedServiceKit + * @library libdevicemanager_ndk.so + * @syscap SystemCapability.DistributedHardware.DeviceManager + * + * @since 20 + */ + + +#ifndef OH_DEVICE_MANAGER_ERR_CODE_H +#define OH_DEVICE_MANAGER_ERR_CODE_H + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Enumerates the error codes. + * + * @since 20 + */ +typedef enum DeviceManager_ErrorCode { + /** + * @error The operation is successful. + */ + ERR_OK = 0, + /** + * @error Permission verification failed. + */ + ERR_PERMISSION_ERROR = 201, + /** + * @error Invalid parameter is detected. + */ + ERR_INVALID_PARAMETER = 401, + /** + * @error Failed to execute the function. + */ + DM_ERR_FAILED = 11600101, + /** + * @error Failed to obtain the service. + */ + DM_ERR_OBTAIN_SERVICE = 11600102, + /** + * @error Failed to obtain the bundleName. + */ + DM_ERR_OBTAIN_BUNDLE_NAME = 11600109, +} DeviceManager_ErrorCode; +#ifdef __cplusplus +}; +#endif + +/** @} */ +#endif diff --git a/interfaces/kits/ndk/src/dm_client.cpp b/interfaces/kits/ndk/src/dm_client.cpp new file mode 100644 index 0000000000000000000000000000000000000000..2d5c6273e40a7402a385d48b4f922b370f3136a0 --- /dev/null +++ b/interfaces/kits/ndk/src/dm_client.cpp @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_client.h" + +#include "app_manager.h" +#include "device_manager.h" +#include "dm_error_type.h" +#include "dm_log.h" +#include "oh_device_manager_err_code.h" + +namespace OHOS { +namespace DistributedHardware { +DmClient &DmClient::GetInstance() +{ + static DmClient instance; + return instance; +} + +int32_t DmClient::Init() +{ + std::lock_guard lck(initMtx_); + if (pkgName_.empty()) { + std::string bundleName = ""; + int32_t ret = AppManager::GetInstance().GetBundleNameForSelf(bundleName); + if (ret != DM_OK || bundleName.empty()) { + LOGE("Get bundle name failed, ret=%{public}d", ret); + return DM_ERR_OBTAIN_BUNDLE_NAME; + } + pkgName_ = bundleName; + } + if (dmInitCallback_ == nullptr) { + dmInitCallback_ = std::make_shared(); + } + int32_t ret = DeviceManager::GetInstance().InitDeviceManager(pkgName_, dmInitCallback_); + if (ret != DM_OK) { + LOGE("Init DeviceManager failed, ret=%{public}d", ret); + return DM_ERR_OBTAIN_SERVICE; + } + return ERR_OK; +} + +int32_t DmClient::UnInit() +{ + std::lock_guard lck(initMtx_); + if (dmInitCallback_ != nullptr) { + DeviceManager::GetInstance().UnInitDeviceManager(pkgName_); + } + pkgName_ = ""; + return ERR_OK; +} + +int32_t DmClient::ReInit() +{ + UnInit(); + return Init(); +} + +int32_t DmClient::GetLocalDeviceName(std::string &deviceName) +{ + int32_t ret = Init(); + if (ret != ERR_OK) { + LOGE("Init dm client failed, ret=%{public}d", ret); + return ret; + } + ret = DeviceManager::GetInstance().GetLocalDeviceName(deviceName); + if (ret != DM_OK) { + LOGE("Get local device name failed, ret=%{public}d", ret); + return DM_ERR_OBTAIN_BUNDLE_NAME; + } + return ERR_OK; +} + +void DmClient::InitCallback::OnRemoteDied() +{ + DmClient::GetInstance().ReInit(); +} +} // namespace DistributedHardware +} // namespace OHOS diff --git a/interfaces/kits/ndk/src/oh_device_manager.cpp b/interfaces/kits/ndk/src/oh_device_manager.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a77411e5e471736568e5e5007581e4a891b1c58d --- /dev/null +++ b/interfaces/kits/ndk/src/oh_device_manager.cpp @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "oh_device_manager.h" + +#include + +#include "app_manager.h" +#include "dm_client.h" +#include "dm_log.h" +#include "oh_device_manager_err_code.h" + +int32_t OH_DeviceManager_GetLocalDeviceName(char **localDeviceName, unsigned int &len) +{ + std::string deviceName = ""; + int32_t ret = OHOS::DistributedHardware::DmClient::GetInstance().GetLocalDeviceName(deviceName); + if (ret != ERR_OK) { + LOGE("Get local device name failed, ret=%{public}d", ret); + return ret; + } + len = static_cast(deviceName.size()); + *localDeviceName = new (std::nothrow) char[len + 1] {0}; + if (*localDeviceName == nullptr) { + LOGE("create localDeviceName fail"); + return DM_ERR_FAILED; + } + if (strcpy_s(*localDeviceName, len + 1, deviceName.c_str()) != EOK) { + LOGE("copy string fail"); + delete [] *localDeviceName; + return DM_ERR_FAILED; + } + return ERR_OK; +} \ No newline at end of file diff --git a/interfaces/kits/taihe/BUILD.gn b/interfaces/kits/taihe/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..cae4b187f0b5654bedbcdd4c84a8960b267fcf85 --- /dev/null +++ b/interfaces/kits/taihe/BUILD.gn @@ -0,0 +1,103 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/config/components/ets_frontend/ets2abc_config.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") +import("//build/ohos.gni") +import("//build/ohos/taihe_idl/taihe.gni") + +subsystem_name = "distributedhardware" +part_name = "device_manager" +taihe_generated_file_path = "$taihe_file_path/out/$subsystem_name/$part_name" + +copy_taihe_idl("copy_taihe") { + sources = [ "${devicemanager_path}/interfaces/kits/taihe/idl/ohos.distributedDeviceManager.taihe" ] +} + +ohos_taihe("run_taihe") { + taihe_generated_file_path = "$taihe_generated_file_path" + deps = [ ":copy_taihe" ] + outputs = [ + "$taihe_generated_file_path/src/ohos.distributedDeviceManager.ani.cpp", + "$taihe_generated_file_path/src/ohos.distributedDeviceManager.abi.c", + ] +} + +if (device_manager_enable_ets_frontend) { + taihe_shared_library("device_manager_ani_taihe") { + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + } + + taihe_generated_file_path = "$taihe_generated_file_path" + subsystem_name = "$subsystem_name" + part_name = "$part_name" + + include_dirs = [ + "include", + "${innerkits_path}/native_cpp/include", + "${devicemanager_path}/interfaces/kits/taihe/include", + ] + + sources = get_target_outputs(":run_taihe") + sources += [ + "src/ani_constructor.cpp", + "src/ohos.distributedDeviceManager.cpp", + "src/dm_ani_callback.cpp" + ] + + deps = [ + ":run_taihe", + "${innerkits_path}/native_cpp:devicemanagersdk" + ] + + external_deps = [ + "hilog:libhilog", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "eventhandler:libeventhandler", + ] + } + + generate_static_abc("ohos_distributedDeviceManager_abc") { + base_url = "$taihe_generated_file_path" + files = [ "$taihe_generated_file_path/@ohos.distributedDeviceManager.ets" ] + is_boot_abc = "True" + device_dst_file = "/system/framework/ohos_distributedDeviceManager_abc.abc" + dependencies = [ ":run_taihe" ] + } + + ohos_prebuilt_etc("ohos_distributedDeviceManager_etc") { + source = "$target_out_dir/ohos_distributedDeviceManager_abc.abc" + module_install_dir = "framework" + part_name = "$part_name" + subsystem_name = "$subsystem_name" + deps = [ + ":ohos_distributedDeviceManager_abc" + ] + } +} + +group("devicemanager_ani") { + if (device_manager_enable_ets_frontend) { + deps = [ + ":device_manager_ani_taihe", + ":ohos_distributedDeviceManager_etc", + ] + } +} diff --git a/interfaces/kits/taihe/idl/ohos.distributedDeviceManager.taihe b/interfaces/kits/taihe/idl/ohos.distributedDeviceManager.taihe new file mode 100644 index 0000000000000000000000000000000000000000..7bebee0b1d6c7e75f1cee4ec308c18ce5261dbcf --- /dev/null +++ b/interfaces/kits/taihe/idl/ohos.distributedDeviceManager.taihe @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@!namespace("@ohos.distributedDeviceManager", "distributedDeviceManager") + +@!sts_inject(""" +static { loadLibrary("device_manager_ani_taihe");} +""") + +struct DeviceBasicInfo { + deviceId: String; + deviceName: String; + deviceType: String; + networkId: String; + extraData: String; +} + +function MakeDeviceBasicInfo(deviceId:String, deviceName:String, deviceType:String, + networkId:String, extraData: String): DeviceBasicInfo; + +struct ServiceProfileInfo { + deviceId: String; +} + +enum DeviceStateChange: i32 { + UNKNOWN = 0, + AVAILABLE = 1, + UNAVAILABLE = 2, +} + +struct DeviceResult { + deviceId: String; +} + +function MakeDeviceResult(deviceId: String): DeviceResult; + +struct DeviceResultNumber { + reason: i32; +} + +function MakeDeviceResultNumber(reason: i32): DeviceResultNumber; + +struct DeviceStateChangeAction { + device: DeviceBasicInfo; +} + +function MakeDeviceStateChangeAction(device: DeviceBasicInfo): DeviceStateChangeAction; + +struct DeviceStateChangeData { + deviceStateChange: DeviceStateChange; + deviceBasicInfo: DeviceBasicInfo; +} + +function MakeDeviceStateChangeData(deviceStateChange : DeviceStateChange, + deviceBasicInfo : DeviceBasicInfo): DeviceStateChangeData; + +interface DeviceManager { + GetLocalDeviceId(): String; + UnbindTarget(deviceId: String): void; + GetDeviceType(networkId: String): f64; + GetDeviceName(networkId: String): String; + GetLocalDeviceNetworkId(): String; + + @!sts_inject_into_interface("on(type: string, callback: (data: object) => void): void;") + @!sts_inject_into_class("""on(type: string, callback: object): void { + if (type === "discoverSuccess") { + this.OnDiscoverSuccess_inner(callback as (data: DeviceStateChangeAction) => void); + } else if (type === "deviceStateChange") { + this.OnDeviceStateChange_inner(callback as (data: DeviceStateChangeData) => void); + } else if (type === "replyResult") { + this.OnreplyResult_inner(callback as (data: DeviceResult) => void); + } else if (type === "deviceNameChange") { + this.OnDeviceNameChange_inner(callback as (data: DeviceResult) => void); + } else if (type === "discoverFailure") { + this.OnDiscoverFailure_inner(callback as (data: DeviceResultNumber) => void); + } else if (type ==="serviceDie") { + this.OnServiceDie_inner(callback as () => void); + } else { + throw new Error(`Unknown type: ${type}`); + } + } + """) + + @!sts_inject_into_interface("off(type: string, callback?: (data: object) => void): void;") + @!sts_inject_into_class("""off(type: string, callback?: object): void { + if (type === "discoverSuccess") { + this.OffDiscoverSuccess_inner(callback as (((data: DeviceStateChangeAction) => void) | undefined)); + } else if (type === "deviceStateChange") { + this.OffDeviceStateChange_inner(callback as (((data: DeviceStateChangeData) => void) | undefined)); + } else if (type === "replyResult") { + this.OffreplyResult_inner(callback as (((data: DeviceResult) => void) | undefined)); + } else if (type === "deviceNameChange") { + this.OffDeviceNameChange_inner(callback as (((data: DeviceResult) => void) | undefined)); + } else if (type === "discoverFailure"){ + this.OffDiscoverFailure_inner(callback as (((data: DeviceResultNumber) => void) | undefined)); + } else if (type ==="serviceDie") { + this.OffServiceDie_inner(callback as () => void); + }else { + throw new Error(`Unknown type: ${type}`); + } + } + """) + + OnDiscoverSuccess(onDiscoverSuccesscb: (device: DeviceStateChangeAction) => void): void; + OffDiscoverSuccess(offDiscoverSuccesscb: Optional<(device: DeviceStateChangeAction) => void>): void; + OnDeviceStateChange(onDeviceStateChangecb: (deviceStateChangeData: DeviceStateChangeData) => void): void; + OffDeviceStateChange(offDeviceStateChangecb: + Optional<(deviceStateChangeData: DeviceStateChangeData) => void>): void; + OnreplyResult(onreplyResultcb: (data: DeviceResult) => void): void; + OffreplyResult(offreplyResultcb: Optional<(data: DeviceResult) => void>): void; + OnDeviceNameChange(onDeviceNameChangecb: (deviceName: DeviceResult) => void): void; + OffDeviceNameChange(offDeviceNameChangecb: Optional<(deviceName: DeviceResult) => void>): void; + OnDiscoverFailure(onDiscoverFailurecb: (reason: DeviceResultNumber) => void): void; + OffDiscoverFailure(offDiscoverFailurecb: Optional<(reason: DeviceResultNumber) => void>): void; + OnServiceDie(onServiceDiecb: () => void): void; + OffServiceDie(offServiceDiecb: Optional<() => void>): void; +} + +function CreateDeviceManager(bundleName: String): DeviceManager; diff --git a/interfaces/kits/taihe/include/dm_ani_callback.h b/interfaces/kits/taihe/include/dm_ani_callback.h new file mode 100644 index 0000000000000000000000000000000000000000..019c42b6251272169700a2fa560323b89c853829 --- /dev/null +++ b/interfaces/kits/taihe/include/dm_ani_callback.h @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_ANI_CALLBACK_H +#define OHOS_DM_ANI_CALLBACK_H + +#include +#include +#include "device_manager_callback.h" +#include "dm_device_info.h" +#include "ohos.distributedDeviceManager.proj.hpp" +#include "ohos.distributedDeviceManager.impl.hpp" +#include "taihe/runtime.hpp" +#include "taihe/callback.hpp" + +class DmAniInitCallback : public OHOS::DistributedHardware::DmInitCallback { +public: + explicit DmAniInitCallback(taihe::string_view bundleName); + ~DmAniInitCallback() override {} + void OnRemoteDied() override; + void SetServiceDieCallback(std::shared_ptr> callback); + void ReleaseServiceDieCallback(); + +private: + std::string bundleName_; + std::shared_ptr> serviceDieCallback_; + std::mutex g_dmInitMutex; +}; + +class DmAniDiscoverySuccessCallback : public OHOS::DistributedHardware::DiscoveryCallback { +public: + explicit DmAniDiscoverySuccessCallback(std::string &bundleName, + taihe::callback + discoverSuccessCallback); + ~DmAniDiscoverySuccessCallback() override {}; + void OnDeviceFound(uint16_t subscribeId, + const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override {} + void OnDiscoveryFailed(uint16_t subscribeId, int32_t failedReason) override {} + void OnDiscoverySuccess(uint16_t subscribeId) override {} + void IncreaseRefCount(); + void DecreaseRefCount(); + int32_t GetRefCount(); + +private: + std::atomic refCount_; + std::string bundleName_; + std::shared_ptr> discoverSuccessCallback_; + std::mutex g_dmDiscoveryMutex; +}; + +class DmAniDiscoveryFailedCallback : public OHOS::DistributedHardware::DiscoveryCallback { +public: + explicit DmAniDiscoveryFailedCallback(std::string &bundleName, + taihe::callback discoverFailedCallback); + ~DmAniDiscoveryFailedCallback() override {}; + void OnDeviceFound(uint16_t subscribeId, + const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override {} + void OnDiscoveryFailed(uint16_t subscribeId, int32_t failedReason) override {} + void OnDiscoverySuccess(uint16_t subscribeId) override {} + void IncreaseRefCount(); + void DecreaseRefCount(); + int32_t GetRefCount(); + +private: + std::atomic refCount_; + std::string bundleName_; + std::shared_ptr> discoverFailedCallback_; + std::mutex g_dmDiscoveryMutex; +}; + +class DmAniDeviceNameChangeCallback : public OHOS::DistributedHardware::DeviceStatusCallback { +public: + explicit DmAniDeviceNameChangeCallback(std::string &bundleName, + taihe::callback deviceNameChangeCallback); + ~DmAniDeviceNameChangeCallback() override {} + void OnDeviceOnline(const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override {} + void OnDeviceReady(const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override {} + void OnDeviceOffline(const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override {} + void OnDeviceChanged(const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override; + +private: + std::string bundleName_; + std::shared_ptr> deviceNameChangeCallback_; +}; + +class DmAniDeviceStateChangeDataCallback : public OHOS::DistributedHardware::DeviceStatusCallback { +public: + explicit DmAniDeviceStateChangeDataCallback(std::string &bundleName, + taihe::callback + deviceStateChangeDataCallback); + ~DmAniDeviceStateChangeDataCallback() override {} + void OnDeviceOnline(const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override {} + void OnDeviceReady(const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override {} + void OnDeviceOffline(const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override {} + void OnDeviceChanged(const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) override; + +private: + std::string bundleName_; + std::shared_ptr> + deviceStateChangeDataCallback_; +}; + +class DmAniDeviceManagerUiCallback : public OHOS::DistributedHardware::DeviceManagerUiCallback { +public: + explicit DmAniDeviceManagerUiCallback(taihe::callback replyResultCallback, + std::string &bundleName); + ~DmAniDeviceManagerUiCallback() override {} + void OnCall(const std::string ¶mJson) override; + +private: + std::string bundleName_; + std::shared_ptr> replyResultCallback_; +}; + +#endif //OHOS_DM_ANI_CALLBACK_H diff --git a/interfaces/kits/taihe/include/ohos.distributedDeviceManager.h b/interfaces/kits/taihe/include/ohos.distributedDeviceManager.h new file mode 100644 index 0000000000000000000000000000000000000000..2d385544a06adfef5e81b2e4a955dacfd6b7f666 --- /dev/null +++ b/interfaces/kits/taihe/include/ohos.distributedDeviceManager.h @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef OHOS_DISTRIBUTEDDEVICEMANAGER_H +#define OHOS_DISTRIBUTEDDEVICEMANAGER_H + +#include +#include +#include "device_manager_callback.h" +#include "dm_device_info.h" +#include "ohos.distributedDeviceManager.proj.hpp" +#include "ohos.distributedDeviceManager.impl.hpp" +#include "taihe/callback.hpp" +#include "taihe/runtime.hpp" + +namespace ANI::distributedDeviceManager { + +enum DMBussinessErrorCode { + ERR_NO_PERMISSION = 201, + DM_ERR_FAILED = 11600101, +}; + +class DeviceManagerImpl { +public: + DeviceManagerImpl() = default; + explicit DeviceManagerImpl(std::shared_ptr impl); + explicit DeviceManagerImpl(const std::string& bundleName); + ~DeviceManagerImpl() = default; + std::string GetLocalDeviceId(); + void UnbindTarget(taihe::string_view deviceId); + double GetDeviceType(taihe::string_view networkId); + std::string GetDeviceName(taihe::string_view networkId); + std::string GetLocalDeviceNetworkId(); + + void OnDeviceNameChange(taihe::callback_view onDeviceNameChangecb); + void OnDiscoverFailure(taihe::callback_view onDiscoverFailurecb); + void OnreplyResult(taihe::callback_view onreplyResultcb); + void OnDiscoverSuccess(taihe::callback_view onDiscoverSuccesscb); + void OnDeviceStateChange(taihe::callback_view onDeviceStateChangecb); + void OnServiceDie(taihe::callback_view onServiceDiecb); + + void OffDeviceNameChange(taihe::optional_view> offDeviceNameChangecb); + void OffDiscoverFailure(taihe::optional_view> offDiscoverFailurecb); + void OffreplyResult(taihe::optional_view> offreplyResultcb); + void OffDiscoverSuccess(taihe::optional_view> offDiscoverSuccesscb); + void OffDeviceStateChange(taihe::optional_view> offDeviceStateChangecb); + void OffServiceDie(taihe::optional_view> offServiceDiecb); + + friend ohos::distributedDeviceManager::DeviceManager CreateDeviceManager(taihe::string_view bundleName); + +private: + std::string bundleName_; +}; + +ohos::distributedDeviceManager::DeviceBasicInfo MakeDeviceBasicInfo(taihe::string_view deviceId, + taihe::string_view deviceName, taihe::string_view deviceType, + taihe::string_view networkId, taihe::string_view extraData); + +ohos::distributedDeviceManager::DeviceResult MakeDeviceResult(taihe::string_view deviceId); +ohos::distributedDeviceManager::DeviceResultNumber MakeDeviceResultNumber(int32_t reason); +ohos::distributedDeviceManager::DeviceStateChangeAction MakeDeviceStateChangeAction( + ohos::distributedDeviceManager::DeviceBasicInfo const& device); +ohos::distributedDeviceManager::DeviceStateChangeData MakeDeviceStateChangeData( + ohos::distributedDeviceManager::DeviceStateChange deviceStateChange, + ohos::distributedDeviceManager::DeviceBasicInfo const& deviceBasicInfo); +ohos::distributedDeviceManager::DeviceManager CreateDeviceManager(taihe::string_view bundleName); +} // namespace ANI::distributedDeviceManager + +#endif //OHOS_DISTRIBUTEDDEVICEMANAGER_H diff --git a/interfaces/kits/taihe/src/ani_constructor.cpp b/interfaces/kits/taihe/src/ani_constructor.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8e29dd47230336761d500f0b17945a0efaf7813b --- /dev/null +++ b/interfaces/kits/taihe/src/ani_constructor.cpp @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "ohos.distributedDeviceManager.ani.hpp" + +ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) +{ + ani_env *env; + if (ANI_OK != vm->GetEnv(ANI_VERSION_1, &env)) { + return ANI_ERROR; + } + if (ANI_OK != ohos::distributedDeviceManager::ANIRegister(env)) { + std::cerr << "Error from ohos::distributedDeviceManager::ANIRegister" << std::endl; + return ANI_ERROR; + } + *result = ANI_VERSION_1; + return ANI_OK; +} diff --git a/interfaces/kits/taihe/src/dm_ani_callback.cpp b/interfaces/kits/taihe/src/dm_ani_callback.cpp new file mode 100644 index 0000000000000000000000000000000000000000..b56a56ed1f648d2ee8d051ff4128279361ea19ca --- /dev/null +++ b/interfaces/kits/taihe/src/dm_ani_callback.cpp @@ -0,0 +1,142 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_ani_callback.h" +#include "device_manager.h" +#include "dm_log.h" +#include "event_handler.h" + +#define DH_LOG_TAG "DeviceManager" + +DmAniInitCallback::DmAniInitCallback(taihe::string_view bundleName) + : bundleName_(std::string(bundleName)) +{ + std::lock_guard autoLock(g_dmInitMutex); + serviceDieCallback_ = nullptr; +} + +void DmAniInitCallback::OnRemoteDied() +{ + LOGI("DmAniInitCallback::OnRemoteDied called."); + auto &deviceManager = static_cast( + OHOS::DistributedHardware::DeviceManager::GetInstance()); + deviceManager.UnInitDeviceManager(bundleName_); +} + +void DmAniInitCallback::SetServiceDieCallback(std::shared_ptr> callback) +{ + std::lock_guard autoLock(g_dmInitMutex); + serviceDieCallback_ = callback; +} + +void DmAniInitCallback::ReleaseServiceDieCallback() +{ + std::lock_guard autoLock(g_dmInitMutex); + serviceDieCallback_ = nullptr; +} + +DmAniDiscoveryFailedCallback::DmAniDiscoveryFailedCallback(std::string &bundleName, + taihe::callback discoverFailedCallback) + : refCount_(0), bundleName_(bundleName), + discoverFailedCallback_(std::make_shared>(discoverFailedCallback)) +{ +} + +void DmAniDiscoveryFailedCallback::IncreaseRefCount() +{ + std::lock_guard autoLock(g_dmDiscoveryMutex); + refCount_++; +} + +void DmAniDiscoveryFailedCallback::DecreaseRefCount() +{ + std::lock_guard autoLock(g_dmDiscoveryMutex); + refCount_--; +} + +int32_t DmAniDiscoveryFailedCallback::GetRefCount() +{ + return refCount_; +} + +DmAniDiscoverySuccessCallback::DmAniDiscoverySuccessCallback(std::string &bundleName, + taihe::callback + discoverSuccessCallback) + : refCount_(0), bundleName_(bundleName), + discoverSuccessCallback_(std::make_shared>(discoverSuccessCallback)) +{ +} + +void DmAniDiscoverySuccessCallback::IncreaseRefCount() +{ + std::lock_guard autoLock(g_dmDiscoveryMutex); + refCount_++; +} + +void DmAniDiscoverySuccessCallback::DecreaseRefCount() +{ + std::lock_guard autoLock(g_dmDiscoveryMutex); + refCount_--; +} + +int32_t DmAniDiscoverySuccessCallback::GetRefCount() +{ + return refCount_; +} + +DmAniDeviceNameChangeCallback::DmAniDeviceNameChangeCallback(std::string &bundleName, + taihe::callback deviceNameChangeCallback) + : bundleName_(bundleName), deviceNameChangeCallback_( + std::make_shared>(deviceNameChangeCallback)) +{ +} + +void DmAniDeviceNameChangeCallback::OnDeviceChanged( + const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) +{ + LOGI("DmAniDeviceNameChangeCallback::OnDeviceChanged called."); +} + +DmAniDeviceStateChangeDataCallback::DmAniDeviceStateChangeDataCallback(std::string &bundleName, + taihe::callback + deviceStateChangeDataCallback) + : bundleName_(bundleName), + deviceStateChangeDataCallback_(std::make_shared>(deviceStateChangeDataCallback)) +{ +} + +void DmAniDeviceStateChangeDataCallback::OnDeviceChanged( + const OHOS::DistributedHardware::DmDeviceBasicInfo &deviceBasicInfo) +{ + LOGI("DmAniDeviceStateChangeDataCallback::OnDeviceChanged called."); +} + +DmAniDeviceManagerUiCallback::DmAniDeviceManagerUiCallback( + taihe::callback replyResultCallback, + std::string &bundleName) + : bundleName_(bundleName), + replyResultCallback_(std::make_shared>(replyResultCallback)) +{ +} + +void DmAniDeviceManagerUiCallback::OnCall(const std::string ¶mJson) +{ + LOGI("DmAniDeviceManagerUiCallback::OnCall called."); +} \ No newline at end of file diff --git a/interfaces/kits/taihe/src/ohos.distributedDeviceManager.cpp b/interfaces/kits/taihe/src/ohos.distributedDeviceManager.cpp new file mode 100644 index 0000000000000000000000000000000000000000..dccd53848baec41731f21060392f3a0b96331371 --- /dev/null +++ b/interfaces/kits/taihe/src/ohos.distributedDeviceManager.cpp @@ -0,0 +1,492 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "ohos.distributedDeviceManager.h" +#include +#include +#include "device_manager.h" +#include "dm_ani_callback.h" +#include "dm_constants.h" +#include "dm_log.h" + +#define DH_LOG_TAG "DeviceManager" + +namespace ANI::distributedDeviceManager { +namespace { +constexpr double DEVICE_TYPE_UNKNOWN = -1.0; +constexpr const char *DEVICE_TYPE_EMPTY_STR = ""; +constexpr const char *ERROR_DEVICE_ID = "error deviceId"; +constexpr const char *ERROR_NETWORK_ID = "error networkId"; + +std::mutex g_initCallbackMapMutex; +std::mutex g_deviceNameChangeCallbackMapMutex; +std::mutex g_discoveryFailedCallbackMapMutex; +std::mutex g_deviceStateChangeDataCallbackMapMutex; +std::mutex g_discoverySuccessCallbackMapMutex; +std::mutex g_dmUiCallbackMapMutex; + +std::map> g_initCallbackMap; +std::map> g_discoveryFailedCallbackMap; +std::map> g_deviceNameChangeCallbackMap; +std::map> g_deviceStateChangeDataCallbackMap; +std::map> g_discoverySuccessCallbackMap; +std::map> g_dmUiCallbackMap; +} //namespace + +DeviceManagerImpl::DeviceManagerImpl(const std::string& bundleName) + : bundleName_(bundleName) +{ +} + +DeviceManagerImpl::DeviceManagerImpl(std::shared_ptr impl) +{ + std::lock_guard autoLock(g_initCallbackMapMutex); + if (impl == nullptr) { + LOGE("Create DeviceManagerImpl for shared_ptr failed."); + } else { + bundleName_ = impl->bundleName_; + } +} + +ohos::distributedDeviceManager::DeviceManager CreateDeviceManager(taihe::string_view bundleName) +{ + auto impl = std::make_shared(std::string(bundleName)); + std::shared_ptr initCallback = std::make_shared(bundleName); + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().InitDeviceManager( + std::string(bundleName), initCallback); + if (ret != 0) { + LOGE("CreateDeviceManager for bundleName %{public}s failed, ret %{public}d.", bundleName.c_str(), ret); + taihe::set_business_error(DM_ERR_FAILED, "CreateDeviceManager for failed"); + return taihe::make_holder(); + } + { + std::lock_guard autoLock(g_initCallbackMapMutex); + g_initCallbackMap[std::string(bundleName)] = initCallback; + } + return taihe::make_holder(impl); +} + +ohos::distributedDeviceManager::DeviceBasicInfo MakeDeviceBasicInfo(taihe::string_view deviceId, + taihe::string_view deviceName, taihe::string_view deviceType, + taihe::string_view networkId, taihe::string_view extraData) +{ + return {deviceId, deviceName, deviceType, networkId, extraData}; +} + +ohos::distributedDeviceManager::DeviceResult MakeDeviceResult(taihe::string_view deviceId) +{ + return {deviceId}; +} + +ohos::distributedDeviceManager::DeviceResultNumber MakeDeviceResultNumber(int32_t reason) +{ + return {reason}; +} + +ohos::distributedDeviceManager::DeviceStateChangeAction MakeDeviceStateChangeAction( + ohos::distributedDeviceManager::DeviceBasicInfo const& device) +{ + return {device}; +} + +ohos::distributedDeviceManager::DeviceStateChangeData MakeDeviceStateChangeData( + ohos::distributedDeviceManager::DeviceStateChange deviceStateChange, + ohos::distributedDeviceManager::DeviceBasicInfo const& deviceBasicInfo) +{ + return {deviceStateChange, deviceBasicInfo}; +} + +std::string DeviceManagerImpl::GetLocalDeviceId() +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, "GetLocalDeviceId for failed1"); + return DEVICE_TYPE_EMPTY_STR; + } + std::string deviceId; + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().GetLocalDeviceId(bundleName_, deviceId); + if (ret != 0) { + taihe::set_business_error(DM_ERR_FAILED, "GetLocalDeviceId for failed2"); + return ERROR_DEVICE_ID; + } + return std::string(deviceId); +} + +void DeviceManagerImpl::UnbindTarget(taihe::string_view deviceId) +{ + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().UnBindDevice( + bundleName_, std::string(deviceId)); + if (ret != 0) { + LOGE("UnBindDevice for bundleName %{public}s failed, ret %{public}d", + bundleName_.c_str(), ret); + taihe::set_business_error(DM_ERR_FAILED, "UnbindTarget for failed"); + return; + } +} + +double DeviceManagerImpl::GetDeviceType(taihe::string_view networkId) +{ + int32_t deviceType; + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().GetDeviceType( + bundleName_, std::string(networkId), deviceType); + if (ret != 0) { + taihe::set_business_error(DM_ERR_FAILED, "GetDeviceType for failed"); + return DEVICE_TYPE_UNKNOWN; + } + return static_cast(deviceType); +} + +std::string DeviceManagerImpl::GetDeviceName(taihe::string_view networkId) +{ + std::string deviceName; + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().GetDeviceName( + bundleName_, std::string(networkId), deviceName); + if (ret != 0) { + taihe::set_business_error(DM_ERR_FAILED, "GetDeviceName for failed"); + return DEVICE_TYPE_EMPTY_STR; + } + return std::string(deviceName); +} + +std::string DeviceManagerImpl::GetLocalDeviceNetworkId() +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, "GetLocalDeviceNetworkId failed"); + return DEVICE_TYPE_EMPTY_STR; + } + std::string networkId; + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().GetLocalDeviceNetWorkId( + bundleName_, networkId); + if (ret != 0) { + LOGE("GetLocalDeviceNetworkId for failed, ret %{public}d", ret); + taihe::set_business_error(DM_ERR_FAILED, "GetLocalDeviceNetworkId failed"); + return ERROR_NETWORK_ID; + } + return std::string(networkId); +} + +void DeviceManagerImpl::OnDeviceNameChange(taihe::callback_view onDeviceNameChangecb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "ondeviceNameChange check permission failed."); + return; + } + + { + std::lock_guard autoLock(g_deviceNameChangeCallbackMapMutex); + if (g_deviceNameChangeCallbackMap.find(bundleName_) != g_deviceNameChangeCallbackMap.end()) { + LOGI("bundleName already register."); + return; + } + } + + auto dmonDeviceNameChangecb = std::make_shared(bundleName_, onDeviceNameChangecb); + std::string extra = ""; + if (OHOS::DistributedHardware::DeviceManager::GetInstance().RegisterDevStatusCallback(bundleName_, extra, + dmonDeviceNameChangecb) != 0) { + LOGE("RegisterDevStatusCallback failed"); + return; + } + { + std::lock_guard autoLock(g_deviceNameChangeCallbackMapMutex); + g_deviceNameChangeCallbackMap[bundleName_] = dmonDeviceNameChangecb; + } + return; +} + +void DeviceManagerImpl::OnDiscoverFailure(taihe::callback_view onDiscoverFailurecb) +{ + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission(); + if (ret != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "ondiscoverFailure check permission failed."); + return; + } + + auto dmDiscoverFailurecb = std::make_shared(bundleName_, onDiscoverFailurecb); + { + std::lock_guard autoLock(g_discoveryFailedCallbackMapMutex); + g_discoveryFailedCallbackMap[bundleName_] = dmDiscoverFailurecb; + } + std::shared_ptr discoveryCallback = dmDiscoverFailurecb; + discoveryCallback->IncreaseRefCount(); + return; +} + +void DeviceManagerImpl::OnreplyResult(taihe::callback_view onreplyResultcb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "OnreplyResult check permission failed"); + return; + } + + auto dmcallback = std::make_shared(onreplyResultcb, bundleName_); + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().RegisterDeviceManagerFaCallback( + bundleName_, dmcallback); + if (ret != 0) { + LOGE("RegisterDeviceManagerFaCallback failed for bundleName %{public}s", bundleName_.c_str()); + return; + } + { + std::lock_guard autoLock(g_dmUiCallbackMapMutex); + g_dmUiCallbackMap[bundleName_] = dmcallback; + } + return; +} + +void DeviceManagerImpl::OnDiscoverSuccess(taihe::callback_view onDiscoverSuccesscb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "ondiscoverSuccess check Permission failed"); + return; + } + + auto dmCallback = std::make_shared(bundleName_, onDiscoverSuccesscb); + { + std::lock_guard autoLock(g_discoverySuccessCallbackMapMutex); + g_discoverySuccessCallbackMap[bundleName_] = dmCallback; + } + std::shared_ptr discoveryCallback = dmCallback; + discoveryCallback->IncreaseRefCount(); + return ; +} + +void DeviceManagerImpl::OnDeviceStateChange(taihe::callback_view onDeviceStateChangecb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "ondeviceStateChange check Permission failed"); + return; + } + + { + std::lock_guard autoLock(g_deviceStateChangeDataCallbackMapMutex); + if (g_deviceStateChangeDataCallbackMap.find(bundleName_) != g_deviceStateChangeDataCallbackMap.end()) { + LOGI("bundleName already register."); + return; + } + } + + auto dmCallback = std::make_shared(bundleName_, onDeviceStateChangecb); + std::string extra = ""; + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().RegisterDevStatusCallback(bundleName_, + extra, dmCallback); + if (ret != 0) { + LOGE("RegisterDevStatusCallback failed ret %{public}d", ret); + return; + } + { + std::lock_guard autoLock(g_deviceStateChangeDataCallbackMapMutex); + g_deviceStateChangeDataCallbackMap[bundleName_] = dmCallback; + } + return; +} + +void DeviceManagerImpl::OnServiceDie(taihe::callback_view onServiceDiecb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "OnreplyResult check permission failed"); + return; + } + + { + std::lock_guard autoLock(g_initCallbackMapMutex); + auto dmCallback = g_initCallbackMap[bundleName_]; + dmCallback->SetServiceDieCallback(std::make_shared>(onServiceDiecb)); + } + return; +} + +void DeviceManagerImpl::OffDeviceNameChange(taihe::optional_view> offDeviceNameChangecb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "offdeviceNameChange check permission failed."); + return; + } + + { + std::lock_guard autoLock(g_deviceNameChangeCallbackMapMutex); + auto iter = g_deviceNameChangeCallbackMap.find(bundleName_); + if (iter == g_deviceNameChangeCallbackMap.end()) { + LOGE("ReleaseDmCallback: cannot find statusCallback for bundleName " + "%{public}s", + bundleName_.c_str()); + return; + } + } + + if (OHOS::DistributedHardware::DeviceManager::GetInstance().UnRegisterDevStatusCallback(bundleName_) != 0) { + LOGE("UnRegisterDevStatusCallback failed for bundleName %{public}s", bundleName_.c_str()); + return; + } + { + std::lock_guard autoLock(g_deviceNameChangeCallbackMapMutex); + g_deviceNameChangeCallbackMap.erase(bundleName_); + } + return; +} + +void DeviceManagerImpl::OffDiscoverFailure(taihe::optional_view> offDiscoverFailurecb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "offdiscoverFailure check permission failed."); + return; + } + + std::shared_ptr discoveryCallback = nullptr; + { + std::lock_guard autoLock(g_discoveryFailedCallbackMapMutex); + auto iter = g_discoveryFailedCallbackMap.find(bundleName_); + if (iter == g_discoveryFailedCallbackMap.end()) { + return; + } + discoveryCallback = iter->second; + } + + discoveryCallback->DecreaseRefCount(); + if (discoveryCallback->GetRefCount() == 0) { + std::lock_guard autoLock(g_discoveryFailedCallbackMapMutex); + g_discoveryFailedCallbackMap.erase(bundleName_); + } + return; +} + +void DeviceManagerImpl::OffreplyResult(taihe::optional_view> offreplyResultcb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "OffreplyResult check permission failed"); + return; + } + + { + std::lock_guard autoLock(g_dmUiCallbackMapMutex); + auto iter = g_dmUiCallbackMap.find(bundleName_); + if (iter == g_dmUiCallbackMap.end()) { + LOGE("cannot find dmFaCallback for bundleName %{public}s", bundleName_.c_str()); + return; + } + } + + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().UnRegisterDeviceManagerFaCallback( + bundleName_); + if (ret != 0) { + LOGE("UnRegisterDeviceManagerFaCallback failed for bundleName %{public}s", bundleName_.c_str()); + return; + } + + { + std::lock_guard autoLock(g_dmUiCallbackMapMutex); + g_dmUiCallbackMap.erase(bundleName_); + } +} + +void DeviceManagerImpl::OffDiscoverSuccess(taihe::optional_view> offDiscoverSuccesscb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "offdiscoverSuccess check Permission failed"); + return; + } + + std::shared_ptr disCoveryCallback = nullptr; + { + std::lock_guard autoLock(g_discoverySuccessCallbackMapMutex); + auto iter = g_discoverySuccessCallbackMap.find(bundleName_); + if (iter == g_discoverySuccessCallbackMap.end()) { + LOGE("Cannot find discoveryCallback for bundleName %{public}s", bundleName_.c_str()); + return; + } + disCoveryCallback = iter->second; + } + + disCoveryCallback->DecreaseRefCount(); + if (disCoveryCallback->GetRefCount() == 0) { + std::lock_guard autoLock(g_discoverySuccessCallbackMapMutex); + g_discoverySuccessCallbackMap.erase(bundleName_); + } + return; +} + +void DeviceManagerImpl::OffDeviceStateChange(taihe::optional_view> offDeviceStateChangecb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "offdeviceStateChange check Permission failed"); + return; + } + + { + std::lock_guard autoLock(g_deviceStateChangeDataCallbackMapMutex); + auto iter = g_deviceStateChangeDataCallbackMap.find(bundleName_); + if (iter == g_deviceStateChangeDataCallbackMap.end()) { + LOGE("Cannot find stateChangeDataCallback for bundleName %{public}s", bundleName_.c_str()); + return; + } + } + + int32_t ret = OHOS::DistributedHardware::DeviceManager::GetInstance().UnRegisterDevStatusCallback(bundleName_); + if (ret != 0) { + LOGE("UnRegisterDevStatusCallback failed for bundleName %{public}s", bundleName_.c_str()); + return; + } + { + std::lock_guard autoLock(g_deviceStateChangeDataCallbackMapMutex); + g_deviceStateChangeDataCallbackMap.erase(bundleName_); + } + return; +} + +void DeviceManagerImpl::OffServiceDie(taihe::optional_view> offServiceDiecb) +{ + if (OHOS::DistributedHardware::DeviceManager::GetInstance().CheckNewAPIAccessPermission() != 0) { + taihe::set_business_error(OHOS::DistributedHardware::ERR_DM_NO_PERMISSION, + "offdiscoverFailure check permission failed."); + return; + } + + { + std::lock_guard autoLock(g_initCallbackMapMutex); + auto iter = g_initCallbackMap.find(bundleName_); + if (iter == g_initCallbackMap.end() || !iter->second) { + LOGE("Cannot find ServiceDieCallback for bundleName %{public}s", bundleName_.c_str()); + return; + } + iter->second->ReleaseServiceDieCallback(); + } +} +} // namespace ANI::distributedDeviceManager + +TH_EXPORT_CPP_API_CreateDeviceManager(ANI::distributedDeviceManager::CreateDeviceManager); +TH_EXPORT_CPP_API_MakeDeviceBasicInfo(ANI::distributedDeviceManager::MakeDeviceBasicInfo); +TH_EXPORT_CPP_API_MakeDeviceResult(ANI::distributedDeviceManager::MakeDeviceResult); +TH_EXPORT_CPP_API_MakeDeviceResultNumber(ANI::distributedDeviceManager::MakeDeviceResultNumber); +TH_EXPORT_CPP_API_MakeDeviceStateChangeAction(ANI::distributedDeviceManager::MakeDeviceStateChangeAction); +TH_EXPORT_CPP_API_MakeDeviceStateChangeData(ANI::distributedDeviceManager::MakeDeviceStateChangeData); diff --git a/json/BUILD.gn b/json/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..d23d34226192024226a3b69477dd30468c8eba12 --- /dev/null +++ b/json/BUILD.gn @@ -0,0 +1,117 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if (defined(ohos_lite)) { + import("//build/lite/config/component/lite_component.gni") +} else { + import("//build/ohos.gni") +} +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +if (defined(ohos_lite)) { + if (ohos_kernel_type == "linux") { + shared_library("devicemanagerjson") { + include_dirs = [ + "include", + "${common_path}/include", + ] + + if (use_nlohmann_json) { + include_dirs += [ "//third_party/json/include" ] + } else { + include_dirs += [ "//third_party/cJSON" ] + } + + if (use_nlohmann_json) { + sources = [ "src/json_object_nlohmannjson.cpp" ] + } else { + sources = [ "src/json_object_cjson.cpp" ] + } + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerjson\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [ "${hilog_path}:hilog_shared" ] + } + } +} else { + config("cflags_config") { + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + "-ffunction-sections", + "-fdata-sections", + "-Oz", + "-flto", + ] + ldflags = [ "-flto" ] + } + + ohos_shared_library("devicemanagerjson") { + branch_protector_ret = "pac_ret" + + include_dirs = [ + "include", + "${common_path}/include", + ] + + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + ] + + ldflags = [ + "-Wl,-z,relro", + "-Wl,-z,now", + ] + + configs = [ ":cflags_config" ] + + if (use_nlohmann_json) { + sources = [ "src/json_object_nlohmannjson.cpp" ] + } else { + sources = [ "src/json_object_cjson.cpp" ] + } + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerjson\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [] + + external_deps = [ "hilog:libhilog" ] + + if (use_nlohmann_json) { + external_deps += [ "json:nlohmann_json_static" ] + } else { + external_deps += [ "cJSON:cjson" ] + } + + subsystem_name = "distributedhardware" + + part_name = "device_manager" + } +} diff --git a/common/include/json_object.h b/json/include/json_object.h similarity index 89% rename from common/include/json_object.h rename to json/include/json_object.h index 940a5d6f869fd8603560993bb5002a460a0a9d87..9b91ddf85255e8e2754c1575a742e9e7ca2fce56 100644 --- a/common/include/json_object.h +++ b/json/include/json_object.h @@ -19,9 +19,6 @@ #include #include -#include "cJSON.h" -#include "dm_log.h" - namespace OHOS { namespace DistributedHardware { class JsonObject; @@ -56,7 +53,8 @@ public: bool Contains(const std::string &key) const; bool IsDiscarded() const; bool PushBack(const std::string &strValue); - bool PushBack(const double &strValue); + bool PushBack(const double &value); + bool PushBack(const int64_t &value); bool PushBack(const JsonItemObject &item); std::string Key() const; void Insert(const std::string &key, const JsonItemObject &object); @@ -83,7 +81,6 @@ public: { dataList.clear(); if (!IsArray()) { - LOGE("item is not array"); return; } for (auto& item : this->Items()) { @@ -119,12 +116,7 @@ public: operationItem.parent_ = item_; operationItem.beValid_ = true; operationItem = value; - if (cJSON_AddItemToArray(item_, operationItem.item_)) { - operationItem.itemIndex_ = cJSON_GetArraySize(item_) - 1; - } else if (operationItem.item_ != nullptr) { - // item add fail, need delete - operationItem.needDeleteItem_ = true; - } + AddItemToArray(operationItem); } return *this; } @@ -132,13 +124,13 @@ protected: JsonItemObject(); void Delete(); std::string Dump(bool formatFlag) const; - bool AddToArray(cJSON *newItem); + void AddItemToArray(JsonItemObject &item); bool InitItem(JsonItemObject &item); bool InitArray(); - bool ReplaceItem(cJSON *newItem); + bool ReplaceItem(void *newItem); protected: - cJSON *item_ = nullptr; - cJSON *parent_ = nullptr; + void *item_ = nullptr; + void *parent_ = nullptr; int32_t itemIndex_ = -1; bool needDeleteItem_ = false; bool beValid_ = false; diff --git a/common/src/json_object.cpp b/json/src/json_object_cjson.cpp similarity index 66% rename from common/src/json_object.cpp rename to json/src/json_object_cjson.cpp index 0cae1100d35e8afde8a76ea886eb15417746717e..76b3a4aeb6804272e6e73e00e2a77bdcda461e01 100644 --- a/common/src/json_object.cpp +++ b/json/src/json_object_cjson.cpp @@ -15,13 +15,35 @@ #include "json_object.h" +#include "cJSON.h" +#include "dm_log.h" + namespace OHOS { namespace DistributedHardware { +static cJSON *GetCJsonPointer(void *pointer) +{ + return static_cast(pointer); +} + +static bool AddToArray(cJSON *item, cJSON *newItem) +{ + if (item == nullptr) { + LOGE("item is nullptr"); + return false; + } + if (!cJSON_AddItemToArray(item, newItem)) { + LOGE("add item to array fail"); + cJSON_Delete(newItem); + return false; + } + return true; +} + void ToJson(JsonItemObject &itemObject, const std::string &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } itemObject.item_ = cJSON_CreateString(value.c_str()); } @@ -29,7 +51,7 @@ void ToJson(JsonItemObject &itemObject, const std::string &value) void ToJson(JsonItemObject &itemObject, const char *value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } itemObject.item_ = cJSON_CreateString(value); } @@ -37,7 +59,7 @@ void ToJson(JsonItemObject &itemObject, const char *value) void ToJson(JsonItemObject &itemObject, const double &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } itemObject.item_ = cJSON_CreateNumber(value); } @@ -45,7 +67,7 @@ void ToJson(JsonItemObject &itemObject, const double &value) void ToJson(JsonItemObject &itemObject, const bool &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } itemObject.item_ = value ? cJSON_CreateTrue() : cJSON_CreateFalse(); } @@ -53,57 +75,85 @@ void ToJson(JsonItemObject &itemObject, const bool &value) void ToJson(JsonItemObject &itemObject, const uint8_t &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } +#ifdef __CJSON_USE_INT64 + itemObject.item_ = cJSON_CreateInt64Number(value); +#else itemObject.item_ = cJSON_CreateNumber(value); +#endif } void ToJson(JsonItemObject &itemObject, const int16_t &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } +#ifdef __CJSON_USE_INT64 + itemObject.item_ = cJSON_CreateInt64Number(value); +#else itemObject.item_ = cJSON_CreateNumber(value); +#endif } void ToJson(JsonItemObject &itemObject, const uint16_t &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } +#ifdef __CJSON_USE_INT64 + itemObject.item_ = cJSON_CreateInt64Number(value); +#else itemObject.item_ = cJSON_CreateNumber(value); +#endif } void ToJson(JsonItemObject &itemObject, const int32_t &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } +#ifdef __CJSON_USE_INT64 + itemObject.item_ = cJSON_CreateInt64Number(value); +#else itemObject.item_ = cJSON_CreateNumber(value); +#endif } void ToJson(JsonItemObject &itemObject, const uint32_t &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } +#ifdef __CJSON_USE_INT64 + itemObject.item_ = cJSON_CreateInt64Number(value); +#else itemObject.item_ = cJSON_CreateNumber(value); +#endif } void ToJson(JsonItemObject &itemObject, const int64_t &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } +#ifdef __CJSON_USE_INT64 + itemObject.item_ = cJSON_CreateInt64Number(value); +#else itemObject.item_ = cJSON_CreateNumber(value); +#endif } void ToJson(JsonItemObject &itemObject, const uint64_t &value) { if (itemObject.item_ != nullptr) { - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); } +#ifdef __CJSON_USE_INT64 + itemObject.item_ = cJSON_CreateInt64Number(value); +#else itemObject.item_ = cJSON_CreateNumber(value); +#endif } void FromJson(const JsonItemObject &itemObject, std::string &value) @@ -181,7 +231,7 @@ JsonItemObject::JsonItemObject(const JsonItemObject &object) itemName_ = object.itemName_; needDeleteItem_ = object.needDeleteItem_; if (object.needDeleteItem_) { - item_ = cJSON_Duplicate(object.item_, cJSON_True); + item_ = cJSON_Duplicate(GetCJsonPointer(object.item_), cJSON_True); } } @@ -193,7 +243,7 @@ JsonItemObject::~JsonItemObject() void JsonItemObject::Delete() { if (needDeleteItem_ && item_ != nullptr) { - cJSON_Delete(item_); + cJSON_Delete(GetCJsonPointer(item_)); } item_ = nullptr; } @@ -203,7 +253,7 @@ bool JsonItemObject::IsString() const if (item_ == nullptr) { return false; } - return cJSON_IsString(item_); + return cJSON_IsString(GetCJsonPointer(item_)); } bool JsonItemObject::IsNumber() const @@ -211,9 +261,18 @@ bool JsonItemObject::IsNumber() const if (item_ == nullptr) { return false; } - return cJSON_IsNumber(item_); + return cJSON_IsNumber(GetCJsonPointer(item_)); } +#ifdef __CJSON_USE_INT64 +bool JsonItemObject::IsNumberInteger() const +{ + if (item_ == nullptr) { + return false; + } + return cJSON_IsInt64Number(GetCJsonPointer(item_)); +} +#else bool JsonItemObject::IsNumberInteger() const { if (!IsNumber()) { @@ -223,13 +282,14 @@ bool JsonItemObject::IsNumberInteger() const GetTo(value); return ((value - static_cast(value)) == 0); } +#endif bool JsonItemObject::IsArray() const { if (item_ == nullptr) { return false; } - return cJSON_IsArray(item_); + return cJSON_IsArray(GetCJsonPointer(item_)); } bool JsonItemObject::IsBoolean() const @@ -237,7 +297,7 @@ bool JsonItemObject::IsBoolean() const if (item_ == nullptr) { return false; } - return cJSON_IsBool(item_); + return cJSON_IsBool(GetCJsonPointer(item_)); } bool JsonItemObject::IsObject() const @@ -245,7 +305,7 @@ bool JsonItemObject::IsObject() const if (item_ == nullptr) { return false; } - return cJSON_IsObject(item_); + return cJSON_IsObject(GetCJsonPointer(item_)); } void JsonItemObject::Insert(const std::string &key, const JsonItemObject &object) @@ -254,15 +314,15 @@ void JsonItemObject::Insert(const std::string &key, const JsonItemObject &object LOGE("invalid item or object item"); return; } - cJSON *newItem = cJSON_Duplicate(object.item_, cJSON_True); + cJSON *newItem = cJSON_Duplicate(GetCJsonPointer(object.item_), cJSON_True); if (newItem == nullptr) { LOGE("copy item fail"); return; } - if (cJSON_GetObjectItemCaseSensitive(item_, key.c_str()) != nullptr) { - cJSON_DeleteItemFromObjectCaseSensitive(item_, key.c_str()); + if (cJSON_GetObjectItemCaseSensitive(GetCJsonPointer(item_), key.c_str()) != nullptr) { + cJSON_DeleteItemFromObjectCaseSensitive(GetCJsonPointer(item_), key.c_str()); } - if (!cJSON_AddItemToObject(item_, key.c_str(), newItem)) { + if (!cJSON_AddItemToObject(GetCJsonPointer(item_), key.c_str(), newItem)) { LOGE("add new item to object fail"); cJSON_Delete(newItem); } @@ -273,9 +333,10 @@ JsonItemObject& JsonItemObject::operator=(const JsonItemObject &object) item_ = object.item_; parent_ = object.parent_; itemName_ = object.itemName_; + itemIndex_ = object.itemIndex_; needDeleteItem_ = object.needDeleteItem_; if (object.needDeleteItem_) { - item_ = cJSON_Duplicate(object.item_, cJSON_True); + item_ = cJSON_Duplicate(GetCJsonPointer(object.item_), cJSON_True); } return *this; } @@ -296,7 +357,8 @@ std::string JsonItemObject::Dump(bool formatFlag) const LOGE("item_ is nullptr"); return ""; } - char* jsonString = formatFlag ? cJSON_Print(item_) : cJSON_PrintUnformatted(item_); + cJSON *jsonItem = GetCJsonPointer(item_); + char* jsonString = formatFlag ? cJSON_Print(jsonItem) : cJSON_PrintUnformatted(jsonItem); if (jsonString == nullptr) { return ""; } @@ -313,9 +375,9 @@ JsonItemObject JsonItemObject::operator[](const std::string &key) if (itemObject.item_ == nullptr) { return itemObject; } - if (!cJSON_AddItemToObject(item_, key.c_str(), itemObject.item_)) { + if (!cJSON_AddItemToObject(GetCJsonPointer(item_), key.c_str(), GetCJsonPointer(itemObject.item_))) { LOGE("add item to object fail"); - cJSON_Delete(itemObject.item_); + cJSON_Delete(GetCJsonPointer(itemObject.item_)); itemObject.item_ = nullptr; } else { itemObject.beValid_ = true; @@ -335,7 +397,7 @@ bool JsonItemObject::Contains(const std::string &key) const LOGE("item_ is nullptr"); return false; } - cJSON* item = cJSON_GetObjectItemCaseSensitive(item_, key.c_str()); + cJSON* item = cJSON_GetObjectItemCaseSensitive(GetCJsonPointer(item_), key.c_str()); return (item != nullptr); } @@ -350,12 +412,12 @@ bool JsonItemObject::PushBack(const std::string &strValue) LOGE("item_ is nullptr"); return false; } - if (item_->type != cJSON_Array) { + if (GetCJsonPointer(item_)->type != cJSON_Array) { LOGE("item_ type is not array"); return false; } cJSON *newItem = cJSON_CreateString(strValue.c_str()); - return AddToArray(newItem); + return AddToArray(GetCJsonPointer(item_), newItem); } bool JsonItemObject::PushBack(const double &value) @@ -364,49 +426,64 @@ bool JsonItemObject::PushBack(const double &value) LOGE("item_ is nullptr"); return false; } - if (item_->type != cJSON_Array) { + if (GetCJsonPointer(item_)->type != cJSON_Array) { LOGE("item_ type is not array"); return false; } cJSON *newItem = cJSON_CreateNumber(value); - return AddToArray(newItem); + return AddToArray(GetCJsonPointer(item_), newItem); } -bool JsonItemObject::PushBack(const JsonItemObject &item) +bool JsonItemObject::PushBack(const int64_t &value) { if (item_ == nullptr) { LOGE("item_ is nullptr"); return false; } - if (!item.beValid_ || !beValid_) { - return false; - } - if (item_->type != cJSON_Array) { + if (GetCJsonPointer(item_)->type != cJSON_Array) { LOGE("item_ type is not array"); return false; } - cJSON* newItem = cJSON_Duplicate(item.item_, cJSON_True); - return AddToArray(newItem); +#ifdef __CJSON_USE_INT64 + cJSON *newItem = cJSON_CreateInt64Number(value); +#else + cJSON *newItem = cJSON_CreateNumber(static_cast(value)); +#endif + return AddToArray(GetCJsonPointer(item_), newItem); } -bool JsonItemObject::AddToArray(cJSON *newItem) +bool JsonItemObject::PushBack(const JsonItemObject &item) { if (item_ == nullptr) { LOGE("item_ is nullptr"); return false; } - if (!cJSON_AddItemToArray(item_, newItem)) { - LOGE("add item to array fail"); - cJSON_Delete(newItem); + if (!item.beValid_ || !beValid_) { return false; } - return true; + if (GetCJsonPointer(item_)->type != cJSON_Array) { + LOGE("item_ type is not array"); + return false; + } + cJSON* newItem = cJSON_Duplicate(GetCJsonPointer(item.item_), cJSON_True); + return AddToArray(GetCJsonPointer(item_), newItem); +} + +void JsonItemObject::AddItemToArray(JsonItemObject &item) +{ + cJSON* jsonItem = GetCJsonPointer(item_); + if (cJSON_AddItemToArray(jsonItem, GetCJsonPointer(item.item_))) { + item.itemIndex_ = cJSON_GetArraySize(jsonItem) - 1; + } else if (item.item_ != nullptr) { + // item add fail, need delete + item.needDeleteItem_ = true; + } } std::string JsonItemObject::Key() const { if (item_ != nullptr) { - return std::string(item_->string); + return std::string(GetCJsonPointer(item_)->string); } return itemName_; } @@ -414,7 +491,7 @@ std::string JsonItemObject::Key() const JsonItemObject JsonItemObject::At(const std::string &key) const { JsonItemObject operationItem; - operationItem.item_ = cJSON_GetObjectItemCaseSensitive(item_, key.c_str()); + operationItem.item_ = cJSON_GetObjectItemCaseSensitive(GetCJsonPointer(item_), key.c_str()); if (operationItem.item_ != nullptr) { operationItem.beValid_ = true; } @@ -433,7 +510,7 @@ void JsonItemObject::GetTo(std::string &value) const if (!IsString()) { return; } - const char* strValue = cJSON_GetStringValue(item_); + const char* strValue = cJSON_GetStringValue(GetCJsonPointer(item_)); if (strValue == nullptr) { return; } @@ -450,28 +527,44 @@ void JsonItemObject::GetTo(double &value) const if (!IsNumber()) { return; } - value = cJSON_GetNumberValue(item_); + value = cJSON_GetNumberValue(GetCJsonPointer(item_)); } void JsonItemObject::GetTo(int32_t &value) const { - double tmpValue = 0.0; + int64_t tmpValue = 0; GetTo(tmpValue); value = static_cast(tmpValue); } void JsonItemObject::GetTo(uint32_t &value) const { - double tmpValue = 0.0; + int64_t tmpValue = 0; GetTo(tmpValue); value = static_cast(tmpValue); } void JsonItemObject::GetTo(int64_t &value) const { - double tmpValue = 0.0; - GetTo(tmpValue); + value = 0; + if (item_ == nullptr) { + LOGE("value item is null"); + return; + } + if (!IsNumberInteger()) { + return; + } +#ifdef __CJSON_USE_INT64 + long long *pValue = cJSON_GetInt64NumberValue(GetCJsonPointer(item_)); + if (pValue == nullptr) { + LOGE("value is null"); + return; + } + value = *pValue; +#else + double tmpValue = cJSON_GetNumberValue(GetCJsonPointer(item_)); value = static_cast(tmpValue); +#endif } void JsonItemObject::GetTo(bool &value) const @@ -484,7 +577,7 @@ void JsonItemObject::GetTo(bool &value) const if (!IsBoolean()) { return; } - value = cJSON_IsTrue(item_) ? true : false; + value = cJSON_IsTrue(GetCJsonPointer(item_)) ? true : false; } std::vector JsonItemObject::Items() const @@ -494,8 +587,9 @@ std::vector JsonItemObject::Items() const return items; } cJSON *current = nullptr; - if (item_->type == cJSON_Object || item_->type == cJSON_Array) { - cJSON_ArrayForEach(current, item_) { + cJSON *jsonItem = GetCJsonPointer(item_); + if (jsonItem->type == cJSON_Object || jsonItem->type == cJSON_Array) { + cJSON_ArrayForEach(current, jsonItem) { JsonItemObject child; child.item_ = current; child.parent_ = item_; @@ -539,22 +633,23 @@ bool JsonItemObject::InitArray() return true; } -bool JsonItemObject::ReplaceItem(cJSON *newItem) +bool JsonItemObject::ReplaceItem(void *newItem) { if (parent_ != nullptr) { - if (cJSON_IsObject(parent_)) { - if (!cJSON_ReplaceItemInObjectCaseSensitive(parent_, itemName_.c_str(), newItem)) { + cJSON *jsonParent = GetCJsonPointer(parent_); + if (cJSON_IsObject(jsonParent)) { + if (!cJSON_ReplaceItemInObjectCaseSensitive(jsonParent, itemName_.c_str(), GetCJsonPointer(newItem))) { LOGE("replace item in object fail, itemName:%{public}s", itemName_.c_str()); return false; } - } else if (cJSON_IsArray(parent_) && itemIndex_ >= 0 && itemIndex_ < cJSON_GetArraySize(parent_)) { - if (!cJSON_ReplaceItemInArray(parent_, itemIndex_, newItem)) { + } else if (cJSON_IsArray(jsonParent) && itemIndex_ >= 0 && itemIndex_ < cJSON_GetArraySize(jsonParent)) { + if (!cJSON_ReplaceItemInArray(jsonParent, itemIndex_, GetCJsonPointer(newItem))) { LOGE("replace item in array fail, itemIndex:%{public}d", itemIndex_); return false; } } } else { - cJSON_Delete(item_); + cJSON_Delete(GetCJsonPointer(item_)); } item_ = newItem; return true; @@ -566,7 +661,7 @@ void JsonItemObject::Erase(const std::string &key) return; } if (IsObject()) { - cJSON_DeleteItemFromObjectCaseSensitive(item_, key.c_str()); + cJSON_DeleteItemFromObjectCaseSensitive(GetCJsonPointer(item_), key.c_str()); } } @@ -608,7 +703,7 @@ bool JsonObject::Parse(const std::string &strJson) void JsonObject::Duplicate(const JsonObject &object) { Delete(); - item_ = cJSON_Duplicate(object.item_, cJSON_True); + item_ = cJSON_Duplicate(GetCJsonPointer(object.item_), cJSON_True); } } // namespace DistributedHardware diff --git a/json/src/json_object_nlohmannjson.cpp b/json/src/json_object_nlohmannjson.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a834dfdbda6dfa08196af701006b0c91386748a3 --- /dev/null +++ b/json/src/json_object_nlohmannjson.cpp @@ -0,0 +1,608 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "json_object.h" + +#include "nlohmann/json.hpp" +#include "dm_log.h" + +namespace OHOS { +namespace DistributedHardware { +static nlohmann::json *GetJsonPointer(void *pointer) +{ + return static_cast(pointer); +} + +void ToJson(JsonItemObject &itemObject, const std::string &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = value; + } +} + +void ToJson(JsonItemObject &itemObject, const char *value) +{ + if (itemObject.item_ != nullptr && value != nullptr) { + *GetJsonPointer(itemObject.item_) = std::string(value); + } +} + +void ToJson(JsonItemObject &itemObject, const double &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = value; + } +} + +void ToJson(JsonItemObject &itemObject, const bool &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = value; + } +} + +void ToJson(JsonItemObject &itemObject, const uint8_t &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = (int)value; + } +} + +void ToJson(JsonItemObject &itemObject, const int16_t &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = value; + } +} + +void ToJson(JsonItemObject &itemObject, const uint16_t &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = value; + } +} + +void ToJson(JsonItemObject &itemObject, const int32_t &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = value; + } +} + +void ToJson(JsonItemObject &itemObject, const uint32_t &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = value; + } +} + +void ToJson(JsonItemObject &itemObject, const int64_t &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = value; + } +} + +void ToJson(JsonItemObject &itemObject, const uint64_t &value) +{ + if (itemObject.item_ != nullptr) { + *GetJsonPointer(itemObject.item_) = value; + } +} + +void FromJson(const JsonItemObject &itemObject, std::string &value) +{ + itemObject.GetTo(value); +} + +void FromJson(const JsonItemObject &itemObject, double &value) +{ + itemObject.GetTo(value); +} + +void FromJson(const JsonItemObject &itemObject, bool &value) +{ + itemObject.GetTo(value); +} + +void FromJson(const JsonItemObject &itemObject, uint8_t &value) +{ + int32_t tmpValue = 0; + itemObject.GetTo(tmpValue); + value = static_cast(tmpValue); +} + +void FromJson(const JsonItemObject &itemObject, int16_t &value) +{ + int32_t tmpValue = 0; + itemObject.GetTo(tmpValue); + value = static_cast(tmpValue); +} + +void FromJson(const JsonItemObject &itemObject, uint16_t &value) +{ + int32_t tmpValue = 0; + itemObject.GetTo(tmpValue); + value = static_cast(tmpValue); +} + +void FromJson(const JsonItemObject &itemObject, int32_t &value) +{ + itemObject.GetTo(value); +} + +void FromJson(const JsonItemObject &itemObject, uint32_t &value) +{ + int32_t tmpValue = 0; + itemObject.GetTo(tmpValue); + value = static_cast(tmpValue); +} + +void FromJson(const JsonItemObject &itemObject, int64_t &value) +{ + itemObject.GetTo(value); +} + +void FromJson(const JsonItemObject &itemObject, uint64_t &value) +{ + int64_t tmpValue = 0; + itemObject.GetTo(tmpValue); + value = static_cast(tmpValue); +} + +std::string ToString(const JsonItemObject &jsonItem) +{ + return jsonItem.Dump(); +} + +JsonItemObject::JsonItemObject() +{} + +JsonItemObject::JsonItemObject(const JsonItemObject &object) +{ + parent_ = object.parent_; + itemName_ = object.itemName_; + itemIndex_ = object.itemIndex_; + needDeleteItem_ = object.needDeleteItem_; + if (object.needDeleteItem_ && object.item_ != nullptr) { + item_ = new nlohmann::json(); + if (item_ != nullptr) { + *GetJsonPointer(item_) = *GetJsonPointer(object.item_); + } + } else { + item_ = object.item_; + } +} + +JsonItemObject::~JsonItemObject() +{ + Delete(); +} + +void JsonItemObject::Delete() +{ + if (needDeleteItem_ && item_ != nullptr) { + nlohmann::json *item = GetJsonPointer(item_); + delete item; + } + item_ = nullptr; +} + +bool JsonItemObject::IsString() const +{ + if (item_ == nullptr) { + return false; + } + return GetJsonPointer(item_)->is_string(); +} + +bool JsonItemObject::IsNumber() const +{ + if (item_ == nullptr) { + return false; + } + return GetJsonPointer(item_)->is_number(); +} + +bool JsonItemObject::IsNumberInteger() const +{ + if (item_ == nullptr) { + return false; + } + return GetJsonPointer(item_)->is_number_integer(); +} + +bool JsonItemObject::IsArray() const +{ + if (item_ == nullptr) { + return false; + } + return GetJsonPointer(item_)->is_array(); +} + +bool JsonItemObject::IsBoolean() const +{ + if (item_ == nullptr) { + return false; + } + return GetJsonPointer(item_)->is_boolean(); +} + +bool JsonItemObject::IsObject() const +{ + if (item_ == nullptr) { + return false; + } + return GetJsonPointer(item_)->is_object(); +} + +void JsonItemObject::Insert(const std::string &key, const JsonItemObject &object) +{ + if (item_ == nullptr || object.item_ == nullptr) { + LOGE("invalid item or object item"); + return; + } + (*GetJsonPointer(item_))[key] = *GetJsonPointer(object.item_); +} + +JsonItemObject& JsonItemObject::operator=(const JsonItemObject &object) +{ + parent_ = object.parent_; + itemName_ = object.itemName_; + itemIndex_ = object.itemIndex_; + needDeleteItem_ = object.needDeleteItem_; + if (object.needDeleteItem_ && object.item_ != nullptr) { + if (item_ == nullptr) { + item_ = new nlohmann::json(); + } + if (item_ != nullptr) { + *GetJsonPointer(item_) = *GetJsonPointer(object.item_); + } + } else { + item_ = object.item_; + } + return *this; +} + +std::string JsonItemObject::DumpFormated() const +{ + return Dump(true); +} + +std::string JsonItemObject::Dump() const +{ + return Dump(false); +} + +std::string JsonItemObject::Dump(bool formatFlag) const +{ + if (item_ == nullptr) { + LOGE("item_ is nullptr"); + return ""; + } + if (formatFlag) { + return GetJsonPointer(item_)->dump(1, '\t', false, nlohmann::detail::error_handler_t::ignore); + } + return GetJsonPointer(item_)->dump(); +} + +JsonItemObject JsonItemObject::operator[](const std::string &key) +{ + JsonItemObject itemObject = At(key); + if (itemObject.item_ == nullptr) { + auto& newItem = (*GetJsonPointer(item_))[key]; + itemObject.item_ = &newItem; + itemObject.beValid_ = true; + } + return itemObject; +} + +const JsonItemObject JsonItemObject::operator[](const std::string &key) const +{ + return At(key); +} + +bool JsonItemObject::Contains(const std::string &key) const +{ + if (item_ == nullptr) { + LOGE("item_ is nullptr"); + return false; + } + return GetJsonPointer(item_)->contains(key); +} + +bool JsonItemObject::IsDiscarded() const +{ + if (item_ == nullptr) { + LOGE("item_ is nullptr"); + return true; + } + return GetJsonPointer(item_)->is_discarded(); +} + +bool JsonItemObject::PushBack(const std::string &strValue) +{ + if (item_ == nullptr) { + LOGE("item_ is nullptr"); + return false; + } + if (!GetJsonPointer(item_)->is_array()) { + LOGE("item_ type is not array"); + return false; + } + GetJsonPointer(item_)->push_back(strValue); + return true; +} + +bool JsonItemObject::PushBack(const double &value) +{ + if (item_ == nullptr) { + LOGE("item_ is nullptr"); + return false; + } + if (!GetJsonPointer(item_)->is_array()) { + LOGE("item_ type is not array"); + return false; + } + GetJsonPointer(item_)->push_back(value); + return true; +} + +bool JsonItemObject::PushBack(const int64_t &value) +{ + if (item_ == nullptr) { + LOGE("item_ is nullptr"); + return false; + } + if (!GetJsonPointer(item_)->is_array()) { + LOGE("item_ type is not array"); + return false; + } + GetJsonPointer(item_)->push_back(value); + return true; +} + +bool JsonItemObject::PushBack(const JsonItemObject &item) +{ + if (item_ == nullptr || item.item_ == nullptr) { + LOGE("item_ or item.item_ is nullptr"); + return false; + } + if (!GetJsonPointer(item_)->is_array()) { + LOGE("item_ type is not array"); + return false; + } + GetJsonPointer(item_)->push_back(*GetJsonPointer(item.item_)); + return true; +} + +void JsonItemObject::AddItemToArray(JsonItemObject &item) +{ + PushBack(item); +} + +std::string JsonItemObject::Key() const +{ + return itemName_; +} + +JsonItemObject JsonItemObject::At(const std::string &key) const +{ + JsonItemObject operationItem; + if (item_ == nullptr) { + LOGE("item_ is nullptr"); + return operationItem; + } + if (Contains(key)) { + auto& findItem = GetJsonPointer(item_)->at(key); + operationItem.item_ = &findItem; + operationItem.beValid_ = true; + } + operationItem.parent_ = item_; + operationItem.itemName_ = key; + return operationItem; +} + +void JsonItemObject::GetTo(std::string &value) const +{ + value = ""; + if (item_ == nullptr) { + LOGE("value item is null"); + return; + } + if (!IsString()) { + return; + } + GetJsonPointer(item_)->get_to(value); +} + +void JsonItemObject::GetTo(double &value) const +{ + value = 0.0; + if (item_ == nullptr) { + LOGE("value item is null"); + return; + } + if (!IsNumber()) { + return; + } + GetJsonPointer(item_)->get_to(value); +} + +void JsonItemObject::GetTo(int32_t &value) const +{ + int64_t tmpValue = 0; + GetTo(tmpValue); + value = static_cast(tmpValue); +} + +void JsonItemObject::GetTo(uint32_t &value) const +{ + int64_t tmpValue = 0; + GetTo(tmpValue); + value = static_cast(tmpValue); +} + +void JsonItemObject::GetTo(int64_t &value) const +{ + value = 0; + if (item_ == nullptr) { + LOGE("value item is null"); + return; + } + if (!IsNumberInteger()) { + return; + } + GetJsonPointer(item_)->get_to(value); +} + +void JsonItemObject::GetTo(bool &value) const +{ + value = false; + if (item_ == nullptr) { + LOGE("value item is null"); + return; + } + if (!IsBoolean()) { + return; + } + GetJsonPointer(item_)->get_to(value); +} + +std::vector JsonItemObject::Items() const +{ + std::vector items; + if (item_ == nullptr) { + return items; + } + for (auto &element : GetJsonPointer(item_)->items()) { + JsonItemObject newItem; + newItem.itemName_ = element.key(); + newItem.item_ = &(element.value()); + newItem.parent_ = item_; + items.push_back(newItem); + } + return items; +} + +bool JsonItemObject::InitItem(JsonItemObject &item) +{ + if (!beValid_) { + LOGE("invalid item"); + return false; + } + if (item.item_ == nullptr) { + item.needDeleteItem_ = true; + item.item_ = new nlohmann::json(); + if (item.item_ == nullptr) { + LOGE("new item fail"); + return false; + } + } + item.parent_ = parent_; + item.beValid_ = true; + item.itemName_ = itemName_; + item.itemIndex_ = itemIndex_; + return true; +} + +bool JsonItemObject::InitArray() +{ + if (!beValid_ || item_ == nullptr) { + return false; + } + *GetJsonPointer(item_) = nlohmann::json::array({}); + return true; +} + +bool JsonItemObject::ReplaceItem(void *newItem) +{ + if (newItem == nullptr) { + LOGE("newItem is null"); + return false; + } + if (item_ == nullptr) { + needDeleteItem_ = true; + item_ = new nlohmann::json(); + if (item_ == nullptr) { + LOGE("new item fail"); + return false; + } + } + *GetJsonPointer(item_) = *GetJsonPointer(newItem); + return true; +} + +void JsonItemObject::Erase(const std::string &key) +{ + if (item_ == nullptr) { + return; + } + if (IsObject()) { + GetJsonPointer(item_)->erase(key); + } +} + + +JsonObject::JsonObject(JsonCreateType type) +{ + needDeleteItem_ = true; + item_ = new nlohmann::json(); + if (item_ != nullptr) { + beValid_ = true; + if (type == JsonCreateType::JSON_CREATE_TYPE_ARRAY) { + *GetJsonPointer(item_) = nlohmann::json::array({}); + } + } +} + +JsonObject::JsonObject(const std::string &strJson) +{ + needDeleteItem_ = true; + item_ = new nlohmann::json(); + if (item_ != nullptr) { + beValid_ = true; + Parse(strJson); + } +} + +JsonObject::~JsonObject() +{ + Delete(); +} + +bool JsonObject::Parse(const std::string &strJson) +{ + if (item_ == nullptr) { + return false; + } + if (!strJson.empty()) { + *GetJsonPointer(item_) = nlohmann::json::parse(strJson, nullptr, false); + return true; + } + LOGE("strJson is empty"); + *GetJsonPointer(item_) = nlohmann::json::parse(strJson, nullptr, false); + return false; +} + +void JsonObject::Duplicate(const JsonObject &object) +{ + if (item_ != nullptr && object.item_ != nullptr) { + *GetJsonPointer(item_) = *GetJsonPointer(object.item_); + } +} + +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/radar/BUILD.gn b/radar/BUILD.gn index 21119763e3ff3fa830761b001a44e6f0ba5c2b46..1a5793e7ad2d44f7e2055b5a8a08524d55c90247 100644 --- a/radar/BUILD.gn +++ b/radar/BUILD.gn @@ -25,7 +25,7 @@ if (defined(ohos_lite)) { "${common_path}/include", "${innerkits_path}/native_cpp/include", "${c_utils_path}/include", - "//third_party/cJSON", + "${json_path}/include", ] sources = [ "src/lite/dm_radar_helper.cpp" ] @@ -38,6 +38,7 @@ if (defined(ohos_lite)) { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/startup/init/interfaces/innerkits:libbegetutil", "//commonlibrary/utils_lite:utils", @@ -46,13 +47,34 @@ if (defined(ohos_lite)) { } } } else { + config("cflags_config") { + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + "-ffunction-sections", + "-fdata-sections", + "-fvisibility=hidden", + "-Oz", + "-flto", + ] + ldflags = [ "-flto" ] + } + ohos_shared_library("devicemanagerradar") { include_dirs = [ "include", "${common_path}/include", "${innerkits_path}/native_cpp/include", + "${json_path}/include", ] + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + cflags = [ "-Werror", "-fPIC", @@ -64,6 +86,8 @@ if (defined(ohos_lite)) { "-Wl,-z,now", ] + configs = [ ":cflags_config" ] + sources = [ "src/dm_radar_helper.cpp" ] defines = [ @@ -72,7 +96,65 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004110", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] + + external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libtokenid_sdk", + "cJSON:cjson", + "c_utils:utils", + "hilog:libhilog", + "hisysevent:libhisysevent", + "init:libbegetutil", + "ipc:ipc_core", + "ipc:ipc_single", + ] + + subsystem_name = "distributedhardware" + + part_name = "device_manager" + } + + ohos_shared_library("devicemanagerradartest") { + include_dirs = [ + "include", + "${common_path}/include", + "${innerkits_path}/native_cpp/include", + "${json_path}/include", + ] + + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + ] + + ldflags = [ + "-Wl,-z,relro", + "-Wl,-z,now", + ] + + sources = [ "src/dm_radar_helper.cpp" ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerradar\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/radar/include/dm_radar_helper.h b/radar/include/dm_radar_helper.h index 1bfb18159c614c960a8e574a1cededc4404a4557..7c3909feed26baf27d56d6e34411f78cecedc573 100644 --- a/radar/include/dm_radar_helper.h +++ b/radar/include/dm_radar_helper.h @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -27,9 +28,9 @@ namespace OHOS { namespace DistributedHardware { -extern const char* ORGPKGNAME; -extern const char* SOFTBUSNAME; -extern const char* HICHAINNAME; +DM_EXPORT extern const char* ORGPKGNAME; +DM_EXPORT extern const char* SOFTBUSNAME; +DM_EXPORT extern const char* HICHAINNAME; enum class DiscoverScene : int32_t { DM_DISCOVER = 0x1, DM_GET_TRUST_DEVICE_LIST = 0x2, @@ -217,8 +218,8 @@ public: std::string funcName, DmDeviceInfo &info, int32_t errCode, std::string localUdid) override; std::string GetDeviceInfoList(std::vector &deviceInfoList) override; std::string ConvertHexToString(uint16_t hex); - int32_t GetErrCode(int32_t errCode); - std::string GetAnonyLocalUdid(); + DM_EXPORT int32_t GetErrCode(int32_t errCode); + DM_EXPORT std::string GetAnonyLocalUdid(); int32_t ReportDiscoverRegCallbackStageIdle(struct RadarInfo &info); int32_t ReportDiscoverUserResStageCancel(struct RadarInfo &info); int32_t ReportDiscoverUserResStageSucc(struct RadarInfo &info); @@ -245,6 +246,8 @@ public: private: std::string GetAnonyUdid(std::string udid); int32_t GetApiType(); + std::string localCallerName_; + std::mutex lock_; }; extern "C" IDmRadarHelper *CreateDmRadarInstance(); diff --git a/radar/src/dm_radar_helper.cpp b/radar/src/dm_radar_helper.cpp index c62a930cb20b391f21a91383cdabdc1226bc9ba7..7c8f66f807b667b78ab13deda2a72287f8ee081a 100644 --- a/radar/src/dm_radar_helper.cpp +++ b/radar/src/dm_radar_helper.cpp @@ -1251,9 +1251,15 @@ void DmRadarHelper::ReportGetLocalDevInfo(std::string hostName, std::string funcName, DmDeviceInfo &info, int32_t errCode, std::string localUdid) { int32_t res = DM_OK; - static std::string localCallerName = ""; - if (localCallerName != hostName) { - localCallerName = hostName; + bool compare = false; + { + std::lock_guard autoLock(lock_); + if (localCallerName_ != hostName) { + compare = true; + localCallerName_ = hostName; + } + } + if (compare) { if (errCode == DM_OK) { res = ReportGetLocalDevInfoResultSucc(hostName, funcName, info, errCode, localUdid); } else { diff --git a/radar/src/lite/dm_radar_helper.cpp b/radar/src/lite/dm_radar_helper.cpp index 29962be5d53e0a4f000204e3b8123ca76ec8c229..16ca40be6bfe8d16a71e4fbfb166a3440c550e69 100644 --- a/radar/src/lite/dm_radar_helper.cpp +++ b/radar/src/lite/dm_radar_helper.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include "dm_constants.h" #include "dm_log.h" #include "parameter.h" diff --git a/sa_profile/device_manager.cfg b/sa_profile/device_manager.cfg index f99cf2b500c38c6e3b900b6d2767c110bae07d55..a1aaa5e7c5e2db98727470ee57e5442fcba99bb4 100644 --- a/sa_profile/device_manager.cfg +++ b/sa_profile/device_manager.cfg @@ -39,10 +39,15 @@ "ohos.permission.SET_TIME_ZONE", "ohos.permission.ALLOW_CONNECT_CAR", "ohos.permission.ACCESS_SERVICE_DP", - "ohos.permission.ACCESS_SENSING_WITH_ULTRASOUND" + "ohos.permission.ACCESS_SENSING_WITH_ULTRASOUND", + "ohos.permission.ACCESS_DEVAUTH_CRED_PRIVILEGE", + "ohos.permission.ACCESS_IDS", + "ohos.permission.sec.ACCESS_UDID" ], "permission_acls" : [ - "ohos.permission.MANAGE_SOFTBUS_NETWORK" + "ohos.permission.MANAGE_SOFTBUS_NETWORK", + "ohos.permission.ACCESS_DEVAUTH_CRED_PRIVILEGE", + "ohos.permission.ACCESS_IDS" ], "jobs" : { "on-start" : "service:device_manager" diff --git a/services/implementation/BUILD.gn b/services/implementation/BUILD.gn index 652b2e0730d0b94cd95714e63540d2f726d8cbd5..d8c4ef70779e81246b3cf7d5ae72dd0c60b8ed59 100644 --- a/services/implementation/BUILD.gn +++ b/services/implementation/BUILD.gn @@ -43,7 +43,7 @@ if (defined(ohos_lite)) { "${utils_path}/include/crypto", "${utils_path}/include/fwkload/lite", "${utils_path}/include/timer/lite", - "//third_party/json/include", + "${json_path}/include", "${services_path}/include", "${services_path}/include/ipc/lite", "${interfaces_path}/c/ipc/include", @@ -79,6 +79,7 @@ if (defined(ohos_lite)) { deps = [ "${devicemanager_path}/radar:devicemanagerradar", + "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", @@ -113,8 +114,9 @@ if (defined(ohos_lite)) { "include", "include/config", "include/adapter", + "include/attest", "include/authentication", - "include/authentication/showconfirm/standard", + "include/authentication_v2", "include/ability", "include/credential", "include/cryptomgr", @@ -124,6 +126,7 @@ if (defined(ohos_lite)) { "include/dependency/multipleuser", "include/dependency/hichain", "include/dependency/softbus", + "include/dependency/MSDP", "include/i18n", "${common_path}/include", "${common_path}/include/dfx", @@ -141,6 +144,7 @@ if (defined(ohos_lite)) { "${utils_path}/include/fwkload/standard", "${utils_path}/include/permission/standard", "${utils_path}/include/timer", + "${json_path}/include", "${services_path}/include", "${services_path}/include/ipc/standard", "${softbuscache_parh}/include", @@ -174,12 +178,26 @@ if (defined(ohos_lite)) { "src/ability/standard/dm_ability_manager.cpp", "src/ability/standard/dm_dialog_manager.cpp", "src/adapter/standard/dm_adapter_manager.cpp", + "src/attest/dm_auth_attest_common.cpp", + "src/attest/dm_auth_cert.cpp", "src/authentication/auth_message_processor.cpp", "src/authentication/auth_request_state.cpp", "src/authentication/auth_response_state.cpp", "src/authentication/auth_ui_state_manager.cpp", "src/authentication/dm_auth_manager.cpp", - "src/authentication/showconfirm/standard/show_confirm.cpp", + "src/authentication_v2/auth_manager.cpp", + "src/authentication_v2/auth_stages/auth_acl.cpp", + "src/authentication_v2/auth_stages/auth_confirm.cpp", + "src/authentication_v2/auth_stages/auth_credential.cpp", + "src/authentication_v2/auth_stages/auth_negotiate.cpp", + "src/authentication_v2/auth_stages/auth_pin_auth.cpp", + "src/authentication_v2/dm_auth_context.cpp", + "src/authentication_v2/dm_auth_manager_base.cpp", + "src/authentication_v2/dm_auth_message_processor.cpp", + "src/authentication_v2/dm_auth_state.cpp", + "src/authentication_v2/dm_auth_state_machine.cpp", + "src/authentication_v2/dm_negotiate_process.cpp", + "src/authentication_v2/dm_freeze_process.cpp", "src/config/dm_config_manager.cpp", "src/credential/dm_credential_manager.cpp", "src/cryptomgr/crypto_mgr.cpp", @@ -207,6 +225,7 @@ if (defined(ohos_lite)) { "${devicemanager_path}/commondependency:devicemanagerdependency", "${devicemanager_path}/radar:devicemanagerradar", "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", ] @@ -219,12 +238,12 @@ if (defined(ohos_lite)) { "access_token:libaccesstoken_sdk", "cJSON:cjson", "c_utils:utils", - "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "dsoftbus:softbus_utils", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -233,8 +252,11 @@ if (defined(ohos_lite)) { "mbedtls:mbedtls_shared", "openssl:libcrypto_shared", "os_account:libaccountkits", + "os_account:os_account_innerkits", + "power_manager:powermgr_client", "resource_management:resmgr_napi_core", "samgr:samgr_proxy", + "zlib:shared_libz", ] if (support_screenlock && device_manager_feature_product == "default") { @@ -246,7 +268,11 @@ if (defined(ohos_lite)) { defines += [ "DEVICE_MANAGER_COMMON_FLAG" ] } - public_external_deps = [ "cJSON:cjson" ] + if (support_msdp) { + sources += [ "src/dependency/MSDP/spatial_location_callback_impl.cpp" ] + defines += [ "SUPPORT_MSDP" ] + external_deps += [ "spatial_awareness:spatial_awareness_client" ] + } subsystem_name = "distributedhardware" diff --git a/services/implementation/include/attest/dm_auth_attest_common.h b/services/implementation/include/attest/dm_auth_attest_common.h new file mode 100644 index 0000000000000000000000000000000000000000..00c9499309dfc475b0f2797ad5bc16e74e4fa43b --- /dev/null +++ b/services/implementation/include/attest/dm_auth_attest_common.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_AUTH_ATTEST_COMMON_H +#define OHOS_DM_AUTH_ATTEST_COMMON_H + +#define DM_CERTS_COUNT 4 +#define UDID_BUF_LEN 65 +#define DM_CERTIFICATE_SIZE 8192 + +#include +#include + +#include "dm_anonymous.h" +#include "dm_auth_manager_base.h" +#include "dm_cert.h" +#include "dm_crypto.h" +#include "dm_random.h" +#include "json_object.h" + +namespace OHOS { +namespace DistributedHardware { +class AuthAttestCommon { +public: + static AuthAttestCommon &GetInstance(void) + { + static AuthAttestCommon instance; + return instance; + } + + std::string SerializeDmCertChain(const DmCertChain *chain); + bool DeserializeDmCertChain(const std::string &data, DmCertChain *outChain); + void FreeDmCertChain(DmCertChain &chain); +private: + AuthAttestCommon(); + ~AuthAttestCommon(); +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_AUTH_ATTEST_COMMON_H \ No newline at end of file diff --git a/services/implementation/include/attest/dm_auth_cert.h b/services/implementation/include/attest/dm_auth_cert.h new file mode 100644 index 0000000000000000000000000000000000000000..8891398616c2f3e87d5ce5dacda580dfb4aab098 --- /dev/null +++ b/services/implementation/include/attest/dm_auth_cert.h @@ -0,0 +1,55 @@ +/* +* Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_AUTH_CERT_H +#define OHOS_DM_AUTH_CERT_H + +#include + +#include "dm_cert.h" +#include "i_dm_auth_cert_ext.h" +#if defined(__LITEOS_M__) +#include "dm_mutex.h" +#else +#include +#endif + +namespace OHOS { +namespace DistributedHardware { +class AuthCert { +public: + static AuthCert &GetInstance(void) + { + static AuthCert instance; + return instance; + } + + int32_t GenerateCertificate(DmCertChain &dmCertChain); + int32_t VerifyCertificate(const DmCertChain &dmCertChain, const char *deviceIdHash); + +private: + AuthCert(); + ~AuthCert(); + bool IsDMAdapterAuthCertLoaded(); + + bool isAdapterAuthCertSoLoaded_ = false; + void *authCertSoHandle_ = nullptr; + std::mutex isAdapterAuthCertLoadedLock_; + std::shared_ptr dmAuthCertExt_; +}; +} // namespace DistributedHardware +} // namespace OHOS + +#endif // OHOS_DM_AUTH_CERT_H \ No newline at end of file diff --git a/services/implementation/include/authentication/auth_message_processor.h b/services/implementation/include/authentication/auth_message_processor.h index dde7dbf83b63396621afb0f7c40bab4508754fee..294243d87e74288180da39738388b0fe6f10572b 100644 --- a/services/implementation/include/authentication/auth_message_processor.h +++ b/services/implementation/include/authentication/auth_message_processor.h @@ -27,7 +27,6 @@ namespace OHOS { namespace DistributedHardware { -extern const char* TAG_REPLY; extern const char* TAG_NET_ID; extern const char* TAG_TARGET; extern const char* TAG_APP_OPERATION; @@ -37,7 +36,6 @@ extern const char* TAG_GROUPIDS; extern const char* TAG_CUSTOM_DESCRIPTION; extern const char* TAG_DEVICE_TYPE; extern const char* TAG_REQUESTER; -extern const char* TAG_LOCAL_DEVICE_ID; extern const char* TAG_LOCAL_DEVICE_TYPE; extern const char* TAG_INDEX; extern const char* TAG_SLICE_NUM; @@ -46,38 +44,19 @@ extern const char* TAG_IS_SHOW_DIALOG; extern const char* TAG_TOKEN; extern const char* TAG_CRYPTO_NAME; extern const char* TAG_CRYPTO_VERSION; -extern const char* TAG_IDENTICAL_ACCOUNT; -extern const char* TAG_ACCOUNT_GROUPID; -extern const char* APP_THUMBNAIL; extern const char* QR_CODE_KEY; extern const char* TAG_AUTH_TOKEN; extern const char* NFC_CODE_KEY; extern const char* OLD_VERSION_ACCOUNT; -extern const char* TAG_AUTH_FINISH; -extern const char* TAG_HAVE_CREDENTIAL; extern const char* TAG_PUBLICKEY; extern const char* TAG_SESSIONKEY; -extern const char* TAG_BIND_LEVEL; -extern const char* TAG_LOCAL_USERID; extern const char* TAG_BIND_TYPE_SIZE; -extern const char* TAG_ISONLINE; -extern const char* TAG_AUTHED; -extern const char* TAG_LOCAL_ACCOUNTID; -extern const char* TAG_DMVERSION; extern const char* TAG_HOST_PKGNAME; -extern const char* TAG_TOKENID; extern const char* TAG_HAVECREDENTIAL; extern const char* TAG_CONFIRM_OPERATION; -extern const char* TAG_DATA; -extern const char* TAG_DATA_LEN; extern const char* TAG_IMPORT_AUTH_CODE; -extern const char* TAG_HOST_PKGLABEL; -extern const char* TAG_EDITION; -extern const char* TAG_BUNDLE_NAME; extern const char* TAG_CRYPTIC_MSG; -extern const char* TAG_PEER_BUNDLE_NAME; -extern const char* TAG_REMOTE_DEVICE_NAME; extern const char* TAG_SESSIONKEY_ID; class DmAuthManager; diff --git a/services/implementation/include/authentication/dm_auth_manager.h b/services/implementation/include/authentication/dm_auth_manager.h index 44f75921da331646e3d94ef5c5e7d432c6fe6c0b..3080fff94f003b8cf27635d4894a7f009cfd729b 100644 --- a/services/implementation/include/authentication/dm_auth_manager.h +++ b/services/implementation/include/authentication/dm_auth_manager.h @@ -15,6 +15,7 @@ #ifndef OHOS_DM_AUTH_MANAGER_H #define OHOS_DM_AUTH_MANAGER_H +#define TYPE_TV_ID 0x9C #include #include @@ -28,6 +29,7 @@ #include "deviceprofile_connector.h" #include "dm_ability_manager.h" #include "dm_adapter_manager.h" +#include "dm_auth_manager_base.h" #include "dm_constants.h" #include "dm_device_info.h" #include "dm_timer.h" @@ -172,7 +174,7 @@ typedef struct DmAuthResponseContext { std::string authToken; int32_t pageId; int64_t requestId; - int32_t code = INVALID_PINCODE; + std::string code = ""; int32_t state; std::vector syncGroupList; std::string accountGroupIdHash; @@ -203,9 +205,7 @@ typedef struct DmAuthResponseContext { class AuthMessageProcessor; -class DmAuthManager final : public ISoftbusSessionCallback, - public IHiChainConnectorCallback, - public IDmDeviceAuthCallback, +class DmAuthManager final : public AuthManagerBase, public std::enable_shared_from_this { public: DmAuthManager(std::shared_ptr softbusConnector, @@ -260,6 +260,13 @@ public: void OnDataReceived(const int32_t sessionId, const std::string message); /** + * @tc.name: DmAuthManager::OnSoftbusJoinLNNResult + * @tc.desc: OnSoftbus JoinLNN Result of the SoftbusConnector + * @tc.type: FUNC + */ + void OnSoftbusJoinLNNResult(const int32_t sessionId, const char *networkId, int32_t result); + + /** * @tc.name: DmAuthManager::OnGroupCreated * @tc.desc: Created Group of the DeviceManager Authenticate Manager * @tc.type: FUNC @@ -327,7 +334,7 @@ public: * @tc.desc: Process pin code of the DeviceManager Authenticate Manager * @tc.type: FUNC */ - int32_t ProcessPincode(int32_t pinCode); + int32_t ProcessPincode(const std::string &pinCode); /** * @tc.name: DmAuthManager::GetConnectAddr @@ -376,7 +383,7 @@ public: * @tc.desc: Get Pin Code of the DeviceManager Authenticate Manager * @tc.type: FUNC */ - int32_t GetPinCode(int32_t &code); + int32_t GetPinCode(std::string &code); /** * @tc.name: DmAuthManager::GenerateGroupName @@ -397,7 +404,7 @@ public: * @tc.desc: Generate Pincode of the DeviceManager Authenticate Manager * @tc.type: FUNC */ - int32_t GeneratePincode(); + std::string GeneratePincode(); /** * @tc.name: DmAuthManager::ShowConfigDialog @@ -475,7 +482,10 @@ public: * @tc.type: FUNC */ int32_t BindTarget(const std::string &pkgName, const PeerTargetId &targetId, - const std::map &bindParam); + const std::map &bindParam, int sessionId, uint64_t logicalSessionId); + + void ClearSoftbusSessionCallback(); + void PrepareSoftbusSessionCallback(); void HandleSessionHeartbeat(std::string name); @@ -500,18 +510,16 @@ private: const std::string &extra); int32_t CheckAuthParamVaildExtra(const std::string &extra, const std::string &deviceId); bool CheckHmlParamValid(JsonObject &jsonObject); - bool CheckProcessNameInWhiteList(const std::string &processName); void ProcessSourceMsg(); void ProcessSinkMsg(); std::string GetAccountGroupIdHash(); void AbilityNegotiate(); void HandleMemberJoinImportAuthCode(const int64_t requestId, const int32_t status); int32_t DeleteAuthCode(); - int32_t GetAuthCode(const std::string &pkgName, int32_t &pinCode); + int32_t GetAuthCode(const std::string &pkgName, std::string &pinCode); bool IsAuthTypeSupported(const int32_t &authType); bool IsAuthCodeReady(const std::string &pkgName); int32_t ParseConnectAddr(const PeerTargetId &targetId, std::string &deviceId, std::string &addrType); - int32_t ParseAuthType(const std::map &bindParam, int32_t &authType); std::string ParseExtraFromMap(const std::map &bindParam); std::string GenerateBindResultContent(); void InitAuthState(const std::string &pkgName, int32_t authType, const std::string &deviceId, @@ -536,8 +544,10 @@ public: bool AuthDeviceTransmit(int64_t requestId, const uint8_t *data, uint32_t dataLen); void AuthDeviceFinish(int64_t requestId); void AuthDeviceError(int64_t requestId, int32_t errorCode); + int32_t GetOutputState(int32_t state); void GetRemoteDeviceId(std::string &deviceId); void AuthDeviceSessionKey(int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen); + char *AuthDeviceRequest(int64_t requestId, int operationCode, const char *reqParams); int32_t GetSessionKeyIdSync(int64_t requestId); void OnAuthDeviceDataReceived(const int32_t sessionId, const std::string message); void OnScreenLocked(); @@ -548,6 +558,7 @@ public: void RequestReCheckMsg(); void ResponseReCheckMsg(); void RequestReCheckMsgDone(); + void CloseAuthSession(const int32_t sessionId); private: int32_t ImportCredential(std::string &deviceId, std::string &publicKey); void GetAuthParam(const std::string &pkgName, int32_t authType, const std::string &deviceId, @@ -562,23 +573,19 @@ private: void ProcessAuthRequest(const int32_t &sessionId); int32_t ConfirmProcess(const int32_t &action); int32_t ConfirmProcessExt(const int32_t &action); - int32_t AddMember(int32_t pinCode); - int32_t AuthDevice(int32_t pinCode); + int32_t AddMember(const std::string &pinCode); + int32_t AuthDevice(const std::string &pinCode); void PutAccessControlList(); void SinkAuthenticateFinish(); void SrcAuthenticateFinish(); - std::string GetBundleLable(const std::string &bundleName); bool IsScreenLocked(); - std::string ConvertSrcVersion(const std::string &version, const std::string &edition); + void CheckAndEndTvDream(); std::string ConvertSinkVersion(const std::string &version); void NegotiateRespMsg(const std::string &version); void SetAuthType(int32_t authType); int32_t GetTaskTimeout(const char* taskName, int32_t taskTimeOut); void GetPeerUdidHash(int32_t sessionId, std::string &peerUdidHash); void DeleteOffLineTimer(int32_t sessionId); - bool IsAllowDeviceBind(); - int32_t GetBindLevel(int32_t bindLevel); - std::string GetBundleName(JsonObject &jsonObject); int32_t GetBinderInfo(); void SetProcessInfo(); int32_t GetCloseSessionDelaySeconds(std::string &delaySecondsStr); @@ -587,7 +594,8 @@ private: bool IsSourceMsgValid(); void ProcessReqPublicKey(); int32_t GetTokenIdByBundleName(int32_t userId, std::string &bundleName, int64_t &tokenId); - bool CheckBindLevel(const JsonItemObject &jsonObj, const std::string &key, int32_t &bindLevel); + void RegisterCleanNotifyCallback(CleanNotifyCallback cleanNotifyCallback); + void GetBindCallerInfo(); private: std::shared_ptr softbusConnector_; @@ -618,6 +626,7 @@ private: std::string dmVersion_ = ""; bool isAuthDevice_ = false; bool isAuthenticateDevice_ = false; + bool isNeedJoinLnn_ = true; int32_t authForm_ = DmAuthForm::ACROSS_ACCOUNT; std::string remoteVersion_ = ""; std::atomic authType_ = AUTH_TYPE_UNKNOW; @@ -633,6 +642,10 @@ private: std::mutex sessionKeyIdMutex_; std::condition_variable sessionKeyIdCondition_; std::map> sessionKeyIdAsyncResult_; + bool isWaitingJoinLnnCallback_ = false; + CleanNotifyCallback cleanNotifyCallback_{nullptr}; + std::mutex bindParamMutex_; + std::map bindParam_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/include/authentication_v2/auth_manager.h b/services/implementation/include/authentication_v2/auth_manager.h new file mode 100644 index 0000000000000000000000000000000000000000..1c5395dfe90a59c1efa284c921e243311435cd12 --- /dev/null +++ b/services/implementation/include/authentication_v2/auth_manager.h @@ -0,0 +1,215 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_AUTH_MANAGER_V2_H +#define OHOS_DM_AUTH_MANAGER_V2_H + +#include + +#include "auth_ui_state_manager.h" +#include "dm_auth_manager_base.h" +#include "hichain_auth_connector.h" +#include "hichain_connector.h" +#include "json_object.h" +#include "softbus_connector.h" +#include "softbus_session.h" + +namespace OHOS { +namespace DistributedHardware { +struct DmAuthContext; + +class AuthManager : public AuthManagerBase, + public std::enable_shared_from_this { +public: + AuthManager(std::shared_ptr softbusConnector, + std::shared_ptr hiChainConnector, + std::shared_ptr listener, + std::shared_ptr hiChainAuthConnector); + virtual ~AuthManager(); + + // External API begin + /** + * @tc.name: DmAuthManager::OnUserOperation + * @tc.desc: User Operation of the DeviceManager Authenticate Manager + * @tc.type: FUNC + */ + virtual int32_t OnUserOperation(int32_t action, const std::string ¶ms) = 0; + + /** + * @tc.name: AuthManager::GeneratePincode + * @tc.desc: Generate Pincode of the DeviceManager Authenticate Manager + * @tc.type: FUNC + */ + int32_t BindTarget(const std::string &sessionName, const PeerTargetId &targetId, + const std::map &bindParam, int sessionId, uint64_t logicalSessionId); + + /** + * @tc.name: AuthManager::OnUserOperation + * @tc.desc: User Operation of the DeviceManager Authenticate Manager + * @tc.type: FUNC + */ + std::string GeneratePincode(); + + /** + * @tc.name: AuthManager::ImportAuthCode + * @tc.desc: Import auth code + * @tc.type: FUNC + */ + int32_t ImportAuthCode(const std::string &sessionName, const std::string &authCode); + + /** + * @tc.name: AuthManager::RegisterUiStateCallback + * @tc.desc: Register ui state callback + * @tc.type: FUNC + */ + int32_t RegisterUiStateCallback(const std::string sessionName); + + /** + * @tc.name: AuthManager::UnRegisterUiStateCallback + * @tc.desc: Unregister ui state callback + * @tc.type: FUNC + */ + int32_t UnRegisterUiStateCallback(const std::string sessionName); + + /** + * @tc.name: AuthManager::UnAuthenticateDevice + * @tc.desc: UnAuthenticate Device of the DeviceManager Authenticate Manager + * @tc.type: FUNC + */ + int32_t UnAuthenticateDevice(const std::string &sessionName, const std::string &udid, int32_t bindLevel); + + /** + * @brief UnBind device. + * @param sessionName package name. + * @param deviceId device id. + * @return Return 0 if success. + */ + int32_t UnBindDevice(const std::string &sessionName, const std::string &udid, + int32_t bindLevel, const std::string &extra); + + void HandleDeviceNotTrust(const std::string &udid); + + int32_t RegisterAuthenticationType(int32_t authenticationType); + void OnScreenLocked(); + int32_t StopAuthenticateDevice(const std::string &sessionName); + // External API begin end + + // Internal API begin + void SetAuthContext(std::shared_ptr context); + std::shared_ptr GetAuthContext(); + static bool IsHmlSessionType(const std::string &sessionType); + int32_t GetTokenIdByBundleName(int32_t userId, std::string &bundleName, int64_t &tokenId); + void GetBindTargetParams(std::string &pkgName, PeerTargetId &targetId, + std::map &bindParam); + void GetAuthCodeAndPkgName(std::string &pkgName, std::string &authCode); + void SetBindTargetParams(const PeerTargetId &targetId); + int32_t GetReason(); + + // Internal API end + void RegisterCleanNotifyCallback(CleanNotifyCallback cleanNotifyCallback); + void ClearSoftbusSessionCallback(); + void PrepareSoftbusSessionCallback(); + void DeleteTimer(); + + int32_t HandleBusinessEvents(const std::string &businessId, int32_t action); + +protected: + std::shared_ptr context_; + std::mutex bindParamMutex_; + std::map bindParam_; + PeerTargetId targetId_; + + int32_t GetPinCode(std::string &code); + void GetRemoteDeviceId(std::string &deviceId); +private: + void ParseHmlInfoInJsonObject(const JsonObject &jsonObject); + void ParseJsonObject(const JsonObject &jsonObject); + void GetAuthParam(const std::string &sessionName, int32_t authType, + const std::string &deviceId, const std::string &extra); + std::string GetBundleName(const JsonObject &jsonObject); + void SetAuthType(int32_t authType); + bool IsAuthTypeSupported(const int32_t &authType); + bool IsAuthCodeReady(const std::string &sessionName); + int32_t CheckAuthParamVaild(const std::string &sessionName, int32_t authType, + const std::string &deviceId, const std::string &extra); + void InitAuthState(const std::string &sessionName, int32_t authType, + const std::string &deviceId, const std::string &extra); + int32_t AuthenticateDevice(const std::string &sessionName, int32_t authType, + const std::string &deviceId, const std::string &extra); + void ParseUltrasonicSide(const JsonObject &jsonObject); + void GetBindCallerInfo(); + int32_t GetBindLevel(int32_t bindLevel); +}; + +class AuthSrcManager : public AuthManager { +public: + AuthSrcManager(std::shared_ptr softbusConnector, + std::shared_ptr hiChainConnector, + std::shared_ptr listener, + std::shared_ptr hiChainAuthConnector); + virtual ~AuthSrcManager() override = default; + + // External API begin + int32_t OnUserOperation(int32_t action, const std::string ¶ms) override; + // External API end + + // IDmDeviceAuthCallback implement begin + bool AuthDeviceTransmit(int64_t requestId, const uint8_t *data, uint32_t dataLen) override; + void AuthDeviceError(int64_t requestId, int32_t errorCode) override; + void AuthDeviceFinish(int64_t requestId) override; + void AuthDeviceSessionKey(int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen) override; + char *AuthDeviceRequest(int64_t requestId, int operationCode, const char *reqParams) override; + // IDmDeviceAuthCallback implement end + + // ISoftbusSessionCallback implement begin + void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result) override; + void OnSessionClosed(int32_t sessionId) override; + void OnSessionDisable() override; + void OnDataReceived(int32_t sessionId, std::string message) override; + + bool GetIsCryptoSupport() override; + // ISoftbusSessionCallback implement end +}; + +class AuthSinkManager : public AuthManager { +public: + AuthSinkManager(std::shared_ptr softbusConnector, + std::shared_ptr hiChainConnector, + std::shared_ptr listener, + std::shared_ptr hiChainAuthConnector); + virtual ~AuthSinkManager() override = default; + + // External API begin + int32_t OnUserOperation(int32_t action, const std::string ¶ms) override; + // External API end + + // IDmDeviceAuthCallback implement begin + bool AuthDeviceTransmit(int64_t requestId, const uint8_t *data, uint32_t dataLen) override; + void AuthDeviceError(int64_t requestId, int32_t errorCode) override; + void AuthDeviceFinish(int64_t requestId) override; + void AuthDeviceSessionKey(int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen) override; + char *AuthDeviceRequest(int64_t requestId, int operationCode, const char *reqParams) override; + // IDmDeviceAuthCallback implement end + + // ISoftbusSessionCallback implement begin + void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result) override; + void OnSessionClosed(int32_t sessionId) override; + void OnDataReceived(int32_t sessionId, std::string message) override; + bool GetIsCryptoSupport() override; + // ISoftbusSessionCallback implement end +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_AUTH_MANAGER_V2_H \ No newline at end of file diff --git a/services/implementation/include/authentication_v2/dm_auth_context.h b/services/implementation/include/authentication_v2/dm_auth_context.h new file mode 100644 index 0000000000000000000000000000000000000000..c2212ab40d15701ffc53a087e1b66a578377ae98 --- /dev/null +++ b/services/implementation/include/authentication_v2/dm_auth_context.h @@ -0,0 +1,258 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_AUTH_CONTEXT_V2_H +#define OHOS_DM_AUTH_CONTEXT_V2_H +#include +#include + +#include "access_control_profile.h" +#include "authentication.h" +#include "auth_manager.h" +#include "auth_ui_state_manager.h" +#include "dm_ability_manager.h" +#include "dm_anonymous.h" +#include "dm_auth_message_processor.h" +#include "dm_constants.h" +#include "dm_device_info.h" +#include "dm_log.h" +#include "dm_timer.h" +#include "hichain_auth_connector.h" +#include "hichain_connector.h" +#include "softbus_connector.h" +#include "softbus_session.h" + +namespace OHOS { +namespace DistributedHardware { + +class DmAuthStateMachine; +class DmAuthMessageProcessor; + +using CleanNotifyCallback = std::function; + +// PIN Code Authentication Type +enum DmAuthType : int32_t { + AUTH_TYPE_CRE = 0, + AUTH_TYPE_PIN, // Input PIN code + AUTH_TYPE_QR_CODE, // Not used in the new protocol + AUTH_TYPE_NFC, + AUTH_TYPE_NO_INTER_ACTION, // Not used in the new protocol + AUTH_TYPE_IMPORT_AUTH_CODE, // Import PIN code + AUTH_TYPE_PIN_ULTRASONIC, // Ultrasonic PIN code + AUTH_TYPE_UNKNOW, // Not used in the new protocol +}; + +enum DmAuthDirection { + DM_AUTH_SOURCE = 0, + DM_AUTH_SINK, +}; + +enum DmBindType { + DM_AUTH_USERID = 1, + DM_AUTH_SYSTEM_SERVICE, + DM_AUTH_APP_SERVICE, + DM_AUTH_DEVICEID, +}; + +enum DmAuthSide { + DM_AUTH_LOCAL_SIDE = 0, + DM_AUTH_REMOTE_SIDE, +}; + +enum DmAuthScope { + DM_AUTH_SCOPE_INVALID = 0, + DM_AUTH_SCOPE_DEVICE, + DM_AUTH_SCOPE_USER, + DM_AUTH_SCOPE_APP, + DM_AUTH_SCOPE_LNN, + DM_AUTH_SCOPE_MAX, +}; + +enum { + DM_UNKNOWN_TYPE = 0, + DM_SAME_ACCOUNT_TYPE = 1, + DM_SHARE_TYPE = 2, + DM_POINT_TO_POINT_TYPE = 256, + DM_SAME_GROUP_TYPE = 3, +}; + +enum DmUltrasonicInfo { + // Forward means the pincode is generated at sink side, then send by ultrasonic from sink to source side. + DM_Ultrasonic_Forward = 0, + // Reverse means the pincode is generated at source side, then send by ultrasonic from source to sink side. + DM_Ultrasonic_Reverse = 1, + DM_Ultrasonic_Invalid = 2, +}; + +// Used for one-touch pairing +struct DmPeerTargetAddress { + // directly establish a Bluetooth connection + std::string peerBrMacAddress; + std::string peerBleMacAddress; + std::string peerWifiMacAddress; + std::string peerActionMacAddress; + + std::string peerWifiChannel; + std::string peerWifiIp; + uint16_t peerWifiPort; +}; + +struct DmPeerTarget { + DmBindType peerType; + std::string peerDeviceId; + int64_t peerServiceId; + int64_t peerSaTokenId; + std::string peerBundleName; + DmPeerTargetAddress peerTargetAddress; +}; + +struct DmAccess { + std::string deviceName; + int32_t deviceType; // Device types such as PC, mobile, watch, large screen, etc. + std::string deviceId; + std::string deviceIdHash; + std::string addr; + int32_t userId{-1}; + int32_t displayId{-1}; // Logical screen ID, used for query userId + std::string accountId; + std::string accountIdHash; + int64_t tokenId; + std::string tokenIdHash; + std::string networkId; + std::string bundleName; // Stores the bundleName, HAP -> bundleName in BMS, SA -> process name + std::string pkgName; // store pkgName set by client + std::string language; + int64_t serviceId; // Reserved field, to be used in HM 6.0 + std::string accesserHapSignature; + int32_t bindLevel; + int32_t lnnBindType; + int32_t transmitBindType; + std::string lnnCredentialId; // User-level credential ID + std::string transmitCredentialId; // Application-level credential ID + std::string lnnPublicKey; // User-level public key + std::string transmitPublicKey; // Application-level public key + std::vector bindType; // such as DM_AUTH_CREDENTIAL_ACCOUNT_RELATED + std::string publicKey; + int32_t status; // Indicates whether the service is in the foreground or background + int32_t sessionKeyId; // Used as key delivery material, retrieves the SK from the bus + int32_t transmitSessionKeyId; // Permanent application SKID on this end, returned by DP for ACL updates and aging + int32_t lnnSessionKeyId{0}; // Permanent user SKID on this end, returned by DP for ACL updates and aging + int64_t transmitSkTimeStamp; // Used for aging, time is 2 days, application-level credential timestamp + int64_t lnnSkTimeStamp{0}; // Used for aging, time is 2 days, user-level credential timestamp + int64_t skTimeStamp; // Used for aging, time is 2 days + bool isAuthed; + bool isOnline; + bool isGenerateLnnCredential{true}; + bool isPutLnnAcl{true}; + std::string dmVersion; + std::string edition; // Used for compatibility before version 5.1.0, assists in version negotiation + std::string aclTypeList; // Trust relationship list, used for data aging, KV format + std::string credTypeList; + std::string aclStrList; + std::map credentialInfos; // map: , cred is string tranformed by json + std::map aclProfiles; + // construct for old version compatible start + // In the scenario of compatibility between the new and old protocols, it is necessary to + // send both the new and old protocol messages simultaneously in the 80 message when + // authType == import. Therefore, it is required to define these fields for compatibility processing. + std::string accountGroupIdHash; + int32_t oldBindLevel; + std::string oldBundleName; + // construct for old version compatible end + std::string extraInfo; // Expandable field, JSON format, KV structure + std::string cert; + bool isCommonFlag{false}; +}; + +struct DmAuthContext { + bool isOnline; + uint64_t logicalSessionId; + DmMessageType msgType; + int32_t sessionId; + int64_t requestId; // HiChain authentication ID + DMLocalServiceInfoAuthBoxType authBoxType{DMLocalServiceInfoAuthBoxType::STATE3}; // Authentication box type + UiAction pinInputResult; + // Authorization result (using 0, 1, 6, representing single use, cancel, and always trust, enum UiAction) + UiAction confirmOperation{UiAction::USER_OPERATION_TYPE_ALLOW_AUTH}; + DmAuthType authType{DmAuthType::AUTH_TYPE_PIN}; // PIN code, ultrasonic PIN code, imported PIN code + std::vector authTypeList; + uint32_t currentAuthTypeIdx{0}; + int32_t inputPinAuthFailTimes{0}; // Number of failed PIN authentication attempts, exceeding 3 results in failure + std::string pinCode{""}; + bool serviceInfoFound{false}; + // Link delay release time, does not automatically disconnect after + // authorization (used for specific business needs), reserved field + int32_t connDelayCloseTime; + int32_t reason{DM_OK}; + int32_t reply; + int32_t state; + int32_t hmlActionId = 0; + bool authenticating; // Indicator whether authentication is in progress + bool successFinished{false}; + bool isAppCredentialVerified{false}; // Whether the application credential has been verified + bool hmlEnable160M{false}; + std::string businessId; + std::string pkgName; // Business-provided identifier, custom-defined by business, carries risk of spoofing + std::string pkgLabel; + std::string importCodeBundleName; // Bundle name for imported PIN code + std::string appThumbnail; // Application thumbnail + // Description of the operation this binding is used for, displayed in authorization dialog + std::string appOperation; + // Custom business field, provides detailed information to the user about this binding operation + std::string customData; + std::string connSessionType; + std::string extraInfo; // Expandable field, key-value structure + DmAuthDirection direction; // Indicator of authentication direction + ProcessInfo processInfo; + DmPeerTarget peerTarget; + DmUltrasonicInfo ultrasonicInfo = DmUltrasonicInfo::DM_Ultrasonic_Forward; // Ultrasonic information + DmAccess accesser; + DmAccess accessee; + std::multimap proxy; // Multimap where the key is the accessor and the value is the accesssee + bool isNeedJoinLnn{true}; + + std::shared_ptr authStateMachine; + std::shared_ptr authUiStateMgr; + std::shared_ptr hiChainConnector; + std::shared_ptr hiChainAuthConnector; + std::shared_ptr authMessageProcessor; + std::shared_ptr softbusConnector; + std::shared_ptr listener; + std::shared_ptr authPtr; // Pointer to authentication interface + std::shared_ptr timer; + std::string transmitData; // Data returned from onTransmit function + std::string importPkgName = ""; + std::string importAuthCode = ""; + std::map> authenticationMap; + PeerTargetId peerTargetId; + bool pinNegotiateStarted{false}; + bool isAuthenticateDevice{false}; // Whether device authentication is in progress + bool needBind{true}; + bool needAgreeCredential{true}; + bool needAuth{true}; + + CleanNotifyCallback cleanNotifyCallback{nullptr}; + + std::string GetDeviceId(DmAuthSide side); + int32_t GetUserId(DmAuthSide side); + std::string GetCredentialId(DmAuthSide side, DmAuthScope authorizedScope); + std::string GetPublicKey(DmAuthSide side, DmAuthScope authorizedScope); + void SetCredentialId(DmAuthSide side, DmAuthScope authorizedScope, const std::string &credentialId); + void SetPublicKey(DmAuthSide side, DmAuthScope authorizedScope, const std::string &publicKey); + std::string GetAccountId(DmAuthSide side); +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_AUTH_CONTEXT_V2_H diff --git a/services/implementation/include/authentication_v2/dm_auth_manager_base.h b/services/implementation/include/authentication_v2/dm_auth_manager_base.h new file mode 100644 index 0000000000000000000000000000000000000000..923379717bf71cf40f4907b38ae7284554189de7 --- /dev/null +++ b/services/implementation/include/authentication_v2/dm_auth_manager_base.h @@ -0,0 +1,263 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_AUTH_ADAPTER_V2_H +#define OHOS_DM_AUTH_ADAPTER_V2_H + +#include +#include +#include +#include + +#include "softbus_session_callback.h" +#include "softbus_connector_callback.h" +#include "hichain_connector_callback.h" +#include "auth_request_state.h" +#include "auth_response_state.h" +#include "dm_device_info.h" + +namespace OHOS { +namespace DistributedHardware { +extern const char* TAG_DMVERSION; +extern const char* TAG_DM_VERSION_V2; // compatible for new and old protocol +extern const char* TAG_EDITION; +extern const char* TAG_DATA; +extern const char* TAG_DATA_LEN; +extern const char* TAG_BUNDLE_NAME; +extern const char* TAG_BUNDLE_NAME_V2; +extern const char* TAG_PEER_BUNDLE_NAME; +extern const char* TAG_PEER_BUNDLE_NAME_V2; +extern const char* TAG_PEER_PKG_NAME; +extern const char* TAG_BIND_LEVEL; +extern const char* TAG_REPLY; +extern const char* TAG_APP_THUMBNAIL2; // Naming Add 2 to resolve conflicts with TAG_APP_THUMBNAIL +extern const char* TAG_AUTH_FINISH; +extern const char* TAG_LOCAL_USERID; +extern const char* TAG_LOCAL_DEVICE_ID; +extern const char* TAG_IDENTICAL_ACCOUNT; +extern const char* TAG_ACCOUNT_GROUPID; +extern const char* TAG_HAVE_CREDENTIAL; +extern const char* TAG_ISONLINE; +extern const char* TAG_AUTHED; +extern const char* TAG_LOCAL_ACCOUNTID; +extern const char* TAG_TOKENID; +extern const char* TAG_HOST_PKGLABEL; +extern const char* TAG_REMOTE_DEVICE_NAME; +extern const char* TAG_HOST; + +extern const char* APP_OPERATION_KEY; +extern const char* TARGET_PKG_NAME_KEY; +extern const char* CUSTOM_DESCRIPTION_KEY; +extern const char* CANCEL_DISPLAY_KEY; +extern const char* BUNDLE_NAME_KEY; + +extern const char* AUTHENTICATE_TIMEOUT_TASK; +extern const char* NEGOTIATE_TIMEOUT_TASK; +extern const char* CONFIRM_TIMEOUT_TASK; +extern const char* INPUT_TIMEOUT_TASK; +extern const char* SESSION_HEARTBEAT_TIMEOUT_TASK; +extern const char* WAIT_REQUEST_TIMEOUT_TASK; +extern const char* AUTH_DEVICE_TIMEOUT_TASK; +extern const char* WAIT_PIN_AUTH_TIMEOUT_TASK; +extern const char* WAIT_NEGOTIATE_TIMEOUT_TASK; +extern const char* ADD_TIMEOUT_TASK; +extern const char* WAIT_SESSION_CLOSE_TIMEOUT_TASK; +extern const char* CLOSE_SESSION_TASK_SEPARATOR; +extern const char* TAG_DM_CERT_CHAIN; +extern const char* TAG_CERT_COUNT; +extern const char* TAG_CERT; +extern const char* TAG_IS_COMMON_FLAG; + +extern const int32_t AUTHENTICATE_TIMEOUT; +extern const int32_t CONFIRM_TIMEOUT; +extern const int32_t NEGOTIATE_TIMEOUT; +extern const int32_t INPUT_TIMEOUT; +extern const int32_t ADD_TIMEOUT; +extern const int32_t WAIT_NEGOTIATE_TIMEOUT; +extern const int32_t WAIT_REQUEST_TIMEOUT; +extern const int32_t CLONE_AUTHENTICATE_TIMEOUT; +extern const int32_t CLONE_CONFIRM_TIMEOUT; +extern const int32_t CLONE_NEGOTIATE_TIMEOUT; +extern const int32_t CLONE_ADD_TIMEOUT; +extern const char* GET_ULTRASONIC_PIN_TIMEOUT_TASK; +extern const int32_t CLONE_WAIT_NEGOTIATE_TIMEOUT; +extern const int32_t CLONE_WAIT_REQUEST_TIMEOUT; +extern const int32_t CLONE_SESSION_HEARTBEAT_TIMEOUT; +extern const int32_t CLONE_PIN_AUTH_TIMEOUT; +extern const int32_t HML_SESSION_TIMEOUT; +extern const int32_t SESSION_HEARTBEAT_TIMEOUT; +extern const int32_t PIN_AUTH_TIMEOUT; +extern const int32_t EVENT_TIMEOUT; + +extern const int32_t DM_AUTH_TYPE_MAX; +extern const int32_t DM_AUTH_TYPE_MIN; +extern const int32_t MIN_PIN_TOKEN; +extern const int32_t MAX_PIN_TOKEN; + +using CleanNotifyCallback = std::function; + +enum DmRole { + DM_ROLE_UNKNOWN = 0, + DM_ROLE_USER = 1, + DM_ROLE_SA, + DM_ROLE_FA, +}; + +class AuthManagerBase : public ISoftbusSessionCallback, + public ISoftbusConnectorCallback, + public IHiChainConnectorCallback, + public IDmDeviceAuthCallback { +public: + virtual int32_t AuthenticateDevice(const std::string &pkgName, int32_t authType, const std::string &deviceId, + const std::string &extra); + + virtual int32_t UnAuthenticateDevice(const std::string &pkgName, const std::string &udid, int32_t bindLevel); + + virtual int32_t UnBindDevice(const std::string &pkgName, const std::string &udid, + int32_t bindLevel, const std::string &extra); + + virtual void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result); + + virtual void OnSessionClosed(const int32_t sessionId); + + virtual void OnSessionDisable(); + + virtual void OnDataReceived(const int32_t sessionId, const std::string message); + + virtual void OnAuthDeviceDataReceived(int32_t sessionId, std::string message); + + virtual void OnSoftbusJoinLNNResult(const int32_t sessionId, const char *networkId, int32_t result); + + virtual void OnGroupCreated(int64_t requestId, const std::string &groupId); + + virtual void OnMemberJoin(int64_t requestId, int32_t status); + + virtual int32_t EstablishAuthChannel(const std::string &deviceId); + + virtual void StartNegotiate(const int32_t &sessionId); + + virtual void RespNegotiate(const int32_t &sessionId); + + virtual void SendAuthRequest(const int32_t &sessionId); + + virtual int32_t StartAuthProcess(const int32_t &action); + + virtual void StartRespAuthProcess(); + + virtual int32_t CreateGroup(); + + virtual int32_t ProcessPincode(const std::string &pinCode); + + virtual std::string GetConnectAddr(std::string deviceId); + + virtual int32_t JoinNetwork(); + + virtual void AuthenticateFinish(); + + virtual bool GetIsCryptoSupport(); + + virtual int32_t SetAuthRequestState(std::shared_ptr authRequestState); + + virtual int32_t SetAuthResponseState(std::shared_ptr authResponseState); + + virtual int32_t GetPinCode(std::string &code); + + virtual std::string GenerateGroupName(); + + virtual void HandleAuthenticateTimeout(std::string name); + + virtual std::string GeneratePincode(); + + virtual void ShowConfigDialog(); + + virtual void ShowAuthInfoDialog(bool authDeviceError = false); + + virtual void ShowStartAuthDialog(); + + virtual int32_t OnUserOperation(int32_t action, const std::string ¶ms); + + virtual int32_t SetPageId(int32_t pageId); + + virtual int32_t SetReasonAndFinish(int32_t reason, int32_t state); + + virtual bool IsIdenticalAccount(); + + virtual int32_t RegisterUiStateCallback(const std::string pkgName); + + virtual int32_t UnRegisterUiStateCallback(const std::string pkgName); + + virtual int32_t ImportAuthCode(const std::string &pkgName, const std::string &authCode); + + virtual int32_t BindTarget(const std::string &pkgName, const PeerTargetId &targetId, + const std::map &bindParam, int sessionId, uint64_t logicalSessionId); + + virtual int32_t RegisterAuthenticationType(int32_t authenticationType); + + virtual int32_t StopAuthenticateDevice(const std::string &pkgName); + + virtual void OnScreenLocked() = 0; + + virtual void HandleDeviceNotTrust(const std::string &udid) = 0; + + virtual int32_t DeleteGroup(const std::string &pkgName, const std::string &deviceId); + + // New interface added in version 5.1.0 + virtual int32_t GetReason(); + // When switching from the new protocol to the old protocol, the previous parameters + // need to be obtained for use by the old protocol + virtual void GetBindTargetParams(std::string &pkgName, PeerTargetId &targetId, + std::map &bindParam); + virtual void GetAuthCodeAndPkgName(std::string &pkgName, std::string &authCode); + + virtual void SetBindTargetParams(const PeerTargetId &targetId); + // Register the notification function when the auth_mgr event is complete. + virtual void RegisterCleanNotifyCallback(CleanNotifyCallback cleanNotifyCallback); + + /** + * @brief Classical authMgr is global, single-frame collabration with double-frame device + * need it. If we start bind with single-frame device, we need clear dsoftbus callback + * to avoid the classical authMgr affect the single to single logical. + * For new protocal, the source and sink authMgr lifecycle obey the bind session, no need + * to process it. + */ + virtual void ClearSoftbusSessionCallback(); + /** + * @brief Classical authMgr is global, if we use classical logic, we need prepare the callback. + */ + virtual void PrepareSoftbusSessionCallback(); + virtual void DeleteTimer(); + + // Public functions + static std::string ConvertSrcVersion(const std::string &version, const std::string &edition); + static int32_t DmGetUserId(int32_t displayId); + static int32_t EndDream(); + bool IsTransferReady(); + void SetTransferReady(bool version); + void EnableInsensibleSwitching(); + void DisableInsensibleSwitching(); + int32_t ParseAuthType(const std::map &bindParam, int32_t &authType); + static bool CheckProcessNameInWhiteList(const std::string &processName); +protected: + bool NeedInsensibleSwitching(); + bool isTransferReady_{true}; + /** + For old protocol, when insensible switching is true, no new session needs to be created, + and the actual method 80 message is not sent. + */ + bool insensibleSwitching{false}; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_AUTH_ADAPTER_V2_H diff --git a/services/implementation/include/authentication_v2/dm_auth_message_processor.h b/services/implementation/include/authentication_v2/dm_auth_message_processor.h new file mode 100644 index 0000000000000000000000000000000000000000..a9b348b2f6e3855fbc3e849bceb6e04ff889550e --- /dev/null +++ b/services/implementation/include/authentication_v2/dm_auth_message_processor.h @@ -0,0 +1,332 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_AUTH_MESSAGE_PROCESSOR_V2_H +#define OHOS_DM_AUTH_MESSAGE_PROCESSOR_V2_H + +#include + +#include "access_control_profile.h" +#include "crypto_mgr.h" +#include "deviceprofile_connector.h" +#include "dm_ability_manager.h" +#include "json_object.h" + +namespace OHOS { +namespace DistributedHardware { +struct DmAuthContext; +struct DmAccess; + +extern const char* TAG_LNN_PUBLIC_KEY; +extern const char* TAG_TRANSMIT_PUBLIC_KEY; +extern const char* TAG_LNN_CREDENTIAL_ID; +extern const char* TAG_TRANSMIT_CREDENTIAL_ID; +extern const char* TAG_CONFIRM_OPERATION_V2; +extern const char* TAG_AUTH_TYPE_LIST; +extern const char* TAG_CURRENT_AUTH_TYPE_IDX; + +// IS interface input parameter json format string key +extern const char* TAG_METHOD; +extern const char* TAG_PEER_USER_SPACE_ID; +extern const char* TAG_SUBJECT; +extern const char* TAG_CRED_TYPE; +extern const char* TAG_KEY_FORMAT; +extern const char* TAG_ALGORITHM_TYPE; +extern const char* TAG_PROOF_TYPE; +extern const char* TAG_KEY_VALUE; +extern const char* TAG_AUTHORIZED_SCOPE; +extern const char* TAG_AUTHORIZED_APP_LIST; +extern const char* TAG_CREDENTIAL_OWNER; +extern const char* TAG_SYNC; +extern const char* TAG_ACCESS; +extern const char* TAG_PROXY; +extern const char* TAG_ACL; +extern const char* TAG_ACCESSER; +extern const char* TAG_ACCESSEE; +extern const char* TAG_SERVICEINFO; +extern const char* TAG_USER_CONFIRM_OPT; +// The local SK information is synchronized to the remote end to construct acl-accesser/accessee. +extern const char* TAG_TRANSMIT_SK_ID; +extern const char* TAG_LNN_SK_ID; +extern const char* TAG_TRANSMIT_SK_TIMESTAMP; +extern const char* TAG_LNN_SK_TIMESTAMP; +extern const char* TAG_USER_ID; +extern const char* TAG_TOKEN_ID; +extern const char* TAG_NETWORKID_ID; +extern const char* TAG_ISSUER; + +extern const char* TAG_DEVICE_VERSION; +extern const char* TAG_DEVICE_NAME; +extern const char* TAG_DEVICE_ID_HASH; +extern const char* TAG_ACCOUNT_ID_HASH; +extern const char* TAG_TOKEN_ID_HASH; +extern const char* TAG_SESSION_NAME; +extern const char* TAG_ACL_CHECKSUM; +extern const char* TAG_COMPRESS_ORI_LEN; +extern const char* TAG_COMPRESS; +extern const char* TAG_REPLY; +extern const char* TAG_STATE; +extern const char* TAG_REASON; +extern const char* TAG_PEER_USER_ID; +extern const char* TAG_PEER_DISPLAY_ID; +extern const char* TAG_EXTRA_INFO; + +extern const char* TAG_IS_ONLINE; +extern const char* TAG_IS_AUTHED; +extern const char* TAG_CREDENTIAL_INFO; +extern const char* TAG_CERT_INFO; +extern const char* TAG_LANGUAGE; +extern const char* TAG_ULTRASONIC_SIDE; + +// Logical Session Tag +constexpr const char* DM_TAG_LOGICAL_SESSION_ID = "logicalSessionId"; + +// Message type +enum DmMessageType { + // Terminate/Exception Message + MSG_TYPE_UNKNOWN = 0, + MSG_TYPE_AUTH_TERMINATE = 1, + // Normal Message + MSG_TYPE_REQ_ACL_NEGOTIATE = 80, + MSG_TYPE_RESP_ACL_NEGOTIATE = 90, + MSG_TYPE_REQ_USER_CONFIRM = 100, + MSG_TYPE_FORWARD_ULTRASONIC_START = 101, + MSG_TYPE_REVERSE_ULTRASONIC_START = 102, + MSG_TYPE_RESP_USER_CONFIRM = 110, + MSG_TYPE_FORWARD_ULTRASONIC_NEGOTIATE = 111, + MSG_TYPE_REVERSE_ULTRASONIC_DONE = 112, + MSG_TYPE_REQ_PIN_AUTH_START = 120, + MSG_TYPE_RESP_PIN_AUTH_START = 130, + MSG_TYPE_REQ_PIN_AUTH_MSG_NEGOTIATE = 121, + MSG_TYPE_RESP_PIN_AUTH_MSG_NEGOTIATE = 131, + MSG_TYPE_REQ_CREDENTIAL_EXCHANGE = 140, + MSG_TYPE_RESP_CREDENTIAL_EXCHANGE = 150, + MSG_TYPE_REQ_CREDENTIAL_AUTH_START = 160, + MSG_TYPE_RESP_CREDENTIAL_AUTH_START = 170, + MSG_TYPE_REQ_CREDENTIAL_AUTH_NEGOTIATE = 161, + MSG_TYPE_RESP_CREDENTIAL_AUTH_NEGOTIATE = 171, + MSG_TYPE_REQ_DATA_SYNC = 180, + MSG_TYPE_RESP_DATA_SYNC = 190, + MSG_TYPE_AUTH_REQ_FINISH = 200, + MSG_TYPE_AUTH_RESP_FINISH = 201, +}; + +struct DmAccessControlTable { + int32_t accessControlId; + int64_t accesserId; + int64_t accesseeId; + std::string deviceId; + std::string sessionKey; + int32_t bindType; + uint32_t authType; + uint32_t deviceType; + std::string deviceIdHash; + int32_t status; + int32_t validPeriod; + int32_t lastAuthTime; + uint32_t bindLevel; +}; + +// Structure used for synchronizing ACL access +// Attention: Modifying this structure requires updating the From/ToJson functions in dm_auth_message_processor.cpp. +struct DmAccessToSync { + // the deviceName translate in 80/90 messages, cleaned the privacy info + std::string deviceName; + // the device display name, which need save in DB + std::string deviceNameFull; + // For A->B communication, whether it's the A end or B end, the Accesser object stores + // the A end's deviceId, and the Accessee object stores the B end's deviceId + std::string deviceId; + int32_t userId; + std::string accountId; + uint64_t tokenId; + std::string bundleName; // Stores the bundleName, HAP -> bundleName in BMS, SA -> process name + std::string pkgName; // Store pkgName set by client + int32_t bindLevel; // Passed through for business purposes, no custom definition required + int32_t sessionKeyId; // User credential ID + int64_t skTimeStamp; // Used for aging, time is 2 days, user-level credential timestamp + // the user confirm operation result for the confirm dialog, means allow or allow always. + int32_t userConfirmOperation = UiAction::USER_OPERATION_TYPE_CANCEL_AUTH; +}; + +// json and struct conversion functions +void ToJson(JsonItemObject &itemObject, const DmAccessControlTable &table); +void FromJson(const JsonItemObject &itemObject, DmAccessControlTable &table); +void ToJson(JsonItemObject &itemObject, const DmAccessToSync &table); +void FromJson(const JsonItemObject &itemObject, DmAccessToSync &table); + +using JsonTypeCheckFuncPtr = bool (JsonItemObject::*)() const; + +template +void SetValueFromJson(const JsonItemObject &itemObject, const std::string &key, + JsonTypeCheckFuncPtr funcPtr, T &value) +{ + if (itemObject.Contains(key) && (itemObject[key].*funcPtr)()) { + value = itemObject[key].Get(); + } +} + +class DmAuthMessageProcessor { +public: + using CreateMessageFuncPtr = + int32_t (DmAuthMessageProcessor::*)(std::shared_ptr, JsonObject &jsonObject); + using ParaseMessageFuncPtr = + int32_t (DmAuthMessageProcessor::*)(const JsonObject &, std::shared_ptr); + + DmAuthMessageProcessor(); + ~DmAuthMessageProcessor(); + // Parse the message, and save the parsed information to the context + int32_t ParseMessage(std::shared_ptr context, const std::string &message); + // Create a message, construct the corresponding message based on msgType + std::string CreateMessage(DmMessageType msgType, std::shared_ptr context); + + // Create and send a message + void CreateAndSendMsg(DmMessageType msgType, std::shared_ptr context); + + // Save the session key + int32_t SaveSessionKey(const uint8_t *sessionKey, const uint32_t keyLen); + + // Save the permanent session key to the data profile + int32_t SaveSessionKeyToDP(int32_t userId, int32_t &skId); + + // Save the current access control list + int32_t PutAccessControlList(std::shared_ptr context, + DmAccess &access, std::string trustDeviceId); + + // Extract the access control list (ACL) for message parsing and bus usage. + // If no ACL is available, return an empty string. The returned string is in + // JSON format: {dmversion:x,accesser:[{accesserDeviceId:y,...},...], accessee:{...}} + int32_t DeleteSessionKeyToDP(int32_t userId, int32_t skId); + + void DmAuthUltrasonicMessageProcessor(); + +private: + // Internal implementations for various message types + + // Used to encrypt the synchronization message + int32_t EncryptSyncMessage(std::shared_ptr &context, DmAccess &accessSide, std::string &encSyncMsg); + // Parse the authentication start message + int32_t ParseAuthStartMessage(const JsonObject &jsonObject, std::shared_ptr context); + + // Parse the 80 message + int32_t ParseNegotiateMessage(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 90 message + int32_t ParseMessageRespAclNegotiate(const JsonObject &json, std::shared_ptr context); + // Parse the 100 message + int32_t ParseMessageReqUserConfirm(const JsonObject &json, std::shared_ptr context); + // Parse the 110 message + int32_t ParseMessageRespUserConfirm(const JsonObject &json, std::shared_ptr context); + // Parse the 120 message + int32_t ParseMessageReqPinAuthStart(const JsonObject &json, std::shared_ptr context); + // Parse the 130 message + int32_t ParseMessageRespPinAuthStart(const JsonObject &json, std::shared_ptr context); + // Parse the 121 message + int32_t ParseMessageReqPinAuthNegotiate(const JsonObject &json, std::shared_ptr context); + // Parse the 131 message + int32_t ParseMessageRespPinAuthNegotiate(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 140 message + int32_t ParseMessageReqCredExchange(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 150 message + int32_t ParseMessageRspCredExchange(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 161, 170, and 171 messages + int32_t ParseMessageNegotiateTransmit(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 180 message + int32_t ParseMessageSyncReq(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 190 message + int32_t ParseMessageSyncResp(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 200 message + int32_t ParseMessageSinkFinish(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 201 message + int32_t ParseMessageSrcFinish(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 102 message + int32_t ParseMessageReverseUltrasonicStart(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 112 message + int32_t ParseMessageReverseUltrasonicDone(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 101 message + int32_t ParseMessageForwardUltrasonicStart(const JsonObject &jsonObject, std::shared_ptr context); + // Parse the 111 message + int32_t ParseMessageForwardUltrasonicNegotiate(const JsonObject &jsonObject, + std::shared_ptr context); + + // Create the 80 message + int32_t CreateNegotiateMessage(std::shared_ptr context, JsonObject &jsonObject); + // Create the 90 message + int32_t CreateRespNegotiateMessage(std::shared_ptr context, JsonObject &jsonObject); + // Create the 100 message + int32_t CreateMessageReqUserConfirm(std::shared_ptr context, JsonObject &json); + // Create the 110 message + int32_t CreateMessageRespUserConfirm(std::shared_ptr context, JsonObject &json); + // Create the 120 message + int32_t CreateMessageReqPinAuthStart(std::shared_ptr context, JsonObject &json); + // Create the 130 message + int32_t CreateMessageRespPinAuthStart(std::shared_ptr context, JsonObject &json); + // Create the 121 message + int32_t CreateMessageReqPinAuthNegotiate(std::shared_ptr context, JsonObject &json); + // Create the 131 message + int32_t CreateMessageRespPinAuthNegotiate(std::shared_ptr context, JsonObject &json); + // Create the 140 message + int32_t CreateMessageReqCredExchange(std::shared_ptr context, JsonObject &jsonObject); + // Create the 150 message + int32_t CreateMessageRspCredExchange(std::shared_ptr context, JsonObject &jsonObject); + // Create the 160 message + int32_t CreateMessageReqCredAuthStart(std::shared_ptr context, JsonObject &jsonObject); + // Construct the 161, 170, and 171 credential authentication messages + int32_t CreateCredentialNegotiateMessage(std::shared_ptr context, JsonObject &jsonObject); + int32_t CreateNegotiateOldMessage(std::shared_ptr context, JsonObject &jsonObject); + // Construct the 180 and 190 sync messages + int32_t CreateSyncMessage(std::shared_ptr context, JsonObject &jsonObject); + // Create the 190 message + int32_t CreateMessageSyncResp(std::shared_ptr context, JsonObject &jsonObject); + // Create the 200 message + int32_t CreateMessageFinish(std::shared_ptr context, JsonObject &jsonObject); + + // Compress the sync message + std::string CompressSyncMsg(std::string &inputStr); + // Decompress the sync message + std::string DecompressSyncMsg(std::string& compressed, uint32_t oriLen); + // Serialize the ACL + int32_t ACLToStr(DistributedDeviceProfile::AccessControlProfile acl, std::string aclStr); + // Decrypt the 180 and 190 messages + int32_t DecryptSyncMessage(std::shared_ptr &context, + DmAccess &access, std::string &enSyncMsg); + // Parse the sync message + int32_t ParseSyncMessage(std::shared_ptr &context, + DmAccess &access, JsonObject &jsonObject); + int32_t CreateMessageForwardUltrasonicStart(std::shared_ptr context, JsonObject &jsonObject); + int32_t CreateMessageReverseUltrasonicStart(std::shared_ptr context, JsonObject &jsonObject); + int32_t CreateMessageForwardUltrasonicNegotiate(std::shared_ptr context, JsonObject &jsonObject); + int32_t CreateMessageReverseUltrasonicDone(std::shared_ptr context, JsonObject &jsonObject); + + std::string Base64Encode(std::string &inputStr); + std::string Base64Decode(std::string &inputStr); + void SetAccessControlList(std::shared_ptr context, + DistributedDeviceProfile::AccessControlProfile &profile); + void SetTransmitAccessControlList(std::shared_ptr context, + DistributedDeviceProfile::Accesser &accesser, DistributedDeviceProfile::Accessee &accessee); + void SetLnnAccessControlList(std::shared_ptr context, + DistributedDeviceProfile::Accesser &accesser, DistributedDeviceProfile::Accessee &accessee); + int32_t CheckLogicalSessionId(const JsonObject &jsonObject, std::shared_ptr context); + bool CheckAccessValidityAndAssign(std::shared_ptr &context, DmAccess &access, + DmAccess &accessTmp); + void ParseUltrasonicSide(const JsonObject &jsonObject, std::shared_ptr context); + void ParseCert(const JsonObject &jsonObject, std::shared_ptr context); + void ParseAccesserInfo(const JsonObject &jsonObject, std::shared_ptr context); + std::shared_ptr cryptoMgr_ = nullptr; + std::unordered_map createMessageFuncMap_; + std::unordered_map paraseMessageFuncMap_; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_AUTH_MESSAGE_PROCESSOR_V2_H \ No newline at end of file diff --git a/services/implementation/include/authentication_v2/dm_auth_state.h b/services/implementation/include/authentication_v2/dm_auth_state.h new file mode 100644 index 0000000000000000000000000000000000000000..e761287008a2a2dd77de8afdc459d2821d3f99ec --- /dev/null +++ b/services/implementation/include/authentication_v2/dm_auth_state.h @@ -0,0 +1,517 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_AUTH_STATE_V2_H +#define OHOS_DM_AUTH_STATE_V2_H +#define TYPE_TV_ID 0x9C + +#include + +#include "access_control_profile.h" +#include "dm_auth_context.h" + +namespace OHOS { +namespace DistributedHardware { +const char* const FILED_CRED_OWNER = "credOwner"; +const char* const FILED_DEVICE_ID = "deviceId"; +const char* const FILED_USER_ID = "userId"; +const char* const FILED_DEVICE_ID_HASH = "deviceIdHash"; +const char* const FILED_PEER_USER_SPACE_ID = "peerUserSpaceId"; +const char* const FILED_CRED_ID = "credId"; +const char* const FILED_CRED_TYPE = "credType"; +const char* const FILED_AUTHORIZED_SCOPE = "authorizedScope"; +const char* const FILED_AUTHORIZED_APP_LIST = "authorizedAppList"; +const char* const FILED_SUBJECT = "subject"; + +// State Types +enum class DmAuthStateType { + AUTH_IDLE_STATE = 0, // When the device is initialized + // source end state + AUTH_SRC_START_STATE = 1, // User triggers BindTarget + AUTH_SRC_NEGOTIATE_STATE = 2, // Receive softbus callback OnSessionOpened, send 80 message + AUTH_SRC_CONFIRM_STATE = 3, // Receive 90 authorization result message, send 100 message + AUTH_SRC_PIN_NEGOTIATE_START_STATE = 4, // Start negotiating PIN code, receive 110 authorization message + // or rollback or 90 jump + AUTH_SRC_PIN_INPUT_STATE = 5, // Enter PIN + AUTH_SRC_REVERSE_ULTRASONIC_START_STATE = 6, + AUTH_SRC_REVERSE_ULTRASONIC_DONE_STATE = 7, + AUTH_SRC_FORWARD_ULTRASONIC_START_STATE = 8, + AUTH_SRC_FORWARD_ULTRASONIC_DONE_STATE = 9, + AUTH_SRC_PIN_AUTH_START_STATE = 10, // Start authentication and send 120 message. + AUTH_SRC_PIN_AUTH_MSG_NEGOTIATE_STATE = 11, // Receive 130 authentication PIN result message, send 121 message + AUTH_SRC_PIN_AUTH_DONE_STATE = 12, // Receive 131 authentication PIN result message, call processData + AUTH_SRC_CREDENTIAL_EXCHANGE_STATE = 13, // Trigger the Onfinish callback event and send a 140 message + AUTH_SRC_CREDENTIAL_AUTH_START_STATE = 14, // Received 150 encrypted messages, sent 160 messages + AUTH_SRC_CREDENTIAL_AUTH_NEGOTIATE_STATE = 15, // 收到170凭据认证报文，发送161报文 + AUTH_SRC_CREDENTIAL_AUTH_DONE_STATE = 16, // Received 170 credential authentication message, sent 161 message + AUTH_SRC_DATA_SYNC_STATE = 17, // Received 190 message, sent 200 message + AUTH_SRC_FINISH_STATE = 18, // Received 201 message + + // sink end state + AUTH_SINK_START_STATE = 50, // Bus trigger OnSessionOpened + AUTH_SINK_NEGOTIATE_STATE = 51, // Received 80 trusted relationship negotiation message, send 90 message + AUTH_SINK_CONFIRM_STATE = 52, // Received 100 user authorization messages, sent 110 messages + AUTH_SINK_PIN_NEGOTIATE_START_STATE = 53, // Start negotiating PIN code, active migration or error rollback + AUTH_SINK_PIN_DISPLAY_STATE = 54, // Generate and display PIN + AUTH_SINK_REVERSE_ULTRASONIC_START_STATE = 55, + AUTH_SINK_REVERSE_ULTRASONIC_DONE_STATE = 56, + AUTH_SINK_FORWARD_ULTRASONIC_START_STATE = 57, + AUTH_SINK_FORWARD_ULTRASONIC_DONE_STATE = 58, + AUTH_SINK_PIN_AUTH_START_STATE = 59, // Receive 120 authentication PIN message, send 130 message + AUTH_SINK_PIN_AUTH_MSG_NEGOTIATE_STATE = 60, // Received 121 authentication PIN message, send 131 message + AUTH_SINK_PIN_AUTH_DONE_STATE = 61, // Trigger the Onfinish callback event + AUTH_SINK_CREDENTIAL_EXCHANGE_STATE = 62, // Received 140 encrypted messages, sent 150 messages + AUTH_SINK_CREDENTIAL_AUTH_START_STATE = 63, // Receive 160 authentication message, send 170 message + AUTH_SINK_CREDENTIAL_AUTH_NEGOTIATE_STATE = 64, // Received 161 credential negotiation message, + AUTH_SINK_DATA_SYNC_STATE = 65, // Received 180 synchronization message, send 190 message + AUTH_SINK_FINISH_STATE = 66, // Received 200 end message, send 201 message +}; + +// Credential Addition Method +enum DmAuthCredentialAddMethod : uint8_t { + DM_AUTH_CREDENTIAL_ADD_METHOD_GENERATE = 1, // Generate + DM_AUTH_CREDENTIAL_ADD_METHOD_IMPORT, // Import +}; + +// Credential Subject +enum DmAuthCredentialSubject : uint8_t { + DM_AUTH_CREDENTIAL_SUBJECT_PRIMARY = 1, // Main Control + DM_AUTH_CREDENTIAL_SUBJECT_SUPPLEMENT, // Accessories +}; + +// Credentials and account association +enum DmAuthCredentialAccountRelation : uint8_t { + DM_AUTH_CREDENTIAL_INVALID = 0, // Invalid + DM_AUTH_CREDENTIAL_ACCOUNT_RELATED = 1, // Account related + DM_AUTH_CREDENTIAL_ACCOUNT_UNRELATED = 2, // Account independent + DM_AUTH_CREDENTIAL_ACCOUNT_ACROSS = 3, // Share +}; + +// Key Type +enum DmAuthKeyFormat : uint8_t { + DM_AUTH_KEY_FORMAT_SYMM_IMPORT = 1, // Symmetric key (supported only for import) + DM_AUTH_KEY_FORMAT_ASYMM_IMPORT, // Asymmetric key public key (supported only for import) + DM_AUTH_KEY_FORMAT_ASYMM_GENERATE, // Asymmetric key (supported only for generation) + DM_AUTH_KEY_FORMAT_X509, // X509 certificate +}; + +// Algorithm type +enum DmAuthAlgorithmType : uint8_t { + DM_AUTH_ALG_TYPE_AES256 = 1, // AES256 + DM_AUTH_ALG_TYPE_AES128, // AES128 + DM_AUTH_ALG_TYPE_P256, // P256 + DM_AUTH_ALG_TYPE_ED25519 // ED25519 +}; + +// Credential proof type +enum DmAuthCredentialProofType : uint8_t { + DM_AUTH_CREDENTIAL_PROOF_PSK = 1, // PSK + DM_AUTH_CREDENTIAL_PROOF_PKI, // PKI +}; + +enum DmCredType : uint8_t { + ACCOUNT_RELATED = 1, + ACCOUNT_UNRELATED, + ACCOUNT_ACROSS +}; + +enum DmAuthorizedScope : uint8_t { + SCOPE_DEVICE = 1, + SCOPE_USER, + SCOPE_APP, +}; + +enum DM_SUBJECT : uint8_t { + SUBJECT_PRIMARY = 1, + SUBJECT_SECONDARY, +}; + +class DmAuthState { +public: + virtual ~DmAuthState() {}; + virtual DmAuthStateType GetStateType() = 0; + virtual int32_t Action(std::shared_ptr context) = 0; + void SourceFinish(std::shared_ptr context); + void SinkFinish(std::shared_ptr context); + std::string GenerateBindResultContent(std::shared_ptr context); + static bool IsScreenLocked(); + static int32_t GetTaskTimeout(std::shared_ptr context, const char* taskName, int32_t taskTimeOut); + static void HandleAuthenticateTimeout(std::shared_ptr context, std::string name); + static bool IsImportAuthCodeCompatibility(DmAuthType authType); + + void SetAclExtraInfo(std::shared_ptr context); + void SetAclInfo(std::shared_ptr context); + void FilterProfilesByContext(std::vector &profiles, + std::shared_ptr context); + int32_t GetAclBindType(std::shared_ptr context, std::string credId); + int32_t GetOutputState(int32_t state); + int32_t GetOutputReplay(const std::string &processName, int32_t replay); + static uint64_t GetSysTimeMs(); + static void DeleteAcl(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile); +protected: + bool NeedReqUserConfirm(std::shared_ptr context); + bool NeedAgreeCredential(std::shared_ptr context); + bool NeedAgreeAcl(std::shared_ptr context); + uint32_t GetCredType(std::shared_ptr context, const JsonItemObject &credInfo); + uint32_t GetCredentialType(std::shared_ptr context, const JsonItemObject &credInfo); + bool HaveSameTokenId(std::shared_ptr context, const std::vector &tokenList); + void SetProcessInfo(std::shared_ptr context); +}; + +class AuthSrcConfirmState : public DmAuthState { +public: + virtual ~AuthSrcConfirmState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +private: + void NegotiateCredential(std::shared_ptr context, JsonObject &credTypeNegoRsult); + void NegotiateAcl(std::shared_ptr context, JsonObject &aclNegoRsult); + void GetSrcCredentialInfo(std::shared_ptr context, JsonObject &credInfo); + void GetIdenticalCredentialInfo(std::shared_ptr context, JsonObject &credInfo); + void GetShareCredentialInfo(std::shared_ptr context, JsonObject &credInfo); + void GetP2PCredentialInfo(std::shared_ptr context, JsonObject &credInfo); + void GetSrcAclInfo(std::shared_ptr context, JsonObject &credInfo, JsonObject &aclInfo); + void GetSrcAclInfoForP2P(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, JsonObject &aclInfo); + bool IdenticalAccountAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee); + bool ShareAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee); + bool Point2PointAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee); + bool LnnAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee); + bool CheckCredIdInAcl(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, uint32_t bindType); + void CheckCredIdInAclForP2P(std::shared_ptr context, std::string &credId, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, uint32_t bindType, + bool &checkResult); + void GetSrcCredType(std::shared_ptr context, JsonObject &credInfo, JsonObject &aclInfo, + JsonObject &credTypeJson); + void GetSrcCredTypeForP2P(std::shared_ptr context, const JsonItemObject &credObj, + JsonObject &aclInfo, JsonObject &credTypeJson, int32_t credType, std::vector &deleteCredInfo); + void GetCustomDescBySinkLanguage(std::shared_ptr context); +}; + +class AuthSinkStatePinAuthComm { +public: + static bool IsPinCodeValid(int32_t numpin); + static bool IsPinCodeValid(const std::string& strpin); + static bool IsAuthCodeReady(std::shared_ptr context); + static void GeneratePincode(std::shared_ptr context); + static int32_t ShowAuthInfoDialog(std::shared_ptr context); +private: + static void HandleSessionHeartbeat(std::shared_ptr context, std::string name); +}; + +class AuthSinkConfirmState : public DmAuthState { +public: + virtual ~AuthSinkConfirmState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +private: + void NegotiateCredential(std::shared_ptr context, JsonObject &credTypeNegoRsult); + void NegotiateAcl(std::shared_ptr context, JsonObject &aclNegoRsult); + int32_t ShowConfigDialog(std::shared_ptr context); + void ReadServiceInfo(std::shared_ptr context); + void MatchFallBackCandidateList(std::shared_ptr context, DmAuthType authType); + int32_t ProcessBindAuthorize(std::shared_ptr context); + int32_t ProcessNoBindAuthorize(std::shared_ptr context); + std::string GetCredIdByCredType(std::shared_ptr context, int32_t credType); +}; + +class AuthSrcPinNegotiateStartState : public DmAuthState { +public: + virtual ~AuthSrcPinNegotiateStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +private: + int32_t NegotiatePinAuth(std::shared_ptr context, bool firstTime); + int32_t ProcessCredAuth(std::shared_ptr context); + int32_t ProcessPinBind(std::shared_ptr context); + std::string GetCredIdByCredType(std::shared_ptr context, int32_t credType); +}; + +class AuthSrcPinInputState : public DmAuthState { +public: + virtual ~AuthSrcPinInputState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +private: + int32_t ShowStartAuthDialog(std::shared_ptr context); +}; + +class AuthSinkPinNegotiateStartState : public DmAuthState { +public: + virtual ~AuthSinkPinNegotiateStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkPinDisplayState : public DmAuthState { +public: + virtual ~AuthSinkPinDisplayState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcReverseUltrasonicStartState : public DmAuthState { +public: + virtual ~AuthSrcReverseUltrasonicStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcReverseUltrasonicDoneState : public DmAuthState { +public: + virtual ~AuthSrcReverseUltrasonicDoneState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcForwardUltrasonicStartState : public DmAuthState { +public: + virtual ~AuthSrcForwardUltrasonicStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcForwardUltrasonicDoneState : public DmAuthState { +public: + virtual ~AuthSrcForwardUltrasonicDoneState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkReverseUltrasonicStartState : public DmAuthState { +public: + virtual ~AuthSinkReverseUltrasonicStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkReverseUltrasonicDoneState : public DmAuthState { +public: + virtual ~AuthSinkReverseUltrasonicDoneState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkForwardUltrasonicStartState : public DmAuthState { +public: + virtual ~AuthSinkForwardUltrasonicStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkForwardUltrasonicDoneState : public DmAuthState { +public: + virtual ~AuthSinkForwardUltrasonicDoneState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcPinAuthStartState : public DmAuthState { +public: + virtual ~AuthSrcPinAuthStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +private: + int32_t ShowStartAuthDialog(std::shared_ptr context); // Display PIN input box to user +}; + +class AuthSinkPinAuthStartState : public DmAuthState { +public: + virtual ~AuthSinkPinAuthStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcPinAuthMsgNegotiateState : public DmAuthState { +public: + virtual ~AuthSrcPinAuthMsgNegotiateState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkPinAuthMsgNegotiateState : public DmAuthState { +public: + virtual ~AuthSinkPinAuthMsgNegotiateState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkPinAuthDoneState : public DmAuthState { +public: + virtual ~AuthSinkPinAuthDoneState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcPinAuthDoneState : public DmAuthState { +public: + virtual ~AuthSrcPinAuthDoneState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcStartState : public DmAuthState { +public: + virtual ~AuthSrcStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcNegotiateStateMachine : public DmAuthState { +public: + virtual ~AuthSrcNegotiateStateMachine() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +private: + std::string GetAccountGroupIdHash(std::shared_ptr context); +}; + +// Middle class encapsulates public interfaces related to business. +class AuthCredentialAgreeState : public DmAuthState { +public: + virtual ~AuthCredentialAgreeState() {}; +protected: + std::string CreateAuthParamsString(DmAuthScope authorizedScope, DmAuthCredentialAddMethod method, + const std::shared_ptr &authContext); + int32_t GenerateCredIdAndPublicKey(DmAuthScope authorizedScope, std::shared_ptr &authContext); + int32_t AgreeCredential(DmAuthScope authorizedScope, std::shared_ptr &authContext); +}; + +class AuthSrcCredentialExchangeState : public AuthCredentialAgreeState { +public: + virtual ~AuthSrcCredentialExchangeState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkCredentialExchangeState : public AuthCredentialAgreeState { +public: + virtual ~AuthSinkCredentialExchangeState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcCredentialAuthStartState : public AuthCredentialAgreeState { +public: + virtual ~AuthSrcCredentialAuthStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcCredentialAuthNegotiateState : public DmAuthState { +public: + virtual ~AuthSrcCredentialAuthNegotiateState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcCredentialAuthDoneState : public DmAuthState { +public: + virtual ~AuthSrcCredentialAuthDoneState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +private: + std::string GenerateCertificate(std::shared_ptr context); +}; + +class AuthSinkCredentialAuthStartState : public DmAuthState { +public: + virtual ~AuthSinkCredentialAuthStartState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkCredentialAuthNegotiateState : public DmAuthState { +public: + virtual ~AuthSinkCredentialAuthNegotiateState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkNegotiateStateMachine : public DmAuthState { +public: + virtual ~AuthSinkNegotiateStateMachine() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; + +private: + int32_t RespQueryAcceseeIds(std::shared_ptr context); + int32_t ProcRespNegotiate5_1_0(std::shared_ptr context); + void GetSinkCredentialInfo(std::shared_ptr context, JsonObject &credInfo); + void GetIdenticalCredentialInfo(std::shared_ptr context, JsonObject &credInfo); + void GetShareCredentialInfo(std::shared_ptr context, JsonObject &credInfo); + void GetP2PCredentialInfo(std::shared_ptr context, JsonObject &credInfo); + void GetSinkAclInfo(std::shared_ptr context, JsonObject &credInfo, JsonObject &aclInfo); + void GetSinkAclInfoForP2P(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, JsonObject &aclInfo); + bool IdenticalAccountAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee); + bool ShareAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee); + bool Point2PointAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee); + bool LnnAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee); + bool CheckCredIdInAcl(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, uint32_t bindType); + void CheckCredIdInAclForP2P(std::shared_ptr context, std::string &credId, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, uint32_t bindType, + bool &checkResult); + void GetSinkCredType(std::shared_ptr context, JsonObject &credInfo, JsonObject &aclInfo, + JsonObject &credTypeJson); + void GetSinkCredTypeForP2P(std::shared_ptr context, const JsonItemObject &credObj, + JsonObject &aclInfo, JsonObject &credTypeJson, int32_t credType, std::vector &deleteCredInfo); + bool IsAntiDisturbanceMode(const std::string &businessId); + bool ParseAndCheckAntiDisturbanceMode(const std::string &businessId, const std::string &businessValue); +}; + +class AuthSinkDataSyncState : public DmAuthState { +public: + virtual ~AuthSinkDataSyncState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +private: + int32_t VerifyCertificate(std::shared_ptr context); +}; + +class AuthSrcDataSyncState : public DmAuthState { +public: + virtual ~AuthSrcDataSyncState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSinkFinishState : public DmAuthState { +public: + virtual ~AuthSinkFinishState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; + +class AuthSrcFinishState : public DmAuthState { +public: + virtual ~AuthSrcFinishState() {}; + DmAuthStateType GetStateType() override; + int32_t Action(std::shared_ptr context) override; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_AUTH_STATE_V2_H \ No newline at end of file diff --git a/services/implementation/include/authentication_v2/dm_auth_state_machine.h b/services/implementation/include/authentication_v2/dm_auth_state_machine.h new file mode 100644 index 0000000000000000000000000000000000000000..03a0d83dd1b808e5f8878c60f3665d0225bcbd54 --- /dev/null +++ b/services/implementation/include/authentication_v2/dm_auth_state_machine.h @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_AUTH_STATE_MACHINE_V2_H +#define OHOS_DM_AUTH_STATE_MACHINE_V2_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dm_auth_state.h" + +namespace OHOS { +namespace DistributedHardware { + +// Define the state transition table type +using StateTransitionTable = std::map>; + +enum DmEventType { + ON_TRANSMIT = 0, + ON_SESSION_KEY_RETURNED, + ON_REQUEST, + ON_FINISH, + ON_ERROR, + ON_ULTRASONIC_PIN_CHANGED, + ON_ULTRASONIC_PIN_TIMEOUT, + + ON_TIMEOUT, + ON_USER_OPERATION, + ON_FAIL, + ON_SCREEN_LOCKED, + ON_SESSION_OPENED, +}; + +class DmAuthStateMachine { +public: + DmAuthStateMachine(std::shared_ptr context); + ~DmAuthStateMachine(); + + // Notify state transition, execute the corresponding action for the state, and handle exceptions + // only allowed to be called within OnDataReceived + int32_t TransitionTo(std::shared_ptr state); + + // Wait for the expected event within the action, block until the expected event is completed or + // an exception occurs, returning the actual event that occurred (only allowed to be called within actions) + DmEventType WaitExpectEvent(DmEventType eventType); + + // Notify the completion of an event, passing the event enumeration + // (only allowed to be called when the event is triggered). If it's an exception event, + // record it in the context's reason or reply. + void NotifyEventFinish(DmEventType eventType); + + DmAuthStateType GetCurState(); + + // Stop the thread + void Stop(); + +private: + // Loop to wait for state transitions and execute actions + void Run(std::shared_ptr context); + void InsertSrcTransTable(); + void InsertSinkTransTable(); + void InsertUltrasonicSrcTransTable(); + void InsertUltrasonicSinkTransTable(); + + // Fetch the current state and execute it + std::optional> FetchAndSetCurState(); + + void SetCurState(DmAuthStateType state); + + bool CheckStateTransitValid(DmAuthStateType nextState); + + void NotifyEventWait(); + void NotifyStateWait(); + + DmAuthStateType curState_; + DmAuthStateType preState_{DmAuthStateType::AUTH_IDLE_STATE}; // Previous push state + + // State transition table for normal state transitions (all state transitions to the Finish state are valid) + StateTransitionTable stateTransitionTable_; + + std::queue eventQueue_; + + // Set of exception events + std::set exceptionEvent_; + + // Atomic flag to control the state machine's running state + std::atomic running_; + + // Queue for storing states + std::queue> statesQueue_; + + // Synchronization primitives + std::mutex stateMutex_; + std::condition_variable stateCv_; + std::mutex eventMutex_; + std::condition_variable eventCv_; + + // Direction of authentication + DmAuthDirection direction_; + int32_t reason{DM_OK}; + + // Thread for state machine execution + std::thread thread_; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_AUTH_STATE_MACHINE_V2_H diff --git a/services/implementation/include/authentication_v2/dm_freeze_process.h b/services/implementation/include/authentication_v2/dm_freeze_process.h new file mode 100644 index 0000000000000000000000000000000000000000..5762a772199fdd3f0655096c8764d1e2f0c0a50a --- /dev/null +++ b/services/implementation/include/authentication_v2/dm_freeze_process.h @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef OHOS_DM_FREEZE_PROCESS_V2_H +#define OHOS_DM_FREEZE_PROCESS_V2_H +#include +#include +#include + +#include "kv_adapter_manager.h" +#include "dm_single_instance.h" + +namespace OHOS { +namespace DistributedHardware { +typedef struct DeviceFreezeState { + int64_t startFreezeTimeStamp; + int64_t stopFreezeTimeStamp; + explicit DeviceFreezeState() : startFreezeTimeStamp(0), stopFreezeTimeStamp(0) {} + bool IsEmpty() const + { + return startFreezeTimeStamp == 0 && stopFreezeTimeStamp == 0; + } + void Reset() + { + startFreezeTimeStamp = 0; + stopFreezeTimeStamp = 0; + } +} DeviceFreezeState; + +typedef struct BindFailedEvents { + std::vector failedTimeStamps; + std::vector freezeTimeStamps; + explicit BindFailedEvents() : failedTimeStamps(), freezeTimeStamps() {} + bool IsEmpty() const + { + return failedTimeStamps.empty() && freezeTimeStamps.empty(); + } + void Reset() + { + failedTimeStamps.clear(); + freezeTimeStamps.clear(); + } +} BindFailedEvents; + +class FreezeProcess { +DM_DECLARE_SINGLE_INSTANCE_BASE(FreezeProcess); +public: + bool IsFrozen(); + int32_t DeleteFreezeRecord(); + int32_t UpdateFreezeRecord(); +private: + FreezeProcess() = default; + ~FreezeProcess() = default; + int32_t SyncFreezeData(); + int32_t ConvertJsonToDeviceFreezeState(const std::string &result, DeviceFreezeState &freezeStateObj); + int32_t ConvertJsonToBindFailedEvents(const std::string &result, BindFailedEvents &bindFailedEvents); + void ConvertBindFailedEventsToJson(const BindFailedEvents &value, std::string &result); + void ConvertDeviceFreezeStateToJson(const DeviceFreezeState &value, std::string &result); + int32_t CleanFreezeRecord(int64_t nowTime); + int32_t CleanBindFailedEvents(int64_t reservedDataTimeStamp); + int32_t CleanFreezeState(int64_t reservedDataTimeStamp); + int32_t UpdateFreezeState(int64_t nowTime); + void CalculateNextFreezeTime(int64_t nowFreezeTime, int64_t &nextFreezeTime); + +private: + bool isSynced_ = false; + DeviceFreezeState freezeStateCache_; + BindFailedEvents bindFailedEventsCache_; + std::mutex freezeStateCacheMtx_; + std::mutex bindFailedEventsCacheMtx_; + std::mutex isSyncedMtx_; +}; + +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_FREEZE_PROCESS_V2_H \ No newline at end of file diff --git a/services/implementation/include/authentication_v2/dm_negotiate_process.h b/services/implementation/include/authentication_v2/dm_negotiate_process.h new file mode 100644 index 0000000000000000000000000000000000000000..8a5938d40ff3c6bdf85ed9ed9ae648a05d31140c --- /dev/null +++ b/services/implementation/include/authentication_v2/dm_negotiate_process.h @@ -0,0 +1,192 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef OHOS_DM_NEGOTIATE_PROCESS_V2_H +#define OHOS_DM_NEGOTIATE_PROCESS_V2_H +#include +#include +#include + +#include "dm_auth_context.h" +#include "dm_single_instance.h" +namespace OHOS { +namespace DistributedHardware { +enum CredType : uint8_t { + DM_NO_CRED = 0, + DM_IDENTICAL_CREDTYPE = 1, + DM_SHARE_CREDTYPE = 2, + DM_P2P_CREDTYPE = 3, +}; + +enum AclType : uint8_t { + DM_NO_ACL = 0, + DM_IDENTICAL_ACL = 1, + DM_SHARE_ACL = 2, + DM_P2P_ACL = 3, +}; + +enum AuthType : uint8_t { + DM_INVALIED_AUTHTYPE = 0, + DM_INPUT_PINCODE = 1, + DM_IMPORT_AUTHTYPE = 2, +}; + +class NegotiateSpec { +public: + CredType credType; + AclType aclType; + AuthType authType; + + NegotiateSpec(CredType credTypeTemp, AclType aclTypeTemp, AuthType authTypeTemp) + : credType(credTypeTemp), aclType(aclTypeTemp), authType(authTypeTemp) {} + + // 重载<运算符用于map排序 + bool operator<(const NegotiateSpec& other) const + { + if (credType != other.credType) return credType < other.credType; + if (aclType != other.aclType) return aclType < other.aclType; + return authType < other.authType; + } +}; + +class NegotiateHandler { +public: + virtual int32_t NegotiateHandle(std::shared_ptr context) = 0; + virtual ~NegotiateHandler() {}; +}; + +class NoCredNoAclInputAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~NoCredNoAclInputAuthType() {}; +}; + +class NoCredNoAclImportAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~NoCredNoAclImportAuthType() {}; +}; + +class IdentCredNoAclInputAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~IdentCredNoAclInputAuthType() {}; +}; + +class IdentCredNoAclImportAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~IdentCredNoAclImportAuthType() {}; +}; + +class IdentCredIdentAclInputAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~IdentCredIdentAclInputAuthType() {}; +}; + +class IdentCredIdentAclImportAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~IdentCredIdentAclImportAuthType() {}; +}; + +class IdentCredP2pAclInputAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~IdentCredP2pAclInputAuthType() {}; +}; + +class IdentCredP2pAclImportAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~IdentCredP2pAclImportAuthType() {}; +}; + +class ShareCredNoAclInputAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~ShareCredNoAclInputAuthType() {}; +}; + +class ShareCredNoAclImportAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~ShareCredNoAclImportAuthType() {}; +}; + +class ShareCredShareAclInputAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~ShareCredShareAclInputAuthType() {}; +}; + +class ShareCredShareAclImportAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~ShareCredShareAclImportAuthType() {}; +}; + +class ShareCredP2pAclInputAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~ShareCredP2pAclInputAuthType() {}; +}; + +class ShareCredP2pAclImportAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~ShareCredP2pAclImportAuthType() {}; +}; + +class P2pCredNoAclInputAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~P2pCredNoAclInputAuthType() {}; +}; + +class P2pCredNoAclImportAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~P2pCredNoAclImportAuthType() {}; +}; + +class P2pCredP2pAclInputAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~P2pCredP2pAclInputAuthType() {}; +}; + +class P2pCredP2pAclImportAuthType : public NegotiateHandler { +public: + int32_t NegotiateHandle(std::shared_ptr context) override; + virtual ~P2pCredP2pAclImportAuthType() {}; +}; + +class NegotiateProcess { +DM_DECLARE_SINGLE_INSTANCE_BASE(NegotiateProcess); +public: + NegotiateProcess(); + ~NegotiateProcess(); + int32_t HandleNegotiateResult(std::shared_ptr context); +private: + CredType ConvertCredType(const std::string &credType); + AclType ConvertAclType(const std::string &aclType); + AuthType ConvertAuthType(const DmAuthType &authType); +private: + std::map> handlers_; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_AUTH_STATE_V2_H \ No newline at end of file diff --git a/services/implementation/include/config/json_config.h b/services/implementation/include/config/json_config.h index f9598faa33124f428d3afe297e9174f80dbe2f43..1ebb66c9e3fd71224915aa046b0d1e72392704b9 100644 --- a/services/implementation/include/config/json_config.h +++ b/services/implementation/include/config/json_config.h @@ -20,7 +20,7 @@ namespace OHOS { namespace DistributedHardware { -const std::string adapterJsonConfigString = + DM_EXPORT const std::string adapterJsonConfigString = R"({ "devicemanager_adapter_components": [ { @@ -42,7 +42,7 @@ const std::string adapterJsonConfigString = ] })"; -const std::string authJsonConfigString = +DM_EXPORT const std::string authJsonConfigString = R"({ "devicemanager_auth_components": [ { diff --git a/services/implementation/include/cryptomgr/crypto_mgr.h b/services/implementation/include/cryptomgr/crypto_mgr.h index 86a759081dcc686b32730176d758fda0a71369a9..da5ae1500552cafdfa9936beabeb7f8c96e9375a 100644 --- a/services/implementation/include/cryptomgr/crypto_mgr.h +++ b/services/implementation/include/cryptomgr/crypto_mgr.h @@ -45,6 +45,7 @@ public: int32_t SaveSessionKey(const uint8_t *sessionKey, const uint32_t keyLen); int32_t ProcessSessionKey(const uint8_t *sessionKey, const uint32_t keyLen); void ClearSessionKey(); + std::vector GetSessionKey(); private: int32_t DoEncryptData(AesGcmCipherKey *cipherKey, const unsigned char *input, uint32_t inLen, @@ -56,7 +57,7 @@ private: int32_t DoDecryptData(AesGcmCipherKey *cipherKey, const unsigned char *input, uint32_t inLen, unsigned char *decryptData, uint32_t *decryptLen); int32_t MbedAesGcmDecrypt(const AesGcmCipherKey *cipherKey, const unsigned char *cipherText, - uint32_t cipherTextSize, unsigned char *plain, uint32_t plainLen); + uint32_t cipherTextSize, unsigned char *plain, uint32_t &plainLen); private: std::mutex sessionKeyMtx_; DMSessionKey sessionKey_; diff --git a/services/implementation/include/dependency/MSDP/spatial_location_callback_impl.h b/services/implementation/include/dependency/MSDP/spatial_location_callback_impl.h new file mode 100644 index 0000000000000000000000000000000000000000..68dcfc1a280e26ea777562cdabd0ef8c6a038088 --- /dev/null +++ b/services/implementation/include/dependency/MSDP/spatial_location_callback_impl.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_SPATIAL_LOCATION_CALLBACK_IMPL_DM_H +#define OHOS_SPATIAL_LOCATION_CALLBACK_IMPL_DM_H + +#include "spatial_location_callback_stub.h" +#include "dm_auth_state.h" +#include "dm_auth_context.h" +#include "spatial_awareness_mgr_client.h" + +namespace OHOS { +namespace DistributedHardware { +class SpatialLocationCallbackImpl : public Msdp::SpatialLocationCallbackStub { +public: + SpatialLocationCallbackImpl(std::shared_ptr context); + ~SpatialLocationCallbackImpl(); + void OnPinCodeChanged(const Msdp::PinCodeResponse &pinCodeResponse) override; + +private: + bool IsValidPinCodeStr(const std::string &pinCodeStr); + std::shared_ptr context_ = nullptr; +}; +} // namespace DistributedHardware +} // namespace OHOS + +#endif // OHOS_SPATIAL_LOCATION_CALLBACK_IMPL_DM_H \ No newline at end of file diff --git a/services/implementation/include/dependency/hichain/hichain_auth_connector.h b/services/implementation/include/dependency/hichain/hichain_auth_connector.h index 460a4094d749c6dd2d1cced847902e4406239851..3a3fe46c6d7506eeae64655d41222496cd6af0d3 100644 --- a/services/implementation/include/dependency/hichain/hichain_auth_connector.h +++ b/services/implementation/include/dependency/hichain/hichain_auth_connector.h @@ -16,7 +16,9 @@ #ifndef OHOS_HICHAIN_AUTH_CONNECTOR_H #define OHOS_HICHAIN_AUTH_CONNECTOR_H +#include #include + #include "device_auth.h" #include "device_auth_defines.h" #include "hichain_connector_callback.h" @@ -49,20 +51,39 @@ public: public: HiChainAuthConnector(); ~HiChainAuthConnector(); - int32_t AuthDevice(int32_t pinCode, int32_t osAccountId, std::string udid, int64_t requestId); + int32_t AuthDevice(const std::string &pinCode, int32_t osAccountId, std::string udid, int64_t requestId); int32_t ProcessAuthData(int64_t requestId, std::string authData, int32_t osAccountId); int32_t GenerateCredential(std::string &localUdid, int32_t osAccountId, std::string &publicKey); - bool QueryCredential(std::string &localUdid, int32_t osAccountId); - int32_t ImportCredential(int32_t osAccountId, std::string deviceId, std::string publicKey); - int32_t DeleteCredential(const std::string &deviceId, int32_t userId); + bool QueryCredential(std::string &localUdid, int32_t osAccountId, int32_t peerOsAccountId); + int32_t QueryCredentialInfo(int32_t userId, const JsonObject &queryParams, JsonObject &resultJson); + int32_t QueryCredInfoByCredId(int32_t userId, std::string credId, JsonObject &resultJson); + int32_t ImportCredential(int32_t osAccountId, int32_t peerOsAccountId, std::string deviceId, std::string publicKey); + int32_t DeleteCredential(const std::string &deviceId, int32_t userId, int32_t peerUserId); int32_t RegisterHiChainAuthCallback(std::shared_ptr callback); + int32_t UnRegisterHiChainAuthCallback(); + int32_t RegisterHiChainAuthCallbackById(int64_t id, std::shared_ptr callback); + int32_t UnRegisterHiChainAuthCallbackById(int64_t id); int32_t GetCredential(std::string &localUdid, int32_t osAccountId, std::string &publicKey); + + int32_t ProcessCredData(int64_t authReqId, const std::string &data); + int32_t AddCredential(int32_t osAccountId, const std::string &authParams, std::string &creId); + int32_t ExportCredential(int32_t osAccountId, const std::string &credId, std::string &publicKey); + int32_t AgreeCredential(int32_t osAccountId, const std::string selfCredId, const std::string &authParams, + std::string &credId); + int32_t DeleteCredential(int32_t osAccountId, const std::string &creId); + // Credential authentication pinCode Pin code (required for point-to-point temporary credentials) + int32_t AuthCredential(int32_t osAccountId, int64_t authReqId, const std::string &credId, + const std::string &pinCode); + int32_t AuthCredentialPinCode(int32_t osAccountId, int64_t authReqId, const std::string &pinCode); + private: void FreeJsonString(char *jsonStr); + static std::shared_ptr GetDeviceAuthCallback(int64_t id); private: DeviceAuthCallback deviceAuthCallback_; static std::shared_ptr dmDeviceAuthCallback_; + static std::map> dmDeviceAuthCallbackMap_; static std::mutex dmDeviceAuthCallbackMutex_; }; } // namespace DistributedHardware diff --git a/services/implementation/include/dependency/hichain/hichain_connector_callback.h b/services/implementation/include/dependency/hichain/hichain_connector_callback.h index 1e8e73f430f2a86209dad621e8fa96be5731e84d..5590744cc707cdbfbcaf75afb4eb79df1c6cf428 100644 --- a/services/implementation/include/dependency/hichain/hichain_connector_callback.h +++ b/services/implementation/include/dependency/hichain/hichain_connector_callback.h @@ -23,7 +23,7 @@ public: virtual void OnGroupCreated(int64_t requestId, const std::string &groupId) = 0; virtual void OnMemberJoin(int64_t requestId, int32_t status) = 0; virtual std::string GetConnectAddr(std::string deviceId) = 0; - virtual int32_t GetPinCode(int32_t &code) = 0; + virtual int32_t GetPinCode(std::string &code) = 0; }; class IDmGroupResCallback { @@ -37,8 +37,7 @@ public: virtual void AuthDeviceFinish(int64_t requestId) = 0; virtual void AuthDeviceError(int64_t requestId, int32_t errorCode) = 0; virtual void AuthDeviceSessionKey(int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen) = 0; - virtual int32_t GetPinCode(int32_t &code) = 0; - virtual void GetRemoteDeviceId(std::string &deviceId) = 0; + virtual char *AuthDeviceRequest(int64_t requestId, int operationCode, const char *reqParams) = 0; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/include/dependency/softbus/softbus_connector.h b/services/implementation/include/dependency/softbus/softbus_connector.h index afdf110ebb4bb74bd0e38040c4da5cbf82ce8895..be6e0468b7c5ca4dd2ba25a8a2c4c6001c39856a 100644 --- a/services/implementation/include/dependency/softbus/softbus_connector.h +++ b/services/implementation/include/dependency/softbus/softbus_connector.h @@ -28,9 +28,12 @@ #include "dm_publish_info.h" #include "dm_subscribe_info.h" #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) +#include "deviceprofile_connector.h" #include "softbus_session.h" #endif +#include "softbus_connector_callback.h" #include "softbus_state_callback.h" +#include "hichain_auth_connector.h" namespace OHOS { namespace DistributedHardware { @@ -48,7 +51,7 @@ public: * @tc.desc: Get Connect Addr of the SoftbusConnector * @tc.type: FUNC */ - static ConnectionAddr *GetConnectAddr(const std::string &deviceId, std::string &connectAddr); + static std::shared_ptr GetConnectAddr(const std::string &deviceId, std::string &connectAddr); /** * @tc.name: SoftbusConnector::GetUdidByNetworkId @@ -85,6 +88,25 @@ public: */ static void JoinLnnByHml(int32_t sessionId, int32_t sessionKeyId, int32_t remoteSessionKeyId); + static void JoinLnn(const std::string &deviceId, const std::string &remoteUdidHash); + + static void JoinLNNBySkId(int32_t sessionId, int32_t sessionKeyId, int32_t remoteSessionKeyId, + std::string udid, std::string udidHash); + + /** + * @tc.name: SoftbusConnector::RegisterConnectorCallback + * @tc.desc: RegisterConnectorCallback of the Softbus Connector + * @tc.type: FUNC + */ + int32_t RegisterConnectorCallback(std::shared_ptr callback); + + /** + * @tc.name: SoftbusConnector::UnRegisterConnectorCallback + * @tc.desc: UnRegister ConnectorCallback of the Softbus Connector + * @tc.type: FUNC + */ + int32_t UnRegisterConnectorCallback(); + public: SoftbusConnector(); ~SoftbusConnector(); @@ -92,6 +114,9 @@ public: int32_t UnRegisterSoftbusStateCallback(); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) std::shared_ptr GetSoftbusSession(); + void SortAclListDesc(const std::vector &remoteAllAclList, std::vector &aclVerDesc, + std::map &remoteAllAclMap); + std::string MatchTargetVersion(const std::string &localVersion, const std::vector &remoteVerDesc); #endif bool HaveDeviceInMap(std::string deviceId); std::string GetDeviceUdidHashByUdid(const std::string &udid); @@ -104,31 +129,54 @@ public: void HandleDeviceOnline(std::string deviceId, int32_t authForm); void HandleDeviceOffline(std::string deviceId); void SetProcessInfo(ProcessInfo processInfo); + bool CheckIsNeedJoinLnn(const std::string &udid, const std::string &deviceId); bool CheckIsOnline(const std::string &targetDeviceId); + bool CheckIsOnline(const std::string &targetDeviceIdHash, bool isHash); void SetProcessInfoVec(std::vector processInfoVec); std::vector GetProcessInfo(); void ClearProcessInfo(); + void SetChangeProcessInfo(ProcessInfo processInfo); + std::vector GetChangeProcessInfo(); + void ClearChangeProcessInfo(); DmDeviceInfo GetDeviceInfoByDeviceId(const std::string &deviceId); void DeleteOffLineTimer(std::string &udidHash); + void SyncAclList(int32_t userId, std::string credId, int32_t sessionKeyId, int32_t aclId); + int32_t SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList); + int32_t GetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList); private: + static std::shared_ptr SetAddrAndJson(const ConnectionAddr *addr, + JsonObject &jsonPara, std::string &connectAddr); static void ConvertDeviceInfoToDmDevice(const DeviceInfo &deviceInfo, DmDeviceInfo &dmDeviceInfo); static void ConvertDeviceInfoToDmDevice(const DeviceInfo &deviceInfo, DmDeviceBasicInfo &dmDeviceBasicInfo); static ConnectionAddr *GetConnectAddrByType(DeviceInfo *deviceInfo, ConnectionAddrType type); static void ConvertNodeBasicInfoToDmDevice(const NodeBasicInfo &nodeBasicInfo, DmDeviceInfo &dmDeviceInfo); - + static std::shared_ptr GetDeviceInfoFromMap(const std::string &deviceId); +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + int32_t ParaseAclChecksumList(const std::string &jsonString, std::vector &remoteAllAclList); + int32_t SyncLocalAclList5_1_0(const std::string localUdid, const std::string remoteUdid, + DistributedDeviceProfile::AccessControlProfile &localAcl, std::vector &acLStrList); + int32_t GetLocalVersion(const std::string localUdid, const std::string remoteUdid, + std::string &localVersion, DistributedDeviceProfile::AccessControlProfile &localAcl); +#endif private: static std::string remoteUdidHash_; #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) std::shared_ptr softbusSession_; + std::shared_ptr hiChainAuthConnector_; #endif static std::map> discoveryDeviceInfoMap_; std::shared_ptr deviceStateManagerCallback_; static std::unordered_map deviceUdidMap_; static std::vector processInfoVec_; + static std::vector processChangeInfoVec_; static std::mutex discoveryDeviceInfoMutex_; static std::mutex deviceUdidLocks_; static std::mutex processInfoVecMutex_; + static std::mutex processChangeInfoVecMutex_; + static std::shared_ptr connectorCallback_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/include/dependency/softbus/softbus_connector_callback.h b/services/implementation/include/dependency/softbus/softbus_connector_callback.h new file mode 100644 index 0000000000000000000000000000000000000000..94adf82df45e03d98ad270fe22a56730327fcce0 --- /dev/null +++ b/services/implementation/include/dependency/softbus/softbus_connector_callback.h @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_SOFTBUS_CONNECTOR_CALLBACK_H +#define OHOS_DM_SOFTBUS_CONNECTOR_CALLBACK_H + +namespace OHOS { +namespace DistributedHardware { +class ISoftbusConnectorCallback { +public: + virtual void OnSoftbusJoinLNNResult(const int32_t sessionId, const char *networkId, int32_t result) = 0; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_SOFTBUS_CONNECTOR_CALLBACK_H diff --git a/services/implementation/include/dependency/softbus/softbus_session.h b/services/implementation/include/dependency/softbus/softbus_session.h index 289a9cd60e3ad756eff66cfc0b3039ea401a09ab..aaa548f361113f91bb2f8223f50c04a06673634d 100644 --- a/services/implementation/include/dependency/softbus/softbus_session.h +++ b/services/implementation/include/dependency/softbus/softbus_session.h @@ -33,7 +33,6 @@ class SoftbusSession { public: static int OnSessionOpened(int sessionId, int result); static void OnSessionClosed(int sessionId); - static void OnBytesReceived(int sessionId, const void *data, unsigned int dataLen); public: SoftbusSession(); @@ -60,13 +59,6 @@ public: */ int32_t OpenAuthSession(const std::string &deviceId); - /** - * @tc.name: SoftbusSession::OpenAuthSessionWithPara - * @tc.desc: Open HML AuthSession of the Softbus Session - * @tc.type: FUNC - */ - int32_t OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m); - /** * @tc.name: SoftbusSession::CloseAuthSession * @tc.desc: Close AuthSession of the Softbus Session @@ -91,7 +83,6 @@ public: private: static std::shared_ptr sessionCallback_; - ISocketListener iSocketListener_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/include/device_manager_service_impl.h b/services/implementation/include/device_manager_service_impl.h index f13848c3d8416a58d1b7b81b888afc885d7acbc5..7e22d16a890f33f2410849e04ada8542e191a20a 100644 --- a/services/implementation/include/device_manager_service_impl.h +++ b/services/implementation/include/device_manager_service_impl.h @@ -16,24 +16,60 @@ #ifndef OHOS_DM_SERVICE_IMPL_H #define OHOS_DM_SERVICE_IMPL_H +#include +#include +#include +#include #include #include #include "access_control_profile.h" +#include "auth_manager.h" #include "dm_ability_manager.h" #include "dm_auth_manager.h" +#include "dm_auth_manager_base.h" #include "dm_common_event_manager.h" #include "dm_credential_manager.h" #include "dm_device_info.h" #include "dm_device_state_manager.h" +#include "dm_single_instance.h" #include "dp_inited_callback.h" #include "idevice_manager_service_impl.h" -#include "dm_single_instance.h" -#include "softbus_connector.h" +#include "ipc_skeleton.h" #include "mine_hichain_connector.h" +#include "softbus_connector.h" +#include "deviceprofile_connector.h" namespace OHOS { namespace DistributedHardware { + +class Session { +public: + Session(int sessionId, std::string deviceId); + int sessionId_; + std::string deviceId_; + std::string version_{""}; + std::atomic flag_{false}; // Only one session is allowed + std::set logicalSessionSet_; // Logical Session Set + std::atomic logicalSessionCnt_{0}; +}; + +struct Config { + std::string pkgName; + std::string authCode; + int32_t authenticationType{0}; +}; + +typedef struct DmBindCallerInfo { + int32_t userId = -1; + int32_t tokenId = -1; + int32_t bindLevel = -1; + bool isSystemSA = false; + std::string bundleName = ""; + std::string hostPkgLabel = ""; + std::string processName = ""; +} DmBindCallerInfo; + class DeviceManagerServiceImpl : public IDeviceManagerServiceImpl { public: DeviceManagerServiceImpl(); @@ -110,11 +146,11 @@ public: int32_t DpAclAdd(const std::string &udid); int32_t IsSameAccount(const std::string &udid); - uint64_t GetTokenIdByNameAndDeviceId(std::string pkgName, std::string requestDeviceId); + uint64_t GetTokenIdByNameAndDeviceId(std::string extra, std::string requestDeviceId); void ScreenCommonEventCallback(std::string commonEventType); - int32_t CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + bool CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid); - int32_t CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + bool CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid); void HandleDeviceNotTrust(const std::string &udid); int32_t GetBindLevel(const std::string &pkgName, const std::string &localUdid, @@ -124,7 +160,13 @@ public: void HandleDeviceScreenStatusChange(DmDeviceInfo &devInfo); int32_t StopAuthenticateDevice(const std::string &pkgName); void HandleCredentialAuthStatus(const std::string &deviceList, uint16_t deviceTypeId, int32_t errcode); + int32_t SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList); + int32_t GetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList); int32_t ProcessAppUnintall(const std::string &appId, int32_t accessTokenId); + int32_t ProcessAppUninstall(int32_t userId, int32_t accessTokenId); + void ProcessUnBindApp(int32_t userId, int32_t accessTokenId, const std::string &extra, const std::string &udid); void HandleSyncUserIdEvent(const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, const std::string &remoteUdid, bool isCheckUserStatus); void HandleUserSwitched(const std::vector &deviceVec, int32_t currentUserId, @@ -135,14 +177,42 @@ public: const std::string &localUdid, int32_t localUserId, const std::string &localAccountId); int32_t RegisterAuthenticationType(int32_t authenticationType); void DeleteAlwaysAllowTimeOut(); - void CheckDeleteCredential(const std::string &remoteUdid); + void CheckDeleteCredential(const std::string &remoteUdid, int32_t remoteUserId); + void HandleCredentialDeleted(const char *credId, const char *credInfo, const std::string &localUdid, + std::string &remoteUdid); + void HandleShareUnbindBroadCast(const std::string &credId, const int32_t &userId, const std::string &localUdid); int32_t CheckDeviceInfoPermission(const std::string &localUdid, const std::string &peerDeviceId); + int32_t DeleteAcl(const std::string &sessionName, const std::string &localUdid, const std::string &remoteUdid, + int32_t bindLevel, const std::string &extra); + int32_t DeleteAclV2(const std::string &sessionName, const std::string &localUdid, const std::string &remoteUdid, + int32_t bindLevel, const std::string &extra); + void NotifyCleanEvent(uint64_t logicalSessionId); + void HandleServiceUnBindEvent(int32_t userId, const std::string &remoteUdid, + int32_t remoteTokenId); + int32_t DeleteGroup(const std::string &pkgName, const std::string &deviceId); + int32_t InitAndRegisterAuthMgr(bool isSrcSide, uint64_t tokenId, std::shared_ptr session, + uint64_t logicalSessionId, const std::string &pkgName); + void HandleCommonEventBroadCast(const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds, const std::string &remoteUdid); + std::vector GetDeviceIdByUserIdAndTokenId(int32_t userId, int32_t tokenId); + bool CheckSrcAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); + bool CheckSinkAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); + bool CheckSrcIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); + bool CheckSinkIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); private: int32_t PraseNotifyEventJson(const std::string &event, JsonObject &jsonObject); std::string GetUdidHashByNetworkId(const std::string &networkId); + void SetOnlineProcessInfo(const uint32_t &bindType, ProcessInfo &processInfo, DmDeviceInfo &devInfo, + const std::string &requestDeviceId, const std::string &trustDeviceId, DmDeviceState devState); + void HandleDeletedAclOffline(const std::string &trustDeviceId, + const std::string &requestDeviceId, DmDeviceInfo &devInfo, ProcessInfo &processInfo, DmDeviceState &devState); void HandleOffline(DmDeviceState devState, DmDeviceInfo &devInfo); void HandleOnline(DmDeviceState devState, DmDeviceInfo &devInfo); - void PutIdenticalAccountToAcl(std::string requestDeviceId, std::string trustDeviceId); + bool CheckSharePeerSrc(const std::string &peerUdid, const std::string &localUdid); std::map GetDeviceIdAndBindLevel(int32_t userId); std::multimap GetDeviceIdAndUserId(int32_t userId, const std::string &accountId); void HandleAccountLogoutEvent(int32_t remoteUserId, const std::string &remoteAccountHash, @@ -151,23 +221,111 @@ private: void HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId); void HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, int32_t peerTokenId); - void HandleUserRemoved(int32_t preUserId); + void HandleUserRemoved(std::vector peerUdids, int32_t preUserId); void HandleRemoteUserRemoved(int32_t preUserId, const std::string &remoteUdid); DmAuthForm ConvertBindTypeToAuthForm(int32_t bindType); - + std::shared_ptr GetAuthMgr(); + std::shared_ptr GetAuthMgrByTokenId(uint64_t tokenId); + std::shared_ptr GetCurrentAuthMgr(); + void CreateGlobalClassicalAuthMgr(); + std::shared_ptr GetCurSession(int sessionId); + std::shared_ptr GetOrCreateSession(const std::string& deviceId, + const std::map &bindParam); + int32_t ParseConnectAddr(const PeerTargetId &targetId, std::string &deviceId, + const std::map &bindParam); + std::shared_ptr GetConfigByTokenId(); + int OpenAuthSession(const std::string& deviceId, const std::map &bindParam); + int32_t ChangeUltrasonicTypeToPin(std::map &bindParam); + int32_t TransferByAuthType(int32_t authType, + std::shared_ptr curSession, std::shared_ptr authMgr, + std::map &bindParam, uint64_t logicalSessionId); + + std::shared_ptr GetAuthMgrByMessage(int32_t msgType, uint64_t logicalSessionId, + const JsonObject &jsonObject, std::shared_ptr curSession); + int32_t TransferOldAuthMgr(int32_t msgType, const JsonObject &jsonObject, + std::shared_ptr curSession); + int32_t TransferSrcOldAuthMgr(std::shared_ptr curSession); + int32_t TransferSinkOldAuthMgr(const JsonObject &jsonObject, std::shared_ptr curSession); + int32_t GetDeviceInfo(const PeerTargetId &targetId, std::string &addrType, std::string &deviceId, + std::shared_ptr deviceInfo, int32_t &index); + bool IsAuthNewVersion(int32_t bindLevel, std::string localUdid, std::string remoteUdid, + int32_t tokenId, int32_t userId); + void ImportConfig(std::shared_ptr authMgr, uint64_t tokenId, const std::string &pkgName); + void ImportAuthCodeToConfig(std::shared_ptr authMgr, uint64_t tokenId); + + void CleanAuthMgrByLogicalSessionId(uint64_t logicalSessionId); + void CleanSessionMap(int sessionId, std::shared_ptr session); + void CleanSessionMapByLogicalSessionId(uint64_t logicalSessionId); + int32_t DeleteAclForProcV2(const std::string &localUdid, uint32_t localTokenId, const std::string &remoteUdid, + int32_t bindLevel, const std::string &extra, int32_t userId); + int32_t DeleteSkCredAndAcl(const std::vector &acls); + void DeleteAclByTokenId(const int32_t accessTokenId, + std::vector &profiles, + std::map &delProfileMap, + std::vector> &delACLInfoVec, std::vector &userIdVec); + + void GetDelACLInfoVec(const int32_t &accessTokenId, + std::vector &profiles, + std::vector> &delACLInfoVec, std::vector &userIdVec, + const uint32_t &userId); + + void DeleteAclByDelProfileMap( + const std::map &delProfileMap, + std::vector &profiles, const std::string &localUdid); + + bool CheckLnnAcl(DistributedDeviceProfile::AccessControlProfile delProfile, + DistributedDeviceProfile::AccessControlProfile lastprofile); + void CheckIsLastLnnAcl(DistributedDeviceProfile::AccessControlProfile profile, + DistributedDeviceProfile::AccessControlProfile delProfile, DmOfflineParam &lnnAclParam, + bool &isLastLnnAcl, const std::string &localUdid); + void BindTargetImpl(uint64_t tokenId, const std::string &pkgName, const PeerTargetId &targetId, + const std::map &bindParam); + void GetBindCallerInfo(DmBindCallerInfo &bindCallerInfo, const std::string &pkgName); + void SetBindCallerInfoToBindParam(const std::map &bindParam, + std::map &bindParamTmp, const DmBindCallerInfo &bindCallerInfo); + std::string GetBundleLable(const std::string &bundleName); + int32_t GetLogicalIdAndTokenIdBySessionId(uint64_t &logicalSessionId, uint64_t &tokenId, int32_t sessionId); + void SaveTokenIdAndSessionId(uint64_t &tokenId, int32_t &sessionId, uint64_t &logicalSessionId); + void ReleaseMaps(); + int32_t InitNewProtocolAuthMgr(bool isSrcSide, uint64_t tokenId, uint64_t logicalSessionId, + const std::string &pkgName); + int32_t InitOldProtocolAuthMgr(uint64_t tokenId, const std::string &pkgName); + bool ParseConnectAddrAndSetProcessInfo(const PeerTargetId &targetId, + PeerTargetId &targetIdTmp, const std::map &bindParam, ProcessInfo &processInfo, + const std::string &pkgName); + void OnAuthResultAndOnBindResult(const ProcessInfo &processInfo, const PeerTargetId &targetId, + const std::string &deviceId, int32_t reason); private: - std::shared_ptr authMgr_; + std::shared_ptr authMgr_; // Old protocol only + + std::shared_ptr hiChainConnector_; + std::shared_ptr hiChainAuthConnector_; std::shared_ptr deviceStateMgr_; std::shared_ptr softbusConnector_; std::shared_ptr abilityMgr_; - std::shared_ptr hiChainConnector_; std::shared_ptr mineHiChainConnector_; std::shared_ptr credentialMgr_; std::shared_ptr commonEventManager_; - std::shared_ptr hiChainAuthConnector_; std::shared_ptr listener_; std::atomic isCredentialType_ = false; sptr dpInitedCallback_ = nullptr; + + // The session ID corresponding to the device ID, used only on the src side + std::map deviceId2SessionIdMap_; + std::map> sessionsMap_; // sessionId corresponds to the session object + std::map deviceIdMutexMap_; // Lock corresponding to the device ID + std::mutex mapMutex_; // sessionsMap_ lock + std::map sessionEnableCvMap_; // Condition variable corresponding to the session + std::map sessionEnableMutexMap_; // Lock corresponding to the session + std::map sessionEnableCvReadyMap_; // Condition variable ready flag + std::mutex logicalSessionId2TokenIdMapMtx_; + std::map logicalSessionId2TokenIdMap_; // The relationship between logicalSessionId and tokenId + std::mutex logicalSessionId2SessionIdMapMtx_; + std::map logicalSessionId2SessionIdMap_; // The relationship logicalSessionId and physical sessionId + std::mutex configsMapMutex_; + std::map> configsMap_; // Import when authMgr is not initialized + std::mutex authMgrMapMtx_; + std::map> authMgrMap_; // New protocol sharing }; using CreateDMServiceFuncPtr = IDeviceManagerServiceImpl *(*)(void); diff --git a/services/implementation/include/device_manager_service_impl_lite.h b/services/implementation/include/device_manager_service_impl_lite.h index 2ad955b5e12559697f7d0c601da8d7867336a4eb..f52494632384d2f4ebaf68ac34cacd59e78507b4 100644 --- a/services/implementation/include/device_manager_service_impl_lite.h +++ b/services/implementation/include/device_manager_service_impl_lite.h @@ -56,7 +56,7 @@ public: int32_t UnBindDevice(const std::string &pkgName, const std::string &udid, int32_t bindLevel, const std::string &extra); - + int32_t SetUserOperation(std::string &pkgName, int32_t action, const std::string ¶ms); void HandleDeviceStatusChange(DmDeviceState devState, DmDeviceInfo &devInfo); @@ -122,11 +122,11 @@ public: int32_t DpAclAdd(const std::string &udid); int32_t IsSameAccount(const std::string &udid); - uint64_t GetTokenIdByNameAndDeviceId(std::string pkgName, std::string requestDeviceId); + uint64_t GetTokenIdByNameAndDeviceId(std::string extra, std::string requestDeviceId); void ScreenCommonEventCallback(std::string commonEventType); - int32_t CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + bool CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid); - int32_t CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + bool CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid); void HandleDeviceNotTrust(const std::string &udid); int32_t GetBindLevel(const std::string &pkgName, const std::string &localUdid, @@ -140,13 +140,19 @@ public: int32_t tokenId, int32_t peerTokenId); void HandleIdentAccountLogout(const std::string &localUdid, int32_t localUserId, const std::string &peerUdid, int32_t peerUserId); - void HandleUserRemoved(int32_t preUserId); + void HandleUserRemoved(std::vector peerUdids, int32_t preUserId); void HandleDeviceScreenStatusChange(DmDeviceInfo &devInfo); void HandleUserSwitched(const std::vector &deviceVec, int32_t currentUserId, int32_t beforeUserId); int32_t StopAuthenticateDevice(const std::string &pkgName); void HandleCredentialAuthStatus(const std::string &deviceList, uint16_t deviceTypeId, int32_t errcode); + int32_t SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList); + int32_t GetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList); int32_t ProcessAppUnintall(const std::string &appId, int32_t accessTokenId); + int32_t ProcessAppUninstall(int32_t userId, int32_t accessTokenId); + void ProcessUnBindApp(int32_t userId, int32_t accessTokenId, const std::string &extra, const std::string &udid); void HandleSyncUserIdEvent(const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, const std::string &remoteUdid, bool isCheckUserStatus); void HandleRemoteUserRemoved(int32_t preUserId, const std::string &remoteUdid); @@ -157,8 +163,24 @@ public: int32_t localUserId, const std::string &localAccountId); int32_t RegisterAuthenticationType(int32_t authenticationType); void DeleteAlwaysAllowTimeOut(); - void CheckDeleteCredential(const std::string &remoteUdid); + void CheckDeleteCredential(const std::string &remoteUdid, int32_t remoteUserId); + void HandleCredentialDeleted(const char *credId, const char *credInfo, const std::string &localUdid, + std::string &remoteUdid); + void HandleShareUnbindBroadCast(const std::string &credId, const int32_t &userId, const std::string &localUdid); int32_t CheckDeviceInfoPermission(const std::string &localUdid, const std::string &peerDeviceId); + void HandleServiceUnBindEvent(int32_t userId, const std::string &remoteUdid, + int32_t remoteTokenId); + void HandleCommonEventBroadCast(const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds, const std::string &remoteUdid); + std::vector GetDeviceIdByUserIdAndTokenId(int32_t userId, int32_t tokenId); + bool CheckSrcAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); + bool CheckSinkAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); + bool CheckSrcIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); + bool CheckSinkIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid); private: std::string GetUdidHashByNetworkId(const std::string &networkId); diff --git a/services/implementation/include/devicestate/dm_device_state_manager.h b/services/implementation/include/devicestate/dm_device_state_manager.h index 8e6806ef456bfab8f58703b0e0723e344f332ba5..254024269257ea21b1c065e2c882b477d56fed33 100644 --- a/services/implementation/include/devicestate/dm_device_state_manager.h +++ b/services/implementation/include/devicestate/dm_device_state_manager.h @@ -34,6 +34,9 @@ #include "hichain_connector.h" #include "hichain_auth_connector.h" #include "multiple_user_connector.h" +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) +#include "deviceprofile_connector.h" +#endif namespace OHOS { namespace DistributedHardware { @@ -96,6 +99,9 @@ public: bool CheckIsOnline(const std::string &udid); void DeleteOffLineTimer(std::string udidHash); void HandleDeviceScreenStatusChange(DmDeviceInfo &devInfo); +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + int32_t DeleteSkCredAndAcl(const std::vector &acls); +#endif private: void StartEventThread(); void StopEventThread(); @@ -105,9 +111,9 @@ private: DmAuthForm GetAuthForm(const std::string &networkId); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) int32_t DeleteGroupByDP(const std::string &deviceId); + void DeleteCredential(DmOfflineParam offlineParam, const std::string &deviceId); #endif void ProcessDeviceStateChange(const DmDeviceState devState, const DmDeviceInfo &devInfo); - private: std::mutex timerMapMutex_; std::mutex remoteDeviceInfosMutex_; diff --git a/services/implementation/include/i18n/dm_language_manager.h b/services/implementation/include/i18n/dm_language_manager.h index 9cbc36243c5eee8c7765ffd500ca583b7bd529e1..c100506746dc5feefc3d4ed94a7bb73d16abfa9f 100644 --- a/services/implementation/include/i18n/dm_language_manager.h +++ b/services/implementation/include/i18n/dm_language_manager.h @@ -31,9 +31,12 @@ public: DmLanguageManager() {} ~DmLanguageManager() {} std::string GetSystemParam(const std::string &key); + std::string GetSystemLanguage(); void GetLocaleByLanguage(const std::string &language, std::set &localeSet); std::string GetTextBySystemLocale(const cJSON *const textObj, const std::set &localeSet); std::string GetTextBySystemLanguage(const std::string &text); + std::string GetTextBySystemLanguage(const std::string &text, const std::string &language); + std::string GetTextByLanguage(const std::string &text, const std::string &language); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/src/attest/dm_auth_attest_common.cpp b/services/implementation/src/attest/dm_auth_attest_common.cpp new file mode 100644 index 0000000000000000000000000000000000000000..deec44d104da7dbf1b33900e0ca72c217b676770 --- /dev/null +++ b/services/implementation/src/attest/dm_auth_attest_common.cpp @@ -0,0 +1,177 @@ +/* +* Copyright (c) 2025 Huawei Device Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#include "dm_auth_attest_common.h" + +#include "dm_error_type.h" +#include "dm_log.h" + +namespace OHOS { +namespace DistributedHardware { + +const int32_t MAX_CERT_COUNT = 100; +constexpr int32_t HEX_TO_UINT8 = 2; +const int32_t MAX_LEN_PER_CERT = 8192; + +AuthAttestCommon::AuthAttestCommon() +{ + LOGD("AuthAttestCommon constructor"); +} + +AuthAttestCommon::~AuthAttestCommon() +{ + LOGD("AuthAttestCommon destructor"); +} + +std::string AuthAttestCommon::SerializeDmCertChain(const DmCertChain *chain) +{ + if (chain == nullptr || chain->cert == nullptr || chain->certCount == 0 || chain->certCount > MAX_CERT_COUNT) { + LOGE("input param is invalid."); + return "{}"; + } + JsonObject jsonObject; + jsonObject[TAG_CERT_COUNT] = chain->certCount; + JsonObject jsonArrayObj(JsonCreateType::JSON_CREATE_TYPE_ARRAY); + for (uint32_t i = 0; i < chain->certCount; ++i) { + const DmBlob &blob = chain->cert[i]; + if (blob.data == nullptr || blob.size == 0 || blob.size > MAX_LEN_PER_CERT) { + LOGE("Invalid blob: null data or invalid size."); + return "{}"; + } + const uint32_t hexLen = blob.size * HEX_TO_UINT8 + 1; // 2*blob.size + 1 + char *hexBuffer = new char[hexLen]{0}; + if (hexBuffer == nullptr) { + LOGE("hexBuffer malloc failed."); + return "{}"; + } + int32_t ret = Crypto::ConvertBytesToHexString(hexBuffer, hexLen, blob.data, blob.size); + if (ret != DM_OK) { + LOGE("ConvertBytesToHexString failed."); + delete[] hexBuffer; + return "{}"; + } + jsonArrayObj.PushBack(std::string(hexBuffer)); + delete[] hexBuffer; + } + jsonObject.Insert(TAG_CERT, jsonArrayObj); + return jsonObject.Dump(); +} + +bool ValidateInputJson(const std::string &data) +{ + JsonObject jsonObject; + jsonObject.Parse(data); + if (!IsUint32(jsonObject, TAG_CERT_COUNT) || !jsonObject.Contains(TAG_CERT)) { + LOGE("Missing required fields 'certCount' or 'cert'"); + return false; + } + const uint32_t certCount = jsonObject[TAG_CERT_COUNT].Get(); + if (certCount == 0 || certCount > MAX_CERT_COUNT) { + LOGE("Invalid certCount value %{public}u", certCount); + return false; + } + return true; +} + + bool ProcessCertItem(const JsonItemObject &item, DmBlob &cert, uint32_t processedIndex) + { + std::string hexStr = item.Get(); + const size_t hexLen = hexStr.length(); + if (hexLen == 0 || hexLen % HEX_TO_UINT8 != 0) { + LOGE("Invalid HEX length %{public}zu at index %{public}u", hexLen, processedIndex); + return false; + } + const uint32_t binSize = hexLen / HEX_TO_UINT8; + cert.data = new uint8_t[binSize]{0}; + if (cert.data == nullptr) { + LOGE("Data allocation failed at index %{public}u", processedIndex); + return false; + } + int32_t ret = Crypto::ConvertHexStringToBytes(cert.data, binSize, hexStr.c_str(), hexLen); + if (ret != DM_OK) { + LOGE("HEX conversion failed at index %{public}u, ret = %{public}d", + processedIndex, ret); + delete[] cert.data; + cert.data = nullptr; + return false; + } + cert.size = binSize; + return true; +} + +bool AuthAttestCommon::DeserializeDmCertChain(const std::string &data, DmCertChain *outChain) +{ + if (outChain == nullptr || data.empty() || !ValidateInputJson(data)) { + LOGE("Invalid input"); + return false; + } + JsonObject jsonObject; + jsonObject.Parse(data); + const uint32_t certCount = jsonObject[TAG_CERT_COUNT].Get(); + JsonObject jsonArrayObj(JsonCreateType::JSON_CREATE_TYPE_ARRAY); + jsonArrayObj.Parse(jsonObject[TAG_CERT].Dump()); + DmBlob *certs = new DmBlob[certCount]; + if (certs == nullptr) { + LOGE("Memory allocation failed for certs array"); + return false; + } + if (memset_s(certs, sizeof(DmBlob) * certCount, 0, sizeof(DmBlob) * certCount) != DM_OK) { + LOGE("memset_s failed."); + delete[] certs; + certs = nullptr; + return false; + } + bool success = true; + uint32_t processedIndex = 0; + for (const auto &item : jsonArrayObj.Items()) { + if (!ProcessCertItem(item, certs[processedIndex], processedIndex)) { + success = false; + break; + } + processedIndex++; + } + if (!success) { + for (uint32_t i = 0; i < processedIndex; ++i) { + delete[] certs[i].data; + } + delete[] certs; + return false; + } + if (outChain->cert != nullptr) { + for (uint32_t i = 0; i < outChain->certCount; ++i) { + delete[] outChain->cert[i].data; + } + delete[] outChain->cert; + } + outChain->cert = certs; + outChain->certCount = certCount; + return true; +} + +void AuthAttestCommon::FreeDmCertChain(DmCertChain &chain) +{ + if (chain.cert != nullptr) { + for (uint32_t i = 0; i < chain.certCount; ++i) { + delete[] chain.cert[i].data; + chain.cert[i].data = nullptr; + chain.cert[i].size = 0; + } + delete[] chain.cert; + chain.cert = nullptr; + chain.certCount = 0; + } +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/attest/dm_auth_cert.cpp b/services/implementation/src/attest/dm_auth_cert.cpp new file mode 100644 index 0000000000000000000000000000000000000000..1587ae6bc362b6fd00d7d5ca6086155d3ce301b1 --- /dev/null +++ b/services/implementation/src/attest/dm_auth_cert.cpp @@ -0,0 +1,90 @@ +/* +* Copyright (c) 2025 Huawei Device Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#include "dm_auth_cert.h" + +#include "dm_error_type.h" +#include "dm_log.h" + +namespace OHOS { +namespace DistributedHardware { + +constexpr const char* LIB_DM_AUTH_CERT = "libdm_auth_cert.z.so"; + +AuthCert::AuthCert() +{ + LOGD("AuthCert AuthCert"); +} + +AuthCert::~AuthCert() +{ + LOGD("AuthCert destructor"); +} + +bool AuthCert::IsDMAdapterAuthCertLoaded() +{ + LOGI("Start."); + std::lock_guard lock(isAdapterAuthCertLoadedLock_); + if (isAdapterAuthCertSoLoaded_ && (dmAuthCertExt_ != nullptr)) { + return true; + } + authCertSoHandle_ = dlopen(LIB_DM_AUTH_CERT, RTLD_NOW | RTLD_NODELETE | RTLD_NOLOAD); + char *error = dlerror(); + if (error != nullptr) { + LOGE("dlopen failed, err: %{public}s", error); + } + if (authCertSoHandle_ == nullptr) { + authCertSoHandle_ = dlopen(LIB_DM_AUTH_CERT, RTLD_NOW | RTLD_NODELETE); + error = dlerror(); + if (error != nullptr) { + LOGE("dlopen failed again! err: %{public}s", error); + } + } + if (authCertSoHandle_ == nullptr) { + LOGE("load dm check api white list so failed."); + return false; + } + auto func = (CreateDMAuthCertFuncPtr)dlsym(authCertSoHandle_, "CreateDMAuthCertExtObject"); + if (func == nullptr || dlerror() != nullptr) { + dlclose(authCertSoHandle_); + authCertSoHandle_ = nullptr; + LOGE("Create object function is not exist. err: %{public}s", (dlerror() == nullptr ? "null" : dlerror())); + return false; + } + dmAuthCertExt_ = std::shared_ptr(func()); + isAdapterAuthCertSoLoaded_ = true; + LOGI("Success."); + return true; +} + +int32_t AuthCert::GenerateCertificate(DmCertChain &dmCertChain) +{ + if (!IsDMAdapterAuthCertLoaded()) { + LOGE("authCertSo load failed!"); + return ERR_DM_FAILED; + } + return dmAuthCertExt_->GenerateCertificate(dmCertChain); +} + +int32_t AuthCert::VerifyCertificate(const DmCertChain &dmCertChain, const char *deviceIdHash) +{ + if (!IsDMAdapterAuthCertLoaded()) { + LOGE("authCertSo load failed!"); + return ERR_DM_FAILED; + } + return dmAuthCertExt_->VerifyCertificate(dmCertChain, deviceIdHash); +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication/auth_message_processor.cpp b/services/implementation/src/authentication/auth_message_processor.cpp index 273db6dfb1bc88f6a79a0fd66d53d12f24e1510e..ad84958532d108b8ea551d09af792eff8c09580f 100644 --- a/services/implementation/src/authentication/auth_message_processor.cpp +++ b/services/implementation/src/authentication/auth_message_processor.cpp @@ -22,7 +22,6 @@ namespace OHOS { namespace DistributedHardware { -const char* TAG_REPLY = "REPLY"; const char* TAG_NET_ID = "NETID"; const char* TAG_TARGET = "TARGET"; const char* TAG_APP_OPERATION = "APPOPERATION"; @@ -32,7 +31,6 @@ const char* TAG_GROUPIDS = "GROUPIDLIST"; const char* TAG_CUSTOM_DESCRIPTION = "CUSTOMDESC"; const char* TAG_DEVICE_TYPE = "DEVICETYPE"; const char* TAG_REQUESTER = "REQUESTER"; -const char* TAG_LOCAL_DEVICE_ID = "LOCALDEVICEID"; const char* TAG_LOCAL_DEVICE_TYPE = "LOCALDEVICETYPE"; const char* TAG_INDEX = "INDEX"; const char* TAG_SLICE_NUM = "SLICE"; @@ -41,44 +39,24 @@ const char* TAG_IS_SHOW_DIALOG = "IS_SHOW_DIALOG"; const char* TAG_TOKEN = "TOKEN"; const char* TAG_CRYPTO_NAME = "CRYPTONAME"; const char* TAG_CRYPTO_VERSION = "CRYPTOVERSION"; -const char* TAG_IDENTICAL_ACCOUNT = "IDENTICALACCOUNT"; -const char* TAG_ACCOUNT_GROUPID = "ACCOUNTGROUPID"; -const char* APP_THUMBNAIL = "appThumbnail"; const char* QR_CODE_KEY = "qrCode"; const char* TAG_AUTH_TOKEN = "authToken"; const char* NFC_CODE_KEY = "nfcCode"; const char* OLD_VERSION_ACCOUNT = "oldVersionAccount"; -const char* TAG_AUTH_FINISH = "isFinish"; -const char* TAG_HAVE_CREDENTIAL = "haveCredential"; const char* TAG_PUBLICKEY = "publicKey"; const char* TAG_SESSIONKEY = "sessionKey"; -const char* TAG_BIND_LEVEL = "bindLevel"; -const char* TAG_LOCAL_USERID = "localUserId"; const char* TAG_BIND_TYPE_SIZE = "bindTypeSize"; -const char* TAG_ISONLINE = "isOnline"; -const char* TAG_AUTHED = "authed"; -const char* TAG_LOCAL_ACCOUNTID = "localAccountId"; -const char* TAG_DMVERSION = "dmVersion"; const char* TAG_HOST_PKGNAME = "hostPkgname"; -const char* TAG_TOKENID = "tokenId"; const char* TAG_HAVECREDENTIAL = "haveCredential"; const char* TAG_CONFIRM_OPERATION = "confirmOperation"; -const char* TAG_DATA = "data"; -const char* TAG_DATA_LEN = "dataLen"; const char* TAG_IMPORT_AUTH_CODE = "IMPORT_AUTH_CODE"; -const char* TAG_HOST_PKGLABEL = "hostPkgLabel"; -const char* TAG_EDITION = "edition"; -const char* TAG_BUNDLE_NAME = "bundleName"; const char* TAG_CRYPTIC_MSG = "encryptMsg"; -const char* TAG_PEER_BUNDLE_NAME = "PEER_BUNDLE_NAME"; -const char* TAG_REMOTE_DEVICE_NAME = "REMOTE_DEVICE_NAME"; const char* TAG_SESSIONKEY_ID = "sessionKeyId"; const int32_t MSG_MAX_SIZE = 45 * 1024; const int32_t GROUP_VISIBILITY_IS_PRIVATE = 0; const int32_t MAX_BINDTYPE_SIZE = 1000; -constexpr const char* TAG_HOST = "HOST"; constexpr const char* TAG_VISIBILITY = "VISIBILITY"; constexpr const char* TAG_APP_THUMBNAIL = "APPTHUM"; constexpr const char* TAG_THUMBNAIL_SIZE = "THUMSIZE"; @@ -146,7 +124,7 @@ bool AuthMessageProcessor::IsPincodeImported() std::vector AuthMessageProcessor::CreateAuthRequestMessage() { - LOGI("AuthMessageProcessor::CreateAuthRequestMessage start."); + LOGI("start."); std::vector jsonStrVec; if (authRequestContext_ == nullptr) { LOGE("AuthMessageProcessor::CreateAuthRequestMessage authRequestContext_ is nullptr."); @@ -169,8 +147,6 @@ std::vector AuthMessageProcessor::CreateAuthRequestMessage() jsonThumbnailObj[TAG_THUMBNAIL_SIZE] = thumbnailSize; int32_t leftLen = thumbnailSize - idx * MSG_MAX_SIZE; int32_t sliceLen = (leftLen > MSG_MAX_SIZE) ? MSG_MAX_SIZE : leftLen; - LOGI("TAG_APP_THUMBNAIL encode, idx %{public}d, sliceLen %{public}d, thumbnailSize %{public}d", idx, - (uint32_t)sliceLen, thumbnailSize); jsonObj[TAG_APP_THUMBNAIL] = authRequestContext_->appThumbnail.substr(idx * MSG_MAX_SIZE, sliceLen); jsonStrVec.push_back(SafetyDump(jsonThumbnailObj)); } @@ -179,7 +155,7 @@ std::vector AuthMessageProcessor::CreateAuthRequestMessage() std::string AuthMessageProcessor::CreateSimpleMessage(int32_t msgType) { - LOGI("AuthMessageProcessor::CreateSimpleMessage start. msgType is %{public}d", msgType); + LOGI("start. msgType is %{public}d", msgType); JsonObject jsonObj; jsonObj[TAG_VER] = DM_ITF_VER; jsonObj[TAG_MSG_TYPE] = msgType; @@ -334,7 +310,7 @@ void AuthMessageProcessor::CreateResponseAuthMessage(JsonObject &json) json[TAG_TOKEN] = authResponseContext_->token; if (authResponseContext_->reply == 0) { std::string groupId = authResponseContext_->groupId; - LOGI("AuthMessageProcessor::CreateResponseAuthMessage groupId %{public}s", GetAnonyString(groupId).c_str()); + LOGI("groupId %{public}s", GetAnonyString(groupId).c_str()); JsonObject jsonObject(groupId); if (jsonObject.IsDiscarded()) { LOGE("DecodeRequestAuth jsonStr error"); @@ -374,7 +350,7 @@ int32_t AuthMessageProcessor::ParseMessage(const std::string &message) } int32_t msgType = jsonObject[TAG_MSG_TYPE].Get(); authResponseContext_->msgType = msgType; - LOGI("AuthMessageProcessor::ParseMessage message type %{public}d", authResponseContext_->msgType); + LOGI("message type %{public}d", authResponseContext_->msgType); switch (msgType) { case MSG_TYPE_NEGOTIATE: ParseNegotiateMessage(jsonObject); @@ -438,7 +414,6 @@ void AuthMessageProcessor::ParsePublicKeyMessageExt(JsonObject &json) } if (IsInt32(jsonObject, TAG_SESSIONKEY_ID)) { authResponseContext_->remoteSessionKeyId = jsonObject[TAG_SESSIONKEY_ID].Get(); - LOGI("get remoteSessionKeyId"); } return; } @@ -446,7 +421,7 @@ void AuthMessageProcessor::ParsePublicKeyMessageExt(JsonObject &json) void AuthMessageProcessor::ParseAuthResponseMessageExt(JsonObject &json) { - LOGI("start ParseAuthResponseMessageExt"); + LOGI("start"); if (IsInt32(json, TAG_REPLY)) { authResponseContext_->reply = json[TAG_REPLY].Get(); } @@ -508,7 +483,7 @@ void AuthMessageProcessor::GetAuthReqMessage(JsonObject &json) int32_t AuthMessageProcessor::ParseAuthRequestMessage(JsonObject &json) { - LOGI("start ParseAuthRequestMessage"); + LOGI("start"); int32_t sliceNum = 0; int32_t idx = 0; if (!IsInt32(json, TAG_INDEX) || !IsInt32(json, TAG_SLICE_NUM)) { @@ -550,7 +525,7 @@ int32_t AuthMessageProcessor::ParseAuthRequestMessage(JsonObject &json) void AuthMessageProcessor::ParseAuthResponseMessage(JsonObject &json) { - LOGI("start ParseAuthResponseMessage"); + LOGI("start"); if (!IsInt32(json, TAG_REPLY)) { LOGE("AuthMessageProcessor::ParseAuthResponseMessage err json string, first time."); return; @@ -733,7 +708,7 @@ std::shared_ptr AuthMessageProcessor::GetRequestContext() std::string AuthMessageProcessor::CreateDeviceAuthMessage(int32_t msgType, const uint8_t *data, uint32_t dataLen) { - LOGI("CreateDeviceAuthMessage start, msgType %{public}d.", msgType); + LOGI("start, msgType %{public}d.", msgType); JsonObject jsonObj; jsonObj[TAG_MSG_TYPE] = msgType; std::string authDataStr = std::string(reinterpret_cast(data), dataLen); diff --git a/services/implementation/src/authentication/dm_auth_manager.cpp b/services/implementation/src/authentication/dm_auth_manager.cpp index 3d8c42dbb3f99290a63a61b16129c8385164bfe7..9eaf1fa7f909711fd4c46e55ca68721baeda3c6a 100644 --- a/services/implementation/src/authentication/dm_auth_manager.cpp +++ b/services/implementation/src/authentication/dm_auth_manager.cpp @@ -20,13 +20,10 @@ #include #include -#include "bundle_mgr_interface.h" -#include "bundle_mgr_proxy.h" #include "iservice_registry.h" #if defined(SUPPORT_SCREENLOCK) #include "screenlock_manager.h" #endif -#include "system_ability_definition.h" #include "app_manager.h" #include "auth_message_processor.h" @@ -45,28 +42,12 @@ #include "json_object.h" #include "openssl/sha.h" #include "parameter.h" -#include "show_confirm.h" #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) #include "multiple_user_connector.h" #endif namespace OHOS { namespace DistributedHardware { -const int32_t AUTHENTICATE_TIMEOUT = 120; -const int32_t CONFIRM_TIMEOUT = 60; -const int32_t NEGOTIATE_TIMEOUT = 10; -const int32_t INPUT_TIMEOUT = 60; -const int32_t ADD_TIMEOUT = 10; -const int32_t WAIT_NEGOTIATE_TIMEOUT = 10; -const int32_t WAIT_REQUEST_TIMEOUT = 10; -const int32_t CLONE_AUTHENTICATE_TIMEOUT = 20; -const int32_t CLONE_CONFIRM_TIMEOUT = 10; -const int32_t CLONE_NEGOTIATE_TIMEOUT = 10; -const int32_t CLONE_ADD_TIMEOUT = 10; -const int32_t CLONE_WAIT_NEGOTIATE_TIMEOUT = 10; -const int32_t CLONE_WAIT_REQUEST_TIMEOUT = 10; -const int32_t CLONE_SESSION_HEARTBEAT_TIMEOUT = 20; -const int32_t HML_SESSION_TIMEOUT = 10; const int32_t CANCEL_PIN_CODE_DISPLAY = 1; const int32_t DEVICE_ID_HALF = 2; const int32_t MAX_AUTH_TIMES = 3; @@ -74,30 +55,16 @@ const int32_t MIN_PIN_TOKEN = 10000000; const int32_t MAX_PIN_TOKEN = 90000000; const int32_t MIN_PIN_CODE = 100000; const int32_t MAX_PIN_CODE = 999999; -const int32_t DM_AUTH_TYPE_MAX = 5; +const int32_t DM_AUTH_TYPE_MAX = 6; const int32_t DM_AUTH_TYPE_MIN = 0; const int32_t AUTH_SESSION_SIDE_SERVER = 0; const int32_t USLEEP_TIME_US_500000 = 500000; // 500ms const int32_t AUTH_DEVICE_TIMEOUT = 10; -const int32_t SESSION_HEARTBEAT_TIMEOUT = 50; const int32_t ALREADY_BIND = 1; const int32_t STRTOLL_BASE_10 = 10; const int32_t MAX_PUT_SESSIONKEY_TIMEOUT = 100; //ms - -constexpr const char* AUTHENTICATE_TIMEOUT_TASK = "deviceManagerTimer:authenticate"; -constexpr const char* NEGOTIATE_TIMEOUT_TASK = "deviceManagerTimer:negotiate"; -constexpr const char* CONFIRM_TIMEOUT_TASK = "deviceManagerTimer:confirm"; -constexpr const char* INPUT_TIMEOUT_TASK = "deviceManagerTimer:input"; -constexpr const char* ADD_TIMEOUT_TASK = "deviceManagerTimer:add"; -constexpr const char* WAIT_NEGOTIATE_TIMEOUT_TASK = "deviceManagerTimer:waitNegotiate"; -constexpr const char* WAIT_REQUEST_TIMEOUT_TASK = "deviceManagerTimer:waitRequest"; -constexpr const char* AUTH_DEVICE_TIMEOUT_TASK = "deviceManagerTimer:authDevice_"; -constexpr const char* SESSION_HEARTBEAT_TIMEOUT_TASK = "deviceManagerTimer:sessionHeartbeat"; - -constexpr int32_t PROCESS_NAME_WHITE_LIST_NUM = 1; -constexpr const static char* PROCESS_NAME_WHITE_LIST[PROCESS_NAME_WHITE_LIST_NUM] = { - "com.example.myapplication", -}; +const int32_t SESSION_CLOSE_TIMEOUT = 2; +const char* IS_NEED_JOIN_LNN = "IsNeedJoinLnn"; // clone task timeout map const std::map TASK_TIME_OUT_MAP = { @@ -109,18 +76,27 @@ const std::map TASK_TIME_OUT_MAP = { { std::string(WAIT_REQUEST_TIMEOUT_TASK), CLONE_WAIT_REQUEST_TIMEOUT }, { std::string(SESSION_HEARTBEAT_TIMEOUT_TASK), CLONE_SESSION_HEARTBEAT_TIMEOUT } }; +const std::map OLD_STATE_MAPPING = { + { AuthState::AUTH_REQUEST_INIT, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_NEGOTIATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_NEGOTIATE_DONE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_REPLY, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_JOIN, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_NETWORK, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_FINISH, DmAuthStatus::STATUS_DM_AUTH_FINISH }, + { AuthState::AUTH_REQUEST_CREDENTIAL, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_CREDENTIAL_DONE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_AUTH_FINISH, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_RECHECK_MSG, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_REQUEST_RECHECK_MSG_DONE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { AuthState::AUTH_RESPONSE_FINISH, DmAuthStatus::STATUS_DM_SINK_AUTH_FINISH } +}; +constexpr int32_t PROCESS_NAME_WHITE_LIST_NUM = 1; +constexpr const static char* PROCESS_NAME_WHITE_LIST[PROCESS_NAME_WHITE_LIST_NUM] = { + "com.example.myapplication" +}; -constexpr const char* APP_OPERATION_KEY = "appOperation"; -constexpr const char* TARGET_PKG_NAME_KEY = "targetPkgName"; -constexpr const char* CUSTOM_DESCRIPTION_KEY = "customDescription"; -constexpr const char* CANCEL_DISPLAY_KEY = "cancelPinCodeDisplay"; -constexpr const char* BUNDLE_NAME_KEY = "bundleName"; constexpr const char* DM_VERSION_4_1_5_1 = "4.1.5.1"; -constexpr const char* DM_VERSION_5_0_1 = "5.0.1"; -constexpr const char* DM_VERSION_5_0_2 = "5.0.2"; -constexpr const char* DM_VERSION_5_0_3 = "5.0.3"; -constexpr const char* DM_VERSION_5_0_4 = "5.0.4"; -constexpr const char* DM_VERSION_5_0_5 = "5.0.5"; std::mutex g_authFinishLock; DmAuthManager::DmAuthManager(std::shared_ptr softbusConnector, @@ -154,7 +130,7 @@ bool DmAuthManager::IsHmlSessionType() int32_t DmAuthManager::CheckAuthParamVaild(const std::string &pkgName, int32_t authType, const std::string &deviceId, const std::string &extra) { - LOGI("DmAuthManager::CheckAuthParamVaild start."); + LOGI("start."); if (authType < DM_AUTH_TYPE_MIN || authType > DM_AUTH_TYPE_MAX) { LOGE("CheckAuthParamVaild failed, authType is illegal."); return ERR_DM_AUTH_FAILED; @@ -219,36 +195,9 @@ int32_t DmAuthManager::CheckAuthParamVaildExtra(const std::string &extra, const if (jsonObject.IsDiscarded() || !jsonObject.Contains(TAG_BIND_LEVEL)) { return DM_OK; } - int32_t bindLevel = INVALID_TYPE; - if (!CheckBindLevel(jsonObject, TAG_BIND_LEVEL, bindLevel)) { - LOGE("TAG_BIND_LEVEL is not integer string or int32."); - return ERR_DM_INPUT_PARA_INVALID; - } - if (static_cast(bindLevel) > APP || bindLevel < INVALID_TYPE) { - LOGE("bindlevel error %{public}d.", bindLevel); - return ERR_DM_INPUT_PARA_INVALID; - } - - if (static_cast(bindLevel) == DEVICE && !IsAllowDeviceBind()) { - LOGE("not allowd device level bind bindlevel: %{public}d.", bindLevel); - return ERR_DM_INPUT_PARA_INVALID; - } return DM_OK; } -bool DmAuthManager::CheckBindLevel(const JsonItemObject &jsonObj, const std::string &key, int32_t &bindLevel) -{ - if (IsJsonValIntegerString(jsonObj, TAG_BIND_LEVEL)) { - bindLevel = std::atoi(jsonObj[TAG_BIND_LEVEL].Get().c_str()); - return true; - } - if (IsInt32(jsonObj, TAG_BIND_LEVEL)) { - bindLevel = jsonObj[TAG_BIND_LEVEL].Get(); - return true; - } - return false; -} - bool DmAuthManager::CheckHmlParamValid(JsonObject &jsonObject) { if (!IsString(jsonObject, PARAM_KEY_HML_ACTIONID)) { @@ -268,25 +217,6 @@ bool DmAuthManager::CheckHmlParamValid(JsonObject &jsonObject) return true; } -bool DmAuthManager::CheckProcessNameInWhiteList(const std::string &processName) -{ - LOGI("DmAuthManager::CheckProcessNameInWhiteList start"); - if (processName.empty()) { - LOGE("processName is empty"); - return false; - } - uint16_t index = 0; - for (; index < PROCESS_NAME_WHITE_LIST_NUM; ++index) { - std::string whitePkgName(PROCESS_NAME_WHITE_LIST[index]); - if (processName == whitePkgName) { - LOGI("processName = %{public}s in whiteList.", processName.c_str()); - return true; - } - } - LOGI("CheckProcessNameInWhiteList: %{public}s invalid.", processName.c_str()); - return false; -} - void DmAuthManager::GetAuthParam(const std::string &pkgName, int32_t authType, const std::string &deviceId, const std::string &extra) { @@ -294,10 +224,7 @@ void DmAuthManager::GetAuthParam(const std::string &pkgName, int32_t authType, char localDeviceId[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); std::string localUdid = static_cast(localDeviceId); - std::string realPkgName = GetSubStr(pkgName, PICKER_PROXY_SPLIT, 1); - realPkgName = realPkgName.empty() ? pkgName : realPkgName; - authRequestContext_->hostPkgName = realPkgName; - authRequestContext_->hostPkgLabel = GetBundleLable(realPkgName); + authRequestContext_->hostPkgName = pkgName; authRequestContext_->authType = authType; authRequestContext_->localDeviceName = softbusConnector_->GetLocalDeviceName(); authRequestContext_->localDeviceTypeId = softbusConnector_->GetLocalDeviceTypeId(); @@ -305,12 +232,7 @@ void DmAuthManager::GetAuthParam(const std::string &pkgName, int32_t authType, authRequestContext_->deviceId = deviceId; authRequestContext_->addr = deviceId; authRequestContext_->dmVersion = DM_VERSION_5_0_5; - uint32_t tokenId = 0 ; - MultipleUserConnector::GetTokenIdAndForegroundUserId(tokenId, authRequestContext_->localUserId); - authRequestContext_->tokenId = static_cast(tokenId); - if (realPkgName != pkgName) { - GetTokenIdByBundleName(authRequestContext_->localUserId, realPkgName, authRequestContext_->tokenId); - } + authRequestContext_->localUserId = MultipleUserConnector::GetFirstForegroundUserId(); authRequestContext_->localAccountId = MultipleUserConnector::GetOhosAccountIdByUserId(authRequestContext_->localUserId); authRequestContext_->isOnline = false; @@ -323,7 +245,6 @@ void DmAuthManager::GetAuthParam(const std::string &pkgName, int32_t authType, } ParseJsonObject(jsonObject); authRequestContext_->token = std::to_string(GenRandInt(MIN_PIN_TOKEN, MAX_PIN_TOKEN)); - authRequestContext_->bindLevel = GetBindLevel(authRequestContext_->bindLevel); } void DmAuthManager::ParseJsonObject(JsonObject &jsonObject) @@ -339,10 +260,9 @@ void DmAuthManager::ParseJsonObject(JsonObject &jsonObject) authRequestContext_->customDesc = DmLanguageManager::GetInstance(). GetTextBySystemLanguage(jsonObject[CUSTOM_DESCRIPTION_KEY].Get()); } - if (IsString(jsonObject, APP_THUMBNAIL)) { - authRequestContext_->appThumbnail = jsonObject[APP_THUMBNAIL].Get(); + if (IsString(jsonObject, TAG_APP_THUMBNAIL2)) { + authRequestContext_->appThumbnail = jsonObject[TAG_APP_THUMBNAIL2].Get(); } - CheckBindLevel(jsonObject, TAG_BIND_LEVEL, authRequestContext_->bindLevel); authRequestContext_->closeSessionDelaySeconds = 0; if (IsString(jsonObject, PARAM_CLOSE_SESSION_DELAY_SECONDS)) { std::string delaySecondsStr = jsonObject[PARAM_CLOSE_SESSION_DELAY_SECONDS].Get(); @@ -359,7 +279,6 @@ void DmAuthManager::ParseJsonObject(JsonObject &jsonObject) } ParseHmlInfoInJsonObject(jsonObject); } - authRequestContext_->bundleName = GetBundleName(jsonObject); } void DmAuthManager::ParseHmlInfoInJsonObject(JsonObject &jsonObject) @@ -417,6 +336,12 @@ void DmAuthManager::InitAuthState(const std::string &pkgName, int32_t authType, authMessageProcessor_ = std::make_shared(shared_from_this()); authResponseContext_ = std::make_shared(); authRequestContext_ = std::make_shared(); + JsonObject jsonObject(extra); + if (jsonObject.IsDiscarded()) { + LOGE("extra string not a json type."); + return; + } + GetAuthParam(pkgName, authType, deviceId, extra); authMessageProcessor_->SetRequestContext(authRequestContext_); authRequestState_ = std::make_shared(); @@ -425,6 +350,7 @@ void DmAuthManager::InitAuthState(const std::string &pkgName, int32_t authType, if (!DmRadarHelper::GetInstance().ReportAuthStart(peerTargetId_.deviceId, pkgName)) { LOGE("ReportAuthStart failed"); } + GetBindCallerInfo(); authRequestState_->Enter(); LOGI("DmAuthManager::AuthenticateDevice complete"); } @@ -432,20 +358,25 @@ void DmAuthManager::InitAuthState(const std::string &pkgName, int32_t authType, int32_t DmAuthManager::AuthenticateDevice(const std::string &pkgName, int32_t authType, const std::string &deviceId, const std::string &extra) { - LOGI("DmAuthManager::AuthenticateDevice start auth type %{public}d.", authType); - SetAuthType(authType); - int32_t userId = -1; - MultipleUserConnector::GetCallerUserId(userId); + LOGI("start auth type %{public}d.", authType); processInfo_.pkgName = pkgName; - processInfo_.userId = userId; + { + std::lock_guard lock(bindParamMutex_); + if (bindParam_.find("bindCallerUserId") != bindParam_.end()) { + processInfo_.userId = std::atoi(bindParam_["bindCallerUserId"].c_str()); + } + } + SetAuthType(authType); int32_t ret = CheckAuthParamVaild(pkgName, authType, deviceId, extra); if (ret != DM_OK) { LOGE("DmAuthManager::AuthenticateDevice failed, param is invaild."); + listener_->OnBindResult(processInfo_, peerTargetId_, ret, STATUS_DM_AUTH_DEFAULT, ""); return ret; } ret = CheckAuthParamVaildExtra(extra, deviceId); if (ret != DM_OK) { LOGE("CheckAuthParamVaildExtra failed, param is invaild."); + listener_->OnBindResult(processInfo_, peerTargetId_, ret, STATUS_DM_AUTH_DEFAULT, ""); return ret; } isAuthenticateDevice_ = true; @@ -454,7 +385,6 @@ int32_t DmAuthManager::AuthenticateDevice(const std::string &pkgName, int32_t au softbusConnector_->JoinLnn(deviceId, true); listener_->OnAuthResult(processInfo_, peerTargetId_.deviceId, "", STATUS_DM_AUTH_DEFAULT, DM_OK); listener_->OnBindResult(processInfo_, peerTargetId_, DM_OK, STATUS_DM_AUTH_DEFAULT, ""); - return DM_OK; } InitAuthState(pkgName, authType, deviceId, extra); return DM_OK; @@ -478,7 +408,7 @@ int32_t DmAuthManager::UnAuthenticateDevice(const std::string &pkgName, const st LOGE("ReportDeleteTrustRelation failed"); } remoteDeviceId_ = udid; - if (static_cast(bindLevel) == DEVICE) { + if (static_cast(bindLevel) == USER) { DeleteGroup(pkgName, udid); } std::string extra = ""; @@ -527,17 +457,19 @@ int32_t DmAuthManager::DeleteAcl(const std::string &pkgName, const std::string & if (offlineParam.leftAclNumber == 0) { LOGI("The pkgName unbind app-level type leftAclNumber is zero."); softbusConnector_->SetProcessInfoVec(offlineParam.processVec); - hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID()); + hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID(), + offlineParam.peerUserId); return DM_OK; } } - if (static_cast(bindLevel) == DEVICE && offlineParam.leftAclNumber != 0) { + if (static_cast(bindLevel) == USER && offlineParam.leftAclNumber != 0) { LOGI("Unbind deivce-level, retain identical account bind type."); return DM_OK; } - if (static_cast(bindLevel) == DEVICE && offlineParam.leftAclNumber == 0) { + if (static_cast(bindLevel) == USER && offlineParam.leftAclNumber == 0) { LOGI("Unbind deivce-level, retain null."); - hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID()); + hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID(), + offlineParam.peerUserId); return DM_OK; } return ERR_DM_FAILED; @@ -552,7 +484,7 @@ int32_t DmAuthManager::UnBindDevice(const std::string &pkgName, const std::strin } char localDeviceId[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); - if (static_cast(bindLevel) == DEVICE) { + if (static_cast(bindLevel) == USER) { DeleteGroup(pkgName, udid); } return DeleteAcl(pkgName, std::string(localDeviceId), udid, bindLevel, extra); @@ -649,6 +581,22 @@ void DmAuthManager::OnSessionClosed(const int32_t sessionId) } } +void DmAuthManager::ClearSoftbusSessionCallback() +{ + LOGI("DmAuthManager ClearSoftbusSessionCallback"); + if (softbusConnector_ != nullptr && softbusConnector_->GetSoftbusSession() != nullptr) { + softbusConnector_->GetSoftbusSession()->UnRegisterSessionCallback(); + } +} + +void DmAuthManager::PrepareSoftbusSessionCallback() +{ + LOGI("DmAuthManager PrepareSoftbusSessionCallback"); + if (softbusConnector_ != nullptr && softbusConnector_->GetSoftbusSession() != nullptr) { + softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(shared_from_this()); + } +} + void DmAuthManager::ProcessSourceMsg() { authRequestContext_ = authMessageProcessor_->GetRequestContext(); @@ -790,8 +738,8 @@ void DmAuthManager::OnGroupCreated(int64_t requestId, const std::string &groupId softbusConnector_->GetSoftbusSession()->SendData(authResponseContext_->sessionId, message); return; } - - int32_t pinCode = -1; + CompatiblePutAcl(); + std::string pinCode = ""; if (authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE && !importAuthCode_.empty()) { GetAuthCode(authResponseContext_->hostPkgName, pinCode); } else if (authResponseContext_->authType != AUTH_TYPE_IMPORT_AUTH_CODE) { @@ -848,6 +796,10 @@ void DmAuthManager::MemberJoinAuthRequest(int64_t requestId, int32_t status) if (timer_ != nullptr) { timer_->DeleteTimer(std::string(ADD_TIMEOUT_TASK)); } + if (status == DM_OK) { + LOGI("join group success."); + CompatiblePutAcl(); + } if (authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE) { HandleMemberJoinImportAuthCode(requestId, status); return; @@ -910,13 +862,17 @@ void DmAuthManager::HandleAuthenticateTimeout(std::string name) int32_t DmAuthManager::EstablishAuthChannel(const std::string &deviceId) { + if (NeedInsensibleSwitching()) { + return DM_OK; + } int32_t sessionId = 0; if (IsHmlSessionType()) { CHECK_NULL_RETURN(authRequestContext_, ERR_DM_FAILED); + CHECK_NULL_RETURN(listener_, ERR_DM_FAILED); LOGI("hmlActionId %{public}d, hmlReleaseTime %{public}d, hmlEnable160M %{public}d", authRequestContext_->hmlActionId, authRequestContext_->closeSessionDelaySeconds, authRequestContext_->hmlEnable160M); - sessionId = softbusConnector_->GetSoftbusSession()->OpenAuthSessionWithPara(deviceId, + sessionId = listener_->OpenAuthSessionWithPara(deviceId, authRequestContext_->hmlActionId, authRequestContext_->hmlEnable160M); } else { sessionId = softbusConnector_->GetSoftbusSession()->OpenAuthSession(deviceId); @@ -985,7 +941,9 @@ void DmAuthManager::StartNegotiate(const int32_t &sessionId) authResponseContext_->remoteDeviceName = authRequestContext_->localDeviceName; authMessageProcessor_->SetResponseContext(authResponseContext_); std::string message = authMessageProcessor_->CreateSimpleMessage(MSG_TYPE_NEGOTIATE); - softbusConnector_->GetSoftbusSession()->SendData(sessionId, message); + if (!NeedInsensibleSwitching()) { + softbusConnector_->GetSoftbusSession()->SendData(sessionId, message); + } if (timer_ != nullptr) { timer_->StartTimer(std::string(NEGOTIATE_TIMEOUT_TASK), GetTaskTimeout(NEGOTIATE_TIMEOUT_TASK, NEGOTIATE_TIMEOUT), [this] (std::string name) { @@ -1009,10 +967,6 @@ void DmAuthManager::AbilityNegotiate() CompatiblePutAcl(); } authResponseContext_->reply = ERR_DM_AUTH_PEER_REJECT; - if (!CompareVersion(remoteVersion_, std::string(DM_VERSION_5_0_3)) && - authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE && !importAuthCode_.empty()) { - authResponseContext_->importAuthCode = Crypto::Sha256(importAuthCode_); - } } else { authResponseContext_->reply = ERR_DM_AUTH_REJECT; } @@ -1042,10 +996,10 @@ void DmAuthManager::RespNegotiate(const int32_t &sessionId) remoteDeviceId_ = authResponseContext_->localDeviceId; authResponseContext_->networkId = softbusConnector_->GetLocalDeviceNetworkId(); authResponseContext_->targetDeviceName = softbusConnector_->GetLocalDeviceName(); - remoteVersion_ = ConvertSrcVersion(authResponseContext_->dmVersion, authResponseContext_->edition); + remoteVersion_ = AuthManagerBase::ConvertSrcVersion(authResponseContext_->dmVersion, authResponseContext_->edition); NegotiateRespMsg(remoteVersion_); if (CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) && - (static_cast(authResponseContext_->bindLevel) >= DEVICE && + (static_cast(authResponseContext_->bindLevel) >= USER && static_cast(authResponseContext_->bindLevel) <= APP)) { ProcRespNegotiateExt(sessionId); timer_->StartTimer(std::string(WAIT_REQUEST_TIMEOUT_TASK), @@ -1101,7 +1055,7 @@ void DmAuthManager::SendAuthRequest(const int32_t &sessionId) LOGI("SendAuthRequest dmversion %{public}s, level %{public}d", authResponseContext_->dmVersion.c_str(), authResponseContext_->bindLevel); if (CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) && - (static_cast(authResponseContext_->bindLevel) >= DEVICE && + (static_cast(authResponseContext_->bindLevel) >= USER && static_cast(authResponseContext_->bindLevel) <= APP)) { ProcessAuthRequestExt(sessionId); } else if (!CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) || @@ -1239,6 +1193,8 @@ bool DmAuthManager::IsAuthFinish() int32_t DmAuthManager::ConfirmProcess(const int32_t &action) { LOGI("ConfirmProcess start."); + CHECK_NULL_RETURN(authResponseContext_, ERR_DM_POINT_NULL); + authResponseContext_->confirmOperation = action; if (action_ == USER_OPERATION_TYPE_ALLOW_AUTH || action_ == USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS) { authResponseContext_->reply = USER_OPERATION_TYPE_ALLOW_AUTH; } else { @@ -1269,7 +1225,7 @@ int32_t DmAuthManager::ConfirmProcessExt(const int32_t &action) if (authResponseContext_->reply == USER_OPERATION_TYPE_ALLOW_AUTH && authResponseState_->GetStateType() == AuthState::AUTH_RESPONSE_CONFIRM) { if (CanUsePincodeFromDp()) { - authResponseContext_->code = std::atoi(serviceInfoProfile_.GetPinCode().c_str()); + authResponseContext_->code = serviceInfoProfile_.GetPinCode(); LOGI("import pincode from dp"); } else if (authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE && !importAuthCode_.empty()) { GetAuthCode(authResponseContext_->hostPkgName, authResponseContext_->code); @@ -1305,7 +1261,7 @@ int32_t DmAuthManager::StartAuthProcess(const int32_t &action) LOGE("ReportAuthConfirmBox failed"); } if (CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) && - (static_cast(authResponseContext_->bindLevel) >= DEVICE && + (static_cast(authResponseContext_->bindLevel) >= USER && static_cast(authResponseContext_->bindLevel) <= APP)) { return ConfirmProcessExt(action); } else if (!CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) || @@ -1367,7 +1323,7 @@ int32_t DmAuthManager::CreateGroup() return DM_OK; } -int32_t DmAuthManager::AddMember(int32_t pinCode) +int32_t DmAuthManager::AddMember(const std::string &pinCode) { if (authResponseContext_ == nullptr) { LOGE("failed to AddMember because authResponseContext_ is nullptr"); @@ -1466,6 +1422,16 @@ void DmAuthManager::SinkAuthenticateFinish() authTimes_ = 0; } +int32_t DmAuthManager::GetOutputState(int32_t state) +{ + LOGI("state %{public}d.", state); + auto it = OLD_STATE_MAPPING.find(static_cast(state)); + if (it != OLD_STATE_MAPPING.end()) { + return static_cast(it->second); + } + return static_cast(STATUS_DM_AUTH_DEFAULT); +} + void DmAuthManager::SrcAuthenticateFinish() { LOGI("DmAuthManager::SrcAuthenticateFinish, isFinishOfLocal: %{public}d", isFinishOfLocal_); @@ -1481,25 +1447,33 @@ void DmAuthManager::SrcAuthenticateFinish() (authResponseContext_->authType == AUTH_TYPE_NFC || authPtr_ != nullptr)) { authUiStateMgr_->UpdateUiState(DmUiStateMsg::MSG_CANCEL_PIN_CODE_INPUT); } - - int32_t sessionId = authRequestContext_->sessionId; - auto taskFunc = [this, sessionId]() { - CHECK_NULL_VOID(softbusConnector_); - CHECK_NULL_VOID(softbusConnector_->GetSoftbusSession()); - softbusConnector_->GetSoftbusSession()->CloseAuthSession(sessionId); - }; - const int64_t MICROSECOND_PER_SECOND = 1000000L; - int32_t delaySeconds = authRequestContext_->closeSessionDelaySeconds; - ffrt::submit(taskFunc, ffrt::task_attr().delay(delaySeconds * MICROSECOND_PER_SECOND)); - - listener_->OnAuthResult(processInfo_, peerTargetId_.deviceId, authRequestContext_->token, - authResponseContext_->state, authRequestContext_->reason); - listener_->OnBindResult(processInfo_, peerTargetId_, authRequestContext_->reason, - authResponseContext_->state, GenerateBindResultContent()); + if (timer_ == nullptr) { + timer_ = std::make_shared(); + } + int32_t closeSessionDelaySeconds = authRequestContext_->closeSessionDelaySeconds; + if (IsHmlSessionType() && closeSessionDelaySeconds == 0 && isWaitingJoinLnnCallback_) { + closeSessionDelaySeconds = SESSION_CLOSE_TIMEOUT; + } + timer_->StartTimer(std::string(WAIT_SESSION_CLOSE_TIMEOUT_TASK) + std::string(CLOSE_SESSION_TASK_SEPARATOR) + + std::to_string(authRequestContext_->sessionId), + closeSessionDelaySeconds, [this] (std::string name) { + int32_t sessionIdIndex = 1; + std::string sessionStr = GetSubStr(name, std::string(CLOSE_SESSION_TASK_SEPARATOR), sessionIdIndex); + if (!sessionStr.empty()) { + int32_t sessionId = std::atoi(sessionStr.c_str()); + DmAuthManager::CloseAuthSession(sessionId); + } + }); + int32_t status = GetOutputState(authResponseContext_->state); + listener_->OnAuthResult(processInfo_, peerTargetId_.deviceId, authRequestContext_->token, status, + authRequestContext_->reason); + listener_->OnBindResult(processInfo_, peerTargetId_, authRequestContext_->reason, status, + GenerateBindResultContent()); authRequestContext_ = nullptr; authRequestState_ = nullptr; authTimes_ = 0; + isWaitingJoinLnnCallback_ = false; } void DmAuthManager::AuthenticateFinish() @@ -1523,9 +1497,7 @@ void DmAuthManager::AuthenticateFinish() isAddingMember_ = false; isAuthenticateDevice_ = false; isAuthDevice_ = false; - if (authResponseContext_->isFinish) { - CompatiblePutAcl(); - } + isNeedJoinLnn_ = true; if (DeviceProfileConnector::GetInstance().GetTrustNumber(remoteDeviceId_) >= 1 && CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) && softbusConnector_->CheckIsOnline(remoteDeviceId_) && authResponseContext_->isFinish) { @@ -1533,14 +1505,14 @@ void DmAuthManager::AuthenticateFinish() } DeleteAuthCode(); + if (timer_ != nullptr) { + timer_->DeleteAll(); + } if (authResponseState_ != nullptr) { SinkAuthenticateFinish(); } else if (authRequestState_ != nullptr) { SrcAuthenticateFinish(); } - if (timer_ != nullptr) { - timer_->DeleteAll(); - } isFinishOfLocal_ = true; authResponseContext_ = nullptr; authMessageProcessor_ = nullptr; @@ -1548,6 +1520,9 @@ void DmAuthManager::AuthenticateFinish() authRequestStateTemp_ = nullptr; authenticationType_ = USER_OPERATION_TYPE_ALLOW_AUTH; bundleName_ = ""; + if (cleanNotifyCallback_ != nullptr) { + cleanNotifyCallback_(0); + } LOGI("DmAuthManager::AuthenticateFinish complete"); } @@ -1573,9 +1548,10 @@ int32_t DmAuthManager::UnRegisterUiStateCallback(const std::string pkgName) return DM_OK; } -int32_t DmAuthManager::GeneratePincode() +std::string DmAuthManager::GeneratePincode() { - return GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE); + int32_t pinCode = GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE); + return std::to_string(pinCode); } bool DmAuthManager::IsPinCodeValid(const std::string strpin) @@ -1715,7 +1691,7 @@ int32_t DmAuthManager::SetAuthResponseState(std::shared_ptr a return DM_OK; } -int32_t DmAuthManager::GetPinCode(int32_t &code) +int32_t DmAuthManager::GetPinCode(std::string &code) { if (authResponseContext_ == nullptr) { LOGE("failed to GetPinCode because authResponseContext_ is nullptr"); @@ -1726,6 +1702,24 @@ int32_t DmAuthManager::GetPinCode(int32_t &code) return DM_OK; } +void DmAuthManager::CheckAndEndTvDream() +{ + NodeBasicInfo nodeBasicInfo; + int32_t result = GetLocalNodeDeviceInfo(DM_PKG_NAME, &nodeBasicInfo); + if (result != SOFTBUS_OK) { + LOGE("GetLocalNodeDeviceInfo from dsofbus fail, result=%{public}d", result); + return; + } + + if (nodeBasicInfo.deviceTypeId == TYPE_TV_ID) { + int32_t ret = AuthManagerBase::EndDream(); + if (ret != DM_OK) { + LOGE("fail to end dream, err:%{public}d", ret); + return; + } + } +} + void DmAuthManager::ShowConfigDialog() { if (authResponseContext_ == nullptr) { @@ -1743,6 +1737,7 @@ void DmAuthManager::ShowConfigDialog() StartAuthProcess(authenticationType_); return; } + CheckAndEndTvDream(); LOGI("ShowConfigDialog start"); JsonObject jsonObj; jsonObj[TAG_AUTH_TYPE] = AUTH_TYPE_PIN; @@ -1795,11 +1790,8 @@ void DmAuthManager::ShowAuthInfoDialog(bool authDeviceError) if (!DmRadarHelper::GetInstance().ReportAuthPullPinBox(info)) { LOGE("ReportAuthPullPinBox failed"); } - JsonObject jsonObj; - jsonObj[PIN_CODE_KEY] = authResponseContext_->code; - std::string authParam = SafetyDump(jsonObj); pincodeDialogEverShown_ = true; - DmDialogManager::GetInstance().ShowPinDialog(std::to_string(authResponseContext_->code)); + DmDialogManager::GetInstance().ShowPinDialog(authResponseContext_->code); } void DmAuthManager::ShowStartAuthDialog() @@ -1810,13 +1802,13 @@ void DmAuthManager::ShowStartAuthDialog() } if (authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE) { LOGI("Add member start"); - int32_t pinCode = -1; + std::string pinCode = ""; if (GetAuthCode(authResponseContext_->hostPkgName, pinCode) != DM_OK) { LOGE("failed to get auth code"); return; } if (CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) && - (static_cast(authResponseContext_->bindLevel) >= DEVICE && + (static_cast(authResponseContext_->bindLevel) >= USER && static_cast(authResponseContext_->bindLevel) <= APP)) { AuthDevice(pinCode); } else if (!CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) || @@ -1833,7 +1825,7 @@ void DmAuthManager::ShowStartAuthDialog() return; } LOGI("DmAuthManager::ShowStartAuthDialog start"); - int32_t pincode = 0; + std::string pincode = ""; if (authResponseContext_->authType == AUTH_TYPE_NFC && GetAuthCode(authResponseContext_->hostPkgName, pincode) == DM_OK) { LOGI("already has pin code"); @@ -1845,7 +1837,7 @@ void DmAuthManager::ShowStartAuthDialog() DmDialogManager::GetInstance().ShowInputDialog(authResponseContext_->targetDeviceName); } -int32_t DmAuthManager::ProcessPincode(int32_t pinCode) +int32_t DmAuthManager::ProcessPincode(const std::string &pinCode) { if (authResponseContext_ == nullptr) { LOGE("failed to ProcessPincode because authResponseContext_ is nullptr"); @@ -1855,7 +1847,7 @@ int32_t DmAuthManager::ProcessPincode(int32_t pinCode) timer_->DeleteTimer(std::string(INPUT_TIMEOUT_TASK)); } if (CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) && - (static_cast(authResponseContext_->bindLevel) >= DEVICE && + (static_cast(authResponseContext_->bindLevel) >= USER && static_cast(authResponseContext_->bindLevel) <= APP)) { return AuthDevice(pinCode); } else if (!CompareVersion(remoteVersion_, std::string(DM_VERSION_4_1_5_1)) || @@ -1867,7 +1859,7 @@ int32_t DmAuthManager::ProcessPincode(int32_t pinCode) return ERR_DM_FAILED; } -int32_t DmAuthManager::AuthDevice(int32_t pinCode) +int32_t DmAuthManager::AuthDevice(const std::string &pinCode) { LOGI("DmAuthManager::AuthDevice start."); if (isAuthDevice_) { @@ -1916,35 +1908,26 @@ int32_t DmAuthManager::OnUserOperation(int32_t action, const std::string ¶ms case USER_OPERATION_TYPE_AUTH_CONFIRM_TIMEOUT: SetReasonAndFinish(ERR_DM_TIME_OUT, STATUS_DM_AUTH_DEFAULT); info.errCode = DmRadarHelper::GetInstance().GetErrCode(ERR_DM_TIME_OUT); - if (!DmRadarHelper::GetInstance().ReportAuthConfirmBox(info)) { - LOGE("ReportAuthConfirmBox failed"); - } break; case USER_OPERATION_TYPE_CANCEL_PINCODE_DISPLAY: SetReasonAndFinish(ERR_DM_BIND_USER_CANCEL_PIN_CODE_DISPLAY, STATUS_DM_AUTH_DEFAULT); info.errCode = DmRadarHelper::GetInstance().GetErrCode(ERR_DM_BIND_USER_CANCEL_PIN_CODE_DISPLAY); - if (!DmRadarHelper::GetInstance().ReportAuthInputPinBox(info)) { - LOGE("ReportAuthInputPinBox failed"); - } break; case USER_OPERATION_TYPE_CANCEL_PINCODE_INPUT: SetReasonAndFinish(ERR_DM_BIND_USER_CANCEL_ERROR, STATUS_DM_AUTH_DEFAULT); info.errCode = DmRadarHelper::GetInstance().GetErrCode(ERR_DM_BIND_USER_CANCEL_ERROR); - if (!DmRadarHelper::GetInstance().ReportAuthInputPinBox(info)) { - LOGE("ReportAuthInputPinBox failed"); - } break; case USER_OPERATION_TYPE_DONE_PINCODE_INPUT: - ProcessPincode(std::atoi(params.c_str())); + ProcessPincode(params); info.stageRes = static_cast(StageRes::STAGE_SUCC); - if (!DmRadarHelper::GetInstance().ReportAuthInputPinBox(info)) { - LOGE("ReportAuthInputPinBox failed"); - } break; default: LOGE("this action id not support"); break; } + if (!DmRadarHelper::GetInstance().ReportAuthConfirmBox(info)) { + LOGE("ReportAuthConfirmBox failed"); + } return DM_OK; } @@ -2050,7 +2033,7 @@ int32_t DmAuthManager::ImportAuthCode(const std::string &pkgName, const std::str } int32_t DmAuthManager::BindTarget(const std::string &pkgName, const PeerTargetId &targetId, - const std::map &bindParam) + const std::map &bindParam, int sessionId, uint64_t logicalSessionId) { struct RadarInfo info = { .funcName = "AuthenticateDevice", @@ -2060,6 +2043,10 @@ int32_t DmAuthManager::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); + isNeedJoinLnn_ = std::atoi(isNeedJoinLnnStr.c_str()); + } if (pkgName.empty()) { LOGE("DmAuthManager::BindTarget failed, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -2075,6 +2062,10 @@ int32_t DmAuthManager::BindTarget(const std::string &pkgName, const PeerTargetId if (bindParam.count(PARAM_KEY_CONN_ADDR_TYPE) != 0) { addrType = bindParam.at(PARAM_KEY_CONN_ADDR_TYPE); } + { + std::lock_guard lock(bindParamMutex_); + bindParam_ = bindParam; + } if (ParseConnectAddr(targetId, deviceId, addrType) == DM_OK) { return AuthenticateDevice(pkgName, authType, deviceId, ParseExtraFromMap(bindParam)); } else if (!targetId.deviceId.empty()) { @@ -2134,30 +2125,6 @@ int32_t DmAuthManager::ParseConnectAddr(const PeerTargetId &targetId, std::strin return DM_OK; } -int32_t DmAuthManager::ParseAuthType(const std::map &bindParam, int32_t &authType) -{ - auto iter = bindParam.find(PARAM_KEY_AUTH_TYPE); - if (iter == bindParam.end()) { - LOGE("DmAuthManager::ParseAuthType bind param key: %{public}s not exist.", PARAM_KEY_AUTH_TYPE); - return ERR_DM_INPUT_PARA_INVALID; - } - std::string authTypeStr = iter->second; - if (authTypeStr.empty()) { - LOGE("DmAuthManager::ParseAuthType bind param %{public}s is empty.", PARAM_KEY_AUTH_TYPE); - return ERR_DM_INPUT_PARA_INVALID; - } - if (authTypeStr.length() > 1) { - LOGE("DmAuthManager::ParseAuthType bind param %{public}s length is unsupported.", PARAM_KEY_AUTH_TYPE); - return ERR_DM_INPUT_PARA_INVALID; - } - if (!isdigit(authTypeStr[0])) { - LOGE("DmAuthManager::ParseAuthType bind param %{public}s fromat is unsupported.", PARAM_KEY_AUTH_TYPE); - return ERR_DM_INPUT_PARA_INVALID; - } - authType = std::atoi(authTypeStr.c_str()); - return DM_OK; -} - std::string DmAuthManager::ParseExtraFromMap(const std::map &bindParam) { auto iter = bindParam.find(PARAM_KEY_BIND_EXTRA_DATA); @@ -2187,7 +2154,7 @@ int32_t DmAuthManager::DeleteAuthCode() return DM_OK; } -int32_t DmAuthManager::GetAuthCode(const std::string &pkgName, int32_t &pinCode) +int32_t DmAuthManager::GetAuthCode(const std::string &pkgName, std::string &pinCode) { if (importAuthCode_.empty() || importPkgName_.empty()) { LOGE("GetAuthCode failed, auth code not exist."); @@ -2197,13 +2164,13 @@ int32_t DmAuthManager::GetAuthCode(const std::string &pkgName, int32_t &pinCode) LOGE("GetAuthCode failed, pkgName not supported."); return ERR_DM_FAILED; } - pinCode = std::atoi(importAuthCode_.c_str()); + pinCode = std::to_string(std::atoi(importAuthCode_.c_str())); return DM_OK; } bool DmAuthManager::IsImportedAuthCodeValid() { - int32_t pinCode = 0; + std::string pinCode = ""; if (GetAuthCode(authRequestContext_->hostPkgName, pinCode) == DM_OK) { return true; } @@ -2239,6 +2206,7 @@ std::string DmAuthManager::GenerateBindResultContent() Crypto::GetUdidHash(remoteDeviceId_, reinterpret_cast(deviceIdHash)); jsonObj[TAG_DEVICE_ID] = deviceIdHash; } + jsonObj[TAG_CONFIRM_OPERATION] = authResponseContext_->confirmOperation; std::string content = SafetyDump(jsonObj); return content; } @@ -2290,9 +2258,26 @@ void DmAuthManager::RequestCredentialDone() int32_t DmAuthManager::ImportCredential(std::string &deviceId, std::string &publicKey) { - LOGI("DmAuthManager::ImportCredential"); + LOGI("DmAuthManager::ImportCredential, deviceId %{public}s", GetAnonyString(deviceId).c_str()); int32_t osAccountId = MultipleUserConnector::GetCurrentAccountUserID(); - return hiChainAuthConnector_->ImportCredential(osAccountId, deviceId, publicKey); + if ((authRequestState_ != nullptr) && (authResponseState_ == nullptr)) { + // Source Import Credential + LOGI("Source Import Credential remoteUserId: %{public}d", authRequestContext_->remoteUserId); + CHECK_NULL_RETURN(authRequestContext_, ERR_DM_POINT_NULL); + CHECK_NULL_RETURN(hiChainAuthConnector_, ERR_DM_POINT_NULL); + return hiChainAuthConnector_->ImportCredential(osAccountId, authRequestContext_->remoteUserId, deviceId, + publicKey); + } else if ((authResponseState_ != nullptr) && (authRequestState_ == nullptr)) { + // Sink Import Credential + LOGI("Source Import Credential remoteUserId: %{public}d", authResponseContext_->remoteUserId); + CHECK_NULL_RETURN(authResponseContext_, ERR_DM_POINT_NULL); + CHECK_NULL_RETURN(hiChainAuthConnector_, ERR_DM_POINT_NULL); + return hiChainAuthConnector_->ImportCredential(osAccountId, authResponseContext_->remoteUserId, deviceId, + publicKey); + } else { + LOGE("DmAuthManager::ImportCredential failed, authRequestState_ or authResponseState_ is invalid."); + return ERR_DM_AUTH_FAILED; + } } void DmAuthManager::ResponseCredential() @@ -2459,6 +2444,11 @@ void DmAuthManager::AuthDeviceFinish(int64_t requestId) void DmAuthManager::AuthDeviceError(int64_t requestId, int32_t errorCode) { LOGI("AuthDeviceError start."); + CHECK_NULL_VOID(authResponseContext_); + if (requestId != authResponseContext_->requestId) { + LOGE("reqId: %{public}" PRId64", RespReqId: %{public}" PRId64".", requestId, authResponseContext_->requestId); + return; + } isAuthDevice_ = false; if (authRequestState_ == nullptr || authResponseState_ != nullptr) { if (CheckNeedShowAuthInfoDialog(errorCode)) { @@ -2475,10 +2465,6 @@ void DmAuthManager::AuthDeviceError(int64_t requestId, int32_t errorCode) return; } if (authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE) { - if (requestId != authResponseContext_->requestId) { - LOGE("DmAuthManager::AuthDeviceError requestId %{public}" PRId64 "is error.", requestId); - return; - } authResponseContext_->state = AuthState::AUTH_REQUEST_JOIN; authRequestContext_->reason = ERR_DM_AUTH_CODE_INCORRECT; authResponseContext_->reply = ERR_DM_AUTH_CODE_INCORRECT; @@ -2547,7 +2533,9 @@ void DmAuthManager::PutSessionKeyAsync(int64_t requestId, std::vector guard(sessionKeyIdMutex_); int32_t sessionKeyId = 0; - int32_t ret = DeviceProfileConnector::GetInstance().PutSessionKey(hash, sessionKeyId); + int32_t ret = + DeviceProfileConnector::GetInstance().PutSessionKey(MultipleUserConnector::GetCurrentAccountUserID(), + hash, sessionKeyId); if (ret != DM_OK) { LOGI("PutSessionKey failed."); sessionKeyId = 0; @@ -2575,6 +2563,28 @@ int32_t DmAuthManager::GetSessionKeyIdSync(int64_t requestId) return keyid; } +char *DmAuthManager::AuthDeviceRequest(int64_t requestId, int operationCode, const char *reqParams) +{ + LOGI("DmAuthManager::AuthDeviceRequest start."); + (void)requestId; + (void)reqParams; + JsonObject jsonObj; + std::string pinCode = ""; + if (GetPinCode(pinCode) == ERR_DM_FAILED || pinCode == "") { + jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_REJECTED; + } else { + jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_ACCEPTED; + jsonObj[FIELD_PIN_CODE] = pinCode; + } + LOGI("pinCode: %{public}s", GetAnonyString(pinCode).c_str()); + std::string deviceId = ""; + GetRemoteDeviceId(deviceId); + jsonObj[FIELD_PEER_CONN_DEVICE_ID] = deviceId; + std::string jsonStr = SafetyDump(jsonObj); + char *buffer = strdup(jsonStr.c_str()); + return buffer; +} + void DmAuthManager::GetRemoteDeviceId(std::string &deviceId) { LOGI("GetRemoteDeviceId start."); @@ -2591,7 +2601,7 @@ void DmAuthManager::CompatiblePutAcl() Crypto::GetUdidHash(localUdid, reinterpret_cast(mUdidHash)); std::string localUdidHash = static_cast(mUdidHash); DmAclInfo aclInfo; - aclInfo.bindLevel = DEVICE; + aclInfo.bindLevel = USER; aclInfo.bindType = DM_POINT_TO_POINT; aclInfo.trustDeviceId = remoteDeviceId_; if (action_ == USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS) { @@ -2643,10 +2653,6 @@ void DmAuthManager::ProcRespNegotiateExt(const int32_t &sessionId) DeviceProfileConnector::GetInstance().GetBindTypeByPkgName(authResponseContext_->hostPkgName, authResponseContext_->localDeviceId, authResponseContext_->deviceId); authResponseContext_->authed = !authResponseContext_->bindType.empty(); - if (authResponseContext_->authed && authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE && - !importAuthCode_.empty() && !CompareVersion(remoteVersion_, std::string(DM_VERSION_5_0_3))) { - authResponseContext_->importAuthCode = Crypto::Sha256(importAuthCode_); - } authResponseContext_->isIdenticalAccount = false; if (authResponseContext_->localAccountId == authResponseContext_->remoteAccountId && @@ -2657,7 +2663,7 @@ void DmAuthManager::ProcRespNegotiateExt(const int32_t &sessionId) authResponseContext_->isOnline = softbusConnector_->CheckIsOnline(remoteDeviceId_); authResponseContext_->haveCredential = hiChainAuthConnector_->QueryCredential(authResponseContext_->deviceId, - MultipleUserConnector::GetFirstForegroundUserId()); + MultipleUserConnector::GetFirstForegroundUserId(), authResponseContext_->remoteUserId); if (!IsAuthTypeSupported(authResponseContext_->authType)) { LOGE("DmAuthManager::AuthenticateDevice authType %{public}d not support.", authResponseContext_->authType); authResponseContext_->reply = ERR_DM_UNSUPPORTED_AUTH_TYPE; @@ -2693,12 +2699,6 @@ void DmAuthManager::ProcRespNegotiate(const int32_t &sessionId) softbusConnector_->GetSoftbusSession()->SendData(sessionId, message); return; } - if (IsIdenticalAccount()) { - jsonObject[TAG_IDENTICAL_ACCOUNT] = true; - if (authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE && !importAuthCode_.empty()) { - jsonObject[TAG_IMPORT_AUTH_CODE] = Crypto::Sha256(importAuthCode_); - } - } jsonObject[TAG_ACCOUNT_GROUPID] = GetAccountGroupIdHash(); authResponseContext_ = authResponseState_->GetAuthContext(); if (jsonObject[TAG_CRYPTO_SUPPORT].Get() == true && authResponseContext_->cryptoSupport) { @@ -2929,42 +2929,6 @@ int32_t DmAuthManager::CheckTrustState() return DM_OK; } -std::string DmAuthManager::GetBundleLable(const std::string &bundleName) -{ - auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - LOGE("Get ability manager failed"); - return bundleName; - } - - sptr object = samgr->GetSystemAbility(BUNDLE_MGR_SERVICE_SYS_ABILITY_ID); - if (object == nullptr) { - LOGE("object is NULL."); - return bundleName; - } - - sptr bms = iface_cast(object); - if (bms == nullptr) { - LOGE("bundle manager service is NULL."); - return bundleName; - } - - auto bundleResourceProxy = bms->GetBundleResourceProxy(); - if (bundleResourceProxy == nullptr) { - LOGE("GetBundleResourceProxy fail"); - return bundleName; - } - AppExecFwk::BundleResourceInfo resourceInfo; - auto result = bundleResourceProxy->GetBundleResourceInfo(bundleName, - static_cast(OHOS::AppExecFwk::ResourceFlag::GET_RESOURCE_INFO_ALL), resourceInfo); - if (result != ERR_OK) { - LOGE("GetBundleResourceInfo failed"); - return bundleName; - } - LOGI("bundle resource label is %{public}s ", (resourceInfo.label).c_str()); - return resourceInfo.label; -} - bool DmAuthManager::IsScreenLocked() { bool isLocked = false; @@ -3017,21 +2981,6 @@ void DmAuthManager::HandleDeviceNotTrust(const std::string &udid) hiChainConnector_->DeleteAllGroupByUdid(udid); } -std::string DmAuthManager::ConvertSrcVersion(const std::string &version, const std::string &edition) -{ - std::string srcVersion = ""; - if (version == "" && edition != "") { - srcVersion = edition; - } else if (version == "" && edition == "") { - srcVersion = DM_VERSION_5_0_1; - } else if (version != "" && edition == "") { - srcVersion = version; - } - LOGI("ConvertSrcVersion version %{public}s, edition %{public}s, srcVersion is %{public}s.", - version.c_str(), edition.c_str(), srcVersion.c_str()); - return srcVersion; -} - std::string DmAuthManager::ConvertSinkVersion(const std::string &version) { std::string sinkVersion = ""; @@ -3061,50 +3010,6 @@ int32_t DmAuthManager::GetTaskTimeout(const char* taskName, int32_t taskTimeOut) return taskTimeOut; } -bool DmAuthManager::IsAllowDeviceBind() -{ - if (AppManager::GetInstance().IsSystemSA()) { - return true; - } - return false; -} - -int32_t DmAuthManager::GetBindLevel(int32_t bindLevel) -{ -#ifdef DEVICE_MANAGER_COMMON_FLAG - LOGI("device_manager_common is true!"); - std::string processName = ""; - int32_t ret = AppManager::GetInstance().GetCallerProcessName(processName); - LOGI("GetBindLevel processName = %{public}s", GetAnonyString(processName).c_str()); - if (ret == DM_OK && CheckProcessNameInWhiteList(processName)) { - return DEVICE; - } -#endif - if (IsAllowDeviceBind()) { - if (static_cast(bindLevel) == INVALIED_TYPE || static_cast(bindLevel) > APP || - static_cast(bindLevel) < DEVICE) { - return DEVICE; - } - return bindLevel; - } - if (static_cast(bindLevel) == INVALIED_TYPE || (static_cast(bindLevel) != APP && - static_cast(bindLevel) != SERVICE)) { - return APP; - } - return bindLevel; -} - -std::string DmAuthManager::GetBundleName(JsonObject &jsonObject) -{ - if (!jsonObject.IsDiscarded() && IsString(jsonObject, BUNDLE_NAME_KEY)) { - return jsonObject[BUNDLE_NAME_KEY].Get(); - } - bool isSystemSA = false; - std::string bundleName; - AppManager::GetInstance().GetCallerName(isSystemSA, bundleName); - return bundleName; -} - int32_t DmAuthManager::GetBinderInfo() { CHECK_NULL_RETURN(authResponseContext_, ERR_DM_POINT_NULL); @@ -3130,9 +3035,12 @@ int32_t DmAuthManager::GetBinderInfo() } ret = AppManager::GetInstance().GetHapTokenIdByName(authResponseContext_->localUserId, authResponseContext_->peerBundleName, 0, authResponseContext_->tokenId); - if (ret != DM_OK) { +#ifndef DEVICE_MANAGER_COMMON_FLAG + if (ret == DM_OK && static_cast(authResponseContext_->bindLevel) != APP) { LOGI("get tokenId by bundleName failed %{public}s", GetAnonyString(authResponseContext_->bundleName).c_str()); + return ERR_DM_FAILED; } +#endif return ret; } @@ -3150,7 +3058,7 @@ void DmAuthManager::SetProcessInfo() } else { LOGE("DMAuthManager::SetProcessInfo failed, state is invalid."); } - } else if (static_cast(authResponseContext_->bindLevel) == DEVICE || + } else if (static_cast(authResponseContext_->bindLevel) == USER || static_cast(authResponseContext_->bindLevel) == INVALIED_TYPE) { processInfo.pkgName = std::string(DM_PKG_NAME); processInfo.userId = authResponseContext_->localUserId; @@ -3244,6 +3152,14 @@ void DmAuthManager::RequestReCheckMsgDone() bool DmAuthManager::IsSinkMsgValid() { + LOGI("sink remoteVersion %{public}s, remoteDeviceId %{public}s, remoteUserId %{public}d," + "remoteHostPkgName %{public}s, remoteBindLevel %{public}d", remoteVersion_.c_str(), + GetAnonyString(remoteDeviceId_).c_str(), authResponseContext_->remoteUserId, + authResponseContext_->hostPkgName.c_str(), authResponseContext_->bindLevel); + LOGI("src version %{public}s, deviceId %{public}s, userId %{public}d, hostPkgName %{public}s, bindLevel %{public}d", + authResponseContext_->edition.c_str(), GetAnonyString(authResponseContext_->localDeviceId).c_str(), + authResponseContext_->localUserId, authResponseContext_->bundleName.c_str(), + authResponseContext_->localBindLevel); if (authResponseContext_->edition != remoteVersion_ || authResponseContext_->localDeviceId != remoteDeviceId_ || authResponseContext_->localUserId != authResponseContext_->remoteUserId || @@ -3269,11 +3185,6 @@ bool DmAuthManager::IsSourceMsgValid() int32_t DmAuthManager::RegisterAuthenticationType(int32_t authenticationType) { - if (authenticationType != USER_OPERATION_TYPE_ALLOW_AUTH && - authenticationType != USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS) { - LOGE("Invalid parameter."); - return ERR_DM_INPUT_PARA_INVALID; - } authenticationType_ = authenticationType; return DM_OK; } @@ -3344,12 +3255,18 @@ void DmAuthManager::JoinLnn(const std::string &deviceId, bool isForceJoin) CHECK_NULL_VOID(authResponseContext_); CHECK_NULL_VOID(softbusConnector_); if (IsHmlSessionType()) { + if (authRequestContext_->closeSessionDelaySeconds == 0) { + isWaitingJoinLnnCallback_ = true; + } authResponseContext_->localSessionKeyId = GetSessionKeyIdSync(authResponseContext_->requestId); softbusConnector_->JoinLnnByHml(authRequestContext_->sessionId, authResponseContext_->localSessionKeyId, authResponseContext_->remoteSessionKeyId); return; } - softbusConnector_->JoinLnn(deviceId, isForceJoin); + if (isNeedJoinLnn_) { + LOGI("isNeedJoinLnn %{public}d", isNeedJoinLnn_); + softbusConnector_->JoinLnn(deviceId, isForceJoin); + } } int32_t DmAuthManager::GetTokenIdByBundleName(int32_t userId, std::string &bundleName, int64_t &tokenId) @@ -3364,5 +3281,50 @@ int32_t DmAuthManager::GetTokenIdByBundleName(int32_t userId, std::string &bundl } return ret; } + +void DmAuthManager::OnSoftbusJoinLNNResult(const int32_t sessionId, const char *networkId, int32_t result) +{ + (void)sessionId; + (void)networkId; + (void)result; +} + +void DmAuthManager::CloseAuthSession(const int32_t sessionId) +{ + if (timer_ != nullptr) { + timer_->DeleteTimer(std::string(WAIT_SESSION_CLOSE_TIMEOUT_TASK) + std::string(CLOSE_SESSION_TASK_SEPARATOR) + + std::to_string(sessionId)); + } + CHECK_NULL_VOID(softbusConnector_); + CHECK_NULL_VOID(softbusConnector_->GetSoftbusSession()); + softbusConnector_->GetSoftbusSession()->CloseAuthSession(sessionId); +} + +void DmAuthManager::RegisterCleanNotifyCallback(CleanNotifyCallback cleanNotifyCallback) +{ + cleanNotifyCallback_ = cleanNotifyCallback; + return; +} + +void DmAuthManager::GetBindCallerInfo() +{ + LOGI("start."); + CHECK_NULL_VOID(authRequestContext_); + { + std::lock_guard lock(bindParamMutex_); + if (bindParam_.find("bindCallerTokenId") != bindParam_.end()) { + authRequestContext_->tokenId = std::atoi(bindParam_["bindCallerTokenId"].c_str()); + } + if (bindParam_.find("bindCallerOldBindLevel") != bindParam_.end()) { + authRequestContext_->bindLevel = std::atoi(bindParam_["bindCallerOldBindLevel"].c_str()); + } + if (bindParam_.find("bindCallerBundleName") != bindParam_.end()) { + authRequestContext_->bundleName = bindParam_["bindCallerBundleName"]; + } + if (bindParam_.find("bindCallerHostPkgLabel") != bindParam_.end()) { + authRequestContext_->hostPkgLabel = bindParam_["bindCallerHostPkgLabel"]; + } + } +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/src/authentication_v2/auth_manager.cpp b/services/implementation/src/authentication_v2/auth_manager.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8bd8aef10a3aceb80274bbba23adcfb7b4a65c0a --- /dev/null +++ b/services/implementation/src/authentication_v2/auth_manager.cpp @@ -0,0 +1,1123 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#include "app_manager.h" +#include "business_event.h" +#include "distributed_device_profile_client.h" +#include "softbus_common.h" +#include "system_ability_definition.h" +#include "iservice_registry.h" +#include "parameter.h" +#include "deviceprofile_connector.h" +#include "multiple_user_connector.h" + +#include "auth_manager.h" +#include "dm_constants.h" +#include "dm_crypto.h" +#include "dm_random.h" +#include "dm_log.h" +#include "dm_timer.h" +#include "dm_radar_helper.h" +#include "dm_device_info.h" +#include "dm_anonymous.h" +#include "dm_auth_state_machine.h" +#include "dm_auth_context.h" +#include "dm_auth_message_processor.h" +#include "dm_auth_state.h" +#include "json_object.h" + +namespace OHOS { +namespace DistributedHardware { +namespace { + +constexpr int32_t MIN_PIN_CODE = 100000; +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"; +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"; + +int32_t GetCloseSessionDelaySeconds(std::string &delaySecondsStr) +{ + if (!IsNumberString(delaySecondsStr)) { + LOGE("Invalid parameter, param is not number."); + return 0; + } + const int32_t closeSessionDelaySecondsMax = 10; + int32_t delaySeconds = std::atoi(delaySecondsStr.c_str()); + if (delaySeconds < 0 || delaySeconds > closeSessionDelaySecondsMax) { + LOGE("Invalid parameter, param out of range."); + return 0; + } + return delaySeconds; +} + +std::string GetBundleLabel(const std::string &bundleName) +{ + auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + if (samgr == nullptr) { + LOGE("Get ability manager failed"); + return bundleName; + } + + sptr object = samgr->GetSystemAbility(BUNDLE_MGR_SERVICE_SYS_ABILITY_ID); + if (object == nullptr) { + LOGE("object is NULL."); + return bundleName; + } + + sptr bms = iface_cast(object); + if (bms == nullptr) { + LOGE("bundle manager service is NULL."); + return bundleName; + } + + auto bundleResourceProxy = bms->GetBundleResourceProxy(); + if (bundleResourceProxy == nullptr) { + LOGE("GetBundleResourceProxy fail"); + return bundleName; + } + AppExecFwk::BundleResourceInfo resourceInfo; + auto result = bundleResourceProxy->GetBundleResourceInfo(bundleName, + static_cast(OHOS::AppExecFwk::ResourceFlag::GET_RESOURCE_INFO_ALL), resourceInfo); + if (result != ERR_OK) { + LOGE("GetBundleResourceInfo failed"); + return bundleName; + } + LOGI("bundle resource label is %{public}s ", (resourceInfo.label).c_str()); + return resourceInfo.label; +} + +std::string ParseExtraFromMap(const std::map &bindParam) +{ + auto iter = bindParam.find(PARAM_KEY_BIND_EXTRA_DATA); + if (iter != bindParam.end()) { + return iter->second; + } + return ConvertMapToJsonString(bindParam); +} + +} // namespace + +bool AuthManager::IsHmlSessionType(const std::string &sessionType) +{ + return sessionType == CONN_SESSION_TYPE_HML; +} + +AuthManager::AuthManager(std::shared_ptr softbusConnector, + std::shared_ptr hiChainConnector, + std::shared_ptr listener, + std::shared_ptr hiChainAuthConnector) +{ + LOGI("DmAuthManager constructor"); + context_ = std::make_shared(); + context_->softbusConnector = softbusConnector; + context_->listener = listener; + context_->hiChainConnector = hiChainConnector; + context_->hiChainAuthConnector = hiChainAuthConnector; + context_->authUiStateMgr = std::make_shared(context_->listener); + context_->authenticationMap[AUTH_TYPE_PIN] = nullptr; + context_->authenticationMap[AUTH_TYPE_IMPORT_AUTH_CODE] = nullptr; + context_->authenticationMap[AUTH_TYPE_PIN_ULTRASONIC] = nullptr; + context_->authenticationMap[AUTH_TYPE_NFC] = nullptr; + context_->authenticationMap[AUTH_TYPE_CRE] = nullptr; + context_->accesser.dmVersion = DM_CURRENT_VERSION; + context_->accessee.dmVersion = DM_CURRENT_VERSION; + context_->timer = std::make_shared(); + context_->authMessageProcessor = std::make_shared(); + context_->businessId = ""; +} + +AuthManager::~AuthManager() +{ + if (context_ != nullptr) { + context_->successFinished = true; + context_->authStateMachine->Stop(); // Stop statemMachine thread + context_->timer->DeleteAll(); + LOGI("AuthManager context variables destroy successful."); + } + { + std::lock_guard lock(bindParamMutex_); + bindParam_.clear(); + } + LOGI("DmAuthManager destructor"); +} + +void AuthManager::RegisterCleanNotifyCallback(CleanNotifyCallback cleanNotifyCallback) +{ + context_->cleanNotifyCallback = cleanNotifyCallback; + return; +} + +void AuthManager::SetAuthContext(std::shared_ptr context) +{ + this->context_ = context; +} + +std::shared_ptr AuthManager::GetAuthContext() +{ + return this->context_; +} + +std::string AuthManager::GeneratePincode() +{ + LOGI("AuthManager::GeneratePincode start"); + int32_t pinCode = GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE); + context_->pinCode = std::to_string(pinCode); + return context_->pinCode; +} + +int32_t AuthManager::RegisterUiStateCallback(const std::string pkgName) +{ + LOGI("AuthManager::RegisterUiStateCallback start"); + if (context_->authUiStateMgr == nullptr) { + LOGE("AuthManager::RegisterUiStateCallback context_->authUiStateMgr is null."); + return ERR_DM_FAILED; + } + context_->authUiStateMgr->RegisterUiStateCallback(pkgName); + return DM_OK; +} + +int32_t AuthManager::UnRegisterUiStateCallback(const std::string pkgName) +{ + LOGI("AuthManager::UnRegisterUiStateCallback start"); + if (context_->authUiStateMgr == nullptr) { + LOGE("AuthManager::UnRegisterUiStateCallback context_->authUiStateMgr is null."); + return ERR_DM_FAILED; + } + context_->authUiStateMgr->UnRegisterUiStateCallback(pkgName); + return DM_OK; +} + +int32_t AuthManager::UnAuthenticateDevice(const std::string &pkgName, const std::string &udid, int32_t bindLevel) +{ + LOGI("AuthManager::UnAuthenticateDevice start"); + return ERR_DM_FAILED; +} + +int32_t AuthManager::ImportAuthCode(const std::string &pkgName, const std::string &authCode) +{ + if (authCode.empty() || pkgName.empty()) { + LOGE("ImportAuthCode failed, authCode or pkgName is empty"); + return ERR_DM_INPUT_PARA_INVALID; + } + context_->importAuthCode = authCode; + context_->importPkgName = pkgName; + context_->pinCode = authCode; + LOGI("AuthManager::ImportAuthCode ok"); + return DM_OK; +} + +int32_t AuthManager::UnBindDevice(const std::string &pkgName, const std::string &udid, + int32_t bindLevel, const std::string &extra) +{ + LOGI("AuthManager::UnBindDevice start"); + return ERR_DM_FAILED; +} + +int32_t AuthManager::StopAuthenticateDevice(const std::string &pkgName) +{ + (void)pkgName; + LOGI("AuthManager::StopAuthenticateDevice start"); + + context_->reason = STOP_BIND; + if (context_->direction == DM_AUTH_SOURCE) { + context_->authStateMachine->TransitionTo(std::make_shared()); + } else { + context_->authStateMachine->TransitionTo(std::make_shared()); + } + return DM_OK; +} + +void AuthManager::OnScreenLocked() +{ + LOGI("AuthManager::OnScreenLocked start"); + if (DmAuthState::IsImportAuthCodeCompatibility(context_->authType)) { + LOGI("OnScreenLocked authtype is: %{public}d, no need stop bind.", context_->authType); + return; + } + context_->reason = ERR_DM_BIND_USER_CANCEL; + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); +} + +void AuthManager::HandleDeviceNotTrust(const std::string &udid) +{ + LOGI("AuthManager::HandleDeviceNotTrust start"); +} + +int32_t AuthManager::RegisterAuthenticationType(int32_t authenticationType) +{ + context_->confirmOperation = static_cast(authenticationType); + return DM_OK; +} + +int32_t AuthManager::GetReason() +{ + return context_->reason; +} + +// Save the key +void AuthSrcManager::AuthDeviceSessionKey(int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen) +{ + LOGI("AuthSrcManager::AuthDeviceSessionKey start. keyLen: %{public}u", sessionKeyLen); + if (context_ == nullptr || context_->authMessageProcessor == nullptr || context_->authStateMachine == nullptr) { + LOGE("AuthSrcManager::AuthDeviceSessionKey failed, auth context not initial."); + return; + } + if (requestId != context_->requestId) { + LOGE("AuthSrcManager::onTransmit requestId %{public}" PRId64 "is error.", requestId); + return; + } + int32_t ret = context_->authMessageProcessor->SaveSessionKey(sessionKey, sessionKeyLen); + if (ret != DM_OK) { + LOGE("AuthSrcManager::AuthDeviceSessionKey, save session key error, ret: %{public}d", ret); + } + + context_->authStateMachine->NotifyEventFinish(ON_SESSION_KEY_RETURNED); + LOGI("AuthSrcManager::AuthDeviceSessionKey leave."); +} + +char *AuthSrcManager::AuthDeviceRequest(int64_t requestId, int operationCode, const char *reqParams) +{ + LOGI("AuthSrcManager::AuthDeviceRequest start"); + return nullptr; +} + +void AuthManager::SetAuthType(int32_t authType) +{ + context_->authType = (DmAuthType)authType; +} + +bool AuthManager::IsAuthTypeSupported(const int32_t &authType) +{ + if (context_->authenticationMap.find(authType) == context_->authenticationMap.end()) { + LOGE("IsAuthTypeSupported failed, authType is not supported."); + return false; + } + return true; +} + +bool AuthManager::IsAuthCodeReady(const std::string &pkgName) +{ + if (context_->importAuthCode.empty() || context_->importPkgName.empty()) { + LOGE("AuthManager::IsAuthCodeReady, auth code not ready with authCode %{public}s and pkgName %{public}s.", + GetAnonyString(context_->importAuthCode).c_str(), context_->importPkgName.c_str()); + return false; + } + if (pkgName != context_->importPkgName) { + LOGE("AuthManager::IsAuthCodeReady pkgName %{public}s not supported with import pkgName %{public}s.", + pkgName.c_str(), context_->importPkgName.c_str()); + return false; + } + return true; +} + +int32_t AuthManager::CheckAuthParamVaild(const std::string &pkgName, int32_t authType, + const std::string &deviceId, const std::string &extra) +{ + LOGI("AuthManager::CheckAuthParamVaild start."); + if (authType < DM_AUTH_TYPE_MIN || authType > DM_AUTH_TYPE_MAX) { + LOGE("CheckAuthParamVaild failed, authType is illegal."); + return ERR_DM_AUTH_FAILED; + } + if (pkgName.empty() || deviceId.empty()) { + LOGE("AuthManager::CheckAuthParamVaild failed, pkgName is %{public}s, deviceId is %{public}s, extra is" + "%{public}s.", pkgName.c_str(), GetAnonyString(deviceId).c_str(), extra.c_str()); + return ERR_DM_INPUT_PARA_INVALID; + } + if (context_->listener == nullptr || context_->authUiStateMgr == nullptr) { + LOGE("AuthManager::CheckAuthParamVaild listener or authUiStateMgr is nullptr."); + return ERR_DM_INPUT_PARA_INVALID; + } + + if (!IsAuthTypeSupported(authType)) { + LOGE("AuthManager::CheckAuthParamVaild authType %{public}d not support.", authType); + context_->listener->OnAuthResult(context_->processInfo, context_->peerTargetId.deviceId, "", + STATUS_DM_AUTH_DEFAULT, + ERR_DM_UNSUPPORTED_AUTH_TYPE); + context_->listener->OnBindResult(context_->processInfo, context_->peerTargetId, + ERR_DM_UNSUPPORTED_AUTH_TYPE, STATUS_DM_AUTH_DEFAULT, ""); + return ERR_DM_UNSUPPORTED_AUTH_TYPE; + } + JsonObject jsonObject(extra); + if ((jsonObject.IsDiscarded() || !IsString(jsonObject, PARAM_KEY_CONN_SESSIONTYPE) || + jsonObject[PARAM_KEY_CONN_SESSIONTYPE].Get() != CONN_SESSION_TYPE_HML) && + !context_->softbusConnector->HaveDeviceInMap(deviceId)) { + LOGE("CheckAuthParamVaild failed, the discoveryDeviceInfoMap_ not have this device."); + context_->listener->OnAuthResult(context_->processInfo, context_->peerTargetId.deviceId, "", + STATUS_DM_AUTH_DEFAULT, ERR_DM_INPUT_PARA_INVALID); + context_->listener->OnBindResult(context_->processInfo, context_->peerTargetId, + ERR_DM_INPUT_PARA_INVALID, STATUS_DM_AUTH_DEFAULT, ""); + return ERR_DM_INPUT_PARA_INVALID; + } + + if (DmAuthState::IsImportAuthCodeCompatibility(static_cast(authType)) && + (!IsAuthCodeReady(pkgName))) { + LOGE("Auth code not exist."); + context_->listener->OnAuthResult(context_->processInfo, context_->peerTargetId.deviceId, "", + STATUS_DM_AUTH_DEFAULT, ERR_DM_INPUT_PARA_INVALID); + context_->listener->OnBindResult(context_->processInfo, context_->peerTargetId, + ERR_DM_INPUT_PARA_INVALID, STATUS_DM_AUTH_DEFAULT, ""); + return ERR_DM_INPUT_PARA_INVALID; + } + return DM_OK; +} + +void AuthManager::ParseHmlInfoInJsonObject(const JsonObject &jsonObject) +{ + if (jsonObject[PARAM_KEY_CONN_SESSIONTYPE].IsString()) { + context_->connSessionType = jsonObject[PARAM_KEY_CONN_SESSIONTYPE].Get(); + LOGI("connSessionType %{public}s", context_->connSessionType.c_str()); + } + if (!IsHmlSessionType(context_->connSessionType)) { + return; + } + if (context_->connDelayCloseTime == 0) { + context_->connDelayCloseTime = HML_SESSION_TIMEOUT; + } + if (jsonObject[PARAM_KEY_HML_ENABLE_160M].IsBoolean()) { + context_->hmlEnable160M = jsonObject[PARAM_KEY_HML_ENABLE_160M].Get(); + LOGI("hmlEnable160M %{public}d", context_->hmlEnable160M); + } + if (jsonObject[PARAM_KEY_HML_ACTIONID].IsString()) { + std::string actionIdStr = jsonObject[PARAM_KEY_HML_ACTIONID].Get(); + if (IsNumberString(actionIdStr)) { + context_->hmlActionId = std::atoi(actionIdStr.c_str()); + } + if (context_->hmlActionId <= 0) { + context_->hmlActionId = 0; + } + LOGI("hmlActionId %{public}d", context_->hmlActionId); + } + + return; +} + +std::string AuthManager::GetBundleName(const JsonObject &jsonObject) +{ + if (!jsonObject.IsDiscarded() && jsonObject[BUNDLE_NAME_KEY].IsString()) { + return jsonObject[BUNDLE_NAME_KEY].Get(); + } + bool isSystemSA = false; + std::string bundleName; + AppManager::GetInstance().GetCallerName(isSystemSA, bundleName); + return bundleName; +} + +void AuthManager::ParseJsonObject(const JsonObject &jsonObject) +{ + if (IsString(jsonObject, DM_BUSINESS_ID)) { + context_->businessId = jsonObject[DM_BUSINESS_ID].Get(); + } + if (jsonObject[APP_OPERATION_KEY].IsString()) { + context_->appOperation = jsonObject[APP_OPERATION_KEY].Get(); + } + if (jsonObject[CUSTOM_DESCRIPTION_KEY].IsString()) { + context_->customData = jsonObject[CUSTOM_DESCRIPTION_KEY].Get(); + } + if (jsonObject[TAG_APP_THUMBNAIL2].IsString()) { + context_->appThumbnail = jsonObject[TAG_APP_THUMBNAIL2].Get(); + } + context_->connDelayCloseTime = 0; + if (jsonObject[PARAM_CLOSE_SESSION_DELAY_SECONDS].IsString()) { + std::string delaySecondsStr = jsonObject[PARAM_CLOSE_SESSION_DELAY_SECONDS].Get(); + context_->connDelayCloseTime = GetCloseSessionDelaySeconds(delaySecondsStr); + } + + context_->accessee.bundleName = context_->accesser.bundleName; + if (jsonObject[TAG_PEER_BUNDLE_NAME].IsString() && !jsonObject[TAG_PEER_BUNDLE_NAME].Get().empty()) { + context_->accessee.bundleName = jsonObject[TAG_PEER_BUNDLE_NAME].Get(); + context_->accessee.oldBundleName = context_->accessee.bundleName; + } else { + context_->accessee.oldBundleName = context_->pkgName; + } + + context_->accesser.pkgName = context_->pkgName; + context_->accessee.pkgName = context_->accesser.pkgName; + + if (jsonObject[TAG_PEER_PKG_NAME].IsString()) { + context_->accessee.pkgName = jsonObject[TAG_PEER_PKG_NAME].Get(); + } + + if (jsonObject[TAG_PEER_DISPLAY_ID].IsNumberInteger()) { + context_->accessee.displayId = jsonObject[TAG_PEER_DISPLAY_ID].Get(); + } + if (jsonObject[TAG_LOCAL_USERID].IsNumberInteger()) { + context_->accesser.userId = jsonObject[TAG_LOCAL_USERID].Get(); + } else { + context_->accesser.userId = MultipleUserConnector::GetFirstForegroundUserId(); + } + + if (context_->authType == AUTH_TYPE_PIN_ULTRASONIC) { + ParseUltrasonicSide(jsonObject); + } + + ParseHmlInfoInJsonObject(jsonObject); + return; +} + +void AuthManager::ParseUltrasonicSide(const JsonObject &jsonObject) +{ + if (jsonObject[TAG_ULTRASONIC_SIDE].IsString()) { + std::string tempInfo = jsonObject[TAG_ULTRASONIC_SIDE].Get(); + if (tempInfo.length() > 0 && isdigit(tempInfo[0])) { + int32_t intTempInfo = std::atoi(tempInfo.c_str()); + if (intTempInfo == DM_ULTRASONIC_REVERSE) { + context_->ultrasonicInfo = DmUltrasonicInfo::DM_Ultrasonic_Reverse; + } else if (intTempInfo == DM_ULTRASONIC_FORWARD) { + context_->ultrasonicInfo = DmUltrasonicInfo::DM_Ultrasonic_Forward; + } else { + context_->ultrasonicInfo = DmUltrasonicInfo::DM_Ultrasonic_Invalid; + } + } + } +} + +int32_t AuthManager::GetTokenIdByBundleName(int32_t userId, std::string &bundleName, int64_t &tokenId) +{ + int32_t ret = AppManager::GetInstance().GetNativeTokenIdByName(bundleName, tokenId); + if (ret == DM_OK) { + return DM_OK; + } + ret = AppManager::GetInstance().GetHapTokenIdByName(userId, bundleName, 0, tokenId); + if (ret != DM_OK) { + LOGE("get tokenId by bundleName failed %{public}s", GetAnonyString(bundleName).c_str()); + } + return ret; +} + +bool CheckBindLevel(const JsonItemObject &jsonObj, const std::string &key, int32_t &bindLevel) +{ + if (IsJsonValIntegerString(jsonObj, TAG_BIND_LEVEL)) { + bindLevel = std::atoi(jsonObj[TAG_BIND_LEVEL].Get().c_str()); + return true; + } + if (IsInt32(jsonObj, TAG_BIND_LEVEL)) { + bindLevel = jsonObj[TAG_BIND_LEVEL].Get(); + return true; + } + return false; +} + +int32_t AuthManager::GetBindLevel(int32_t bindLevel) +{ + LOGI("start."); + std::string processName = ""; + bool isSystemSA = false; + { + std::lock_guard lock(bindParamMutex_); + if (bindParam_.find("bindCallerProcessName") != bindParam_.end()) { + processName = bindParam_["bindCallerProcessName"]; + } + if (bindParam_.find("bindCallerIsSystemSA") != bindParam_.end()) { + isSystemSA = static_cast(std::atoi(bindParam_["bindCallerIsSystemSA"].c_str())); + } + } + LOGI("processName = %{public}s, isSystemSA %{public}d.", GetAnonyString(processName).c_str(), isSystemSA); + if (processName != "" && AuthManagerBase::CheckProcessNameInWhiteList(processName)) { + return USER; + } + if (isSystemSA) { + if (static_cast(bindLevel) == INVALIED_TYPE || static_cast(bindLevel) > APP || + static_cast(bindLevel) < USER) { + return USER; + } + return bindLevel; + } + if (static_cast(bindLevel) == INVALIED_TYPE || (static_cast(bindLevel) != APP && + static_cast(bindLevel) != SERVICE)) { + return APP; + } + return bindLevel; +} + +void AuthManager::GetAuthParam(const std::string &pkgName, int32_t authType, + const std::string &deviceId, const std::string &extra) +{ + LOGI("Get auth param with pkgName %{public}s and extra %{public}s.", pkgName.c_str(), extra.c_str()); + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + context_->accesser.deviceId = std::string(localDeviceId); + context_->pkgName = pkgName; + context_->authType = (DmAuthType)authType; + context_->accesser.deviceName = context_->listener->GetLocalDisplayDeviceNameForPrivacy(); + context_->accesser.deviceType = context_->softbusConnector->GetLocalDeviceTypeId(); + context_->accesser.isOnline = false; + + context_->accessee.deviceId = deviceId; + context_->accessee.addr = deviceId; + JsonObject jsonObject(extra); + if (jsonObject.IsDiscarded()) { + LOGE("extra string not a json type."); + return; + } + ParseJsonObject(jsonObject); + context_->accesser.accountId = MultipleUserConnector::GetOhosAccountIdByUserId(context_->accesser.userId); + + // compatible for old version + context_->accesser.oldBindLevel = INVALIED_TYPE; + CheckBindLevel(jsonObject, TAG_BIND_LEVEL, context_->accesser.oldBindLevel); + context_->accesser.oldBindLevel = GetBindLevel(context_->accesser.oldBindLevel); + { + std::lock_guard lock(bindParamMutex_); + bindParam_["bindCallerOldBindLevel"] = std::to_string(context_->accesser.oldBindLevel); + } + LOGI("bindCallerOldBindLevel %{public}d.", context_->accesser.oldBindLevel); +} + +void AuthManager::InitAuthState(const std::string &pkgName, int32_t authType, + const std::string &deviceId, const std::string &extra) +{ + auto iter = context_->authenticationMap.find(authType); + if (iter != context_->authenticationMap.end()) { + context_->authPtr = iter->second; + } + + context_->timer->StartTimer(std::string(AUTHENTICATE_TIMEOUT_TASK), + AUTHENTICATE_TIMEOUT, + [this] (std::string name) { + DmAuthState::HandleAuthenticateTimeout(context_, name); + }); + GetAuthParam(pkgName, authType, deviceId, extra); + context_->authStateMachine->TransitionTo(std::make_shared()); + LOGI("AuthManager::AuthenticateDevice complete"); + + return; +} + +int32_t AuthManager::AuthenticateDevice(const std::string &pkgName, int32_t authType, + const std::string &deviceId, const std::string &extra) +{ + LOGI("AuthManager::AuthenticateDevice start auth type %{public}d, extra %{public}s.", authType, extra.c_str()); + SetAuthType(authType); + context_->processInfo.pkgName = pkgName; + GetBindCallerInfo(); + int32_t ret = CheckAuthParamVaild(pkgName, authType, deviceId, extra); + if (ret != DM_OK) { + LOGE("AuthManager::AuthenticateDevice failed, param is invaild."); + return ret; + } + context_->isAuthenticateDevice = true; + if (authType == AUTH_TYPE_CRE) { + LOGI("AuthManager::AuthenticateDevice for credential type, joinLNN directly."); + context_->softbusConnector->JoinLnn(deviceId, true); + context_->listener->OnAuthResult(context_->processInfo, context_->peerTargetId.deviceId, + "", STATUS_DM_AUTH_DEFAULT, DM_OK); + context_->listener->OnBindResult(context_->processInfo, context_->peerTargetId, + DM_OK, STATUS_DM_AUTH_DEFAULT, ""); + return DM_OK; + } + InitAuthState(pkgName, authType, deviceId, extra); + if (context_->ultrasonicInfo == DmUltrasonicInfo::DM_Ultrasonic_Invalid) { + return ERR_DM_INPUT_PARA_INVALID; + } + return DM_OK; +} + +int32_t AuthManager::BindTarget(const std::string &pkgName, const PeerTargetId &targetId, + const std::map &bindParam, int sessionId, uint64_t logicalSessionId) +{ + int ret = DM_OK; + LOGI("AuthManager::BindTarget start. pkgName: %{public}s", pkgName.c_str()); + for (auto iter = bindParam.begin(); iter != bindParam.end(); iter++) { + LOGI("AuthManager::BindTarget para: %{public}s : %{public}s ", iter->first.c_str(), iter->second.c_str()); + } + + struct RadarInfo info = { + .funcName = "AuthenticateDevice", + .stageRes = static_cast(StageRes::STAGE_SUCC), + .bizState = static_cast(BizState::BIZ_STATE_END), + }; + 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()); + } + if (pkgName.empty()) { + LOGE("AuthManager::BindTarget failed, pkgName is empty."); + return ERR_DM_INPUT_PARA_INVALID; + } + int32_t authType = -1; + if (ParseAuthType(bindParam, authType) != DM_OK) { + LOGE("AuthManager::BindTarget failed, key: %{public}s error.", PARAM_KEY_AUTH_TYPE); + return ERR_DM_INPUT_PARA_INVALID; + } + context_->peerTargetId = targetId_; + { + std::lock_guard lock(bindParamMutex_); + bindParam_ = bindParam; + } + if (!targetId.deviceId.empty()) { + ret = AuthenticateDevice(pkgName, authType, targetId.deviceId, ParseExtraFromMap(bindParam)); + if (ret != DM_OK) { return ret; } + } else { + LOGE("AuthManager::BindTarget failed, targetId is error."); + return ERR_DM_INPUT_PARA_INVALID; + } + + context_->sessionId = sessionId; + context_->logicalSessionId = logicalSessionId; + context_->requestId = static_cast(logicalSessionId); + context_->authStateMachine->TransitionTo(std::make_shared()); + info = { .funcName = "BindTarget" }; + info.channelId = sessionId; + DmRadarHelper::GetInstance().ReportAuthSendRequest(info); + return ret; +} + +AuthSinkManager::AuthSinkManager(std::shared_ptr softbusConnector, + std::shared_ptr hiChainConnector, + std::shared_ptr listener, + std::shared_ptr hiChainAuthConnector) + : AuthManager(softbusConnector, hiChainConnector, listener, hiChainAuthConnector) +{ + context_->direction = DM_AUTH_SINK; + context_->authStateMachine = std::make_shared(context_); +} + +void AuthSinkManager::OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result) +{ + LOGI("sessionId = %{public}d and sessionSide = %{public}d result = %{public}d", sessionId, sessionSide, result); +} + +void AuthSinkManager::OnSessionClosed(int32_t sessionId) +{ + LOGI("AuthSrcManager::OnSessionClosed sessionId = %{public}d", sessionId); + context_->reason = ERR_DM_SESSION_CLOSED; + context_->authStateMachine->TransitionTo(std::make_shared()); +} + +void AuthSinkManager::OnDataReceived(int32_t sessionId, std::string message) +{ + context_->sessionId = sessionId; + int32_t ret = context_->authMessageProcessor->ParseMessage(context_, message); + if (ret != DM_OK) { + LOGE("OnDataReceived failed, parse input message error."); + context_->reason = ERR_DM_PARSE_MESSAGE_FAILED; + context_->authStateMachine->TransitionTo(std::make_shared()); + } + + return; +} + +bool AuthSinkManager::GetIsCryptoSupport() +{ + return false; +} + +void AuthManager::GetRemoteDeviceId(std::string &deviceId) +{ + deviceId = (context_->direction == DM_AUTH_SOURCE) ? context_->accessee.deviceId : context_->accesser.deviceId; + return; +} + +int32_t AuthSinkManager::OnUserOperation(int32_t action, const std::string ¶ms) +{ + LOGI("AuthSinkManager::OnUserOperation start."); + if (context_ == nullptr || context_->authStateMachine == nullptr) { + LOGE("OnUserOperation: Authenticate is not start"); + return ERR_DM_AUTH_NOT_START; + } + + std::string businessId = context_->businessId; + if (!businessId.empty()) { + LOGI("AuthSinkManager::OnUserOperation found businessId: %{public}s", businessId.c_str()); + int32_t ret = HandleBusinessEvents(businessId, action); + if (ret != DM_OK) { + LOGE("AuthSinkManager::OnUserOperation failed to handle business events, ret: %{public}d", ret); + return ret; + } + } + + switch (action) { + case USER_OPERATION_TYPE_CANCEL_AUTH: + case USER_OPERATION_TYPE_ALLOW_AUTH: + case USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS: + context_->confirmOperation = static_cast(action); + context_->reply = USER_OPERATION_TYPE_ALLOW_AUTH; + if (action == USER_OPERATION_TYPE_CANCEL_AUTH) { + LOGI("AuthSinkManager::OnUserOperation USER_OPERATION_TYPE_CANCEL_AUTH."); + context_->reply = USER_OPERATION_TYPE_CANCEL_AUTH; + } + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_USER_OPERATION); + break; + case USER_OPERATION_TYPE_AUTH_CONFIRM_TIMEOUT: + LOGI("AuthSinkManager::OnUserOperation USER_OPERATION_TYPE_AUTH_CONFIRM_TIMEOUT."); + context_->confirmOperation = USER_OPERATION_TYPE_AUTH_CONFIRM_TIMEOUT; + context_->reason = ERR_DM_TIME_OUT; + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + break; + case USER_OPERATION_TYPE_CANCEL_PINCODE_DISPLAY: + LOGI("AuthSinkManager::OnUserOperation USER_OPERATION_TYPE_CANCEL_PINCODE_DISPLAY."); + context_->confirmOperation = USER_OPERATION_TYPE_CANCEL_PINCODE_DISPLAY; + context_->reason = ERR_DM_BIND_USER_CANCEL_PIN_CODE_DISPLAY; + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + break; + default: + LOGE("this action id not support"); + break; + } + LOGI("AuthSinkManager::OnUserOperation leave."); + return DM_OK; +} + +AuthSrcManager::AuthSrcManager(std::shared_ptr softbusConnector, + std::shared_ptr hiChainConnector, + std::shared_ptr listener, + std::shared_ptr hiChainAuthConnector) + : AuthManager(softbusConnector, hiChainConnector, listener, hiChainAuthConnector) +{ + context_->direction = DM_AUTH_SOURCE; + context_->authStateMachine = std::make_shared(context_); +} + +void AuthSrcManager::OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result) +{ + LOGI("sessionId = %{public}d and sessionSide = %{public}d result = %{public}d", sessionId, sessionSide, result); +} + +void AuthSrcManager::OnSessionClosed(int32_t sessionId) +{ + LOGI("AuthSrcManager::OnSessionClosed sessionId = %{public}d", sessionId); + context_->reason = ERR_DM_SESSION_CLOSED; + context_->authStateMachine->TransitionTo(std::make_shared()); +} + +void AuthSrcManager::OnSessionDisable() +{ + context_->sessionId = -1; +} + +void AuthSrcManager::OnDataReceived(int32_t sessionId, std::string message) +{ + context_->sessionId = sessionId; + int32_t ret = context_->authMessageProcessor->ParseMessage(context_, message); + if (ret != DM_OK) { + LOGE("OnDataReceived failed, parse input message error."); + context_->reason = ERR_DM_PARSE_MESSAGE_FAILED; + context_->authStateMachine->TransitionTo(std::make_shared()); + } + + return; +} + +bool AuthSrcManager::GetIsCryptoSupport() +{ + return false; +} + +int32_t AuthSrcManager::OnUserOperation(int32_t action, const std::string ¶ms) +{ + LOGI("AuthSrcManager::OnUserOperation start."); + if (context_ == nullptr || context_->authStateMachine == nullptr) { + LOGE("OnUserOperation: Authenticate is not start"); + return ERR_DM_AUTH_NOT_START; + } + + switch (action) { + case USER_OPERATION_TYPE_CANCEL_PINCODE_INPUT: + LOGE("AuthSrcManager OnUserOperation user cancel"); + context_->pinInputResult = USER_OPERATION_TYPE_CANCEL_PINCODE_INPUT; + context_->reason = ERR_DM_BIND_USER_CANCEL_ERROR; + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + break; + case USER_OPERATION_TYPE_DONE_PINCODE_INPUT: + LOGE("AuthSrcManager OnUserOperation user input done"); + context_->pinInputResult = USER_OPERATION_TYPE_DONE_PINCODE_INPUT; + { + if (!IsNumberString(params)) { + LOGE("OnUserOperation jsonStr error"); + return ERR_DM_INPUT_PARA_INVALID; + } + context_->pinCode = params; + } + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_USER_OPERATION); + break; + default: + LOGE("this action id not support"); + break; + } + LOGI("AuthSrcManager::OnUserOperation leave."); + return DM_OK; +} + +void AuthSrcManager::AuthDeviceError(int64_t requestId, int32_t errorCode) +{ + LOGI("AuthSrcManager::AuthDeviceError start."); + CHECK_NULL_VOID(context_); + if (requestId != context_->requestId) { + LOGE("requestId: %{public}" PRId64", context_->requestId: %{public}" PRId64".", requestId, context_->requestId); + return; + } + auto curState = context_->authStateMachine->GetCurState(); + if (curState == DmAuthStateType::AUTH_SRC_PIN_AUTH_START_STATE || + curState == DmAuthStateType::AUTH_SRC_PIN_AUTH_MSG_NEGOTIATE_STATE || + curState == DmAuthStateType::AUTH_SRC_PIN_AUTH_DONE_STATE) { + LOGI("AuthSrcManager::AuthDeviceError Auth pin err."); + if (context_->authType == DmAuthType::AUTH_TYPE_PIN) { + context_->inputPinAuthFailTimes++; + } + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_ERROR); + context_->authStateMachine->TransitionTo(std::make_shared()); + } else { + LOGI("AuthSrcManager::AuthDeviceError unexpected err."); + context_->reason = errorCode; + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + } + LOGI("AuthSrcManager::AuthDeviceError leave."); +} + +void AuthSinkManager::AuthDeviceError(int64_t requestId, int32_t errorCode) +{ + LOGI("AuthSinkManager::AuthDeviceError start."); + auto curState = context_->authStateMachine->GetCurState(); + if (curState == DmAuthStateType::AUTH_SINK_PIN_AUTH_START_STATE || + curState == DmAuthStateType::AUTH_SINK_PIN_AUTH_MSG_NEGOTIATE_STATE) { + LOGI("AuthSrcManager::AuthDeviceError Auth pin err."); + if (context_->authType == DmAuthType::AUTH_TYPE_PIN) { + context_->inputPinAuthFailTimes++; + } + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_ERROR); + context_->authStateMachine->TransitionTo(std::make_shared()); + } else { + LOGI("AuthSinkManager::AuthDeviceError unexpected err."); + context_->reason = errorCode; + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + } + LOGI("AuthSinkManager::AuthDeviceError leave."); +} + +bool AuthSrcManager::AuthDeviceTransmit(int64_t requestId, const uint8_t *data, uint32_t dataLen) +{ + LOGI("AuthSrcManager::AuthDeviceTransmit start."); + // check request id first + if (requestId != context_->requestId) { + LOGE("AuthSrcManager::onTransmit requestId %{public}" PRId64"is error.", requestId); + return false; + } + + context_->transmitData = std::string(reinterpret_cast(data), dataLen); + context_->authStateMachine->NotifyEventFinish(ON_TRANSMIT); + LOGI("AuthSrcManager::AuthDeviceTransmit leave."); + return true; +} + +bool AuthSinkManager::AuthDeviceTransmit(int64_t requestId, const uint8_t *data, uint32_t dataLen) +{ + LOGI("AuthSinkManager::AuthDeviceTransmit start."); + // check request id first + if (requestId != context_->requestId) { + LOGE("AuthSinkManager::onTransmit requestId %{public}" PRId64"is error.", requestId); + return false; + } + + context_->transmitData = std::string(reinterpret_cast(data), dataLen); + context_->authStateMachine->NotifyEventFinish(ON_TRANSMIT); + LOGI("AuthSinkManager::AuthDeviceTransmit leave."); + return true; +} + +void AuthSrcManager::AuthDeviceFinish(int64_t requestId) +{ + LOGI("AuthSrcManager::AuthDeviceFinish start."); + context_->authStateMachine->NotifyEventFinish(ON_FINISH); + // Perform business processing based on the current state + DmAuthStateType curState = context_->authStateMachine->GetCurState(); + switch (curState) { + case DmAuthStateType::AUTH_SRC_PIN_AUTH_DONE_STATE: + // ON_FINISH event occurs, start credential exchange + context_->authStateMachine->TransitionTo(std::make_shared()); + break; + default: + break; + } + LOGI("AuthSrcManager::AuthDeviceFinish leave."); +} + +void AuthSinkManager::AuthDeviceFinish(int64_t requestId) +{ + LOGI("AuthSinkManager::AuthDeviceFinish start."); + context_->authStateMachine->NotifyEventFinish(ON_FINISH); + LOGI("AuthSinkManager::AuthDeviceFinish leave."); +} + +void AuthSinkManager::AuthDeviceSessionKey(int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen) +{ + LOGI("AuthSrcManager::AuthDeviceSessionKey start. keyLen: %{public}u", sessionKeyLen); + if (context_ == nullptr || context_->authMessageProcessor == nullptr || context_->authStateMachine == nullptr) { + LOGE("AuthSrcManager::AuthDeviceSessionKey failed, auth context not initial."); + return; + } + if (requestId != context_->requestId) { + LOGE("AuthSrcManager::onTransmit requestId %{public}" PRId64 "is error.", requestId); + return; + } + int32_t ret = context_->authMessageProcessor->SaveSessionKey(sessionKey, sessionKeyLen); + if (ret != DM_OK) { + LOGE("AuthSrcManager::AuthDeviceSessionKey, save session key error, ret: %{public}d", ret); + } + + context_->authStateMachine->NotifyEventFinish(ON_SESSION_KEY_RETURNED); +} + +char *AuthSinkManager::AuthDeviceRequest(int64_t requestId, int operationCode, const char *reqParams) +{ + LOGI("AuthSinkManager::AuthDeviceRequest start"); + (void)requestId; + (void)reqParams; + JsonObject jsonObj; + + DmAuthStateType curState = context_->authStateMachine->GetCurState(); + if (curState == DmAuthStateType::AUTH_SINK_PIN_AUTH_START_STATE || + curState == DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_DONE_STATE|| + curState == DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_DONE_STATE) { + std::string pinCode = ""; + if (GetPinCode(pinCode) == ERR_DM_FAILED || pinCode == "") { + jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_REJECTED; + } else { + jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_ACCEPTED; + jsonObj[FIELD_PIN_CODE] = pinCode; + } + LOGI("pinCode: %{public}s", GetAnonyString(pinCode).c_str()); + } else if (curState == DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_START_STATE) { + if (context_->isOnline) { // Non-first time certification + jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_ACCEPTED; + jsonObj[FIELD_CRED_ID] = context_->accessee.transmitCredentialId; + } else if (!context_->isAppCredentialVerified) { // First-time authentication && appCred auth + jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_ACCEPTED; + jsonObj[FIELD_CRED_ID] = context_->accessee.transmitCredentialId; + } else { // First-time authentication && User credential authentication + jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_ACCEPTED; + jsonObj[FIELD_CRED_ID] = context_->accessee.lnnCredentialId; + } + } + jsonObj[FIELD_SERVICE_PKG_NAME] = std::string(DM_PKG_NAME); + std::string jsonStr = jsonObj.Dump(); + char *buffer = strdup(jsonStr.c_str()); + return buffer; +} + +int32_t AuthManager::GetPinCode(std::string &code) +{ + if (context_ == nullptr) { + LOGE("AuthManager failed to GetPinCode because context_ is nullptr"); + return ERR_DM_FAILED; + } + LOGI("GetPinCode called."); + code = context_->pinCode; + return DM_OK; +} + +// Reacquire BindParams to rebuild the link, generally used when switching between old and new protocol objects +void AuthManager::GetBindTargetParams(std::string &pkgName, PeerTargetId &targetId, + std::map &bindParam) +{ + pkgName = context_->pkgName; + targetId = targetId_; + { + std::lock_guard lock(bindParamMutex_); + bindParam = bindParam_; + } + LOGI("AuthManager::GetBindTargetParams get pkgName %{public}s to reuse", pkgName.c_str()); + return; +} + +void AuthManager::GetAuthCodeAndPkgName(std::string &pkgName, std::string &authCode) +{ + if (context_ == nullptr || context_->importAuthCode.empty() || context_->importPkgName.empty()) { + LOGE("GetAuthCodeAndPkgName failed, authCode or pkgName is empty"); + return; + } + authCode = context_->importAuthCode; + pkgName = context_->importPkgName; +} + +void AuthManager::SetBindTargetParams(const PeerTargetId &targetId) +{ + targetId_ = targetId; + LOGI("AuthManager::SetBindTargetParams set targetId to reuse"); + return; +} + +void AuthManager::ClearSoftbusSessionCallback() +{} + +void AuthManager::PrepareSoftbusSessionCallback() +{} + +void AuthManager::GetBindCallerInfo() +{ + LOGI("start."); + { + std::lock_guard lock(bindParamMutex_); + if (bindParam_.find("bindCallerUserId") != bindParam_.end()) { + context_->processInfo.userId = std::atoi(bindParam_["bindCallerUserId"].c_str()); + } + if (bindParam_.find("bindCallerTokenId") != bindParam_.end()) { + context_->accesser.tokenId = std::atoi(bindParam_["bindCallerTokenId"].c_str()); + } + if (bindParam_.find("bindCallerBindLevel") != bindParam_.end()) { + context_->accesser.bindLevel = std::atoi(bindParam_["bindCallerBindLevel"].c_str()); + } + if (bindParam_.find("bindCallerBundleName") != bindParam_.end()) { + context_->accesser.bundleName = bindParam_["bindCallerBundleName"]; + } + if (bindParam_.find("bindCallerHostPkgLabel") != bindParam_.end()) { + context_->pkgLabel = bindParam_["bindCallerHostPkgLabel"]; + } + } +} + +void AuthManager::DeleteTimer() +{ + if (context_ != nullptr) { + context_->successFinished = true; + context_->authStateMachine->Stop(); // Stop statemMachine thread + context_->timer->DeleteAll(); + LOGI("AuthManager context deleteTimer successful."); + } + { + std::lock_guard lock(bindParamMutex_); + bindParam_.clear(); + } + LOGI("end."); +} + +int32_t AuthManager::HandleBusinessEvents(const std::string &businessId, int32_t action) +{ + LOGI("AuthManager::HandleBusinessEvents start."); + DistributedDeviceProfile::BusinessEvent rejectEvent; + rejectEvent.SetBusinessKey(DM_REJECT_KEY); + JsonObject rejectJson; + rejectJson[DM_BUSINESS_ID] = businessId; + rejectJson[DM_AUTH_DIALOG_REJECT] = (action == USER_OPERATION_TYPE_CANCEL_AUTH); + rejectJson[DM_TIMESTAMP] = std::to_string(GetCurrentTimestamp()); + rejectEvent.SetBusinessValue(rejectJson.Dump()); + int32_t ret = DistributedDeviceProfile::DistributedDeviceProfileClient::GetInstance().PutBusinessEvent(rejectEvent); + if (ret != DM_OK) { + LOGE("HandleBusinessEvents failed to store reject_event, ret: %{public}d", ret); + return ret; + } + LOGI("HandleBusinessEvents successfully stored reject_event."); + return DM_OK; +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication_v2/auth_stages/auth_acl.cpp b/services/implementation/src/authentication_v2/auth_stages/auth_acl.cpp new file mode 100644 index 0000000000000000000000000000000000000000..40a6620897f1b14dd13874948c57282e22345424 --- /dev/null +++ b/services/implementation/src/authentication_v2/auth_stages/auth_acl.cpp @@ -0,0 +1,224 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "auth_manager.h" +#include "deviceprofile_connector.h" +#include "dm_auth_attest_common.h" +#include "dm_auth_cert.h" +#include "dm_auth_context.h" +#include "dm_auth_state.h" +#include "dm_auth_state_machine.h" +#include "dm_constants.h" +#include "dm_crypto.h" +#include "dm_freeze_process.h" +#include "multiple_user_connector.h" + +namespace OHOS { +namespace DistributedHardware { + +const int32_t USLEEP_TIME_US_500000 = 500000; // 500ms + +int32_t AuthSinkDataSyncState::VerifyCertificate(std::shared_ptr context) +{ +#ifdef DEVICE_MANAGER_COMMON_FLAG + (void)context; + LOGI("open source device do not verify cert!"); + return DM_OK; +#else + if (context == nullptr) { + LOGE("context_ is nullptr!"); + return ERR_DM_POINT_NULL; + } + // Compatible with 5.1.0 and earlier + if (!CompareVersion(context->accesser.dmVersion, DM_VERSION_5_1_0)) { + LOGI("cert verify is not supported"); + return DM_OK; + } + // Compatible common device + if (CompareVersion(context->accesser.dmVersion, DM_VERSION_5_1_0) && + context->accesser.isCommonFlag == true) { + LOGI("src is common device."); + if (DeviceProfileConnector::GetInstance(). + CheckIsSameAccountByUdidHash(context->accesser.deviceIdHash) == DM_OK) { + LOGE("src is common device, but the udidHash is identical in acl!"); + return ERR_DM_VERIFY_CERT_FAILED; + } + return DM_OK; + } + DmCertChain dmCertChain{nullptr, 0}; + if (!AuthAttestCommon::GetInstance(). + DeserializeDmCertChain(context->accesser.cert, &dmCertChain)) { + LOGE("cert deserialize fail!"); + return ERR_DM_DESERIAL_CERT_FAILED; + } + int32_t certRet = AuthCert::GetInstance(). + VerifyCertificate(dmCertChain, context->accesser.deviceIdHash.c_str()); + // free dmCertChain memory + AuthAttestCommon::GetInstance().FreeDmCertChain(dmCertChain); + if (certRet != DM_OK) { + LOGE("validate cert fail, certRet = %{public}d", certRet); + return ERR_DM_VERIFY_CERT_FAILED; + } + return DM_OK; +#endif +} + +// Received 180 synchronization message, send 190 message +int32_t AuthSinkDataSyncState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkDataSyncState::Action start"); + // verify device cert + int32_t ret = VerifyCertificate(context); + if (ret != DM_OK) { + LOGE("AuthSinkNegotiateStateMachine::Action cert verify fail!"); + context->reason = ret; + return ret; + } + // Query the ACL of the sink end. Compare the ACLs at both ends. + context->softbusConnector->SyncLocalAclListProcess({context->accessee.deviceId, context->accessee.userId}, + {context->accesser.deviceId, context->accesser.userId}, context->accesser.aclStrList); + // Synchronize the local SP information, the format is uncertain, not done for now + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_DATA_SYNC, context); + context->accessee.deviceName = context->softbusConnector->GetLocalDeviceName(); + LOGI("AuthSinkDataSyncState::Action ok"); + return DM_OK; +} + +DmAuthStateType AuthSinkDataSyncState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_DATA_SYNC_STATE; +} + +// Received 190 message, sent 200 message +int32_t AuthSrcDataSyncState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcDataSyncState::Action start"); + + if (NeedAgreeAcl(context)) { + // Query the ACL of the sink end. Compare the ACLs at both ends. + context->softbusConnector->SyncLocalAclListProcess({context->accesser.deviceId, context->accesser.userId}, + {context->accessee.deviceId, context->accessee.userId}, context->accessee.aclStrList); + context->accesser.deviceName = context->softbusConnector->GetLocalDeviceName(); + // Save this acl + SetAclInfo(context); + context->authMessageProcessor->PutAccessControlList(context, context->accesser, context->accessee.deviceId); + // Synchronize the local SP information, the format is uncertain, not done for now + } + + std::string peerDeviceId = ""; + peerDeviceId = context->accesser.aclProfiles[DM_IDENTICAL_ACCOUNT].GetAccessee().GetAccesseeDeviceId(); + if (peerDeviceId.empty()) { + peerDeviceId = context->accesser.aclProfiles[DM_SHARE].GetAccessee().GetAccesseeDeviceId(); + } + if (peerDeviceId.empty()) { + peerDeviceId = context->accesser.aclProfiles[DM_POINT_TO_POINT].GetAccessee().GetAccesseeDeviceId(); + } + bool isNeedJoinLnn = context->softbusConnector->CheckIsNeedJoinLnn(peerDeviceId, context->accessee.addr); + // Trigger networking + if ((!context->accesser.isOnline || isNeedJoinLnn) && context->isNeedJoinLnn) { + if (context->connSessionType == CONN_SESSION_TYPE_HML) { + context->softbusConnector->JoinLnnByHml(context->sessionId, context->accesser.transmitSessionKeyId, + context->accessee.transmitSessionKeyId); + } else { + char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {0}; + if (Crypto::GetUdidHash(context->accessee.deviceId, reinterpret_cast(udidHashTmp)) != DM_OK) { + LOGE("AuthSrcDataSyncState joinLnn get udidhash by udid: %{public}s failed", + GetAnonyString(context->accessee.deviceId).c_str()); + return ERR_DM_FAILED; + } + std::string peerUdidHash = std::string(udidHashTmp); + context->softbusConnector->JoinLNNBySkId(context->sessionId, context->accesser.transmitSessionKeyId, + context->accessee.transmitSessionKeyId, context->accessee.addr, peerUdidHash); + } + } + context->reason = DM_OK; + context->reply = DM_OK; + context->state = static_cast(GetStateType()); + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_AUTH_REQ_FINISH, context); + LOGI("AuthSrcDataSyncState::Action ok"); + return DM_OK; +} + +DmAuthStateType AuthSrcDataSyncState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_DATA_SYNC_STATE; +} + +// Received 200 end message, send 201 +int32_t AuthSinkFinishState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkFinishState::Action start"); + int32_t ret = DM_OK; + LOGI("reason: %{public}d", context->reason); + if (context->reason == DM_OK) { + context->state = static_cast(GetStateType()); + ret = FreezeProcess::GetInstance().DeleteFreezeRecord(); + LOGI("DeleteFreezeRecord ret: %{public}d", ret); + } + if (context->reason == ERR_DM_BIND_PIN_CODE_ERROR) { + ret = FreezeProcess::GetInstance().UpdateFreezeRecord(); + LOGI("UpdateFreezeData ret: %{public}d", ret); + } + context->isNeedJoinLnn = true; + SinkFinish(context); + LOGI("AuthSinkFinishState::Action ok"); + if (context->cleanNotifyCallback != nullptr) { + context->cleanNotifyCallback(context->logicalSessionId); + } + + return DM_OK; +} + +DmAuthStateType AuthSinkFinishState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_FINISH_STATE; +} + +// Received 201 end message +int32_t AuthSrcFinishState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcFinishState::Action start"); + if (context->reason != DM_OK) { + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_AUTH_REQ_FINISH, context); + } else { + context->state = static_cast(GetStateType()); + } + context->isNeedJoinLnn = true; + SourceFinish(context); + LOGI("AuthSrcFinishState::Action ok"); + std::shared_ptr tempContext = context; + auto taskFunc = [this, tempContext]() { + if (tempContext->cleanNotifyCallback != nullptr) { + tempContext->cleanNotifyCallback(tempContext->logicalSessionId); + } + }; + const int64_t MICROSECOND_PER_SECOND = 1000000L; + int32_t delaySeconds = context->connDelayCloseTime; + if (context->reason != DM_OK && context->reason != DM_ALREADY_AUTHED) { + delaySeconds = 0; + } + ffrt::submit(taskFunc, ffrt::task_attr().delay(delaySeconds * MICROSECOND_PER_SECOND)); + return DM_OK; +} + +DmAuthStateType AuthSrcFinishState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_FINISH_STATE; +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication_v2/auth_stages/auth_confirm.cpp b/services/implementation/src/authentication_v2/auth_stages/auth_confirm.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f9b71d6ebc3c827a52f112cf5dcc8c58a15ec7bc --- /dev/null +++ b/services/implementation/src/authentication_v2/auth_stages/auth_confirm.cpp @@ -0,0 +1,789 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "auth_manager.h" +#include "access_control_profile.h" +#include "deviceprofile_connector.h" +#include "distributed_device_profile_errors.h" +#include "dm_anonymous.h" +#include "dm_auth_context.h" +#include "dm_auth_state.h" +#include "dm_auth_state_machine.h" +#include "dm_crypto.h" +#include "dm_dialog_manager.h" +#include "dm_language_manager.h" +#include "dm_log.h" +#include "dm_negotiate_process.h" +#include "dm_softbus_cache.h" +#include "multiple_user_connector.h" + +namespace OHOS { +namespace DistributedHardware { + +constexpr const char* TAG_CRED_ID = "credId"; +constexpr const char* TAG_CUSTOM_DESCRIPTION = "CUSTOMDESC"; +constexpr const char* TAG_LOCAL_DEVICE_TYPE = "LOCALDEVICETYPE"; +constexpr const char* TAG_REQUESTER = "REQUESTER"; +constexpr const char* UNVALID_CREDTID = "invalidCredId"; +// authType fallback table +using FallBackKey = std::pair; // accessee.bundleName, authType +static std::map g_pinAuthTypeFallBackMap = { + {{"cast_engine_service", DmAuthType::AUTH_TYPE_NFC}, DmAuthType::AUTH_TYPE_PIN}, +}; +// Maximum number of recursive lookups +constexpr size_t MAX_FALLBACK_LOOPKUP_TIMES = 2; + +DmAuthStateType AuthSrcConfirmState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_CONFIRM_STATE; +} + +void AuthSrcConfirmState::NegotiateCredential(std::shared_ptr context, JsonObject &credTypeNegoResult) +{ + CHECK_NULL_VOID(context); + JsonObject accesseeCredTypeList; + accesseeCredTypeList.Parse(context->accessee.credTypeList); + JsonObject accesserCredTypeList; + accesserCredTypeList.Parse(context->accesser.credTypeList); + if (accesseeCredTypeList.IsDiscarded() || accesserCredTypeList.IsDiscarded()) { + LOGE("CredTypeList invalid."); + return; + } + if (accesseeCredTypeList.Contains("identicalCredType") && accesserCredTypeList.Contains("identicalCredType")) { + LOGI("have identical credential."); + credTypeNegoResult["identicalCredType"] = DM_IDENTICAL_ACCOUNT; + context->accesser.isGenerateLnnCredential = false; + } + if (accesseeCredTypeList.Contains("shareCredType") && accesserCredTypeList.Contains("shareCredType")) { + LOGI("have share credential."); + credTypeNegoResult["shareCredType"] = DM_SHARE; + context->accesser.isGenerateLnnCredential = false; + } + if (accesseeCredTypeList.Contains("pointTopointCredType") && + accesserCredTypeList.Contains("pointTopointCredType")) { + LOGI("have point_to_point credential."); + credTypeNegoResult["pointTopointCredType"] = DM_POINT_TO_POINT; + } + if (accesseeCredTypeList.Contains("lnnCredType") && accesserCredTypeList.Contains("lnnCredType")) { + LOGI("have lnn credential."); + credTypeNegoResult["lnnCredType"] = DM_LNN; + context->accesser.isGenerateLnnCredential = false; + } +} + +void AuthSrcConfirmState::NegotiateAcl(std::shared_ptr context, JsonObject &aclNegoResult) +{ + CHECK_NULL_VOID(context); + JsonObject accesseeAclList; + accesseeAclList.Parse(context->accessee.aclTypeList); + JsonObject accesserAclList; + accesserAclList.Parse(context->accesser.aclTypeList); + if (accesseeAclList.IsDiscarded() || accesserAclList.IsDiscarded()) { + LOGE("aclList invalid."); + return; + } + if (accesseeAclList.Contains("identicalAcl") && accesserAclList.Contains("identicalAcl")) { + LOGI("have identical acl."); + aclNegoResult["identicalAcl"] = DM_IDENTICAL_ACCOUNT; + context->accesser.isAuthed = true; + context->accesser.isPutLnnAcl = false; + } + if (accesseeAclList.Contains("shareAcl") && accesserAclList.Contains("shareAcl")) { + LOGI("have share acl."); + aclNegoResult["shareAcl"] = DM_SHARE; + context->accesser.isAuthed = true; + context->accesser.isPutLnnAcl = false; + } + if (accesseeAclList.Contains("pointTopointAcl") && accesserAclList.Contains("pointTopointAcl")) { + LOGI("have point_to_point acl."); + aclNegoResult["pointTopointAcl"] = DM_POINT_TO_POINT; + context->accesser.isAuthed = true; + } + if (accesseeAclList.Contains("lnnAcl") && accesserAclList.Contains("lnnAcl")) { + LOGI("have lnn acl."); + aclNegoResult["lnnAcl"] = DM_LNN; + context->accesser.isPutLnnAcl = false; + } +} + +void AuthSrcConfirmState::GetSrcCredType(std::shared_ptr context, + JsonObject &credInfo, JsonObject &aclInfo, JsonObject &credTypeJson) +{ + CHECK_NULL_VOID(context); + std::vector deleteCredInfo; + for (const auto &item : credInfo.Items()) { + if (!item.Contains(FILED_CRED_TYPE) || !item[FILED_CRED_TYPE].IsNumberInteger() || + !item.Contains(FILED_CRED_ID) || !item[FILED_CRED_ID].IsString()) { + deleteCredInfo.push_back(item[FILED_CRED_ID].Get()); + continue; + } + int32_t credType = item[FILED_CRED_TYPE].Get(); + LOGI("credType %{public}d.", credType); + switch (credType) { + case DM_IDENTICAL_ACCOUNT: + credTypeJson["identicalCredType"] = credType; + context->accesser.credentialInfos[credType] = item.Dump(); + break; + case DM_SHARE: + credTypeJson["shareCredType"] = credType; + context->accesser.credentialInfos[credType] = item.Dump(); + break; + case DM_POINT_TO_POINT: + GetSrcCredTypeForP2P(context, item, aclInfo, credTypeJson, credType, deleteCredInfo); + break; + case DM_LNN: + if (!aclInfo.Contains("lnnAcl") || + (context->accesser.aclProfiles[DM_LNN].GetAccesser().GetAccesserCredentialIdStr() != + item[FILED_CRED_ID].Get() && + context->accesser.aclProfiles[DM_LNN].GetAccessee().GetAccesseeCredentialIdStr() != + item[FILED_CRED_ID].Get())) { + deleteCredInfo.push_back(item[FILED_CRED_ID].Get()); + } else { + credTypeJson["lnnCredType"] = credType; + context->accesser.credentialInfos[credType] = item.Dump(); + } + break; + default: + LOGE("invalid credType %{public}d.", credType); + break; + } + } + for (const auto &item : deleteCredInfo) { + credInfo.Erase(item); + context->hiChainAuthConnector->DeleteCredential(context->accesser.userId, item); + } +} + +void AuthSrcConfirmState::GetSrcCredTypeForP2P(std::shared_ptr context, const JsonItemObject &credObj, + JsonObject &aclInfo, JsonObject &credTypeJson, int32_t credType, std::vector &deleteCredInfo) +{ + CHECK_NULL_VOID(context); + if (!aclInfo.Contains("pointTopointAcl") || + (context->accesser.aclProfiles[DM_POINT_TO_POINT].GetAccesser().GetAccesserCredentialIdStr() != + credObj[FILED_CRED_ID].Get() && + context->accesser.aclProfiles[DM_POINT_TO_POINT].GetAccessee().GetAccesseeCredentialIdStr() != + credObj[FILED_CRED_ID].Get())) { + deleteCredInfo.push_back(credObj[FILED_CRED_ID].Get()); + } else { + credTypeJson["pointTopointCredType"] = credType; + context->accesser.credentialInfos[credType] = credObj.Dump(); + } +} + +void AuthSrcConfirmState::GetSrcAclInfo(std::shared_ptr context, + JsonObject &credInfo, JsonObject &aclInfo) +{ + CHECK_NULL_VOID(context); + std::vector profiles = + DeviceProfileConnector::GetInstance().GetAllAclIncludeLnnAcl(); + FilterProfilesByContext(profiles, context); + uint32_t bindLevel = DM_INVALIED_TYPE; + for (const auto &item : profiles) { + std::string trustDeviceId = item.GetTrustDeviceId(); + std::string trustDeviceIdHash = Crypto::GetUdidHash(trustDeviceId); + if ((trustDeviceIdHash != context->accessee.deviceIdHash && + trustDeviceIdHash != context->accesser.deviceIdHash)) { + LOGE("devId %{public}s hash %{public}s, accesser devId %{public}s.", GetAnonyString(trustDeviceId).c_str(), + GetAnonyString(trustDeviceIdHash).c_str(), GetAnonyString(context->accesser.deviceIdHash).c_str()); + continue; + } + bindLevel = item.GetBindLevel(); + switch (item.GetBindType()) { + case DM_IDENTICAL_ACCOUNT: + if (IdenticalAccountAclCompare(context, item.GetAccesser(), item.GetAccessee())) { + aclInfo["identicalAcl"] = DM_IDENTICAL_ACCOUNT; + context->accesser.aclProfiles[DM_IDENTICAL_ACCOUNT] = item; + } + break; + case DM_SHARE: + if (ShareAclCompare(context, item.GetAccesser(), item.GetAccessee()) && + CheckCredIdInAcl(context, item, credInfo, DM_SHARE)) { + aclInfo["shareAcl"] = DM_SHARE; + context->accesser.aclProfiles[DM_SHARE] = item; + } + break; + case DM_POINT_TO_POINT: + GetSrcAclInfoForP2P(context, item, credInfo, aclInfo); + break; + default: + LOGE("invalid bindType %{public}d.", item.GetBindType()); + break; + } + } + if (aclInfo.Contains("pointTopointAcl") && !aclInfo.Contains("lnnAcl") && bindLevel != USER) { + aclInfo.Erase("pointTopointAcl"); + DeleteAcl(context, context->accesser.aclProfiles[DM_POINT_TO_POINT]); + } +} + +void AuthSrcConfirmState::GetSrcAclInfoForP2P(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, JsonObject &aclInfo) +{ + CHECK_NULL_VOID(context); + if (Point2PointAclCompare(context, profile.GetAccesser(), profile.GetAccessee()) && + CheckCredIdInAcl(context, profile, credInfo, DM_POINT_TO_POINT)) { + aclInfo["pointTopointAcl"] = DM_POINT_TO_POINT; + context->accesser.aclProfiles[DM_POINT_TO_POINT] = profile; + } + if (LnnAclCompare(context, profile.GetAccesser(), profile.GetAccessee()) && + CheckCredIdInAcl(context, profile, credInfo, DM_LNN) && profile.GetBindLevel() == USER) { + aclInfo["lnnAcl"] = DM_LNN; + context->accesser.aclProfiles[DM_LNN] = profile; + } +} + +bool AuthSrcConfirmState::CheckCredIdInAcl(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, uint32_t bindType) +{ + LOGI("start."); + std::string credId = profile.GetAccesser().GetAccesserCredentialIdStr(); + if (!credInfo.Contains(credId)) { + credId = profile.GetAccessee().GetAccesseeCredentialIdStr(); + if (!credInfo.Contains(credId)) { + LOGE("credInfoJson not contain credId %{public}s.", GetAnonyString(credId).c_str()); + DeleteAcl(context, profile); + return false; + } + } + if (credInfo.Contains(credId) && (!credInfo[credId].IsObject() || !credInfo[credId].Contains(FILED_CRED_TYPE) || + !credInfo[credId][FILED_CRED_TYPE].IsNumberInteger())) { + LOGE("credId %{public}s contain credInfoJson invalid.", credId.c_str()); + DeleteAcl(context, profile); + credInfo.Erase(credId); + return false; + } + bool checkResult = false; + switch (bindType) { + LOGI("bindType %{public}d.", bindType); + case DM_IDENTICAL_ACCOUNT: + case DM_SHARE: + case DM_LNN: + if (credInfo[credId][FILED_CRED_TYPE].Get() == bindType) { + checkResult = true; + } else { + DeleteAcl(context, profile); + } + break; + case DM_POINT_TO_POINT: + CheckCredIdInAclForP2P(context, credId, profile, credInfo, bindType, checkResult); + break; + default: + break; + } + return checkResult; +} + +void AuthSrcConfirmState::CheckCredIdInAclForP2P(std::shared_ptr context, std::string &credId, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, uint32_t bindType, + bool &checkResult) +{ + if (credInfo[credId][FILED_CRED_TYPE].Get() == bindType) { + std::vector appList; + credInfo[credId][FILED_AUTHORIZED_APP_LIST].Get(appList); + const size_t APP_LIST_SIZE = 2; + if (appList.size() >= APP_LIST_SIZE && + ((std::to_string(profile.GetAccesser().GetAccesserTokenId()) == appList[0] && + std::to_string(profile.GetAccessee().GetAccesseeTokenId()) == appList[1]) || + (std::to_string(profile.GetAccesser().GetAccesserTokenId()) == appList[1] && + std::to_string(profile.GetAccessee().GetAccesseeTokenId()) == appList[0]))) { + checkResult = true; + } else { + DeleteAcl(context, profile); + } + } +} + +bool AuthSrcConfirmState::IdenticalAccountAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee) +{ + LOGI("start."); + return accesser.GetAccesserDeviceId() == context->accesser.deviceId && + accesser.GetAccesserUserId() == context->accesser.userId && + Crypto::GetUdidHash(accessee.GetAccesseeDeviceId()) == context->accessee.deviceIdHash; +} + +bool AuthSrcConfirmState::ShareAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee) +{ + LOGI("start."); + return accesser.GetAccesserDeviceId() == context->accesser.deviceId && + accesser.GetAccesserUserId() == context->accesser.userId && + Crypto::GetUdidHash(accessee.GetAccesseeDeviceId()) == context->accessee.deviceIdHash; +} + +bool AuthSrcConfirmState::Point2PointAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee) +{ + LOGI("start."); + return (accesser.GetAccesserDeviceId() == context->accesser.deviceId && + accesser.GetAccesserUserId() == context->accesser.userId && + accesser.GetAccesserTokenId() == context->accesser.tokenId && + Crypto::GetUdidHash(accessee.GetAccesseeDeviceId()) == context->accessee.deviceIdHash && + Crypto::GetTokenIdHash(std::to_string(accessee.GetAccesseeTokenId())) == context->accessee.tokenIdHash) || + (accessee.GetAccesseeDeviceId() == context->accesser.deviceId && + accessee.GetAccesseeUserId() == context->accesser.userId && + accessee.GetAccesseeTokenId() == context->accesser.tokenId && + Crypto::GetUdidHash(accesser.GetAccesserDeviceId()) == context->accessee.deviceIdHash && + Crypto::GetTokenIdHash(std::to_string(accesser.GetAccesserTokenId())) == context->accessee.tokenIdHash); +} + +bool AuthSrcConfirmState::LnnAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee) +{ + LOGI("start."); + return ((accesser.GetAccesserDeviceId() == context->accesser.deviceId && + accesser.GetAccesserUserId() == context->accesser.userId) || + (accessee.GetAccesseeDeviceId() == context->accesser.deviceId && + accessee.GetAccesseeUserId() == context->accesser.userId)) && + accesser.GetAccesserTokenId() == 0 && accesser.GetAccesserBundleName() == "" && + (Crypto::GetUdidHash(accessee.GetAccesseeDeviceId()) == context->accessee.deviceIdHash || + Crypto::GetUdidHash(accesser.GetAccesserDeviceId()) == context->accessee.deviceIdHash) && + accessee.GetAccesseeTokenId() == 0 && accessee.GetAccesseeBundleName() == ""; +} + +void AuthSrcConfirmState::GetSrcCredentialInfo(std::shared_ptr context, JsonObject &credInfo) +{ + LOGI("start."); + CHECK_NULL_VOID(context); + // get identical credential + if (context->accesser.accountIdHash == context->accessee.accountIdHash) { + GetIdenticalCredentialInfo(context, credInfo); + } + // get share credential + if (context->accesser.accountIdHash != context->accessee.accountIdHash && + context->accesser.accountIdHash != Crypto::GetAccountIdHash16("ohosAnonymousUid") && + context->accessee.accountIdHash != Crypto::GetAccountIdHash16("ohosAnonymousUid")) { + GetShareCredentialInfo(context, credInfo); + GetP2PCredentialInfo(context, credInfo); + } + // get point_to_point credential + if (context->accesser.accountIdHash == Crypto::GetAccountIdHash16("ohosAnonymousUid") || + context->accessee.accountIdHash == Crypto::GetAccountIdHash16("ohosAnonymousUid")) { + GetP2PCredentialInfo(context, credInfo); + } + std::vector deleteCredInfo; + for (auto &item : credInfo.Items()) { // id1:json1, id2:json2, id3:json3 + uint32_t credType = DmAuthState::GetCredentialType(context, item); + if (credType == DM_INVALIED_TYPE || !item.Contains(FILED_CRED_TYPE) || + !item[FILED_CRED_TYPE].IsNumberInteger() || !item.Contains(FILED_CRED_ID) || + !item[FILED_CRED_ID].IsString()) { + deleteCredInfo.push_back(item[FILED_CRED_ID].Get()); + continue; + } + item[FILED_CRED_TYPE] = credType; + } + for (const auto &item : deleteCredInfo) { + credInfo.Erase(item); + } +} + +void AuthSrcConfirmState::GetIdenticalCredentialInfo(std::shared_ptr context, + JsonObject &credInfo) +{ + LOGI("start."); + CHECK_NULL_VOID(context); + JsonObject queryParams; + queryParams[FILED_DEVICE_ID] = context->accesser.deviceId; + queryParams[FILED_USER_ID] = MultipleUserConnector::GetOhosAccountNameByUserId(context->accesser.userId); + queryParams[FILED_CRED_TYPE] = DM_AUTH_CREDENTIAL_ACCOUNT_RELATED; + CHECK_NULL_VOID(context->hiChainAuthConnector); + int32_t ret = context->hiChainAuthConnector->QueryCredentialInfo(context->accesser.userId, queryParams, credInfo); + if (ret != DM_OK) { + LOGE("QueryCredentialInfo failed ret %{public}d.", ret); + } +} + +void AuthSrcConfirmState::GetShareCredentialInfo(std::shared_ptr context, + JsonObject &credInfo) +{ + LOGI("start."); + CHECK_NULL_VOID(context); + JsonObject queryParams; + queryParams[FILED_DEVICE_ID_HASH] = context->accessee.deviceIdHash; + queryParams[FILED_PEER_USER_SPACE_ID] = std::to_string(context->accessee.userId); + queryParams[FILED_CRED_TYPE] = DM_AUTH_CREDENTIAL_ACCOUNT_ACROSS; + CHECK_NULL_VOID(context->hiChainAuthConnector); + int32_t ret = context->hiChainAuthConnector->QueryCredentialInfo(context->accesser.userId, queryParams, credInfo); + if (ret != DM_OK) { + LOGE("QueryCredentialInfo failed ret %{public}d.", ret); + } +} + +void AuthSrcConfirmState::GetP2PCredentialInfo(std::shared_ptr context, + JsonObject &credInfo) +{ + LOGI("start."); + CHECK_NULL_VOID(context); + JsonObject queryParams; + queryParams[FILED_DEVICE_ID_HASH] = context->accessee.deviceIdHash; + queryParams[FILED_PEER_USER_SPACE_ID] = std::to_string(context->accessee.userId); + queryParams[FILED_CRED_TYPE] = DM_AUTH_CREDENTIAL_ACCOUNT_UNRELATED; + queryParams[FILED_CRED_OWNER] = "DM"; + CHECK_NULL_VOID(context->hiChainAuthConnector); + int32_t ret = context->hiChainAuthConnector->QueryCredentialInfo(context->accesser.userId, queryParams, credInfo); + if (ret != DM_OK) { + LOGE("QueryCredentialInfo failed ret %{public}d.", ret); + } +} + +int32_t AuthSrcConfirmState::Action(std::shared_ptr context) +{ + LOGI("start."); + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + context->timer->DeleteTimer(std::string(NEGOTIATE_TIMEOUT_TASK)); + GetCustomDescBySinkLanguage(context); + context->accessee.isOnline = SoftbusCache::GetInstance().CheckIsOnline(context->accessee.deviceIdHash); + JsonObject credInfo; + GetSrcCredentialInfo(context, credInfo); + JsonObject aclInfo; + GetSrcAclInfo(context, credInfo, aclInfo); + context->accesser.aclTypeList = aclInfo.Dump(); + JsonObject credTypeJson; + GetSrcCredType(context, credInfo, aclInfo, credTypeJson); + context->accesser.credTypeList = credTypeJson.Dump(); + // update credType negotiate result + JsonObject credTypeNegoResult; + NegotiateCredential(context, credTypeNegoResult); + context->accesser.credTypeList = credTypeNegoResult.Dump(); + // update acl negotiate result + JsonObject aclNegoResult; + NegotiateAcl(context, aclNegoResult); + context->accesser.aclTypeList = aclNegoResult.Dump(); + + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_REQ_USER_CONFIRM, context); + context->listener->OnAuthResult(context->processInfo, context->peerTargetId.deviceId, context->accessee.tokenIdHash, + static_cast(STATUS_DM_SHOW_AUTHORIZE_UI), DM_OK); + context->listener->OnBindResult(context->processInfo, context->peerTargetId, + DM_OK, static_cast(STATUS_DM_SHOW_AUTHORIZE_UI), ""); + context->timer->StartTimer(std::string(CONFIRM_TIMEOUT_TASK), + DmAuthState::GetTaskTimeout(context, CONFIRM_TIMEOUT_TASK, CONFIRM_TIMEOUT), + [context] (std::string name) { + HandleAuthenticateTimeout(context, name); + }); + return DM_OK; +} + +void AuthSrcConfirmState::GetCustomDescBySinkLanguage(std::shared_ptr context) +{ + if (context == nullptr || context->customData.empty()) { + LOGI("customDesc is empty."); + return; + } + context->customData = DmLanguageManager::GetInstance().GetTextBySystemLanguage(context->customData, + context->accessee.language); +} + +DmAuthStateType AuthSinkConfirmState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_CONFIRM_STATE; +} + +int32_t AuthSinkConfirmState::ShowConfigDialog(std::shared_ptr context) +{ + LOGI("AuthSinkConfirmState::ShowConfigDialog start"); + + if (context->authType == AUTH_TYPE_PIN_ULTRASONIC && + context->ultrasonicInfo == DmUltrasonicInfo::DM_Ultrasonic_Invalid) { + LOGE("AuthSinkConfirmState::ShowConfigDialog ultrasonicInfo invalid."); + return STOP_BIND; + } + + NodeBasicInfo nodeBasicInfo; + int32_t result = GetLocalNodeDeviceInfo(DM_PKG_NAME, &nodeBasicInfo); + if (result != SOFTBUS_OK) { + LOGE("GetLocalNodeDeviceInfo from dsofbus fail, result=%{public}d", result); + return STOP_BIND; + } + + if (nodeBasicInfo.deviceTypeId == TYPE_TV_ID) { + int32_t ret = AuthManagerBase::EndDream(); + if (ret != DM_OK) { + LOGE("fail to end dream, err:%{public}d", ret); + return STOP_BIND; + } + } else if (IsScreenLocked()) { + LOGE("AuthSinkConfirmState::ShowStartAuthDialog screen is locked."); + context->reason = ERR_DM_BIND_USER_CANCEL; + context->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + return STOP_BIND; + } + + JsonObject jsonObj; + jsonObj[TAG_CUSTOM_DESCRIPTION] = context->customData; + jsonObj[TAG_LOCAL_DEVICE_TYPE] = context->accesser.deviceType; + jsonObj[TAG_REQUESTER] = context->accesser.deviceName; + jsonObj[TAG_USER_ID] = context->accessee.userId; // Reserved + jsonObj[TAG_HOST_PKGLABEL] = context->pkgLabel; + + const std::string params = jsonObj.Dump(); + DmDialogManager::GetInstance().ShowConfirmDialog(params); + + LOGI("AuthSinkConfirmState::ShowConfigDialog end"); + return DM_OK; +} + +void AuthSinkConfirmState::NegotiateCredential(std::shared_ptr context, JsonObject &credTypeNegoResult) +{ + CHECK_NULL_VOID(context); + JsonObject accesseeCredTypeList; + accesseeCredTypeList.Parse(context->accessee.credTypeList); + JsonObject accesserCredTypeList; + accesserCredTypeList.Parse(context->accesser.credTypeList); + if (accesseeCredTypeList.IsDiscarded() || accesserCredTypeList.IsDiscarded()) { + LOGE("CredTypeList invalid."); + return; + } + if (accesseeCredTypeList.Contains("identicalCredType") && accesserCredTypeList.Contains("identicalCredType")) { + LOGI("have identical credential."); + credTypeNegoResult["identicalCredType"] = DM_IDENTICAL_ACCOUNT; + context->accessee.isGenerateLnnCredential = false; + } + if (accesseeCredTypeList.Contains("shareCredType") && accesserCredTypeList.Contains("shareCredType")) { + LOGI("have share credential."); + credTypeNegoResult["shareCredType"] = DM_SHARE; + context->accessee.isGenerateLnnCredential = false; + } + if (accesseeCredTypeList.Contains("pointTopointCredType") && + accesserCredTypeList.Contains("pointTopointCredType")) { + LOGI("have point_to_point credential."); + credTypeNegoResult["pointTopointCredType"] = DM_POINT_TO_POINT; + } + if (accesseeCredTypeList.Contains("lnnCredType") && accesserCredTypeList.Contains("lnnCredType")) { + LOGI("have lnn credential."); + credTypeNegoResult["lnnCredType"] = DM_LNN; + context->accessee.isGenerateLnnCredential = false; + } + return; +} + +void AuthSinkConfirmState::NegotiateAcl(std::shared_ptr context, JsonObject &aclNegoResult) +{ + CHECK_NULL_VOID(context); + JsonObject accesseeAclList; + accesseeAclList.Parse(context->accessee.aclTypeList); + JsonObject accesserAclList; + accesserAclList.Parse(context->accesser.aclTypeList); + if (accesseeAclList.IsDiscarded() || accesserAclList.IsDiscarded()) { + LOGE("aclList invalid."); + return; + } + if (accesseeAclList.Contains("identicalAcl") && accesserAclList.Contains("identicalAcl")) { + LOGI("have identical acl."); + aclNegoResult["identicalAcl"] = DM_IDENTICAL_ACCOUNT; + context->accessee.isPutLnnAcl = false; + context->accessee.isAuthed = true; + } + if (accesseeAclList.Contains("shareCredType") && accesserAclList.Contains("shareCredType")) { + LOGI("have share acl."); + aclNegoResult["shareAcl"] = DM_SHARE; + context->accessee.isPutLnnAcl = false; + context->accessee.isAuthed = true; + } + if (accesseeAclList.Contains("pointTopointAcl") && accesserAclList.Contains("pointTopointAcl")) { + LOGI("have point_to_point acl."); + aclNegoResult["pointTopointAcl"] = DM_POINT_TO_POINT; + context->accessee.isAuthed = true; + } + if (accesseeAclList.Contains("lnnAcl") && accesserAclList.Contains("lnnAcl")) { + LOGI("have lnn acl."); + aclNegoResult["lnnAcl"] = DM_LNN; + context->accessee.isPutLnnAcl = false; + } +} + +void AuthSinkConfirmState::MatchFallBackCandidateList( + std::shared_ptr context, DmAuthType authType) +{ + for (size_t i = 0; i < MAX_FALLBACK_LOOPKUP_TIMES; i++) { + auto it = g_pinAuthTypeFallBackMap.find({context->accessee.bundleName, authType}); + if (it != g_pinAuthTypeFallBackMap.end()) { + authType = it->second; + context->authTypeList.push_back(authType); + } else { + break; + } + } +} + +void AuthSinkConfirmState::ReadServiceInfo(std::shared_ptr context) +{ + // query ServiceInfo by accessee.pkgName and authType from client + OHOS::DistributedDeviceProfile::LocalServiceInfo srvInfo; + auto ret = DeviceProfileConnector::GetInstance().GetLocalServiceInfoByBundleNameAndPinExchangeType( + context->accessee.pkgName, context->authType, srvInfo); + if (ret == OHOS::DistributedDeviceProfile::DP_SUCCESS) { + LOGI("AuthSinkConfirmState::ReadServiceInfo found"); + // ServiceInfo found + context->serviceInfoFound = true; + // read authBoxType + context->authBoxType = static_cast(srvInfo.GetAuthBoxType()); + if (DmAuthState::IsImportAuthCodeCompatibility(context->authType)) { + std::string pinCode = srvInfo.GetPinCode(); // read pincode + if (AuthSinkStatePinAuthComm::IsPinCodeValid(pinCode)) { + context->pinCode = pinCode; + } + srvInfo.SetPinCode("******"); + DeviceProfileConnector::GetInstance().UpdateLocalServiceInfo(srvInfo); + } + if (context->authBoxType == DMLocalServiceInfoAuthBoxType::SKIP_CONFIRM) { // no authorization box + int32_t confirmOperation = srvInfo.GetAuthType(); // read confirmOperation + if (confirmOperation == static_cast(DMLocalServiceInfoAuthType::TRUST_ONETIME)) { + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH; + } else if (confirmOperation == static_cast(DMLocalServiceInfoAuthType::CANCEL)) { + context->confirmOperation = UiAction::USER_OPERATION_TYPE_CANCEL_AUTH; + } else if (confirmOperation == static_cast(DMLocalServiceInfoAuthType::TRUST_ALWAYS)) { + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + } else { + context->confirmOperation = UiAction::USER_OPERATION_TYPE_CANCEL_AUTH; + } + } + context->customData = srvInfo.GetDescription(); // read customData + } else if (DmAuthState::IsImportAuthCodeCompatibility(context->authType) && + AuthSinkStatePinAuthComm::IsAuthCodeReady(context)) { + // only special scenarios can import pincode + context->authBoxType = DMLocalServiceInfoAuthBoxType::SKIP_CONFIRM; // no authorization box + } else { + // not special scenarios, reset confirmOperation to cancel + context->confirmOperation = UiAction::USER_OPERATION_TYPE_CANCEL_AUTH; + context->authBoxType = DMLocalServiceInfoAuthBoxType::STATE3; // default: tristate box + } +} + +int32_t AuthSinkConfirmState::Action(std::shared_ptr context) +{ + LOGI("start."); + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + JsonObject credTypeNegoResult; + JsonObject aclNegoResult; + NegotiateCredential(context, credTypeNegoResult); + context->accessee.credTypeList = credTypeNegoResult.Dump(); + NegotiateAcl(context, aclNegoResult); + context->accessee.aclTypeList = aclNegoResult.Dump(); + if (credTypeNegoResult.Dump() != context->accesser.credTypeList || + aclNegoResult.Dump() != context->accesser.aclTypeList) { + LOGE("compability negotiate not match."); + context->reason = ERR_DM_CAPABILITY_NEGOTIATE_FAILED; + return ERR_DM_FAILED; + } + int32_t ret = NegotiateProcess::GetInstance().HandleNegotiateResult(context); + if (ret != DM_OK) { + LOGE("HandleNegotiateResult failed ret %{public}d.", ret); + context->reason = ERR_DM_CAPABILITY_NEGOTIATE_FAILED; + return ret; + } + if (context->needBind) { + return ProcessBindAuthorize(context); + } else { + return ProcessNoBindAuthorize(context); + } +} + +int32_t AuthSinkConfirmState::ProcessBindAuthorize(std::shared_ptr context) +{ + LOGI("start."); + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + ReadServiceInfo(context); + context->authTypeList.clear(); + context->authTypeList.push_back(context->authType); + if (context->authType == AUTH_TYPE_PIN_ULTRASONIC) { + context->authTypeList.push_back(AUTH_TYPE_PIN); + } else { + MatchFallBackCandidateList(context, context->authType); + } + if (DmAuthState::IsImportAuthCodeCompatibility(context->authType) && + (context->serviceInfoFound || AuthSinkStatePinAuthComm::IsAuthCodeReady(context)) && + context->authBoxType == DMLocalServiceInfoAuthBoxType::SKIP_CONFIRM) { + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_USER_CONFIRM, context); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + if ((context->authType == DmAuthType::AUTH_TYPE_PIN || context->authType == DmAuthType::AUTH_TYPE_NFC || + context->authType == DmAuthType::AUTH_TYPE_PIN_ULTRASONIC) && + context->authBoxType == DMLocalServiceInfoAuthBoxType::STATE3) { + context->timer->DeleteTimer(std::string(WAIT_REQUEST_TIMEOUT_TASK)); + if (ShowConfigDialog(context) != DM_OK) { + LOGE("ShowConfigDialog failed"); + context->reason = ERR_DM_SHOW_CONFIRM_FAILED; + return ERR_DM_FAILED; + } + if (DmEventType::ON_USER_OPERATION != + context->authStateMachine->WaitExpectEvent(DmEventType::ON_USER_OPERATION)) { + LOGE("AuthSinkConfirmState::Action ON_USER_OPERATION err"); + return ERR_DM_FAILED; + } + if (context->confirmOperation == USER_OPERATION_TYPE_CANCEL_AUTH) { + LOGE("AuthSinkConfirmState::Action USER_OPERATION_TYPE_CANCEL_AUTH"); + context->reason = ERR_DM_AUTH_PEER_REJECT; + return ERR_DM_FAILED; + } + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_USER_CONFIRM, context); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + context->confirmOperation = UiAction::USER_OPERATION_TYPE_CANCEL_AUTH; + return ERR_DM_FAILED; +} + +int32_t AuthSinkConfirmState::ProcessNoBindAuthorize(std::shared_ptr context) +{ + LOGI("start."); + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + JsonObject accesseeCredTypeList; + accesseeCredTypeList.Parse(context->accessee.credTypeList); + if (accesseeCredTypeList.IsDiscarded()) { + LOGE("CredTypeList invalid."); + context->reason = ERR_DM_CAPABILITY_NEGOTIATE_FAILED; + return ERR_DM_FAILED; + } + if (accesseeCredTypeList.Contains("identicalCredType")) { + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->accessee.transmitCredentialId = GetCredIdByCredType(context, DM_IDENTICAL_ACCOUNT); + } else if (accesseeCredTypeList.Contains("shareCredType")) { + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->accessee.transmitCredentialId = GetCredIdByCredType(context, DM_SHARE); + } else if (accesseeCredTypeList.Contains("pointTopointCredType")) { + context->accessee.transmitCredentialId = GetCredIdByCredType(context, DM_POINT_TO_POINT); + } else if (accesseeCredTypeList.Contains("lnnCredType")) { + context->accessee.lnnCredentialId = GetCredIdByCredType(context, DM_LNN); + } else { + LOGE("credTypeList invalid."); + context->reason = ERR_DM_CAPABILITY_NEGOTIATE_FAILED; + return ERR_DM_FAILED; + } + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_USER_CONFIRM, context); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +std::string AuthSinkConfirmState::GetCredIdByCredType(std::shared_ptr context, int32_t credType) +{ + LOGI("credType %{public}d.", credType); + CHECK_NULL_RETURN(context, UNVALID_CREDTID); + if (context->accessee.credentialInfos.find(credType) != context->accessee.credentialInfos.end()) { + LOGE("invalid credType."); + return UNVALID_CREDTID; + } + std::string credInfoStr = context->accessee.credentialInfos[credType]; + JsonObject credInfoJson; + credInfoJson.Parse(credInfoStr); + if (credInfoJson.IsDiscarded() || !credInfoJson.Contains(FILED_CRED_ID) || + !credInfoJson[FILED_CRED_ID].IsNumberInteger()) { + LOGE("credInfoStr invalid."); + return UNVALID_CREDTID; + } + return credInfoJson[FILED_CRED_ID].Get(); +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication_v2/auth_stages/auth_credential.cpp b/services/implementation/src/authentication_v2/auth_stages/auth_credential.cpp new file mode 100644 index 0000000000000000000000000000000000000000..363cb393f40f142ab1941233e917d723f723ab23 --- /dev/null +++ b/services/implementation/src/authentication_v2/auth_stages/auth_credential.cpp @@ -0,0 +1,576 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include +#include +#include +#include "dm_auth_attest_common.h" +#include "dm_auth_cert.h" +#include "dm_auth_context.h" +#include "dm_auth_manager_base.h" +#include "dm_auth_message_processor.h" +#include "dm_auth_state.h" +#include "dm_auth_state_machine.h" +#include "dm_constants.h" +#include "dm_log.h" +#include "deviceprofile_connector.h" +#include "hichain_auth_connector.h" +#include "multiple_user_connector.h" + +namespace OHOS { +namespace DistributedHardware { + +namespace { + +// tag in Lowercase, need by hichain tag +constexpr const char* TAG_LOWER_DEVICE_ID = "deviceId"; +constexpr const char* TAG_LOWER_USER_ID = "userId"; + +constexpr const char* DM_AUTH_CREDENTIAL_OWNER = "DM"; + +// decrypt process +int32_t g_authCredentialTransmitDecryptProcess(std::shared_ptr context, DmEventType event) +{ + if (context->transmitData.empty()) { + LOGE("DmAuthMessageProcessor::CreateMessageReqCredAuthStart failed, get onTransmitData failed."); + return ERR_DM_FAILED; + } + + int32_t ret = context->hiChainAuthConnector->ProcessCredData(context->requestId, context->transmitData); + if (ret != DM_OK) { + LOGE("AuthCredentialTransmitDecryptProcess: ProcessCredData transmit data failed"); + return ERR_DM_FAILED; + } + + if (context->authStateMachine->WaitExpectEvent(event) != event) { + LOGE("AuthCredentialTransmitDecryptProcess: Hichain auth transmit data failed"); + return ERR_DM_FAILED; + } + return DM_OK; +} + +int32_t AuthCredentialTransmitSend(std::shared_ptr context, DmMessageType msgType) +{ + if (context->transmitData.empty()) { + LOGE("AuthCredentialTransmitSend: Get onTransmitData failed."); + return ERR_DM_FAILED; + } + + std::string message = + context->authMessageProcessor->CreateMessage(msgType, context); + if (message.empty()) { + LOGE("AuthCredentialTransmitSend: CreateMessage AuthCredential transmit data failed"); + return ERR_DM_FAILED; + } + + return context->softbusConnector->GetSoftbusSession()->SendData(context->sessionId, message); +} + +void SetAuthContext(int32_t skId, int64_t &appSkTimeStamp, int32_t &appSessionKeyId) +{ + appSkTimeStamp = static_cast(DmAuthState::GetSysTimeMs()); + appSessionKeyId = skId; + return; +} + +} + +DmAuthStateType AuthSrcCredentialAuthNegotiateState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_NEGOTIATE_STATE; +} + +// Parse the ontransmit data, respond with 161 message +int32_t AuthSrcCredentialAuthNegotiateState::Action(std::shared_ptr context) +{ + // decrypt and transmit transmitData + int32_t ret = g_authCredentialTransmitDecryptProcess(context, ON_TRANSMIT); + if (ret != DM_OK) { + return ret; + } + + // Send 161 message + return AuthCredentialTransmitSend(context, DmMessageType::MSG_TYPE_REQ_CREDENTIAL_AUTH_NEGOTIATE); +} + +DmAuthStateType AuthSrcCredentialAuthDoneState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_DONE_STATE; +} + +std::string AuthSrcCredentialAuthDoneState::GenerateCertificate(std::shared_ptr context) +{ +#ifdef DEVICE_MANAGER_COMMON_FLAG + if (context == nullptr) { + LOGE("context_ is nullptr!"); + return ""; + } + context->accesser.isCommonFlag = true; + LOGI("open device do not generate cert!"); + return ""; +#else + DmCertChain dmCertChain; + int32_t certRet = AuthCert::GetInstance().GenerateCertificate(dmCertChain); + if (certRet != DM_OK) { + LOGE("generate cert fail, certRet = %{public}d", certRet); + return ""; + } + std::string cert = AuthAttestCommon::GetInstance().SerializeDmCertChain(&dmCertChain); + AuthAttestCommon::GetInstance().FreeDmCertChain(dmCertChain); + return cert; +#endif +} + +int32_t AuthSrcCredentialAuthDoneState::Action(std::shared_ptr context) +{ + // decrypt and transmit transmitData + int32_t ret = g_authCredentialTransmitDecryptProcess(context, ON_SESSION_KEY_RETURNED); + if (ret != DM_OK) { + return ret; + } + // Authentication completion triggers the Onfinish callback event. + if (context->authStateMachine->WaitExpectEvent(ON_FINISH) != ON_FINISH) { + LOGE("AuthSrcCredentialAuthDoneState::Action Hichain auth SINK transmit data failed"); + return ERR_DM_FAILED; + } + DmMessageType msgType; + int32_t skId; + ret = context->authMessageProcessor->SaveSessionKeyToDP(context->accesser.userId, skId); + if (ret != DM_OK) { + LOGE("AuthSrcCredentialAuthDoneState::Action DP save user session key failed"); + return ret; + } + // first time joinLnn, auth lnnCredential + if (context->accesser.isGenerateLnnCredential == true && context->isAppCredentialVerified == false && + context->accesser.bindLevel != USER) { + context->isAppCredentialVerified = true; + SetAuthContext(skId, context->accesser.transmitSkTimeStamp, context->accesser.transmitSessionKeyId); + msgType = MSG_TYPE_REQ_CREDENTIAL_AUTH_START; + ret = context->hiChainAuthConnector->AuthCredential(context->accesser.userId, context->requestId, + context->accesser.lnnCredentialId, std::string("")); + if (ret != DM_OK) { + LOGE("AuthSrcCredentialAuthDoneState::Action Hichain auth credentail failed"); + return ret; + } + // wait for onTransmit event + if (context->authStateMachine->WaitExpectEvent(ON_TRANSMIT) != ON_TRANSMIT) { + LOGE("AuthSrcCredentialAuthDoneState::Action failed, ON_TRANSMIT event not arrived."); + return ERR_DM_FAILED; + } + // First-time authentication and Lnn credential process + } else if (context->accesser.isGenerateLnnCredential == true && context->accesser.bindLevel != USER) { + SetAuthContext(skId, context->accesser.lnnSkTimeStamp, context->accesser.lnnSessionKeyId); + context->accesser.cert = GenerateCertificate(context); + msgType = MSG_TYPE_REQ_DATA_SYNC; + } else { // Non-first-time authentication transport credential process + SetAuthContext(skId, context->accesser.transmitSkTimeStamp, context->accesser.transmitSessionKeyId); + context->accesser.cert = GenerateCertificate(context); + msgType = MSG_TYPE_REQ_DATA_SYNC; + } + std::string message = + context->authMessageProcessor->CreateMessage(msgType, context); + if (message.empty()) { + LOGE("AuthSrcCredentialAuthDoneState::Action CreateMessage failed"); + return ERR_DM_FAILED; + } + return context->softbusConnector->GetSoftbusSession()->SendData(context->sessionId, message); +} + +DmAuthStateType AuthSinkCredentialAuthStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_START_STATE; +} + +int32_t AuthSinkCredentialAuthStartState::Action(std::shared_ptr context) +{ + context->timer->DeleteTimer(std::string(WAIT_REQUEST_TIMEOUT_TASK)); + + int32_t ret = g_authCredentialTransmitDecryptProcess(context, ON_TRANSMIT); + if (ret != DM_OK) { + return ret; + } + + return AuthCredentialTransmitSend(context, DmMessageType::MSG_TYPE_RESP_CREDENTIAL_AUTH_START); +} + +DmAuthStateType AuthSinkCredentialAuthNegotiateState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_NEGOTIATE_STATE; +} + +int32_t AuthSinkCredentialAuthNegotiateState::Action(std::shared_ptr context) +{ + int32_t ret = g_authCredentialTransmitDecryptProcess(context, ON_TRANSMIT); + if (ret != DM_OK) { + return ret; + } + + // Construct and send 171 message + ret = AuthCredentialTransmitSend(context, DmMessageType::MSG_TYPE_RESP_CREDENTIAL_AUTH_NEGOTIATE); + if (ret != DM_OK) { + return ret; + } + + if (context->authStateMachine->WaitExpectEvent(ON_SESSION_KEY_RETURNED) != ON_SESSION_KEY_RETURNED) { + LOGE("AuthSinkCredentialAuthNegotiateState::Action Hichain auth SINK transmit data failed"); + return ERR_DM_FAILED; + } + + if (context->authStateMachine->WaitExpectEvent(ON_FINISH) != ON_FINISH) { + LOGE("AuthSinkCredentialAuthNegotiateState::Action Hichain auth SINK transmit data failed"); + return ERR_DM_FAILED; + } + int32_t skId; + ret = context->authMessageProcessor->SaveSessionKeyToDP(context->accessee.userId, skId); + if (ret != DM_OK) { + LOGE("AuthSinkCredentialAuthNegotiateState::Action DP save user session key failed"); + return ret; + } + + // First lnn cred auth, second time receiving 161 message + if (context->accessee.isGenerateLnnCredential == true && context->accessee.bindLevel != USER && + context->isAppCredentialVerified == true) { + context->accessee.lnnSkTimeStamp = static_cast(GetSysTimeMs()); + context->accessee.lnnSessionKeyId = skId; + } else { // Twice transport cred auth + context->isAppCredentialVerified = true; + context->accessee.transmitSkTimeStamp = static_cast(GetSysTimeMs()); + context->accessee.transmitSessionKeyId = skId; + } + return DM_OK; +} + +// Generate the json string of authParams in the credential negotiation state +std::string AuthCredentialAgreeState::CreateAuthParamsString(DmAuthScope authorizedScope, + DmAuthCredentialAddMethod method, const std::shared_ptr &authContext) +{ + LOGI("AuthCredentialAgreeState::CreateAuthParamsString start, authorizedScope: %{public}d.", + static_cast(authorizedScope)); + + if ((authorizedScope <= DM_AUTH_SCOPE_INVALID || authorizedScope >= DM_AUTH_SCOPE_MAX) || + (method != DM_AUTH_CREDENTIAL_ADD_METHOD_GENERATE && method != DM_AUTH_CREDENTIAL_ADD_METHOD_IMPORT)) { + return std::string(""); + } + + JsonObject jsonObj; + if (method == DM_AUTH_CREDENTIAL_ADD_METHOD_GENERATE) { + jsonObj[TAG_METHOD] = method; + } + + jsonObj[TAG_LOWER_DEVICE_ID] = (method == DM_AUTH_CREDENTIAL_ADD_METHOD_GENERATE) ? + authContext->GetDeviceId(DM_AUTH_LOCAL_SIDE) : authContext->GetDeviceId(DM_AUTH_REMOTE_SIDE); + if (method == DM_AUTH_CREDENTIAL_ADD_METHOD_IMPORT) { + jsonObj[TAG_PEER_USER_SPACE_ID] = std::to_string(authContext->GetUserId(DM_AUTH_REMOTE_SIDE)); + } + jsonObj[TAG_LOWER_USER_ID] = (method == DM_AUTH_CREDENTIAL_ADD_METHOD_GENERATE) ? + authContext->GetAccountId(DM_AUTH_LOCAL_SIDE) : authContext->GetAccountId(DM_AUTH_REMOTE_SIDE); + jsonObj[TAG_SUBJECT] = DM_AUTH_CREDENTIAL_SUBJECT_PRIMARY; + jsonObj[TAG_CRED_TYPE] = DM_AUTH_CREDENTIAL_ACCOUNT_UNRELATED; + jsonObj[TAG_KEY_FORMAT] = (method == DM_AUTH_CREDENTIAL_ADD_METHOD_GENERATE) ? + DM_AUTH_KEY_FORMAT_ASYMM_GENERATE : DM_AUTH_KEY_FORMAT_ASYMM_IMPORT; + jsonObj[TAG_ALGORITHM_TYPE] = DM_AUTH_ALG_TYPE_ED25519; + jsonObj[TAG_PROOF_TYPE] = DM_AUTH_CREDENTIAL_PROOF_PSK; + if (method == DM_AUTH_CREDENTIAL_ADD_METHOD_IMPORT) { + jsonObj[TAG_KEY_VALUE] = authContext->GetPublicKey(DM_AUTH_REMOTE_SIDE, authorizedScope); + } + if (authorizedScope == DM_AUTH_SCOPE_LNN || authorizedScope == DM_AUTH_SCOPE_USER) { + jsonObj[TAG_AUTHORIZED_SCOPE] = DM_AUTH_SCOPE_USER; + } else { + jsonObj[TAG_AUTHORIZED_SCOPE] = authorizedScope; + } + if (authorizedScope == DM_AUTH_SCOPE_APP || authorizedScope == DM_AUTH_SCOPE_USER) { + std::vector tokenIds = {std::to_string(authContext->accesser.tokenId), + std::to_string(authContext->accessee.tokenId)}; + jsonObj[TAG_AUTHORIZED_APP_LIST] = tokenIds; + } + jsonObj[TAG_CREDENTIAL_OWNER] = DM_AUTH_CREDENTIAL_OWNER; + + LOGI("AuthCredentialAgreeState::CreateAuthParamsString leave."); + return jsonObj.Dump(); +} + +// Generate credential ID and public key +int32_t AuthCredentialAgreeState::GenerateCredIdAndPublicKey(DmAuthScope authorizedScope, + std::shared_ptr &authContext) +{ + LOGI("authorizedScope %{public}d.", static_cast(authorizedScope)); + if ((authorizedScope <= DM_AUTH_SCOPE_INVALID || authorizedScope >= DM_AUTH_SCOPE_MAX) || + authContext == nullptr || authContext->hiChainAuthConnector == nullptr) { + return ERR_DM_FAILED; + } + + std::string authParamsString = CreateAuthParamsString(authorizedScope, + DM_AUTH_CREDENTIAL_ADD_METHOD_GENERATE, authContext); + if (authParamsString == "") { + LOGE("AuthCredentialAgreeState::GenerateCredIdAndPublicKey() error, create authParamsString failed."); + return ERR_DM_FAILED; + } + + int32_t osAccountId = (authContext->direction == DM_AUTH_SOURCE) ? + authContext->accesser.userId : authContext->accessee.userId; + std::string credId; + int32_t ret = authContext->hiChainAuthConnector->AddCredential(osAccountId, authParamsString, credId); + if (ret != DM_OK) { + LOGE("AuthCredentialAgreeState::GenerateCredIdAndPublicKey() error, add credential failed."); + return ret; + } + + std::string publicKey; + ret = authContext->hiChainAuthConnector->ExportCredential(osAccountId, credId, publicKey); + if (ret != DM_OK) { + LOGE("AuthCredentialAgreeState::GenerateCredIdAndPublicKey(), export publicKey failed."); + authContext->hiChainAuthConnector->DeleteCredential(osAccountId, credId); + return ret; + } + + (void)authContext->SetCredentialId(DM_AUTH_LOCAL_SIDE, authorizedScope, credId); + (void)authContext->SetPublicKey(DM_AUTH_LOCAL_SIDE, authorizedScope, publicKey); + LOGI("AuthCredentialAgreeState::GenerateCredIdAndPublicKey credId=%{public}s, publicKey=%{public}s.\n", + GetAnonyString(authContext->GetCredentialId(DM_AUTH_LOCAL_SIDE, authorizedScope)).c_str(), + GetAnonyString(authContext->GetPublicKey(DM_AUTH_LOCAL_SIDE, authorizedScope)).c_str()); + LOGI("AuthCredentialAgreeState::GenerateCredIdAndPublicKey leave."); + return DM_OK; +} + +// Get the negotiation credential ID by agree credential +int32_t AuthCredentialAgreeState::AgreeCredential(DmAuthScope authorizedScope, + std::shared_ptr &authContext) +{ + LOGI("AuthCredentialAgreeState::AgreeCredential start, authorizedScope: %{public}d.", + static_cast(authorizedScope)); + if ((authorizedScope <= DM_AUTH_SCOPE_INVALID || authorizedScope >= DM_AUTH_SCOPE_MAX) || authContext == nullptr) { + return ERR_DM_FAILED; + } + + std::string authParamsString = CreateAuthParamsString(authorizedScope, + DM_AUTH_CREDENTIAL_ADD_METHOD_IMPORT, authContext); + if (authParamsString == "") { + LOGE("AuthCredentialAgreeState::AgreeCredential error, create authParamsString failed."); + return ERR_DM_FAILED; + } + + int32_t osAccountId = authContext->direction == DM_AUTH_SOURCE ? + authContext->accesser.userId : authContext->accessee.userId; + std::string selfCredId = authContext->GetCredentialId(DM_AUTH_LOCAL_SIDE, authorizedScope); + std::string credId; + LOGI("AuthCredentialAgreeState::AgreeCredential agree with accountId %{public}d and param %{public}s.", + osAccountId, GetAnonyJsonString(authParamsString).c_str()); + int32_t ret = authContext->hiChainAuthConnector->AgreeCredential(osAccountId, selfCredId, + authParamsString, credId); + if (ret != DM_OK) { + LOGE("AuthCredentialAgreeState::AgreeCredential error, agree credential failed."); + return ret; + } + + (void)authContext->SetCredentialId(DM_AUTH_LOCAL_SIDE, authorizedScope, credId); + LOGI("AuthCredentialAgreeState::AgreeCredential leave."); + return DM_OK; +} + +DmAuthStateType AuthSrcCredentialExchangeState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_CREDENTIAL_EXCHANGE_STATE; +} + +int32_t AuthSrcCredentialExchangeState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcCredentialExchangeState::Action() start."); + int32_t ret = ERR_DM_FAILED; + context->isAppCredentialVerified = false; + + if (!NeedAgreeAcl(context)) { + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + + if (!NeedAgreeCredential(context)) { + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + + // First authentication, generate LNN credentials and public key + if (context->accesser.isGenerateLnnCredential && context->accesser.bindLevel != USER) { + ret = GenerateCredIdAndPublicKey(DM_AUTH_SCOPE_LNN, context); + if (ret != DM_OK) { + LOGE("AuthSrcCredentialExchangeState::Action() error, generate user credId and publicKey failed."); + return ret; + } + } + + DmAuthScope authorizedScope = DM_AUTH_SCOPE_INVALID; + if (context->accesser.bindLevel == APP || context->accesser.bindLevel == SERVICE) { + authorizedScope = DM_AUTH_SCOPE_APP; + } else if (context->accesser.bindLevel == USER) { + authorizedScope = DM_AUTH_SCOPE_USER; + } + + // Generate transmit credentials and public key + ret = GenerateCredIdAndPublicKey(authorizedScope, context); + if (ret != DM_OK) { + LOGE("AuthSrcCredentialExchangeState::Action() error, generate app credId and publicKey failed."); + return ret; + } + + std::string message = context->authMessageProcessor->CreateMessage(MSG_TYPE_REQ_CREDENTIAL_EXCHANGE, context); + LOGI("AuthSrcCredentialExchangeState::Action() leave."); + return context->softbusConnector->GetSoftbusSession()->SendData(context->sessionId, message); +} + +DmAuthStateType AuthSinkCredentialExchangeState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_CREDENTIAL_EXCHANGE_STATE; +} + +int32_t AuthSinkCredentialExchangeState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkCredentialExchangeState::Action start."); + int32_t ret = ERR_DM_FAILED; + std::string tmpCredId; + int32_t osAccountId = context->accessee.userId; + context->isAppCredentialVerified = false; + + if (context == nullptr || context->hiChainAuthConnector == nullptr || + context->authMessageProcessor == nullptr || context->softbusConnector == nullptr) { + return ret; + } + + // First authentication lnn cred + if (context->accessee.isGenerateLnnCredential && context->accessee.bindLevel != USER) { + // Generate credentials and public key + ret = GenerateCredIdAndPublicKey(DM_AUTH_SCOPE_LNN, context); + if (ret != DM_OK) { + LOGE("AuthSinkCredentialExchangeState::Action failed, generate user cred and publicKey failed."); + return ret; + } + + // Agree credentials + tmpCredId = context->accessee.lnnCredentialId; + ret = AgreeCredential(DM_AUTH_SCOPE_LNN, context); + if (ret != DM_OK) { + context->hiChainAuthConnector->DeleteCredential(osAccountId, tmpCredId); + context->SetCredentialId(DM_AUTH_LOCAL_SIDE, DM_AUTH_SCOPE_LNN, ""); + LOGE("AuthSinkCredentialExchangeState::Action failed, agree user cred failed."); + return ret; + } + + // Delete temporary credentials + context->hiChainAuthConnector->DeleteCredential(osAccountId, tmpCredId); + } + + // + DmAuthScope authorizedScope = DM_AUTH_SCOPE_INVALID; + if (context->accessee.bindLevel == APP || context->accessee.bindLevel == SERVICE) { + authorizedScope = DM_AUTH_SCOPE_APP; + } else if (context->accessee.bindLevel == USER) { + authorizedScope = DM_AUTH_SCOPE_USER; + } + // Generate transport credentials and public key + ret = GenerateCredIdAndPublicKey(authorizedScope, context); + if (ret != DM_OK) { + LOGE("AuthSinkCredentialExchangeState::Action failed, generate app cred and publicKey failed."); + return ret; + } + + // Agree transport credentials and public key + tmpCredId = context->accessee.transmitCredentialId; + ret = AgreeCredential(authorizedScope, context); + if (ret != DM_OK) { + context->hiChainAuthConnector->DeleteCredential(osAccountId, tmpCredId); + context->SetCredentialId(DM_AUTH_LOCAL_SIDE, authorizedScope, ""); + LOGE("AuthSinkCredentialExchangeState::Action failed, agree app cred failed."); + return ret; + } + + // Delete temporary transport credentials + context->hiChainAuthConnector->DeleteCredential(osAccountId, tmpCredId); + + std::string message = context->authMessageProcessor->CreateMessage(MSG_TYPE_RESP_CREDENTIAL_EXCHANGE, context); + LOGI("AuthSinkCredentialExchangeState::Action leave."); + return context->softbusConnector->GetSoftbusSession()->SendData(context->sessionId, message); +} + +DmAuthStateType AuthSrcCredentialAuthStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_START_STATE; +} + +int32_t AuthSrcCredentialAuthStartState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcCredentialAuthStartState::Action start."); + int32_t ret = ERR_DM_FAILED; + std::string tmpCredId = ""; + int32_t osAccountId = context->accesser.userId; + + if (context == nullptr || context->hiChainAuthConnector == nullptr || + context->authMessageProcessor == nullptr || context->softbusConnector == nullptr) { + return ret; + } + + if (NeedAgreeCredential(context)) { + // First authentication + if (context->accesser.isGenerateLnnCredential && context->accesser.bindLevel != USER) { + // Agree lnn credentials and public key + tmpCredId = context->accesser.lnnCredentialId; + ret = AgreeCredential(DM_AUTH_SCOPE_LNN, context); + if (ret != DM_OK) { + context->hiChainAuthConnector->DeleteCredential(osAccountId, tmpCredId); + context->SetCredentialId(DM_AUTH_LOCAL_SIDE, DM_AUTH_SCOPE_LNN, ""); + return ret; + } + + // Delete temporary lnn credentials + context->hiChainAuthConnector->DeleteCredential(osAccountId, tmpCredId); + } + + DmAuthScope authorizedScope = DM_AUTH_SCOPE_INVALID; + if (context->accesser.bindLevel == APP || context->accesser.bindLevel == SERVICE) { + authorizedScope = DM_AUTH_SCOPE_APP; + } else if (context->accesser.bindLevel == USER) { + authorizedScope = DM_AUTH_SCOPE_USER; + } + + // Agree transport credentials and public key + tmpCredId = context->accesser.transmitCredentialId; + ret = AgreeCredential(authorizedScope, context); + if (ret != DM_OK) { + context->hiChainAuthConnector->DeleteCredential(osAccountId, tmpCredId); + context->SetCredentialId(DM_AUTH_LOCAL_SIDE, authorizedScope, ""); + LOGE("AuthSrcCredentialAuthStartState::Action failed, agree app cred failed."); + return ret; + } + + // Delete temporary transport credentials + context->hiChainAuthConnector->DeleteCredential(osAccountId, tmpCredId); + } + + // Transport credential authentication + ret = context->hiChainAuthConnector->AuthCredential(osAccountId, context->requestId, + context->accesser.transmitCredentialId, std::string("")); + if (ret != DM_OK) { + LOGE("AuthSrcCredentialAuthStartState::Action failed, auth app cred failed."); + return ret; + } + + if (context->authStateMachine->WaitExpectEvent(ON_TRANSMIT) != ON_TRANSMIT) { + LOGE("AuthSrcCredentialAuthStartState::Action failed, ON_TRANSMIT event not arrived."); + return ERR_DM_FAILED; + } + + std::string message = context->authMessageProcessor->CreateMessage(MSG_TYPE_REQ_CREDENTIAL_AUTH_START, context); + LOGI(" AuthSrcCredentialAuthStartState::Action leave."); + return context->softbusConnector->GetSoftbusSession()->SendData(context->sessionId, message); +} +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/implementation/src/authentication_v2/auth_stages/auth_negotiate.cpp b/services/implementation/src/authentication_v2/auth_stages/auth_negotiate.cpp new file mode 100644 index 0000000000000000000000000000000000000000..eae7d17263c2756a3842fbfde38b41dffdd5169c --- /dev/null +++ b/services/implementation/src/authentication_v2/auth_stages/auth_negotiate.cpp @@ -0,0 +1,599 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "accesstoken_kit.h" +#include "access_control_profile.h" +#include "accesser.h" +#include "accessee.h" +#include "auth_manager.h" +#include "app_manager.h" +#include "business_event.h" +#include "distributed_device_profile_client.h" +#include "dm_crypto.h" +#include "dm_log.h" +#include "dm_timer.h" +#include "dm_radar_helper.h" +#include "dm_language_manager.h" +#include "dm_constants.h" +#include "dm_anonymous.h" +#include "dm_random.h" +#include "dm_auth_context.h" +#include "dm_auth_state.h" +#include "dm_freeze_process.h" +#include "deviceprofile_connector.h" +#include "distributed_device_profile_errors.h" +#include "device_auth.h" +#include "hap_token_info.h" +#include "json_object.h" +#include "multiple_user_connector.h" +#include "os_account_manager.h" +#include "parameter.h" + +using namespace OHOS::Security::AccessToken; + +namespace OHOS { +namespace DistributedHardware { +namespace { + const char* DM_DISTURBANCE_EVENT_KEY = "business_id_cast+_disturbance_event"; + const char* DM_ANTI_DISTURBANCE_MODE = "is_in_anti_disturbance_mode"; +} + +DmAuthStateType AuthSrcStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_START_STATE; +} + +int32_t AuthSrcStartState::Action(std::shared_ptr context) +{ + return DM_OK; +} + +DmAuthStateType AuthSrcNegotiateStateMachine::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_NEGOTIATE_STATE; +} + +std::string AuthSrcNegotiateStateMachine::GetAccountGroupIdHash(std::shared_ptr context) +{ + JsonObject jsonObj; + jsonObj[FIELD_GROUP_TYPE] = GROUP_TYPE_IDENTICAL_ACCOUNT_GROUP; + std::string queryParams = SafetyDump(jsonObj); + + int32_t osAccountUserId = MultipleUserConnector::GetCurrentAccountUserID(); + if (osAccountUserId < 0) { + LOGE("get current process account user id failed"); + return ""; + } + std::vector groupList; + if (!context->hiChainConnector->GetGroupInfo(osAccountUserId, queryParams, groupList)) { + return ""; + } + JsonObject jsonAccountObj(JsonCreateType::JSON_CREATE_TYPE_ARRAY); + for (auto &groupInfo : groupList) { + jsonAccountObj.PushBack(Crypto::GetGroupIdHash(groupInfo.groupId)); + } + return SafetyDump(jsonAccountObj); +} + +int32_t AuthSrcNegotiateStateMachine::Action(std::shared_ptr context) +{ + LOGI("AuthSrcNegotiateStateMachine::Action sessionId %{public}d.", context->sessionId); + + context->reply = ERR_DM_AUTH_REJECT; + context->accessee.dmVersion = ""; + + // Calculate the hash value + context->accesser.deviceIdHash = Crypto::GetUdidHash(context->accesser.deviceId); + context->accesser.accountIdHash = Crypto::GetAccountIdHash16(context->accesser.accountId); + context->accesser.tokenIdHash = Crypto::GetTokenIdHash(std::to_string(context->accesser.tokenId)); + + // Create old message for compatible + context->accesser.accountGroupIdHash = GetAccountGroupIdHash(context); + + std::string message = context->authMessageProcessor->CreateMessage(MSG_TYPE_REQ_ACL_NEGOTIATE, context); + context->softbusConnector->GetSoftbusSession()->SendData(context->sessionId, message); + if (context->timer != nullptr) { + context->timer->StartTimer(std::string(NEGOTIATE_TIMEOUT_TASK), + DmAuthState::GetTaskTimeout(context, NEGOTIATE_TIMEOUT_TASK, NEGOTIATE_TIMEOUT), + [this, context] (std::string name) { + DmAuthState::HandleAuthenticateTimeout(context, name); + }); + } + + return DM_OK; +} + +DmAuthStateType AuthSinkNegotiateStateMachine::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_NEGOTIATE_STATE; +} + +int32_t AuthSinkNegotiateStateMachine::RespQueryAcceseeIds(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + // 1. Get deviceId + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + context->accessee.deviceId = std::string(localDeviceId); + context->accessee.deviceIdHash = Crypto::GetUdidHash(context->accessee.deviceId); + + // 2. Get userId + context->accessee.userId = MultipleUserConnector::GetUserIdByDisplayId( + static_cast(context->accessee.displayId)); + if (context->accessee.userId < 0) { + LOGE("get userId failed."); + return ERR_DM_GET_LOCAL_USERID_FAILED; + } + + // 3. Get accountId + context->accessee.accountId = MultipleUserConnector::GetOhosAccountIdByUserId(context->accessee.userId); + context->accessee.accountIdHash = Crypto::GetAccountIdHash16(context->accessee.accountId); + + // 4. Get tokenId + if (AppManager::GetInstance().GetNativeTokenIdByName(context->accessee.bundleName, + context->accessee.tokenId) == DM_OK) { + context->accessee.bindLevel = DmRole::DM_ROLE_SA; + } else if (AppManager::GetInstance().GetHapTokenIdByName(context->accessee.userId, context->accessee.bundleName, 0, + context->accessee.tokenId) == DM_OK) { + context->accessee.bindLevel = DmRole::DM_ROLE_FA; + } else { + LOGE("sink not contain the bundlename %{public}s.", context->accessee.bundleName.c_str()); + return ERR_DM_GET_TOKENID_FAILED; + } + if (AuthManagerBase::CheckProcessNameInWhiteList(context->accessee.bundleName)) { + context->accessee.bindLevel = DmRole::DM_ROLE_USER; + } + context->accessee.tokenIdHash = Crypto::GetTokenIdHash(std::to_string(context->accessee.tokenId)); + context->accesser.isOnline = context->softbusConnector->CheckIsOnline(context->accesser.deviceIdHash, true); + context->accessee.language = DmLanguageManager::GetInstance().GetSystemLanguage(); + context->accessee.deviceName = context->listener->GetLocalDisplayDeviceNameForPrivacy(); + context->accessee.networkId = context->softbusConnector->GetLocalDeviceNetworkId(); + return DM_OK; +} + +int32_t AuthSinkNegotiateStateMachine::ProcRespNegotiate5_1_0(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + int32_t ret = RespQueryAcceseeIds(context); + if (ret != DM_OK) { + LOGE("DmAuthManager::ProcRespNegotiate5_1_0 fail to get all id."); + return ret; + } + JsonObject credInfo; + GetSinkCredentialInfo(context, credInfo); + JsonObject aclTypeJson; + GetSinkAclInfo(context, credInfo, aclTypeJson); + context->accessee.aclTypeList = aclTypeJson.Dump(); + JsonObject credTypeJson; + GetSinkCredType(context, credInfo, aclTypeJson, credTypeJson); + context->accessee.credTypeList = credTypeJson.Dump(); + return DM_OK; +} + +int32_t AuthSinkNegotiateStateMachine::Action(std::shared_ptr context) +{ + LOGI("AuthSinkNegotiateStateMachine::Action sessionid %{public}d", context->sessionId); + if (IsAntiDisturbanceMode(context->businessId)) { + LOGI("Sink is AntiDisturbMode."); + context->reason = ERR_DM_ANTI_DISTURB_MODE; + return ERR_DM_ANTI_DISTURB_MODE; + } + if (FreezeProcess::GetInstance().IsFrozen()) { + LOGE("Device is Frozen"); + return ERR_DM_DEVICE_FROZEN; + } + // 1. Create an authorization timer + if (context->timer != nullptr) { + context->timer->StartTimer(std::string(AUTHENTICATE_TIMEOUT_TASK), + AUTHENTICATE_TIMEOUT, + [this, context] (std::string name) { + DmAuthState::HandleAuthenticateTimeout(context, name); + }); + } + // To be compatible with historical versions, use ConvertSrcVersion to get the actual version on the source side. + std::string preVersion = std::string(DM_VERSION_5_0_OLD_MAX); + LOGI("AuthSinkNegotiateStateMachine::Action start version compare %{public}s to %{public}s", + context->accesser.dmVersion.c_str(), preVersion.c_str()); + if (CompareVersion(context->accesser.dmVersion, preVersion) == false) { + LOGE("AuthSinkNegotiateStateMachine::Action incompatible version"); + context->reason = ERR_DM_VERSION_INCOMPATIBLE; + return ERR_DM_VERSION_INCOMPATIBLE; + } + int32_t ret = ProcRespNegotiate5_1_0(context); + if (ret != DM_OK) { + LOGE("AuthSinkNegotiateStateMachine::Action proc response negotiate failed"); + context->reason = ret; + return ret; + } + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_ACL_NEGOTIATE, context); + context->timer->StartTimer(std::string(WAIT_REQUEST_TIMEOUT_TASK), + DmAuthState::GetTaskTimeout(context, WAIT_REQUEST_TIMEOUT_TASK, WAIT_REQUEST_TIMEOUT), + [this, context] (std::string name) { + DmAuthState::HandleAuthenticateTimeout(context, name); + }); + return DM_OK; +} + +void AuthSinkNegotiateStateMachine::GetSinkCredType(std::shared_ptr context, + JsonObject &credInfo, JsonObject &aclInfo, JsonObject &credTypeJson) +{ + CHECK_NULL_VOID(context); + std::vector deleteCredInfo; + for (const auto &item : credInfo.Items()) { + if (!item.Contains(FILED_CRED_TYPE) || !item[FILED_CRED_TYPE].IsNumberInteger() || + !item.Contains(FILED_CRED_ID) || !item[FILED_CRED_ID].IsString()) { + deleteCredInfo.push_back(item[FILED_CRED_ID].Get()); + continue; + } + int32_t credType = item[FILED_CRED_TYPE].Get(); + LOGI("credType %{public}d.", credType); + switch (credType) { + case DM_IDENTICAL_ACCOUNT: + credTypeJson["identicalCredType"] = credType; + context->accessee.credentialInfos[credType] = item.Dump(); + break; + case DM_SHARE: + credTypeJson["shareCredType"] = credType; + context->accessee.credentialInfos[credType] = item.Dump(); + break; + case DM_POINT_TO_POINT: + GetSinkCredTypeForP2P(context, item, aclInfo, credTypeJson, credType, deleteCredInfo); + break; + case DM_LNN: + if (!aclInfo.Contains("lnnAcl") || + (context->accessee.aclProfiles[DM_LNN].GetAccessee().GetAccesseeCredentialIdStr() != + item[FILED_CRED_ID].Get() && + context->accessee.aclProfiles[DM_LNN].GetAccesser().GetAccesserCredentialIdStr() != + item[FILED_CRED_ID].Get())) { + deleteCredInfo.push_back(item[FILED_CRED_ID].Get()); + } else { + credTypeJson["lnnCredType"] = credType; + context->accessee.credentialInfos[credType] = item.Dump(); + } + break; + default: + LOGE("invalid credType %{public}d.", credType); + break; + } + } + for (const auto &item : deleteCredInfo) { + credInfo.Erase(item); + context->hiChainAuthConnector->DeleteCredential(context->accessee.userId, item); + } +} + +void AuthSinkNegotiateStateMachine::GetSinkCredTypeForP2P(std::shared_ptr context, + const JsonItemObject &credObj, JsonObject &aclInfo, JsonObject &credTypeJson, + int32_t credType, std::vector &deleteCredInfo) +{ + CHECK_NULL_VOID(context); + if (!aclInfo.Contains("pointTopointAcl") || + (context->accessee.aclProfiles[DM_POINT_TO_POINT].GetAccessee().GetAccesseeCredentialIdStr() != + credObj[FILED_CRED_ID].Get() && + context->accessee.aclProfiles[DM_POINT_TO_POINT].GetAccesser().GetAccesserCredentialIdStr() != + credObj[FILED_CRED_ID].Get())) { + deleteCredInfo.push_back(credObj[FILED_CRED_ID].Get()); + } else { + credTypeJson["pointTopointCredType"] = credType; + context->accessee.credentialInfos[credType] = credObj.Dump(); + } +} + +void AuthSinkNegotiateStateMachine::GetSinkAclInfo(std::shared_ptr context, + JsonObject &credInfo, JsonObject &aclInfo) +{ + CHECK_NULL_VOID(context); + std::vector profiles = + DeviceProfileConnector::GetInstance().GetAllAclIncludeLnnAcl(); + FilterProfilesByContext(profiles, context); + uint32_t bindLevel = DM_INVALIED_TYPE; + for (const auto &item : profiles) { + std::string trustDeviceId = item.GetTrustDeviceId(); + std::string trustDeviceIdHash = Crypto::GetUdidHash(trustDeviceId); + if (trustDeviceIdHash != context->accesser.deviceIdHash && + trustDeviceIdHash != context->accessee.deviceIdHash) { + LOGE("devId %{public}s hash %{public}s, er devId %{public}s.", GetAnonyString(trustDeviceId).c_str(), + GetAnonyString(trustDeviceIdHash).c_str(), GetAnonyString(context->accesser.deviceIdHash).c_str()); + continue; + } + bindLevel = item.GetBindLevel(); + switch (item.GetBindType()) { + case DM_IDENTICAL_ACCOUNT: + if (IdenticalAccountAclCompare(context, item.GetAccesser(), item.GetAccessee())) { + aclInfo["identicalAcl"] = DM_IDENTICAL_ACCOUNT; + context->accessee.aclProfiles[DM_IDENTICAL_ACCOUNT] = item; + } + break; + case DM_SHARE: + if (ShareAclCompare(context, item.GetAccesser(), item.GetAccessee()) && + CheckCredIdInAcl(context, item, credInfo, DM_SHARE)) { + aclInfo["shareAcl"] = DM_SHARE; + context->accessee.aclProfiles[DM_SHARE] = item; + } + break; + case DM_POINT_TO_POINT: + GetSinkAclInfoForP2P(context, item, credInfo, aclInfo); + break; + default: + LOGE("invalid bindType %{public}d.", item.GetBindType()); + break; + } + } + if (aclInfo.Contains("pointTopointAcl") && !aclInfo.Contains("lnnAcl") && bindLevel != USER) { + aclInfo.Erase("pointTopointAcl"); + DeleteAcl(context, context->accessee.aclProfiles[DM_POINT_TO_POINT]); + } +} + +void AuthSinkNegotiateStateMachine::GetSinkAclInfoForP2P(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, JsonObject &aclInfo) +{ + CHECK_NULL_VOID(context); + if (Point2PointAclCompare(context, profile.GetAccesser(), profile.GetAccessee()) && + CheckCredIdInAcl(context, profile, credInfo, DM_POINT_TO_POINT)) { + aclInfo["pointTopointAcl"] = DM_POINT_TO_POINT; + context->accessee.aclProfiles[DM_POINT_TO_POINT] = profile; + } + if (LnnAclCompare(context, profile.GetAccesser(), profile.GetAccessee()) && + CheckCredIdInAcl(context, profile, credInfo, DM_LNN) && profile.GetBindLevel() == USER) { + aclInfo["lnnAcl"] = DM_LNN; + context->accessee.aclProfiles[DM_LNN] = profile; + } +} + +bool AuthSinkNegotiateStateMachine::CheckCredIdInAcl(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, uint32_t bindType) +{ + std::string credId = profile.GetAccessee().GetAccesseeCredentialIdStr(); + if (!credInfo.Contains(credId)) { + credId = profile.GetAccesser().GetAccesserCredentialIdStr(); + if (!credInfo.Contains(credId)) { + LOGE("credInfoJson not contain credId %{public}s.", credId.c_str()); + DeleteAcl(context, profile); + return false; + } + } + if (credInfo.Contains(credId) && (!credInfo[credId].IsObject() || !credInfo[credId].Contains(FILED_CRED_TYPE) || + !credInfo[credId][FILED_CRED_TYPE].IsNumberInteger())) { + LOGE("credId %{public}s contain credInfoJson invalid.", credId.c_str()); + credInfo.Erase(credId); + DeleteAcl(context, profile); + return false; + } + bool checkResult = false; + switch (bindType) { + LOGI("bindType %{public}d.", bindType); + case DM_IDENTICAL_ACCOUNT: + case DM_SHARE: + case DM_LNN: + if (credInfo[credId][FILED_CRED_TYPE].Get() == bindType) { + checkResult = true; + } else { + DeleteAcl(context, profile); + } + break; + case DM_POINT_TO_POINT: + CheckCredIdInAclForP2P(context, credId, profile, credInfo, bindType, checkResult); + break; + default: + break; + } + return checkResult; +} + +void AuthSinkNegotiateStateMachine::CheckCredIdInAclForP2P(std::shared_ptr context, + std::string &credId, const DistributedDeviceProfile::AccessControlProfile &profile, JsonObject &credInfo, + uint32_t bindType, bool &checkResult) +{ + if (credInfo[credId][FILED_CRED_TYPE].Get() == bindType) { + std::vector appList; + credInfo[credId][FILED_AUTHORIZED_APP_LIST].Get(appList); + const size_t APP_LIST_SIZE = 2; + if (appList.size() >= APP_LIST_SIZE && + ((std::to_string(profile.GetAccesser().GetAccesserTokenId()) == appList[0] && + std::to_string(profile.GetAccessee().GetAccesseeTokenId()) == appList[1]) || + (std::to_string(profile.GetAccessee().GetAccesseeTokenId()) == appList[0] && + std::to_string(profile.GetAccesser().GetAccesserTokenId()) == appList[1]))) { + checkResult = true; + } else { + DeleteAcl(context, profile); + } + } else { + DeleteAcl(context, profile); + } +} + +bool AuthSinkNegotiateStateMachine::IdenticalAccountAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee) +{ + LOGI("start"); + return accesser.GetAccesserDeviceId() == context->accessee.deviceId && + accesser.GetAccesserUserId() == context->accessee.userId && + Crypto::GetUdidHash(accessee.GetAccesseeDeviceId()) == context->accesser.deviceIdHash; +} + +bool AuthSinkNegotiateStateMachine::ShareAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee) +{ + LOGI("start"); + return accessee.GetAccesseeDeviceId() == context->accessee.deviceId && + accessee.GetAccesseeUserId() == context->accessee.userId && + Crypto::GetUdidHash(accesser.GetAccesserDeviceId()) == context->accesser.deviceIdHash; +} + +bool AuthSinkNegotiateStateMachine::Point2PointAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee) +{ + LOGI("start"); + return (accessee.GetAccesseeDeviceId() == context->accessee.deviceId && + accessee.GetAccesseeUserId() == context->accessee.userId && + accessee.GetAccesseeTokenId() == context->accessee.tokenId && + Crypto::GetUdidHash(accesser.GetAccesserDeviceId()) == context->accesser.deviceIdHash && + Crypto::GetTokenIdHash(std::to_string(accesser.GetAccesserTokenId())) == context->accesser.tokenIdHash) || + (accesser.GetAccesserDeviceId() == context->accessee.deviceId && + accesser.GetAccesserUserId() == context->accessee.userId && + accesser.GetAccesserTokenId() == context->accessee.tokenId && + Crypto::GetUdidHash(accessee.GetAccesseeDeviceId()) == context->accesser.deviceIdHash && + Crypto::GetTokenIdHash(std::to_string(accessee.GetAccesseeTokenId())) == context->accesser.tokenIdHash); +} + +bool AuthSinkNegotiateStateMachine::LnnAclCompare(std::shared_ptr context, + const DistributedDeviceProfile::Accesser &accesser, const DistributedDeviceProfile::Accessee &accessee) +{ + LOGI("start"); + return ((accessee.GetAccesseeDeviceId() == context->accessee.deviceId && + accessee.GetAccesseeUserId() == context->accessee.userId) || + (accesser.GetAccesserDeviceId() == context->accessee.deviceId && + accesser.GetAccesserUserId() == context->accessee.userId)) && + accessee.GetAccesseeTokenId() == 0 && accessee.GetAccesseeBundleName() == "" && + (Crypto::GetUdidHash(accesser.GetAccesserDeviceId()) == context->accesser.deviceIdHash || + Crypto::GetUdidHash(accessee.GetAccesseeDeviceId()) == context->accesser.deviceIdHash) && + accesser.GetAccesserTokenId() == 0 && accesser.GetAccesserBundleName() == ""; +} + +void AuthSinkNegotiateStateMachine::GetSinkCredentialInfo(std::shared_ptr context, + JsonObject &credInfo) +{ + CHECK_NULL_VOID(context); + // get identical credential + if (context->accesser.accountIdHash == context->accessee.accountIdHash) { + GetIdenticalCredentialInfo(context, credInfo); + } + // get share credential + if (context->accesser.accountIdHash != context->accessee.accountIdHash && + context->accesser.accountIdHash != Crypto::GetAccountIdHash16("ohosAnonymousUid") && + context->accessee.accountIdHash != Crypto::GetAccountIdHash16("ohosAnonymousUid")) { + GetShareCredentialInfo(context, credInfo); + GetP2PCredentialInfo(context, credInfo); + } + // get point_to_point credential + if (context->accesser.accountIdHash == Crypto::GetAccountIdHash16("ohosAnonymousUid") || + context->accessee.accountIdHash == Crypto::GetAccountIdHash16("ohosAnonymousUid")) { + GetP2PCredentialInfo(context, credInfo); + } + std::vector deleteCredInfo; + for (auto& item : credInfo.Items()) { // id1:json1, id2:json2, id3:json3 + uint32_t credType = DmAuthState::GetCredentialType(context, item); + if (credType == DM_INVALIED_TYPE || !item.Contains(FILED_CRED_TYPE) || + !item[FILED_CRED_TYPE].IsNumberInteger() || !item.Contains(FILED_CRED_ID) || + !item[FILED_CRED_ID].IsString()) { + deleteCredInfo.push_back(item[FILED_CRED_ID].Get()); + continue; + } + item[FILED_CRED_TYPE] = credType; + } + for (const auto &item : deleteCredInfo) { + credInfo.Erase(item); + } +} + +void AuthSinkNegotiateStateMachine::GetIdenticalCredentialInfo(std::shared_ptr context, + JsonObject &credInfo) +{ + CHECK_NULL_VOID(context); + JsonObject queryParams; + queryParams[FILED_DEVICE_ID] = context->accessee.deviceId; + queryParams[FILED_USER_ID] = MultipleUserConnector::GetOhosAccountNameByUserId(context->accessee.userId); + queryParams[FILED_CRED_TYPE] = DM_AUTH_CREDENTIAL_ACCOUNT_RELATED; + CHECK_NULL_VOID(context->hiChainAuthConnector); + if (context->hiChainAuthConnector->QueryCredentialInfo(context->accessee.userId, queryParams, credInfo) != DM_OK) { + LOGE("QueryCredentialInfo failed credInfo %{public}s.", credInfo.Dump().c_str()); + } +} + +void AuthSinkNegotiateStateMachine::GetShareCredentialInfo(std::shared_ptr context, + JsonObject &credInfo) +{ + CHECK_NULL_VOID(context); + JsonObject queryParams; + queryParams[FILED_DEVICE_ID_HASH] = context->accesser.deviceIdHash; + queryParams[FILED_PEER_USER_SPACE_ID] = std::to_string(context->accesser.userId); + queryParams[FILED_CRED_TYPE] = DM_AUTH_CREDENTIAL_ACCOUNT_ACROSS; + CHECK_NULL_VOID(context->hiChainAuthConnector); + if (context->hiChainAuthConnector->QueryCredentialInfo(context->accessee.userId, queryParams, credInfo) != DM_OK) { + LOGE("QueryCredentialInfo failed credInfo %{public}s.", credInfo.Dump().c_str()); + } +} + +void AuthSinkNegotiateStateMachine::GetP2PCredentialInfo(std::shared_ptr context, + JsonObject &credInfo) +{ + CHECK_NULL_VOID(context); + JsonObject queryParams; + queryParams[FILED_DEVICE_ID_HASH] = context->accesser.deviceIdHash; + queryParams[FILED_PEER_USER_SPACE_ID] = std::to_string(context->accesser.userId); + queryParams[FILED_CRED_TYPE] = DM_AUTH_CREDENTIAL_ACCOUNT_UNRELATED; + queryParams[FILED_CRED_OWNER] = "DM"; + CHECK_NULL_VOID(context->hiChainAuthConnector); + if (context->hiChainAuthConnector->QueryCredentialInfo(context->accessee.userId, queryParams, credInfo) != DM_OK) { + LOGE("QueryCredentialInfo failed credInfo %{public}s.", credInfo.Dump().c_str()); + } +} + +bool AuthSinkNegotiateStateMachine::IsAntiDisturbanceMode(const std::string &businessId) +{ + LOGI("AuthManager::IsAntiDisturbMode start."); + if (businessId.empty()) { + LOGE("AuthManager::IsAntiDisturbMode businessId is empty."); + return false; + } + + DistributedDeviceProfile::BusinessEvent event; + event.SetBusinessKey(DM_DISTURBANCE_EVENT_KEY); + int32_t ret = DistributedDeviceProfile::DistributedDeviceProfileClient::GetInstance().GetBusinessEvent(event); + if (ret != DM_OK) { + LOGE("GetBusinessEvent failed to get event, ret: %{public}d", ret); + return false; + } + std::string businessValue = event.GetBusinessValue(); + if (businessValue.empty()) { + LOGE("AuthManager::IsAntiDisturbMode failed: businessValue is empty."); + return false; + } + return ParseAndCheckAntiDisturbanceMode(businessId, businessValue); +} + +bool AuthSinkNegotiateStateMachine::ParseAndCheckAntiDisturbanceMode(const std::string &businessId, + const std::string &businessValue) +{ + JsonObject jsonObject(businessValue); + if (jsonObject.IsDiscarded()) { + LOGE("AuthManager::IsAntiDisturbMode failed: invalid JSON format in businessValue."); + return false; + } + if (!IsString(jsonObject, DM_BUSINESS_ID)) { + LOGE("AuthManager::IsAntiDisturbMode failed: 'business_id' field is missing or invalid."); + return false; + } + std::string parsedBusinessId = jsonObject[DM_BUSINESS_ID].Get(); + if (parsedBusinessId != businessId) { + LOGE("AuthManager::IsAntiDisturbMode failed: businessId mismatch. Expected: %{public}s, Found: %{public}s", + businessId.c_str(), parsedBusinessId.c_str()); + return false; + } + if (!jsonObject.Contains(DM_ANTI_DISTURBANCE_MODE) || !jsonObject[DM_ANTI_DISTURBANCE_MODE].IsBoolean()) { + LOGE("AuthManager::IsAntiDisturbMode failed: 'is_in_anti_disturbance_mode' field is missing or invalid."); + return false; + } + bool isInAntiDisturbanceMode = jsonObject[DM_ANTI_DISTURBANCE_MODE].Get(); + LOGI("AuthManager::IsAntiDisturbMode result: %{public}s", isInAntiDisturbanceMode ? "true" : "false"); + + return isInAntiDisturbanceMode; +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication_v2/auth_stages/auth_pin_auth.cpp b/services/implementation/src/authentication_v2/auth_stages/auth_pin_auth.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9c11a753a803e120074c1016d7b76dbfdba51eea --- /dev/null +++ b/services/implementation/src/authentication_v2/auth_stages/auth_pin_auth.cpp @@ -0,0 +1,834 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "auth_manager.h" +#include "deviceprofile_connector.h" +#include "dm_anonymous.h" +#include "dm_auth_context.h" +#include "dm_auth_message_processor.h" +#include "dm_auth_state_machine.h" +#include "dm_auth_state.h" +#include "dm_auth_state_machine.h" +#include "dm_dialog_manager.h" +#include "dm_log.h" +#include "dm_negotiate_process.h" +#include "dm_random.h" +#include "hichain_auth_connector.h" +#include "multiple_user_connector.h" +#include "service_info_profile.h" + +#ifdef SUPPORT_MSDP +#include "spatial_location_callback_impl.h" +#include "spatial_awareness_mgr_client.h" +#endif + +namespace OHOS { +namespace DistributedHardware { + +constexpr int32_t MAX_AUTH_INPUT_PIN_FAIL_TIMES = 3; +constexpr int32_t GET_ULTRASONIC_PIN_TIMEOUT = 4; +constexpr int32_t MIN_PIN_CODE = 100000; +constexpr int32_t MAX_PIN_CODE = 999999; +constexpr const char* UNVALID_CREDTID = "invalidCredId"; + +int32_t AuthSinkStatePinAuthComm::ShowAuthInfoDialog(std::shared_ptr context) +{ + LOGI("AuthSinkConfirmState::ShowAuthInfoDialog start"); + if (DmAuthState::IsScreenLocked()) { + LOGE("AuthSinkConfirmState::ShowAuthInfoDialog screen is locked."); + context->reason = ERR_DM_BIND_USER_CANCEL; + context->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + return STOP_BIND; + } + + DmDialogManager::GetInstance().ShowPinDialog(context->pinCode); + context->timer->StartTimer(std::string(SESSION_HEARTBEAT_TIMEOUT_TASK), + DmAuthState::GetTaskTimeout(context, SESSION_HEARTBEAT_TIMEOUT_TASK, SESSION_HEARTBEAT_TIMEOUT), + [context] (std::string name) { + AuthSinkStatePinAuthComm::HandleSessionHeartbeat(context, name); + }); + return DM_OK; +} + +void AuthSinkStatePinAuthComm::HandleSessionHeartbeat(std::shared_ptr context, std::string name) +{ + context->timer->DeleteTimer(std::string(SESSION_HEARTBEAT_TIMEOUT_TASK)); + if (context->successFinished) { + return; + } + + LOGI("DmAuthManager::HandleSessionHeartbeat name %{public}s", name.c_str()); + JsonObject jsonObj; + jsonObj[TAG_SESSION_HEARTBEAT] = TAG_SESSION_HEARTBEAT; + std::string message = jsonObj.Dump(); + context->softbusConnector->GetSoftbusSession()->SendHeartbeatData(context->sessionId, message); + + context->timer->StartTimer(std::string(SESSION_HEARTBEAT_TIMEOUT_TASK), + DmAuthState::GetTaskTimeout(context, SESSION_HEARTBEAT_TIMEOUT_TASK, SESSION_HEARTBEAT_TIMEOUT), + [context] (std::string name) { + AuthSinkStatePinAuthComm::HandleSessionHeartbeat(context, name); + }); + + LOGI("DmAuthManager::HandleSessionHeartbeat complete."); +} + +bool AuthSinkStatePinAuthComm::IsPinCodeValid(int32_t numpin) +{ + if (numpin < MIN_PIN_CODE || numpin > MAX_PIN_CODE) { + return false; + } + return true; +} + +bool AuthSinkStatePinAuthComm::IsPinCodeValid(const std::string& strpin) +{ + if (strpin.empty()) { + return false; + } + for (size_t i = 0; i < strpin.length(); i++) { + if (!isdigit(strpin[i])) { + return false; + } + } + int32_t pinnum = std::atoi(strpin.c_str()); + return IsPinCodeValid(pinnum); +} + +bool AuthSinkStatePinAuthComm::IsAuthCodeReady(std::shared_ptr context) +{ + if (context->importAuthCode.empty() || context->importPkgName.empty()) { + LOGE("AuthSinkStatePinAuthComm::IsAuthCodeReady, auth code not ready with authCode %{public}s and " + "pkgName %{public}s.", GetAnonyString(context->importAuthCode).c_str(), context->importPkgName.c_str()); + return false; + } + if (context->pkgName != context->importPkgName) { + LOGE("AuthSinkNegotiateStateMachine::IsAuthCodeReady pkgName %{public}s not supported with " + "import pkgName %{public}s.", context->pkgName.c_str(), context->importPkgName.c_str()); + return false; + } + return true; +} + +void AuthSinkStatePinAuthComm::GeneratePincode(std::shared_ptr context) +{ + int32_t pinCode = GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE); + context->pinCode = std::to_string(pinCode); +} + +DmAuthStateType AuthSrcPinAuthStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_PIN_AUTH_START_STATE; +} + +int32_t AuthSrcPinAuthStartState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcPinAuthStartState::Action start"); + // auth pincode + auto ret = context->hiChainAuthConnector->AuthCredentialPinCode(context->accesser.userId, context->requestId, + context->pinCode); + if (ret != DM_OK) { + LOGE("AuthSrcPinAuthStartState::AuthDevice call AuthCredentialPinCode failed."); + return ret; + } + // wait for onTransmit from hiChain + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_TRANSMIT); + if (retEvent == DmEventType::ON_TRANSMIT) { + // send 120 msg + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_REQ_PIN_AUTH_START, context); + return DM_OK; + } else if (retEvent == DmEventType::ON_ERROR) { + LOGI("AuthSrcPinAuthStartState::AuthDevice ON_ERROR failed, maybe retry."); + return DM_OK; + } + + return STOP_BIND; +} + +DmAuthStateType AuthSinkPinAuthStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_PIN_AUTH_START_STATE; +} + +int32_t AuthSinkPinAuthStartState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkPinAuthStartState::Action start"); + context->timer->DeleteTimer(std::string(WAIT_REQUEST_TIMEOUT_TASK)); + if (!context->pinNegotiateStarted) { + context->pinNegotiateStarted = true; + context->timer->StartTimer(std::string(WAIT_PIN_AUTH_TIMEOUT_TASK), + DmAuthState::GetTaskTimeout(context, WAIT_PIN_AUTH_TIMEOUT_TASK, PIN_AUTH_TIMEOUT), + [context] (std::string name) { + HandleAuthenticateTimeout(context, name); + }); + } + + // Stop the abnormal authentication process + if (context->authTypeList.empty() || + (context->confirmOperation != UiAction::USER_OPERATION_TYPE_ALLOW_AUTH && + context->confirmOperation != UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS)) { + LOGE("AuthSinkPinAuthStartState::Action invalid parameter."); + return ERR_DM_INPUT_PARA_INVALID; + } + // process pincode auth + auto ret = context->hiChainAuthConnector->ProcessCredData(context->requestId, context->transmitData); + if (ret != DM_OK) { + LOGE("AuthSinkPinAuthStartState::Action call ProcessCredData err."); + return ret; + } + // wait for onTransmit from hiChain + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_TRANSMIT); + if (retEvent == DmEventType::ON_TRANSMIT) { + // send 130 msg + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_PIN_AUTH_START, context); + return DM_OK; + } + if (retEvent == DmEventType::ON_ERROR) { + LOGI("AuthSinkPinAuthStartState::AuthDevice ON_ERROR failed, maybe retry."); + return DM_OK; + } + return STOP_BIND; +} + +DmAuthStateType AuthSrcPinAuthMsgNegotiateState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_PIN_AUTH_MSG_NEGOTIATE_STATE; +} + +int32_t AuthSrcPinAuthMsgNegotiateState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcPinAuthMsgNegotiateState::Action start"); + auto ret = context->hiChainAuthConnector->ProcessCredData(context->requestId, context->transmitData); + if (context->authType == AUTH_TYPE_PIN_ULTRASONIC && context->ultrasonicInfo == DM_Ultrasonic_Forward) { + context->timer->DeleteTimer(std::string(GET_ULTRASONIC_PIN_TIMEOUT_TASK)); + } + if (ret != DM_OK) { + LOGE("AuthSrcPinAuthMsgNegotiateState::Action call ProcessCredData err."); + return ret; + } + // wait for onTransmit from hiChain + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_TRANSMIT); + if (retEvent == DmEventType::ON_TRANSMIT) { + // send 121 msg + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_REQ_PIN_AUTH_MSG_NEGOTIATE, context); + return DM_OK; + } + if (retEvent == DmEventType::ON_ERROR) { + LOGI("AuthSrcPinAuthMsgNegotiateState::AuthDevice ON_ERROR failed, maybe retry."); + return DM_OK; + } + LOGE("AuthSrcPinAuthMsgNegotiateState::Action failed."); + return STOP_BIND; +} + +DmAuthStateType AuthSinkPinAuthMsgNegotiateState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_PIN_AUTH_MSG_NEGOTIATE_STATE; +} + +int32_t AuthSinkPinAuthMsgNegotiateState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkPinAuthMsgNegotiateState::Action start"); + auto ret = context->hiChainAuthConnector->ProcessCredData(context->requestId, context->transmitData); + if (ret != DM_OK) { + LOGE("AuthSinkPinAuthMsgNegotiateState::Action call ProcessCredData err."); + return ret; + } + // wait for onTransmit from hiChain + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_TRANSMIT); + if (retEvent == DmEventType::ON_TRANSMIT) { + // send 131 msg + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_PIN_AUTH_MSG_NEGOTIATE, context); + } else if (retEvent == DmEventType::ON_ERROR) { + LOGI("AuthSinkPinAuthMsgNegotiateState::AuthDevice WAIT ON_TRANSMIT ON_ERROR failed, maybe retry."); + return DM_OK; + } else { + return STOP_BIND; + } + + retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_SESSION_KEY_RETURNED); + if (retEvent == DmEventType::ON_SESSION_KEY_RETURNED) { + retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_FINISH); + if (retEvent == DmEventType::ON_FINISH || retEvent == DmEventType::ON_ERROR) { + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + } else if (retEvent == DmEventType::ON_ERROR) { + LOGI("AuthSinkPinAuthMsgNegotiateState::AuthDevice WAIT ON_SESSION_KEY_RETURNED ON_ERROR failed, maybe retry."); + return DM_OK; + } + + LOGE("AuthSinkPinAuthMsgNegotiateState::AuthDevice failed."); + return STOP_BIND; +} + +DmAuthStateType AuthSinkPinAuthDoneState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_PIN_AUTH_DONE_STATE; +} + +int32_t AuthSinkPinAuthDoneState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkPinAuthDoneState Action"); + return DM_OK; +} + +DmAuthStateType AuthSrcPinAuthDoneState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_PIN_AUTH_DONE_STATE; +} + +int32_t AuthSrcPinAuthDoneState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcPinAuthDoneState::Action start"); + std::string onTransmitData = context->transmitData; + if (context->hiChainAuthConnector->ProcessCredData(context->requestId, onTransmitData) != DM_OK) { + LOGE("AuthSrcPinAuthDoneState::Action failed, processCredData failed."); + return ERR_DM_FAILED; + } + + // wait for ON_SESSION_KEY_RETURNED from hichain + DmEventType ret = context->authStateMachine->WaitExpectEvent(ON_SESSION_KEY_RETURNED); + if (ret != ON_SESSION_KEY_RETURNED) { + if (ret == ON_ERROR) { + LOGE("AuthSrcPinAuthDoneState::Action, ON_SESSION_KEY_RETURNED event not arriverd, maybe retry."); + return DM_OK; + } else { + LOGE("AuthSrcPinAuthDoneState::Action failed, ON_SESSION_KEY_RETURNED event failed, other event arriverd."); + return ERR_DM_FAILED; + } + } + + // wait for ON_FINISH from hichain + ret = context->authStateMachine->WaitExpectEvent(ON_FINISH); + if (ret == ON_FINISH) { + LOGI("AuthSrcPinAuthDoneState::Action wait ON_FINISH done"); + return DM_OK; + } else if (ret == ON_ERROR) { + return DM_OK; + LOGE("AuthSrcPinAuthDoneState::Action, ON_FINISH event not arriverd, maybe retry."); + } + + return ERR_DM_FAILED; +} + +DmAuthStateType AuthSrcPinNegotiateStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE; +} + +int32_t AuthSrcPinNegotiateStartState::NegotiatePinAuth(std::shared_ptr context, bool firstTime) +{ + if (firstTime) { + if (context->authTypeList.empty()) { + LOGE("authTypeList empty"); + context->reason = ERR_DM_AUTH_REJECT; + return ERR_DM_AUTH_REJECT; + } + context->currentAuthTypeIdx = 0; + context->authType = context->authTypeList[0]; + } else { + if (context->authType == DmAuthType::AUTH_TYPE_PIN && + context->inputPinAuthFailTimes < MAX_AUTH_INPUT_PIN_FAIL_TIMES) { + LOGI("input pin auth err, retry"); + } else { + // try to fallback to next auth type + if (context->currentAuthTypeIdx + 1 >= context->authTypeList.size()) { + LOGE("all auth type failed"); + context->reason = ERR_DM_BIND_PIN_CODE_ERROR; + return ERR_DM_BIND_PIN_CODE_ERROR; + } + context->currentAuthTypeIdx++; + context->authType = context->authTypeList[context->currentAuthTypeIdx]; + } + } + + // restart pin auth timer + context->timer->DeleteTimer(std::string(WAIT_PIN_AUTH_TIMEOUT_TASK)); + context->timer->StartTimer(std::string(WAIT_PIN_AUTH_TIMEOUT_TASK), + DmAuthState::GetTaskTimeout(context, WAIT_PIN_AUTH_TIMEOUT_TASK, PIN_AUTH_TIMEOUT), + [context] (std::string name) { + HandleAuthenticateTimeout(context, name); + }); + if (DmAuthState::IsImportAuthCodeCompatibility(context->authType)) { + if (AuthSinkStatePinAuthComm::IsAuthCodeReady(context)) { + context->authStateMachine->TransitionTo(std::make_shared()); + } else { + context->reason = ERR_DM_INPUT_PARA_INVALID; + return ERR_DM_FAILED; + } + } else if (context->authType == DmAuthType::AUTH_TYPE_PIN) { + context->authStateMachine->TransitionTo(std::make_shared()); + } else if (context->authType == DmAuthType::AUTH_TYPE_PIN_ULTRASONIC && + context->ultrasonicInfo == DM_Ultrasonic_Forward) { + context->authStateMachine->TransitionTo(std::make_shared()); + } else if (context->authType == DmAuthType::AUTH_TYPE_PIN_ULTRASONIC && + context->ultrasonicInfo == DM_Ultrasonic_Reverse) { + context->authStateMachine->TransitionTo(std::make_shared()); + } else { + LOGE("authType not support."); + return ERR_DM_FAILED; + } + return DM_OK; +} + +int32_t AuthSrcPinNegotiateStartState::Action(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + if (!context->pinNegotiateStarted) { + int32_t ret = NegotiateProcess::GetInstance().HandleNegotiateResult(context); + if (ret != DM_OK) { + LOGE("HandleNegotiateResult failed ret %{public}d", ret); + context->reason = ERR_DM_CAPABILITY_NEGOTIATE_FAILED; + return ret; + } + } + if (!context->needBind && !context->needAgreeCredential && context->needAuth) { + return ProcessCredAuth(context); + } + if (context->needBind) { + return ProcessPinBind(context); + } + if (!context->needBind && !context->needAgreeCredential && !context->needAuth) { + context->reason = ERR_DM_BIND_TRUST_TARGET; + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + context->reason = ERR_DM_CAPABILITY_NEGOTIATE_FAILED; + return ERR_DM_FAILED; +} + +int32_t AuthSrcPinNegotiateStartState::ProcessCredAuth(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + JsonObject accesserCredTypeList; + accesserCredTypeList.Parse(context->accesser.credTypeList); + if (accesserCredTypeList.IsDiscarded()) { + LOGE("CredTypeList invalid"); + context->reason = ERR_DM_CAPABILITY_NEGOTIATE_FAILED; + return ERR_DM_FAILED; + } + if (accesserCredTypeList.Contains("identicalCredType")) { + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->accesser.transmitCredentialId = GetCredIdByCredType(context, DM_IDENTICAL_ACCOUNT); + } else if (accesserCredTypeList.Contains("shareCredType")) { + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->accesser.transmitCredentialId = GetCredIdByCredType(context, DM_SHARE); + } else if (accesserCredTypeList.Contains("pointTopointCredType")) { + context->accesser.transmitCredentialId = GetCredIdByCredType(context, DM_POINT_TO_POINT); + } else if (accesserCredTypeList.Contains("lnnCredType")) { + context->accesser.lnnCredentialId = GetCredIdByCredType(context, DM_LNN); + } else { + LOGE("credTypeList invalid."); + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +std::string AuthSrcPinNegotiateStartState::GetCredIdByCredType(std::shared_ptr context, int32_t credType) +{ + LOGI("credType %{public}d.", credType); + CHECK_NULL_RETURN(context, UNVALID_CREDTID); + if (context->accesser.credentialInfos.find(credType) != context->accesser.credentialInfos.end()) { + LOGE("invalid credType."); + return UNVALID_CREDTID; + } + std::string credInfoStr = context->accesser.credentialInfos[credType]; + JsonObject credInfoJson; + credInfoJson.Parse(credInfoStr); + if (credInfoJson.IsDiscarded() || !credInfoJson.Contains(FILED_CRED_ID) || + !credInfoJson[FILED_CRED_ID].IsNumberInteger()) { + LOGE("credInfoStr invalid."); + return UNVALID_CREDTID; + } + return credInfoJson[FILED_CRED_ID].Get(); +} + +int32_t AuthSrcPinNegotiateStartState::ProcessPinBind(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + if (!context->pinNegotiateStarted) { + context->pinNegotiateStarted = true; + CHECK_NULL_RETURN(context->timer, ERR_DM_POINT_NULL); + context->timer->DeleteTimer(std::string(CONFIRM_TIMEOUT_TASK)); + // import pin code auth always excute + if (DmAuthState::IsImportAuthCodeCompatibility(context->authType) && + (!context->authTypeList.empty()) && + DmAuthState::IsImportAuthCodeCompatibility(context->authTypeList[0])) { + return NegotiatePinAuth(context, true); + } else if (context->authType == DmAuthType::AUTH_TYPE_PIN_ULTRASONIC) { + return NegotiatePinAuth(context, true); + } else { + return NegotiatePinAuth(context, false); + } + } else { + return NegotiatePinAuth(context, false); + } + return ERR_DM_FAILED; +} + +DmAuthStateType AuthSrcPinInputState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_PIN_INPUT_STATE; +} + +int32_t AuthSrcPinInputState::ShowStartAuthDialog(std::shared_ptr context) +{ + LOGI("AuthSrcPinInputState::ShowStartAuthDialog start."); + if (DmAuthState::IsScreenLocked()) { + LOGE("AuthSrcPinInputState screen is locked."); + context->reason = ERR_DM_BIND_USER_CANCEL; + return STOP_BIND; + } + + context->listener->OnAuthResult(context->processInfo, context->peerTargetId.deviceId, context->accessee.tokenIdHash, + static_cast(STATUS_DM_SHOW_PIN_INPUT_UI), DM_OK); + context->listener->OnBindResult(context->processInfo, context->peerTargetId, + DM_OK, static_cast(STATUS_DM_SHOW_PIN_INPUT_UI), ""); + DmDialogManager::GetInstance().ShowInputDialog(context->accessee.deviceName); + LOGI("AuthSrcPinInputState::ShowStartAuthDialog end."); + return DM_OK; +} + +int32_t AuthSrcPinInputState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcPinInputState::Action start"); + if (context->inputPinAuthFailTimes == 0) { + auto ret = ShowStartAuthDialog(context); + if (ret != DM_OK) { + return ret; + } + } else { + // clear input pin box, and show try again + context->authUiStateMgr->UpdateUiState(DmUiStateMsg::MSG_PIN_CODE_ERROR); + } + + LOGI("AuthSrcPinInputState::Action waitting user operation"); + // wait for user operation + if (DmEventType::ON_USER_OPERATION != + context->authStateMachine->WaitExpectEvent(DmEventType::ON_USER_OPERATION)) { + LOGI("AuthSrcPinInputState::Action wait ON_USER_OPERATION err"); + return STOP_BIND; + } + + if (context->pinInputResult != USER_OPERATION_TYPE_DONE_PINCODE_INPUT) { + LOGE("AuthSrcPinInputState::Action not USER_OPERATION_TYPE_DONE_PINCODE_INPUT err"); + return STOP_BIND; + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +DmAuthStateType AuthSinkPinNegotiateStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE; +} + +int32_t AuthSinkPinNegotiateStartState::Action(std::shared_ptr context) +{ + if (!context->pinNegotiateStarted) { + context->timer->DeleteTimer(std::string(WAIT_REQUEST_TIMEOUT_TASK)); + context->pinNegotiateStarted = true; + } else { + if (context->authType == DmAuthType::AUTH_TYPE_PIN && + context->inputPinAuthFailTimes < MAX_AUTH_INPUT_PIN_FAIL_TIMES) { + LOGI("AuthSinkPinNegotiateStartState::Action input pin auth err, retry"); + } else { + // try to fallback to next auth type + auto idx = context->currentAuthTypeIdx; + if (idx + 1 >= context->authTypeList.size()) { + LOGE("AuthSinkPinNegotiateStartState::Action all auth type failed"); + context->reason = ERR_DM_BIND_PIN_CODE_ERROR; + return ERR_DM_BIND_PIN_CODE_ERROR; + } + ++idx; + context->currentAuthTypeIdx = idx; + context->authType = context->authTypeList[idx]; + } + } + // restart pin auth timer + context->timer->DeleteTimer(std::string(WAIT_PIN_AUTH_TIMEOUT_TASK)); + context->timer->StartTimer(std::string(WAIT_PIN_AUTH_TIMEOUT_TASK), + DmAuthState::GetTaskTimeout(context, WAIT_PIN_AUTH_TIMEOUT_TASK, PIN_AUTH_TIMEOUT), + [context] (std::string name) { + HandleAuthenticateTimeout(context, name); + }); + if (DmAuthState::IsImportAuthCodeCompatibility(context->authType)) { + LOGI("AuthSinkPinNegotiateStartState::Action import auth code"); + } else if (context->authType == DmAuthType::AUTH_TYPE_PIN) { + LOGI("AuthSinkPinNegotiateStartState::Action input pin"); + context->authStateMachine->TransitionTo(std::make_shared()); + } else if (context->authType == DmAuthType::AUTH_TYPE_PIN_ULTRASONIC) { + LOGI("AuthSinkPinNegotiateStartState::Action ultrasonic pin"); + } else { + LOGE("AuthSinkPinNegotiateStartState::Action authType not support"); + return ERR_DM_FAILED; + } + return DM_OK; +} + +DmAuthStateType AuthSinkPinDisplayState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_PIN_DISPLAY_STATE; +} + +int32_t AuthSinkPinDisplayState::Action(std::shared_ptr context) +{ + if (context->inputPinAuthFailTimes == 0) { + // gen pincode + AuthSinkStatePinAuthComm::GeneratePincode(context); + // show pincode + return AuthSinkStatePinAuthComm::ShowAuthInfoDialog(context); + } + return DM_OK; +} + +DmAuthStateType AuthSrcReverseUltrasonicStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_START_STATE; +} + +int32_t AuthSrcReverseUltrasonicStartState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcReverseUltrasonicStartState::Action start"); + context->timer->StartTimer(std::string(GET_ULTRASONIC_PIN_TIMEOUT_TASK), + GET_ULTRASONIC_PIN_TIMEOUT, [context] (std::string name) { + LOGI("AuthSrcReverseUltrasonicStartState::Action timeout"); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + }); + context->pinCode = std::to_string(GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE)); + std::string ultraPinCode = context->pinCode; +#ifdef SUPPORT_MSDP + Msdp::SpatialAwarenessMgrClient::GetInstance().SetPinCode(ultraPinCode); +#endif + context->reply = DM_OK; + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_REVERSE_ULTRASONIC_START, context); + return DM_OK; +} + +DmAuthStateType AuthSrcReverseUltrasonicDoneState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_DONE_STATE; +} + +int32_t AuthSrcReverseUltrasonicDoneState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcReverseUltrasonicDoneState::Action Start."); + context->timer->DeleteTimer(std::string(GET_ULTRASONIC_PIN_TIMEOUT_TASK)); + int32_t osAccountId = MultipleUserConnector::GetCurrentAccountUserID(); + auto ret = context->hiChainAuthConnector->AuthCredentialPinCode(osAccountId, context->requestId, + context->pinCode); + if (ret != DM_OK) { + LOGE("AuthSrcPinAuthStartState::AuthDevice failed."); + return ret; + } + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_TRANSMIT); + if (retEvent == DmEventType::ON_TRANSMIT) { + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_REQ_PIN_AUTH_START, context); + return DM_OK; + } else if (retEvent == DmEventType::ON_ERROR) { + LOGI("AuthSrcReverseUltrasonicDoneState::AuthDevice ON_ERROR failed."); + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_REQ_PIN_AUTH_START, context); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + return STOP_BIND; +} + +DmAuthStateType AuthSrcForwardUltrasonicStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_START_STATE; +} + +int32_t AuthSrcForwardUltrasonicStartState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcForwardUltrasonicStartState::Action Start."); + context->reply = DM_OK; + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_FORWARD_ULTRASONIC_START, context); + LOGI("AuthSrcForwardUltrasonicStartState::Action End."); + return DM_OK; +} + +DmAuthStateType AuthSrcForwardUltrasonicDoneState::GetStateType() +{ + return DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_DONE_STATE; +} + +int32_t AuthSrcForwardUltrasonicDoneState::Action(std::shared_ptr context) +{ + LOGI("AuthSrcForwardUltrasonicDoneState::Action Start."); + context->timer->StartTimer(std::string(GET_ULTRASONIC_PIN_TIMEOUT_TASK), + GET_ULTRASONIC_PIN_TIMEOUT, [context] (std::string name) { + LOGI("AuthSrcForwardUltrasonicDoneState timeout."); +#ifdef SUPPORT_MSDP + Msdp::SpatialAwarenessMgrClient::GetInstance().UnregisterPinCallback(); +#endif + context->authStateMachine->NotifyEventFinish(DmEventType::ON_ULTRASONIC_PIN_TIMEOUT); + }); +#ifdef SUPPORT_MSDP + sptr callback = new(std::nothrow) SpatialLocationCallbackImpl(context); + Msdp::SpatialAwarenessMgrClient::GetInstance().RegisterPinCallback(callback); +#endif + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_ULTRASONIC_PIN_CHANGED); + if (retEvent == DmEventType::ON_ULTRASONIC_PIN_CHANGED) { +#ifdef SUPPORT_MSDP + Msdp::SpatialAwarenessMgrClient::GetInstance().UnregisterPinCallback(); +#endif + auto ret = context->hiChainAuthConnector->AuthCredentialPinCode(context->accesser.userId, context->requestId, + context->pinCode); + if (ret != DM_OK) { + LOGE("OnPinCodeChanged failed."); + return STOP_BIND; + } + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_TRANSMIT); + if (retEvent == DmEventType::ON_TRANSMIT) { + LOGI("OnPinCodeChanged ON_TRANSMIT."); + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_REQ_PIN_AUTH_START, context); + return DM_OK; + } else if (retEvent == DmEventType::ON_ERROR) { + LOGI("OnPinCodeChanged ON_ERROR failed."); + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_REQ_PIN_AUTH_START, context); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + } else if (retEvent == DmEventType::ON_ULTRASONIC_PIN_TIMEOUT) { + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + return STOP_BIND; +} + +DmAuthStateType AuthSinkReverseUltrasonicStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_START_STATE; +} + +int32_t AuthSinkReverseUltrasonicStartState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkReverseUltrasonicStartState::Action Start."); + context->timer->StartTimer(std::string(GET_ULTRASONIC_PIN_TIMEOUT_TASK), + GET_ULTRASONIC_PIN_TIMEOUT, [context] (std::string name) { + LOGI("AuthSinkReverseUltrasonicStartState timeout."); +#ifdef SUPPORT_MSDP + Msdp::SpatialAwarenessMgrClient::GetInstance().UnregisterPinCallback(); +#endif + context->authStateMachine->NotifyEventFinish(DmEventType::ON_ULTRASONIC_PIN_TIMEOUT); + }); +#ifdef SUPPORT_MSDP + sptr callback = new(std::nothrow) SpatialLocationCallbackImpl(context); + Msdp::SpatialAwarenessMgrClient::GetInstance().RegisterPinCallback(callback); +#endif + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_ULTRASONIC_PIN_CHANGED); + if (retEvent == DmEventType::ON_ULTRASONIC_PIN_CHANGED) { +#ifdef SUPPORT_MSDP + Msdp::SpatialAwarenessMgrClient::GetInstance().UnregisterPinCallback(); +#endif + context->reply = DM_OK; + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_REVERSE_ULTRASONIC_DONE, context); + LOGI("OnPinCodeChanged End."); + return DM_OK; + } else if (retEvent == DmEventType::ON_ULTRASONIC_PIN_TIMEOUT) { + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + return STOP_BIND; +} + +DmAuthStateType AuthSinkReverseUltrasonicDoneState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_DONE_STATE; +} + +int32_t AuthSinkReverseUltrasonicDoneState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkReverseUltrasonicDoneState::Action Start."); + context->timer->DeleteTimer(std::string(WAIT_REQUEST_TIMEOUT_TASK)); + context->timer->DeleteTimer(std::string(GET_ULTRASONIC_PIN_TIMEOUT_TASK)); + context->pinNegotiateStarted = true; + auto ret = context->hiChainAuthConnector->ProcessCredData(context->requestId, context->transmitData); + if (ret != DM_OK) { + LOGE("AuthSinkPinAuthStartState::Action call ProcessCredData err"); + return ret; + } + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_TRANSMIT); + if (retEvent == DmEventType::ON_TRANSMIT) { + LOGI("AuthSrcPinAuthStartState::AuthDevice ON_TRANSMIT."); + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_PIN_AUTH_START, context); + return DM_OK; + } + if (retEvent == DmEventType::ON_ERROR) { + LOGI("AuthSrcPinAuthStartState::AuthDevice ON_ERROR failed."); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + return STOP_BIND; +} + +DmAuthStateType AuthSinkForwardUltrasonicStartState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_START_STATE; +} + +int32_t AuthSinkForwardUltrasonicStartState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkForwardUltrasonicStartState::Action Start."); + context->timer->StartTimer(std::string(GET_ULTRASONIC_PIN_TIMEOUT_TASK), + GET_ULTRASONIC_PIN_TIMEOUT, [context] (std::string name) { + LOGI("AuthSinkForwardUltrasonicStartState timeout."); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + }); + context->pinCode = std::to_string(GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE)); + std::string ultraPinCode = context->pinCode; +#ifdef SUPPORT_MSDP + Msdp::SpatialAwarenessMgrClient::GetInstance().SetPinCode(ultraPinCode); +#endif + context->reply = DM_OK; + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_FORWARD_ULTRASONIC_NEGOTIATE, context); + LOGI("AuthSinkForwardUltrasonicStartState::Action End."); + return DM_OK; +} + +DmAuthStateType AuthSinkForwardUltrasonicDoneState::GetStateType() +{ + return DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_DONE_STATE; +} + +int32_t AuthSinkForwardUltrasonicDoneState::Action(std::shared_ptr context) +{ + LOGI("AuthSinkForwardUltrasonicDoneState::Action Start."); + context->timer->DeleteTimer(std::string(WAIT_REQUEST_TIMEOUT_TASK)); + context->timer->DeleteTimer(std::string(GET_ULTRASONIC_PIN_TIMEOUT_TASK)); + context->pinNegotiateStarted = true; + auto ret = context->hiChainAuthConnector->ProcessCredData(context->requestId, context->transmitData); + if (ret != DM_OK) { + LOGE("AuthSinkForwardUltrasonicDoneState::Action call ProcessCredData err"); + return ret; + } + auto retEvent = context->authStateMachine->WaitExpectEvent(DmEventType::ON_TRANSMIT); + if (retEvent == DmEventType::ON_TRANSMIT) { + LOGI("AuthSinkForwardUltrasonicDoneState::AuthDevice ON_TRANSMIT."); + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_RESP_PIN_AUTH_START, context); + return DM_OK; + } + if (retEvent == DmEventType::ON_ERROR) { + LOGI("AuthSinkForwardUltrasonicDoneState::AuthDevice ON_ERROR failed."); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; + } + return STOP_BIND; +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication_v2/dm_auth_context.cpp b/services/implementation/src/authentication_v2/dm_auth_context.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c5fed88ac62ab37db68017d252139d2b2e9a381d --- /dev/null +++ b/services/implementation/src/authentication_v2/dm_auth_context.cpp @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_auth_context.h" + +namespace OHOS { +namespace DistributedHardware { + +std::string DmAuthContext::GetDeviceId(DmAuthSide side) +{ + const DmAccess &localAccess = (direction == DM_AUTH_SOURCE) ? accesser : accessee; + const DmAccess &remoteAccess = (direction == DM_AUTH_SOURCE) ? accessee : accesser; + return (side == DM_AUTH_LOCAL_SIDE) ? localAccess.deviceId : remoteAccess.deviceId; +} + +int32_t DmAuthContext::GetUserId(DmAuthSide side) +{ + const DmAccess &localAccess = (direction == DM_AUTH_SOURCE) ? accesser : accessee; + const DmAccess &remoteAccess = (direction == DM_AUTH_SOURCE) ? accessee : accesser; + return (side == DM_AUTH_LOCAL_SIDE) ? localAccess.userId : remoteAccess.userId; +} + +std::string DmAuthContext::GetCredentialId(DmAuthSide side, DmAuthScope authorizedScope) +{ + const DmAccess &localAccess = (direction == DM_AUTH_SOURCE) ? accesser : accessee; + const DmAccess &remoteAccess = (direction == DM_AUTH_SOURCE) ? accessee : accesser; + const DmAccess &access = (side == DM_AUTH_LOCAL_SIDE) ? localAccess : remoteAccess; + return (authorizedScope == DM_AUTH_SCOPE_LNN) ? access.lnnCredentialId : access.transmitCredentialId; +} + +std::string DmAuthContext::GetPublicKey(DmAuthSide side, DmAuthScope authorizedScope) +{ + const DmAccess &localAccess = (direction == DM_AUTH_SOURCE) ? accesser : accessee; + const DmAccess &remoteAccess = (direction == DM_AUTH_SOURCE) ? accessee : accesser; + const DmAccess &access = (side == DM_AUTH_LOCAL_SIDE) ? localAccess : remoteAccess; + return (authorizedScope == DM_AUTH_SCOPE_LNN) ? access.lnnPublicKey : access.transmitPublicKey; +} + +void DmAuthContext::SetCredentialId(DmAuthSide side, DmAuthScope authorizedScope, const std::string &credentialId) +{ + DmAccess &localAccess = (direction == DM_AUTH_SOURCE) ? accesser : accessee; + DmAccess &remoteAccess = (direction == DM_AUTH_SOURCE) ? accessee : accesser; + DmAccess &access = (side == DM_AUTH_LOCAL_SIDE) ? localAccess : remoteAccess; + std::string &credId = (authorizedScope == DM_AUTH_SCOPE_LNN) ? + access.lnnCredentialId : access.transmitCredentialId; + credId = credentialId; + return; +} + +void DmAuthContext::SetPublicKey(DmAuthSide side, DmAuthScope authorizedScope, const std::string &publicKey) +{ + DmAccess &localAccess = (direction == DM_AUTH_SOURCE) ? accesser : accessee; + DmAccess &remoteAccess = (direction == DM_AUTH_SOURCE) ? accessee : accesser; + DmAccess &access = (side == DM_AUTH_LOCAL_SIDE) ? localAccess : remoteAccess; + std::string &key = (authorizedScope == DM_AUTH_SCOPE_LNN) ? + access.lnnPublicKey : access.transmitPublicKey; + key = publicKey; + + return; +} + +std::string DmAuthContext::GetAccountId(DmAuthSide side) +{ + DmAccess &localAccess = (direction == DM_AUTH_SOURCE) ? accesser : accessee; + DmAccess &remoteAccess = (direction == DM_AUTH_SOURCE) ? accessee : accesser; + return (side == DM_AUTH_LOCAL_SIDE) ? localAccess.accountId : remoteAccess.accountId; +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication_v2/dm_auth_manager_base.cpp b/services/implementation/src/authentication_v2/dm_auth_manager_base.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f2d4fd466207eb05a16d562b45dae89683a78c78 --- /dev/null +++ b/services/implementation/src/authentication_v2/dm_auth_manager_base.cpp @@ -0,0 +1,567 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "multiple_user_connector.h" +#include "os_account_manager.h" + +#include "dm_constants.h" +#include "dm_error_type.h" +#include "dm_auth_manager_base.h" +#include "power_mgr_client.h" +#if defined(SUPPORT_SCREENLOCK) +#include "screenlock_manager.h" +#endif + +#ifdef OS_ACCOUNT_PART_EXISTS +#include "os_account_manager.h" +using namespace OHOS::AccountSA; +#endif // OS_ACCOUNT_PART_EXISTS + +namespace OHOS { +namespace DistributedHardware { +const char* TAG_DMVERSION = "dmVersion"; +const char* TAG_DM_VERSION_V2 = "dmVersionV2"; +const char* TAG_EDITION = "edition"; +const char* TAG_DATA = "data"; +const char* TAG_DATA_LEN = "dataLen"; +const char* TAG_BUNDLE_NAME = "bundleName"; +const char* TAG_BUNDLE_NAME_V2 = "bundleNameV2"; +const char* TAG_PEER_BUNDLE_NAME = "PEER_BUNDLE_NAME"; +const char* TAG_PEER_BUNDLE_NAME_V2 = "PEER_BUNDLE_NAME_V2"; +const char* TAG_PEER_PKG_NAME = "PEER_PKG_NAME"; +const char* TAG_BIND_LEVEL = "bindLevel"; +const char* TAG_REPLY = "REPLY"; +const char* TAG_APP_THUMBNAIL2 = "appThumbnail"; // Naming Add 2 to resolve conflicts with TAG_APP_THUMBNAIL +const char* TAG_AUTH_FINISH = "isFinish"; +const char* TAG_LOCAL_USERID = "localUserId"; +const char* TAG_LOCAL_DEVICE_ID = "LOCALDEVICEID"; +const char* TAG_IDENTICAL_ACCOUNT = "IDENTICALACCOUNT"; +const char* TAG_ACCOUNT_GROUPID = "ACCOUNTGROUPID"; +const char* TAG_HAVE_CREDENTIAL = "haveCredential"; +const char* TAG_ISONLINE = "isOnline"; +const char* TAG_AUTHED = "authed"; +const char* TAG_LOCAL_ACCOUNTID = "localAccountId"; +const char* TAG_TOKENID = "tokenId"; +const char* TAG_HOST_PKGLABEL = "hostPkgLabel"; +const char* TAG_REMOTE_DEVICE_NAME = "REMOTE_DEVICE_NAME"; +const char* TAG_HOST = "HOST"; + +const char* APP_OPERATION_KEY = "appOperation"; +const char* TARGET_PKG_NAME_KEY = "targetPkgName"; +const char* CUSTOM_DESCRIPTION_KEY = "customDescription"; +const char* CANCEL_DISPLAY_KEY = "cancelPinCodeDisplay"; +const char* BUNDLE_NAME_KEY = "bundleName"; + +const char* AUTHENTICATE_TIMEOUT_TASK = "deviceManagerTimer:authenticate"; +const char* NEGOTIATE_TIMEOUT_TASK = "deviceManagerTimer:negotiate"; +const char* CONFIRM_TIMEOUT_TASK = "deviceManagerTimer:confirm"; +const char* INPUT_TIMEOUT_TASK = "deviceManagerTimer:input"; +const char* SESSION_HEARTBEAT_TIMEOUT_TASK = "deviceManagerTimer:sessionHeartbeat"; +const char* WAIT_REQUEST_TIMEOUT_TASK = "deviceManagerTimer:waitRequest"; +const char* AUTH_DEVICE_TIMEOUT_TASK = "deviceManagerTimer:authDevice_"; +const char* WAIT_PIN_AUTH_TIMEOUT_TASK = "deviceManagerTimer:waitPinAuth"; +const char* WAIT_NEGOTIATE_TIMEOUT_TASK = "deviceManagerTimer:waitNegotiate"; +const char* GET_ULTRASONIC_PIN_TIMEOUT_TASK = "deviceManagerTimer:getUltrasonicPin"; +const char* ADD_TIMEOUT_TASK = "deviceManagerTimer:add"; +const char* WAIT_SESSION_CLOSE_TIMEOUT_TASK = "deviceManagerTimer:waitSessionClose"; +const char* CLOSE_SESSION_TASK_SEPARATOR = "#"; +const char* TAG_DM_CERT_CHAIN = "dmCertChain"; +const char* TAG_CERT_COUNT = "certCount"; +const char* TAG_CERT = "cert"; +const char* TAG_IS_COMMON_FLAG = "isCommonFlag"; + +const int32_t AUTHENTICATE_TIMEOUT = 120; +const int32_t CONFIRM_TIMEOUT = 60; +const int32_t NEGOTIATE_TIMEOUT = 10; +const int32_t INPUT_TIMEOUT = 60; +const int32_t ADD_TIMEOUT = 10; +const int32_t WAIT_NEGOTIATE_TIMEOUT = 10; +const int32_t WAIT_REQUEST_TIMEOUT = 10; +const int32_t CLONE_AUTHENTICATE_TIMEOUT = 20; +const int32_t CLONE_CONFIRM_TIMEOUT = 10; +const int32_t CLONE_NEGOTIATE_TIMEOUT = 10; +const int32_t CLONE_ADD_TIMEOUT = 10; +const int32_t CLONE_WAIT_NEGOTIATE_TIMEOUT = 10; +const int32_t CLONE_WAIT_REQUEST_TIMEOUT = 10; +const int32_t CLONE_SESSION_HEARTBEAT_TIMEOUT = 20; +const int32_t CLONE_PIN_AUTH_TIMEOUT = 10; +const int32_t HML_SESSION_TIMEOUT = 10; +const int32_t SESSION_HEARTBEAT_TIMEOUT = 50; +const int32_t PIN_AUTH_TIMEOUT = 60; +const int32_t EVENT_TIMEOUT = 5000; // 5000 ms + +constexpr int32_t OPEN_PROCESS_NAME_WHITE_LIST_NUM = 1; +constexpr int32_t CLOSE_PROCESS_NAME_WHITE_LIST_NUM = 4; +constexpr const static char* OPEN_PROCESS_NAME_WHITE_LIST[OPEN_PROCESS_NAME_WHITE_LIST_NUM] = { + "com.example.myapplication" +}; +constexpr const static char* CLOSE_PROCESS_NAME_WHITE_LIST[CLOSE_PROCESS_NAME_WHITE_LIST_NUM] = { + "CollaborationFwk", + "gameservice_server", + "wear_link_service", + "watch_system_service" +}; + +int32_t AuthManagerBase::AuthenticateDevice(const std::string &pkgName, int32_t authType, + const std::string &deviceId, const std::string &extra) +{ + LOGE("AuthenticateDevice is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::UnAuthenticateDevice(const std::string &pkgName, const std::string &udid, int32_t bindLevel) +{ + LOGE("UnAuthenticateDevice is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::UnBindDevice(const std::string &pkgName, const std::string &udid, + int32_t bindLevel, const std::string &extra) +{ + LOGE("UnBindDevice is not implemented in the current version"); + return ERR_DM_FAILED; +} + +void AuthManagerBase::OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result) +{ + LOGE("OnSessionOpened is not implemented in the current version"); +} + +void AuthManagerBase::OnSessionClosed(const int32_t sessionId) +{ + LOGE("OnSessionClosed is not implemented in the current version"); +} + +void AuthManagerBase::OnSessionDisable() +{ + LOGE("OnSessionDisable is not implemented in the current version"); +} + +void AuthManagerBase::OnDataReceived(const int32_t sessionId, const std::string message) +{ + LOGE("OnDataReceived is not implemented in the current version"); +} + +void AuthManagerBase::OnSoftbusJoinLNNResult(const int32_t sessionId, const char *networkId, int32_t result) +{ + LOGE("OnSoftbusJoinLNNResult is not implemented in the current version"); +} + +void AuthManagerBase::OnGroupCreated(int64_t requestId, const std::string &groupId) +{ + LOGE("OnGroupCreated is not implemented in the current version"); +} + +void AuthManagerBase::OnMemberJoin(int64_t requestId, int32_t status) +{ + LOGE("OnMemberJoin is not implemented in the current version"); +} + +int32_t AuthManagerBase::EstablishAuthChannel(const std::string &deviceId) +{ + LOGE("EstablishAuthChannel is not implemented in the current version"); + return ERR_DM_FAILED; +} + +void AuthManagerBase::StartNegotiate(const int32_t &sessionId) +{ + LOGE("StartNegotiate is not implemented in the current version"); +} + +void AuthManagerBase::RespNegotiate(const int32_t &sessionId) +{ + LOGE("RespNegotiate is not implemented in the current version"); +} + +void AuthManagerBase::SendAuthRequest(const int32_t &sessionId) +{ + LOGE("SendAuthRequest is not implemented in the current version"); +} + +int32_t AuthManagerBase::StartAuthProcess(const int32_t &action) +{ + LOGE("StartAuthProcess is not implemented in the current version"); + return ERR_DM_FAILED; +} + +void AuthManagerBase::StartRespAuthProcess() +{ + LOGE("StartRespAuthProcess is not implemented in the current version"); +} + +int32_t AuthManagerBase::CreateGroup() +{ + LOGE("CreateGroup is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::ProcessPincode(const std::string &pinCode) +{ + LOGE("ProcessPincode is not implemented in the current version"); + return ERR_DM_FAILED; +} + +std::string AuthManagerBase::GetConnectAddr(std::string deviceId) +{ + LOGE("GetConnectAddr is not implemented in the current version"); + return ""; +} + +int32_t AuthManagerBase::JoinNetwork() +{ + LOGE("JoinNetwork is not implemented in the current version"); + return ERR_DM_FAILED; +} + +void AuthManagerBase::AuthenticateFinish() +{ + LOGE("AuthenticateFinish is not implemented in the current version"); +} + +bool AuthManagerBase::GetIsCryptoSupport() +{ + LOGE("GetIsCryptoSupport is not implemented in the current version"); + return false; +} + +int32_t AuthManagerBase::SetAuthRequestState(std::shared_ptr authRequestState) +{ + LOGE("SetAuthRequestState is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::SetAuthResponseState(std::shared_ptr authResponseState) +{ + LOGE("SetAuthResponseState is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::GetPinCode(std::string &code) +{ + LOGE("GetPinCode is not implemented in the current version"); + return ERR_DM_FAILED; +} + +std::string AuthManagerBase::GenerateGroupName() +{ + LOGE("GenerateGroupName is not implemented in the current version"); + return ""; +} + +void AuthManagerBase::HandleAuthenticateTimeout(std::string name) +{ + LOGE("HandleAuthenticateTimeout is not implemented in the current version"); +} + +std::string AuthManagerBase::GeneratePincode() +{ + LOGE("GeneratePincode is not implemented in the current version"); + return ""; +} + +void AuthManagerBase::ShowConfigDialog() +{ + LOGE("ShowConfigDialog is not implemented in the current version"); +} + +void AuthManagerBase::ShowAuthInfoDialog(bool authDeviceError) +{ + LOGE("ShowAuthInfoDialog is not implemented in the current version"); +} + +void AuthManagerBase::ShowStartAuthDialog() +{ + LOGE("ShowStartAuthDialog is not implemented in the current version"); +} + +int32_t AuthManagerBase::OnUserOperation(int32_t action, const std::string ¶ms) +{ + LOGE("OnUserOperation is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::SetPageId(int32_t pageId) +{ + LOGE("SetPageId is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::SetReasonAndFinish(int32_t reason, int32_t state) +{ + LOGE("SetReasonAndFinish is not implemented in the current version"); + return ERR_DM_FAILED; +} + +bool AuthManagerBase::IsIdenticalAccount() +{ + LOGE("IsIdenticalAccount is not implemented in the current version"); + return false; +} + +int32_t AuthManagerBase::RegisterUiStateCallback(const std::string pkgName) +{ + LOGE("RegisterUiStateCallback is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::UnRegisterUiStateCallback(const std::string pkgName) +{ + LOGE("UnRegisterUiStateCallback is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::ImportAuthCode(const std::string &pkgName, const std::string &authCode) +{ + LOGE("ImportAuthCode is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::BindTarget(const std::string &pkgName, const PeerTargetId &targetId, + const std::map &bindParam, int sessionId, uint64_t logicalSessionId) +{ + LOGE("BindTarget is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::RegisterAuthenticationType(int32_t authenticationType) +{ + LOGE("RegisterAuthenticationType is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::StopAuthenticateDevice(const std::string &pkgName) +{ + LOGE("StopAuthenticateDevice is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::DeleteGroup(const std::string &pkgName, const std::string &deviceId) +{ + LOGE("DeleteGroup is not implemented in the current version"); + return ERR_DM_FAILED; +} + +int32_t AuthManagerBase::GetReason() +{ + LOGE("GetReason is not implemented in the current version"); + return ERR_DM_FAILED; +} + +void AuthManagerBase::GetBindTargetParams(std::string &pkgName, PeerTargetId &targetId, + std::map &bindParam) +{ + LOGE("GetBindTargetParams is not implemented in the current version"); + return; +} + +void AuthManagerBase::GetAuthCodeAndPkgName(std::string &pkgName, std::string &authCode) +{ + LOGE("GetAuthCodeAndPkgName is not implemented in the current version"); + return; +} + +void AuthManagerBase::SetBindTargetParams(const PeerTargetId &targetId) +{ + LOGE("SetBindTargetParams is not implemented in the current version"); + return; +} + +void AuthManagerBase::RegisterCleanNotifyCallback(CleanNotifyCallback cleanNotifyCallback) +{ + LOGE("RegisterCleanNotifyCallback is not implemented in the current version"); + return; +} + +std::string AuthManagerBase::ConvertSrcVersion(const std::string &version, const std::string &edition) +{ + std::string srcVersion = ""; + if (version == "" && edition != "") { + srcVersion = edition; + } else if (version == "" && edition == "") { + srcVersion = DM_VERSION_5_1_0; + } else if (version != "" && edition == "") { + srcVersion = version; + } + LOGI("ConvertSrcVersion version %{public}s, edition %{public}s, srcVersion is %{public}s.", + version.c_str(), edition.c_str(), srcVersion.c_str()); + return srcVersion; +} + +// Scenario 1: The remote side specifies userId -> Verify if it is a front-end user +// Scenario 2: The remote side does not specify userId +// Scenario 2.1: Single user -> Use the current unique front-end user +// Scenario 2.2: Multiple users -> Use the current main screen user +int32_t AuthManagerBase::DmGetUserId(int32_t displayId) +{ + int32_t ret; + int32_t userId = -1; + + std::vector userIds; + ret = MultipleUserConnector::GetForegroundUserIds(userIds); + if (ret != DM_OK) { + LOGE("RespQueryTokenId: GetForegroundUserIds failed, ret: %{public}d", ret); + return -1; + } + // Scenario 1: The remote side specifies userId -> Verify if it is a front-end user + // Scenario 2: The remote side does not specify userId + // Scenario 2.1: Single user -> Use the current unique front-end user + // Scenario 2.2: Multiple users -> Use the current main screen user + if (userIds.size() == 0) { + LOGE("RespQueryTokenId: GetForegroundUserIds no foreground users"); + return -1; + } + + if (displayId != -1) { + ret = AccountSA::OsAccountManager::GetForegroundOsAccountLocalId(displayId, userId); + if (ret != DM_OK) { + LOGE("RespQueryTokenId: fail to get userId by displayId %{public}d", displayId); + return -1; + } + return userId; + } + if (userIds.size() == 1) { + return userIds[0]; + } else { + // If userIds.size() > 1, we need to find the main screen user +#ifdef OS_ACCOUNT_PART_EXISTS + ret = AccountSA::OsAccountManager::GetForegroundOsAccountLocalId(userId); + if (ret != DM_OK) { + LOGE("AuthManagerBase::DmGetUserId: get foreground user failed in multi users with error %{public}d", ret); + return -1; + } + return userId; +#else + LOGE("AuthManagerBase::DmGetUserId: get foreground user failed because no OsAcccountManager"); + return -1; +#endif + } +} + +bool AuthManagerBase::IsTransferReady() +{ + return isTransferReady_; +} + +void AuthManagerBase::SetTransferReady(bool version) +{ + isTransferReady_ = version; +} + +void AuthManagerBase::ClearSoftbusSessionCallback() +{} + +void AuthManagerBase::PrepareSoftbusSessionCallback() +{} + +void AuthManagerBase::EnableInsensibleSwitching() +{ + insensibleSwitching = true; +} + +void AuthManagerBase::DisableInsensibleSwitching() +{ + insensibleSwitching = false; +} + +bool AuthManagerBase::NeedInsensibleSwitching() +{ + return insensibleSwitching; +} + +int32_t AuthManagerBase::ParseAuthType(const std::map &bindParam, int32_t &authType) +{ + auto iter = bindParam.find(PARAM_KEY_AUTH_TYPE); + if (iter == bindParam.end()) { + LOGE("AuthManagerBase::ParseAuthType bind param key: %{public}s not exist.", PARAM_KEY_AUTH_TYPE); + return ERR_DM_INPUT_PARA_INVALID; + } + std::string authTypeStr = iter->second; + if (authTypeStr.empty()) { + LOGE("AuthManagerBase::ParseAuthType bind param %{public}s is empty.", PARAM_KEY_AUTH_TYPE); + return ERR_DM_INPUT_PARA_INVALID; + } + if (authTypeStr.length() > 1) { + LOGE("AuthManagerBase::ParseAuthType bind param %{public}s length is unsupported.", PARAM_KEY_AUTH_TYPE); + return ERR_DM_INPUT_PARA_INVALID; + } + if (!isdigit(authTypeStr[0])) { + LOGE("AuthManagerBase::ParseAuthType bind param %{public}s fromat is unsupported.", PARAM_KEY_AUTH_TYPE); + return ERR_DM_INPUT_PARA_INVALID; + } + authType = std::atoi(authTypeStr.c_str()); + return DM_OK; +} + +void AuthManagerBase::OnAuthDeviceDataReceived(int32_t sessionId, std::string message) +{ + LOGE("OnAuthDeviceDataReceived is not used in the new protocol"); +} + +int32_t AuthManagerBase::EndDream() +{ + auto &powerMgrClient = OHOS::PowerMgr::PowerMgrClient::GetInstance(); + if (!powerMgrClient.IsScreenOn()) { + LOGW("screen not on"); + return ERR_DM_FAILED; + } +#if defined(SUPPORT_SCREENLOCK) + if (!OHOS::ScreenLock::ScreenLockManager::GetInstance()->IsScreenLocked()) { + LOGI("screen not locked"); + return DM_OK; + } +#endif + PowerMgr::PowerErrors ret = + powerMgrClient.WakeupDevice(PowerMgr::WakeupDeviceType::WAKEUP_DEVICE_END_DREAM, "end_dream"); + if (ret != OHOS::PowerMgr::PowerErrors::ERR_OK) { + LOGE("fail to end dream, err:%{public}d", ret); + return ERR_DM_FAILED; + } + LOGI("end dream success"); + return DM_OK; +} + +bool AuthManagerBase::CheckProcessNameInWhiteList(const std::string &processName) +{ + LOGI("AuthManagerBase::CheckProcessNameInWhiteList start"); + if (processName.empty()) { + LOGE("processName is empty"); + return false; + } + uint16_t index = 0; +#ifdef DEVICE_MANAGER_COMMON_FLAG + for (; index < OPEN_PROCESS_NAME_WHITE_LIST_NUM; ++index) { + std::string whitePkgName(OPEN_PROCESS_NAME_WHITE_LIST[index]); + if (processName == whitePkgName) { + LOGI("processName = %{public}s in whiteList.", processName.c_str()); + return true; + } + } +#else + for (; index < CLOSE_PROCESS_NAME_WHITE_LIST_NUM; ++index) { + std::string whitePkgName(CLOSE_PROCESS_NAME_WHITE_LIST[index]); + if (processName == whitePkgName) { + LOGI("processName = %{public}s in whiteList.", processName.c_str()); + return true; + } + } +#endif + LOGI("CheckProcessNameInWhiteList: %{public}s invalid.", processName.c_str()); + return false; +} + +void AuthManagerBase::DeleteTimer() +{} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp b/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp new file mode 100644 index 0000000000000000000000000000000000000000..820a997d7c7a647e21883dbc05afbbf508accab5 --- /dev/null +++ b/services/implementation/src/authentication_v2/dm_auth_message_processor.cpp @@ -0,0 +1,1569 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "dm_auth_message_processor.h" + +#include +#include +#include + +#include +#include "parameter.h" + +#include "access_control_profile.h" +#include "distributed_device_profile_client.h" +#include "service_info_profile.h" +#include "service_info_unique_key.h" + +#include "deviceprofile_connector.h" +#include "dm_log.h" +#include "dm_constants.h" +#include "dm_anonymous.h" +#include "dm_auth_manager_base.h" +#include "dm_auth_context.h" +#include "dm_auth_state_machine.h" +#include "dm_crypto.h" + +namespace OHOS { +namespace DistributedHardware { + +const char* TAG_LNN_PUBLIC_KEY = "lnnPublicKey"; +const char* TAG_TRANSMIT_PUBLIC_KEY = "transmitPublicKey"; +const char* TAG_LNN_CREDENTIAL_ID = "lnnCredentialId"; +const char* TAG_TRANSMIT_CREDENTIAL_ID = "transmitCredentialId"; +const char* TAG_CONFIRM_OPERATION_V2 = "confirmOperation"; +const char* TAG_AUTH_TYPE_LIST = "authTypeList"; +const char* TAG_CURRENT_AUTH_TYPE_IDX = "currentAuthTypeIdx"; + +// IS interface input parameter json format string key +const char* TAG_METHOD = "method"; +const char* TAG_PEER_USER_SPACE_ID = "peerUserSpaceId"; +const char* TAG_SUBJECT = "subject"; +const char* TAG_CRED_TYPE = "credType"; +const char* TAG_KEY_FORMAT = "keyFormat"; +const char* TAG_ALGORITHM_TYPE = "algorithmType"; +const char* TAG_PROOF_TYPE = "proofType"; +const char* TAG_KEY_VALUE = "keyValue"; +const char* TAG_AUTHORIZED_SCOPE = "authorizedScope"; +const char* TAG_AUTHORIZED_APP_LIST = "authorizedAppList"; +const char* TAG_CREDENTIAL_OWNER = "credOwner"; +const char* TAG_SYNC = "syncMessage"; +const char* TAG_ACCESS = "dmAccess"; +const char* TAG_PROXY = "proxy"; +const char* TAG_ACL = "accessControlTable"; +const char* TAG_ACCESSER = "dmAccesser"; +const char* TAG_ACCESSEE = "dmAccessee"; +const char* TAG_SERVICEINFO = "serviceInfo"; +const char* TAG_USER_CONFIRM_OPT = "userConfirmOpt"; +// The local SK information is synchronized to the remote end to construct acl-accesser/accessee. +const char* TAG_TRANSMIT_SK_ID = "accessAppSKId"; +const char* TAG_LNN_SK_ID = "accessUserSKId"; +const char* TAG_TRANSMIT_SK_TIMESTAMP = "accessAppSKTimeStamp"; +const char* TAG_LNN_SK_TIMESTAMP = "accessUserSKTimeStamp"; +const char* TAG_USER_ID = "userId"; +const char* TAG_TOKEN_ID = "tokenId"; +const char* TAG_NETWORKID_ID = "networkId"; +const char* TAG_ISSUER = "issuer"; + +const char* TAG_DEVICE_VERSION = "deviceVersion"; +const char* TAG_DEVICE_NAME = "deviceName"; +const char* TAG_DEVICE_ID_HASH = "deviceIdHash"; +const char* TAG_ACCOUNT_ID_HASH = "accountIdHash"; +const char* TAG_TOKEN_ID_HASH = "tokenIdHash"; +const char* TAG_PKG_NAME = "pkgName"; +const char* TAG_ACL_CHECKSUM = "aclCheckSum"; +const char* TAG_COMPRESS_ORI_LEN = "compressOriLen"; +const char* TAG_COMPRESS = "compressMsg"; +const char* TAG_STATE = "state"; +const char* TAG_REASON = "reason"; +const char* TAG_PEER_USER_ID = "peerUserId"; +const char* TAG_PEER_DISPLAY_ID = "peerDisplayId"; +const char* TAG_EXTRA_INFO = "extraInfo"; +const char* TAG_ACL_TYPE_LIST = "aclTypeList"; +const char* TAG_CERT_TYPE_LIST = "certTypeList"; + +const char* TAG_IS_ONLINE = "isOnline"; +const char* TAG_IS_AUTHED = "isAuthed"; +const char* TAG_CREDENTIAL_INFO = "credentialInfo"; +const char* TAG_CERT_INFO = "certInfo"; +const char* TAG_LANGUAGE = "language"; +const char* TAG_ULTRASONIC_SIDE = "ultrasonicSide"; +constexpr const char* TAG_CUSTOM_DESCRIPTION = "CUSTOMDESC"; + +namespace { + +constexpr const int32_t DM_HASH_LEN = 32; +const char* TAG_DEVICE_TYPE = "DEVICETYPE"; +constexpr int32_t DM_ULTRASONIC_FORWARD = 0; +constexpr int32_t DM_ULTRASONIC_REVERSE = 1; + +void ParseDmAccessToSync(const std::string &jsonString, DmAccess &access, bool isUseDeviceFullName) +{ + JsonObject accessjson(jsonString); + DmAccessToSync srcAccessToSync = accessjson.Get(); + access.deviceName = (isUseDeviceFullName ? srcAccessToSync.deviceNameFull : srcAccessToSync.deviceName); + access.deviceId = srcAccessToSync.deviceId; + access.userId = srcAccessToSync.userId; + access.accountId = srcAccessToSync.accountId; + access.tokenId = static_cast(srcAccessToSync.tokenId); + access.bundleName = srcAccessToSync.bundleName; + access.pkgName = srcAccessToSync.pkgName; + access.bindLevel = srcAccessToSync.bindLevel; + access.sessionKeyId = srcAccessToSync.sessionKeyId; + access.skTimeStamp = srcAccessToSync.skTimeStamp; + return; +} + +void SaveToDmAccessSync(DmAccessToSync &accessToSync, const std::shared_ptr context, + const DmAccess &accessSide) +{ + accessToSync.deviceName = accessSide.deviceName; + accessToSync.deviceNameFull = context->softbusConnector->GetLocalDeviceName(); + accessToSync.deviceId = accessSide.deviceId; + accessToSync.userId = accessSide.userId; + accessToSync.accountId = accessSide.accountId; + accessToSync.tokenId = accessSide.tokenId; + accessToSync.bundleName = accessSide.bundleName; + accessToSync.pkgName = accessSide.pkgName; + accessToSync.bindLevel = accessSide.bindLevel; +} + +int32_t ParseInfoToDmAccess(const JsonObject &jsonObject, DmAccess &access) +{ + // transmit session key is mandatory + if (!IsString(jsonObject, TAG_TRANSMIT_SK_ID)) { + LOGE("ParseSyncMessage TAG_TRANSMIT_SK_ID error"); + return ERR_DM_FAILED; + } + access.transmitSessionKeyId = std::atoi(jsonObject[TAG_TRANSMIT_SK_ID].Get().c_str()); + + if (!IsInt64(jsonObject, TAG_TRANSMIT_SK_TIMESTAMP)) { + LOGE("ParseSyncMessage TAG_TRANSMIT_SK_TIMESTAMP error"); + return ERR_DM_FAILED; + } + access.transmitSkTimeStamp = jsonObject[TAG_TRANSMIT_SK_TIMESTAMP].Get(); + + if (!IsString(jsonObject, TAG_TRANSMIT_CREDENTIAL_ID)) { + LOGE("ParseSyncMessage TAG_TRANSMIT_CREDENTIAL_ID error"); + return ERR_DM_FAILED; + } + access.transmitCredentialId = jsonObject[TAG_TRANSMIT_CREDENTIAL_ID].Get().c_str(); + + if (!IsString(jsonObject, TAG_DMVERSION)) { + LOGE("ParseSyncMessage TAG_DMVERSION error"); + return ERR_DM_FAILED; + } + access.dmVersion = jsonObject[TAG_DMVERSION].Get(); + + // lnn session key is optional + if (IsString(jsonObject, TAG_LNN_SK_ID)) { + access.lnnSessionKeyId = std::atoi(jsonObject[TAG_LNN_SK_ID].Get().c_str()); + } + if (IsInt64(jsonObject, TAG_LNN_SK_TIMESTAMP)) { + access.lnnSkTimeStamp = jsonObject[TAG_LNN_SK_TIMESTAMP].Get(); + } + + if (IsString(jsonObject, TAG_LNN_CREDENTIAL_ID)) { + access.lnnCredentialId = jsonObject[TAG_LNN_CREDENTIAL_ID].Get().c_str(); + } + + return DM_OK; +} + +bool IsMessageValid(const JsonItemObject &jsonObject) +{ + if (jsonObject.IsDiscarded()) { + LOGE("DmAuthMessageProcessor::ParseMessage failed, decodeRequestAuth jsonStr error"); + return false; + } + if (!jsonObject[TAG_MSG_TYPE].IsNumberInteger()) { + LOGE("DmAuthMessageProcessor::ParseMessage failed, message type error."); + return false; + } + return true; +} + +} + +int32_t DmAuthMessageProcessor::SaveSessionKey(const uint8_t *sessionKey, const uint32_t keyLen) +{ + if (cryptoMgr_ == nullptr) { + LOGE("DmAuthMessageProcessor::SaveSessionKey failed, cryptoMgr_ is nullptr."); + return ERR_DM_FAILED; + } + return cryptoMgr_->ProcessSessionKey(sessionKey, keyLen); +} + +int32_t DmAuthMessageProcessor::SaveSessionKeyToDP(int32_t userId, int32_t &skId) +{ + if (cryptoMgr_ == nullptr) { + LOGE("DmAuthMessageProcessor::SaveSessionKeyToDP failed, cryptoMgr_ is nullptr."); + return ERR_DM_FAILED; + } + return DeviceProfileConnector::GetInstance().PutSessionKey(userId, cryptoMgr_->GetSessionKey(), skId); +} + +int32_t DmAuthMessageProcessor::DeleteSessionKeyToDP(int32_t userId, int32_t skId) +{ + return DeviceProfileConnector::GetInstance().DeleteSessionKey(userId, skId); +} + +void DmAuthMessageProcessor::SetAccessControlList(std::shared_ptr context, + DistributedDeviceProfile::AccessControlProfile &profile) +{ + uint32_t authenticationType = ALLOW_AUTH_ONCE; + if (context->confirmOperation == USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS) { + authenticationType = ALLOW_AUTH_ALWAYS; + } + profile.SetAuthenticationType(authenticationType); + profile.SetStatus(ACTIVE); + profile.SetDeviceIdType((int32_t)DistributedDeviceProfile::DeviceIdType::UDID); +} + +void DmAuthMessageProcessor::SetTransmitAccessControlList(std::shared_ptr context, + DistributedDeviceProfile::Accesser &accesser, DistributedDeviceProfile::Accessee &accessee) +{ + accesser.SetAccesserDeviceId(context->accesser.deviceId); + accesser.SetAccesserUserId(context->accesser.userId); + accesser.SetAccesserAccountId(context->accesser.accountId); + accesser.SetAccesserTokenId(context->accesser.tokenId); + accesser.SetAccesserBundleName(context->accesser.pkgName); + accesser.SetAccesserDeviceName(context->accesser.deviceName); + accesser.SetAccesserCredentialIdStr(context->accesser.transmitCredentialId); + accesser.SetAccesserSessionKeyId(context->accesser.transmitSessionKeyId); + accesser.SetAccesserSKTimeStamp(context->accesser.transmitSkTimeStamp); + accesser.SetAccesserExtraData(context->accesser.extraInfo); + + accessee.SetAccesseeDeviceId(context->accessee.deviceId); + accessee.SetAccesseeUserId(context->accessee.userId); + accessee.SetAccesseeAccountId(context->accessee.accountId); + accessee.SetAccesseeTokenId(context->accessee.tokenId); + accessee.SetAccesseeBundleName(context->accessee.pkgName); + accessee.SetAccesseeDeviceName(context->accessee.deviceName); + accessee.SetAccesseeCredentialIdStr(context->accessee.transmitCredentialId); // 依赖dp + accessee.SetAccesseeSessionKeyId(context->accessee.transmitSessionKeyId); + accessee.SetAccesseeSKTimeStamp(context->accessee.transmitSkTimeStamp); + accessee.SetAccesseeExtraData(context->accessee.extraInfo); +} + +void DmAuthMessageProcessor::SetLnnAccessControlList(std::shared_ptr context, + DistributedDeviceProfile::Accesser &accesser, DistributedDeviceProfile::Accessee &accessee) +{ + accesser.SetAccesserDeviceId(context->accesser.deviceId); + accesser.SetAccesserUserId(context->accesser.userId); + accesser.SetAccesserAccountId(context->accesser.accountId); + accesser.SetAccesserTokenId(0); + accesser.SetAccesserDeviceName(context->accesser.deviceName); + accesser.SetAccesserCredentialIdStr(context->accesser.lnnCredentialId); + accesser.SetAccesserSessionKeyId(context->accesser.lnnSessionKeyId); + accesser.SetAccesserSKTimeStamp(context->accesser.lnnSkTimeStamp); + accesser.SetAccesserExtraData(context->accesser.extraInfo); + + accessee.SetAccesseeDeviceId(context->accessee.deviceId); + accessee.SetAccesseeUserId(context->accessee.userId); + accessee.SetAccesseeAccountId(context->accessee.accountId); + accessee.SetAccesseeTokenId(0); + accessee.SetAccesseeDeviceName(context->accessee.deviceName); + accessee.SetAccesseeCredentialIdStr(context->accessee.lnnCredentialId); + accessee.SetAccesseeSessionKeyId(context->accessee.lnnSessionKeyId); + accessee.SetAccesseeSKTimeStamp(context->accessee.lnnSkTimeStamp); + accessee.SetAccesseeExtraData(context->accessee.extraInfo); +} + +int32_t DmAuthMessageProcessor::PutAccessControlList(std::shared_ptr context, + DmAccess &access, std::string trustDeviceId) +{ + LOGI("Start."); + DistributedDeviceProfile::Accesser accesser; + DistributedDeviceProfile::Accessee accessee; + SetLnnAccessControlList(context, accesser, accessee); + DistributedDeviceProfile::AccessControlProfile profile; + SetAccessControlList(context, profile); + profile.SetTrustDeviceId(trustDeviceId); + profile.SetDeviceIdHash(access.deviceIdHash); + profile.SetBindType(access.lnnBindType); + profile.SetAccessee(accessee); + profile.SetAccesser(accesser); + JsonObject extraData; + if (access.isPutLnnAcl && access.bindLevel != static_cast(USER)) { + profile.SetBindLevel(USER); + std::string isLnnAclTrue = std::string(ACL_IS_LNN_ACL_VAL_TRUE); + extraData[ACL_IS_LNN_ACL_KEY] = isLnnAclTrue; + profile.SetExtraData(extraData.Dump()); + int32_t ret = + DistributedDeviceProfile::DistributedDeviceProfileClient::GetInstance().PutAccessControlProfile(profile); + if (ret != DM_OK) { + LOGE("PutAccessControlProfile failed."); + } + } + std::string isLnnAclFalse = std::string(ACL_IS_LNN_ACL_VAL_FALSE); + extraData[ACL_IS_LNN_ACL_KEY] = isLnnAclFalse; + profile.SetExtraData(extraData.Dump()); + profile.SetBindLevel(access.bindLevel); + SetTransmitAccessControlList(context, accesser, accessee); + profile.SetBindLevel(access.bindLevel); + profile.SetBindType(access.transmitBindType); + profile.SetAccessee(accessee); + profile.SetAccesser(accesser); + int32_t ret = + DistributedDeviceProfile::DistributedDeviceProfileClient::GetInstance().PutAccessControlProfile(profile); + if (ret != DM_OK) { + LOGE("PutAccessControlProfile failed."); + } + return ret; +} + +DmAuthMessageProcessor::DmAuthMessageProcessor() +{ + LOGI("DmAuthMessageProcessor constructor"); + cryptoMgr_ = std::make_shared(); + createMessageFuncMap_ = { + {DmMessageType::MSG_TYPE_REQ_ACL_NEGOTIATE, &DmAuthMessageProcessor::CreateNegotiateMessage}, + {DmMessageType::MSG_TYPE_RESP_ACL_NEGOTIATE, &DmAuthMessageProcessor::CreateRespNegotiateMessage}, + {DmMessageType::MSG_TYPE_REQ_USER_CONFIRM, &DmAuthMessageProcessor::CreateMessageReqUserConfirm}, + {DmMessageType::MSG_TYPE_RESP_USER_CONFIRM, &DmAuthMessageProcessor::CreateMessageRespUserConfirm}, + {DmMessageType::MSG_TYPE_REQ_PIN_AUTH_START, &DmAuthMessageProcessor::CreateMessageReqPinAuthStart}, + {DmMessageType::MSG_TYPE_REQ_PIN_AUTH_MSG_NEGOTIATE, &DmAuthMessageProcessor::CreateMessageReqPinAuthNegotiate}, + {DmMessageType::MSG_TYPE_RESP_PIN_AUTH_START, &DmAuthMessageProcessor::CreateMessageRespPinAuthStart}, + {DmMessageType::MSG_TYPE_RESP_PIN_AUTH_MSG_NEGOTIATE, + &DmAuthMessageProcessor::CreateMessageRespPinAuthNegotiate}, + {DmMessageType::MSG_TYPE_REQ_CREDENTIAL_EXCHANGE, &DmAuthMessageProcessor::CreateMessageReqCredExchange}, + {DmMessageType::MSG_TYPE_RESP_CREDENTIAL_EXCHANGE, &DmAuthMessageProcessor::CreateMessageRspCredExchange}, + {DmMessageType::MSG_TYPE_REQ_CREDENTIAL_AUTH_START, &DmAuthMessageProcessor::CreateMessageReqCredAuthStart}, + {DmMessageType::MSG_TYPE_REQ_CREDENTIAL_AUTH_NEGOTIATE, + &DmAuthMessageProcessor::CreateCredentialNegotiateMessage}, + {DmMessageType::MSG_TYPE_RESP_CREDENTIAL_AUTH_START, &DmAuthMessageProcessor::CreateCredentialNegotiateMessage}, + {DmMessageType::MSG_TYPE_RESP_CREDENTIAL_AUTH_NEGOTIATE, + &DmAuthMessageProcessor::CreateCredentialNegotiateMessage}, + {DmMessageType::MSG_TYPE_REQ_DATA_SYNC, &DmAuthMessageProcessor::CreateSyncMessage}, + {DmMessageType::MSG_TYPE_RESP_DATA_SYNC, &DmAuthMessageProcessor::CreateMessageSyncResp}, + {DmMessageType::MSG_TYPE_AUTH_REQ_FINISH, &DmAuthMessageProcessor::CreateMessageFinish}, + {DmMessageType::MSG_TYPE_AUTH_RESP_FINISH, &DmAuthMessageProcessor::CreateMessageFinish}, + }; + paraseMessageFuncMap_ = { + {DmMessageType::MSG_TYPE_REQ_ACL_NEGOTIATE, &DmAuthMessageProcessor::ParseNegotiateMessage}, + {DmMessageType::MSG_TYPE_RESP_ACL_NEGOTIATE, &DmAuthMessageProcessor::ParseMessageRespAclNegotiate}, + {DmMessageType::MSG_TYPE_REQ_USER_CONFIRM, &DmAuthMessageProcessor::ParseMessageReqUserConfirm}, + {DmMessageType::MSG_TYPE_RESP_USER_CONFIRM, &DmAuthMessageProcessor::ParseMessageRespUserConfirm}, + {DmMessageType::MSG_TYPE_REQ_PIN_AUTH_START, &DmAuthMessageProcessor::ParseMessageReqPinAuthStart}, + {DmMessageType::MSG_TYPE_REQ_PIN_AUTH_MSG_NEGOTIATE, &DmAuthMessageProcessor::ParseMessageReqPinAuthNegotiate}, + {DmMessageType::MSG_TYPE_RESP_PIN_AUTH_START, &DmAuthMessageProcessor::ParseMessageRespPinAuthStart}, + {DmMessageType::MSG_TYPE_RESP_PIN_AUTH_MSG_NEGOTIATE, + &DmAuthMessageProcessor::ParseMessageRespPinAuthNegotiate}, + {DmMessageType::MSG_TYPE_REQ_CREDENTIAL_EXCHANGE, &DmAuthMessageProcessor::ParseMessageReqCredExchange}, + {DmMessageType::MSG_TYPE_RESP_CREDENTIAL_EXCHANGE, &DmAuthMessageProcessor::ParseMessageRspCredExchange}, + {DmMessageType::MSG_TYPE_REQ_CREDENTIAL_AUTH_START, &DmAuthMessageProcessor::ParseAuthStartMessage}, + {DmMessageType::MSG_TYPE_REQ_CREDENTIAL_AUTH_NEGOTIATE, &DmAuthMessageProcessor::ParseMessageNegotiateTransmit}, + {DmMessageType::MSG_TYPE_RESP_CREDENTIAL_AUTH_START, &DmAuthMessageProcessor::ParseMessageNegotiateTransmit}, + {DmMessageType::MSG_TYPE_RESP_CREDENTIAL_AUTH_NEGOTIATE, + &DmAuthMessageProcessor::ParseMessageNegotiateTransmit}, + {DmMessageType::MSG_TYPE_REQ_DATA_SYNC, &DmAuthMessageProcessor::ParseMessageSyncReq}, + {DmMessageType::MSG_TYPE_RESP_DATA_SYNC, &DmAuthMessageProcessor::ParseMessageSyncResp}, + {DmMessageType::MSG_TYPE_AUTH_REQ_FINISH, &DmAuthMessageProcessor::ParseMessageSinkFinish}, + {DmMessageType::MSG_TYPE_AUTH_RESP_FINISH, &DmAuthMessageProcessor::ParseMessageSrcFinish}, + }; + DmAuthUltrasonicMessageProcessor(); +} + +DmAuthMessageProcessor::~DmAuthMessageProcessor() +{ + if (cryptoMgr_ != nullptr) { + cryptoMgr_->ClearSessionKey(); + cryptoMgr_ = nullptr; + } +} + +int32_t DmAuthMessageProcessor::ParseMessage(std::shared_ptr context, const std::string &message) +{ + JsonObject jsonObject(message); + if (context == nullptr || !IsMessageValid(jsonObject)) { + return ERR_DM_FAILED; + } + DmMessageType msgType = static_cast(jsonObject[TAG_MSG_TYPE].Get()); + context->msgType = msgType; + LOGI("DmAuthMessageProcessor::ParseMessage message type %{public}d", context->msgType); + if (CheckLogicalSessionId(jsonObject, context) != DM_OK) { + LOGE("CheckLogicalSessionId failed."); + return ERR_DM_FAILED; + } + auto itr = paraseMessageFuncMap_.find(msgType); + if (itr == paraseMessageFuncMap_.end()) { + LOGI("DmAuthMessageProcessor::ParseMessage message type error %{public}d", context->msgType); + return ERR_DM_FAILED; + } + return (this->*(itr->second))(jsonObject, context); +} + +void DmAuthMessageProcessor::DmAuthUltrasonicMessageProcessor() +{ + LOGI("DmAuthUltrasonicMessageProcessor enter."); + createMessageFuncMap_[DmMessageType::MSG_TYPE_REVERSE_ULTRASONIC_START] = + &DmAuthMessageProcessor::CreateMessageReverseUltrasonicStart; + createMessageFuncMap_[DmMessageType::MSG_TYPE_REVERSE_ULTRASONIC_DONE] = + &DmAuthMessageProcessor::CreateMessageReverseUltrasonicDone; + createMessageFuncMap_[DmMessageType::MSG_TYPE_FORWARD_ULTRASONIC_START] = + &DmAuthMessageProcessor::CreateMessageForwardUltrasonicStart; + createMessageFuncMap_[DmMessageType::MSG_TYPE_FORWARD_ULTRASONIC_NEGOTIATE] = + &DmAuthMessageProcessor::CreateMessageForwardUltrasonicNegotiate; + + paraseMessageFuncMap_[DmMessageType::MSG_TYPE_REVERSE_ULTRASONIC_START] = + &DmAuthMessageProcessor::ParseMessageReverseUltrasonicStart; + paraseMessageFuncMap_[DmMessageType::MSG_TYPE_REVERSE_ULTRASONIC_DONE] = + &DmAuthMessageProcessor::ParseMessageReverseUltrasonicDone; + paraseMessageFuncMap_[DmMessageType::MSG_TYPE_FORWARD_ULTRASONIC_START] = + &DmAuthMessageProcessor::ParseMessageForwardUltrasonicStart; + paraseMessageFuncMap_[DmMessageType::MSG_TYPE_FORWARD_ULTRASONIC_NEGOTIATE] = + &DmAuthMessageProcessor::ParseMessageForwardUltrasonicNegotiate; + LOGI("DmAuthUltrasonicMessageProcessor leave."); + return; +} + +static std::vector stringToVectorAuthType(const std::string& str) +{ + std::vector vec; + std::istringstream iss(str); + int32_t num; + while (iss >> num) { + vec.push_back(static_cast(num)); + } + return vec; +} + +static std::string vectorAuthTypeToString(const std::vector& vec) +{ + std::ostringstream oss; + for (size_t i = 0; i < vec.size(); ++i) { + oss << static_cast(vec[i]); + if (i != vec.size() - 1) { + oss << " "; // Add a separator (e.g. space) + } + } + return oss.str(); +} + +int32_t DmAuthMessageProcessor::ParseMessageNegotiateTransmit(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject.IsDiscarded() || !jsonObject.Contains(TAG_DATA) || !jsonObject[TAG_DATA].IsString()) { + LOGE("DmAuthMessageProcessor::ParseMessageNegotiateTransmit Unlegal json string failed"); + return ERR_DM_FAILED; + } + + context->transmitData = jsonObject[TAG_DATA].Get(); + + switch (context->msgType) { + case MSG_TYPE_REQ_CREDENTIAL_AUTH_NEGOTIATE: // 161 + context->authStateMachine->TransitionTo(std::make_shared()); + break; + case MSG_TYPE_RESP_CREDENTIAL_AUTH_START: // 170 + context->authStateMachine->TransitionTo(std::make_shared()); + break; + case MSG_TYPE_RESP_CREDENTIAL_AUTH_NEGOTIATE: // 171 + context->authStateMachine->TransitionTo(std::make_shared()); + break; + default: + return ERR_DM_FAILED; + } + + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageRespPinAuthNegotiate(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject.IsDiscarded() || !jsonObject[TAG_DATA].IsString()) { + LOGE("DmAuthMessageProcessor::ParseMessageRespPinAuthNegotiate failed, decodeRequestAuth jsonStr error"); + return ERR_DM_FAILED; + } + + context->transmitData = jsonObject[TAG_DATA].Get(); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageReqCredExchange(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject.IsDiscarded() || !jsonObject[TAG_DATA].IsString()) { + LOGE("DecodeRequestAuth jsonStr error"); + return ERR_DM_FAILED; + } + + std::string plainText; + if (cryptoMgr_->DecryptMessage(jsonObject[TAG_DATA].Get(), plainText) != DM_OK) { + LOGE("DmAuthMessageProcessor::ParseMessageReqCredExchange() error, decrypt data failed."); + return ERR_DM_FAILED; + } + JsonObject jsonData(plainText); + + // First authentication, parse lnn public key + if (context->accessee.isGenerateLnnCredential && context->accessee.bindLevel != static_cast(USER)) { + if (!jsonData[TAG_LNN_PUBLIC_KEY].IsString()) { + LOGE("DmAuthMessageProcessor::ParseMessageReqCredExchange() error, first auth, no lnnPublicKey."); + return ERR_DM_FAILED; + } + context->accesser.lnnPublicKey = jsonData[TAG_LNN_PUBLIC_KEY].Get(); + } + + if (!jsonData[TAG_TRANSMIT_PUBLIC_KEY].IsString() || + !jsonData[TAG_DEVICE_ID].IsString() || + !jsonData[TAG_PEER_USER_SPACE_ID].IsNumberInteger() || + !jsonData[TAG_TOKEN_ID].IsNumberInteger()) { + LOGE("DmAuthMessageProcessor::ParseMessageReqCredExchange, MSG_TYPE_REQ_CREDENTIAL_EXCHANGE message error."); + return ERR_DM_FAILED; + } + context->accesser.transmitPublicKey = jsonData[TAG_TRANSMIT_PUBLIC_KEY].Get(); + context->accesser.deviceId = jsonData[TAG_DEVICE_ID].Get(); + context->accesser.userId = jsonData[TAG_PEER_USER_SPACE_ID].Get(); + context->accesser.tokenId = jsonData[TAG_TOKEN_ID].Get(); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageRspCredExchange(const JsonObject &jsonObject, + std::shared_ptr context) +{ + LOGI("DmAuthMessageProcessor::ParseMessageRspCredExchange start."); + if (jsonObject.IsDiscarded() || !jsonObject[TAG_DATA].IsString()) { + LOGE("DmAuthMessageProcessor::ParseMessageRspCredExchange, DecodeRequestAuth jsonStr error"); + return ERR_DM_FAILED; + } + + std::string plainText; + if (cryptoMgr_->DecryptMessage(jsonObject[TAG_DATA].Get(), plainText) != DM_OK) { + LOGE("DmAuthMessageProcessor::ParseMessageRspCredExchange error, decrypt data failed."); + return ERR_DM_FAILED; + } + LOGI("plainText=%{public}s", GetAnonyJsonString(plainText).c_str()); + + JsonObject jsonData(plainText); + + // First authentication, parse lnn public key + std::string tmpString = ""; + if (context->accesser.isGenerateLnnCredential && context->accesser.bindLevel != static_cast(USER)) { + if (!jsonData[TAG_LNN_PUBLIC_KEY].IsString()) { + LOGE("DmAuthMessageProcessor::ParseMessageRspCredExchange failed, first auth but no lnnPublicKey."); + return ERR_DM_FAILED; + } + context->accessee.lnnPublicKey = jsonData[TAG_LNN_PUBLIC_KEY].Get(); + } + + // First authentication, parse transmit public key + if (!jsonData[TAG_TRANSMIT_PUBLIC_KEY].IsString() || + !jsonData[TAG_DEVICE_ID].IsString() || + !jsonData[TAG_PEER_USER_SPACE_ID].IsNumberInteger() || + !jsonData[TAG_TOKEN_ID].IsNumberInteger()) { + LOGE("DmAuthMessageProcessor::ParseMessageRspCredExchange failed, decode MSG_TYPE_RESP_CREDENTIAL_EXCHANGE " + "message error."); + return ERR_DM_FAILED; + } + context->accessee.transmitPublicKey = jsonData[TAG_TRANSMIT_PUBLIC_KEY].Get(); + context->accessee.deviceId = jsonData[TAG_DEVICE_ID].Get(); + context->accessee.userId = jsonData[TAG_PEER_USER_SPACE_ID].Get(); + context->accessee.tokenId = jsonData[TAG_TOKEN_ID].Get(); + + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +std::string DmAuthMessageProcessor::CreateMessage(DmMessageType msgType, std::shared_ptr context) +{ + LOGI("DmAuthMessageProcessor::CreateMessage start. msgType is %{public}d", msgType); + JsonObject jsonObj; + jsonObj[TAG_MSG_TYPE] = msgType; + jsonObj[DM_TAG_LOGICAL_SESSION_ID] = context->logicalSessionId; + auto itr = createMessageFuncMap_.find(msgType); + if (itr == createMessageFuncMap_.end()) { + LOGE("DmAuthMessageProcessor::CreateMessage msgType %{public}d error.", msgType); + return ""; + } + int32_t ret = (this->*(itr->second))(context, jsonObj); + LOGI("start. message is %{public}s", GetAnonyJsonString(jsonObj.Dump()).c_str()); + return (ret == DM_OK) ? jsonObj.Dump() : ""; +} + +int32_t DmAuthMessageProcessor::CreateCredentialNegotiateMessage(std::shared_ptr context, + JsonObject &jsonObject) +{ + std::string encryptMsg; + jsonObject[TAG_DATA] = context->transmitData; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateNegotiateOldMessage(std::shared_ptr context, + JsonObject &jsonObject) +{ + jsonObject[TAG_CRYPTO_SUPPORT] = false; + jsonObject[TAG_AUTH_TYPE] = context->authType; + jsonObject[TAG_REPLY] = context->reply; + jsonObject[TAG_LOCAL_DEVICE_ID] = context->accesser.deviceId; + jsonObject[TAG_ACCOUNT_GROUPID] = context->accesser.accountGroupIdHash; + + jsonObject[TAG_BIND_LEVEL] = context->accesser.oldBindLevel; // compatible issue + jsonObject[TAG_LOCAL_ACCOUNTID] = context->accesser.accountId; + jsonObject[TAG_LOCAL_USERID] = context->accesser.userId; + jsonObject[TAG_ISONLINE] = false; + jsonObject[TAG_AUTHED] = false; + jsonObject[TAG_HOST] = context->pkgName; + jsonObject[TAG_TOKENID] = context->accesser.tokenId; + jsonObject[TAG_IDENTICAL_ACCOUNT] = false; + jsonObject[TAG_HAVE_CREDENTIAL] = false; + jsonObject[TAG_REMOTE_DEVICE_NAME] = context->accesser.deviceName; + + return DM_OK; +} + +// Create 80 message. +int32_t DmAuthMessageProcessor::CreateNegotiateMessage(std::shared_ptr context, JsonObject &jsonObject) +{ + // create old message for compatible in import auth code + if (context->authType == DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE) { + CreateNegotiateOldMessage(context, jsonObject); + } + jsonObject[TAG_DMVERSION] = ""; + jsonObject[TAG_EDITION] = DM_VERSION_5_0_5; + jsonObject[TAG_BUNDLE_NAME] = context->accesser.bundleName; + jsonObject[TAG_PEER_BUNDLE_NAME] = context->accessee.oldBundleName; + + jsonObject[TAG_PKG_NAME] = context->pkgName; + + jsonObject[TAG_DM_VERSION_V2] = context->accesser.dmVersion; + jsonObject[TAG_USER_ID] = context->accesser.userId; + jsonObject[TAG_DEVICE_NAME] = context->accesser.deviceName; + jsonObject[TAG_DEVICE_ID_HASH] = context->accesser.deviceIdHash; + jsonObject[TAG_ACCOUNT_ID_HASH] = context->accesser.accountIdHash; + jsonObject[TAG_TOKEN_ID_HASH] = context->accesser.tokenIdHash; + jsonObject[TAG_BUNDLE_NAME_V2] = context->accesser.bundleName; + jsonObject[TAG_EXTRA_INFO] = context->accesser.extraInfo; + + jsonObject[TAG_PEER_BUNDLE_NAME_V2] = context->accessee.bundleName; + jsonObject[TAG_ULTRASONIC_SIDE] = static_cast(context->ultrasonicInfo); + jsonObject[TAG_PEER_DISPLAY_ID] = context->accessee.displayId; + jsonObject[TAG_PEER_PKG_NAME] = context->accessee.pkgName; + jsonObject[TAG_HOST_PKGLABEL] = context->pkgLabel; + + if (!context->businessId.empty()) { + jsonObject[DM_BUSINESS_ID] = context->businessId; + } + return DM_OK; +} + +// Create 90 message. +int32_t DmAuthMessageProcessor::CreateRespNegotiateMessage(std::shared_ptr context, + JsonObject &jsonObject) +{ + jsonObject[TAG_DEVICE_VERSION] = context->accessee.dmVersion; + jsonObject[TAG_DEVICE_NAME] = context->accessee.deviceName; + + jsonObject[TAG_DEVICE_ID_HASH] = context->accessee.deviceIdHash; + jsonObject[TAG_ACCOUNT_ID_HASH] = context->accessee.accountIdHash; + jsonObject[TAG_TOKEN_ID_HASH] = context->accessee.tokenIdHash; + jsonObject[TAG_USER_ID] = context->accessee.userId; + jsonObject[TAG_ACL_TYPE_LIST] = context->accessee.aclTypeList; + jsonObject[TAG_CERT_TYPE_LIST] = context->accessee.credTypeList; + jsonObject[TAG_LANGUAGE] = context->accessee.language; + jsonObject[TAG_EXTRA_INFO] = context->accessee.extraInfo; + jsonObject[TAG_NETWORKID_ID] = context->accessee.networkId; + + jsonObject[TAG_IS_ONLINE] = context->accesser.isOnline; + + return DM_OK; +} + +// Create 140 message. +int32_t DmAuthMessageProcessor::CreateMessageReqCredExchange(std::shared_ptr context, + JsonObject &jsonObject) +{ + JsonObject jsonData; + if (context->accesser.isGenerateLnnCredential && context->accesser.bindLevel != static_cast(USER)) { + jsonData[TAG_LNN_PUBLIC_KEY] = context->accesser.lnnPublicKey; + } + jsonData[TAG_TRANSMIT_PUBLIC_KEY] = context->accesser.transmitPublicKey; + jsonData[TAG_DEVICE_ID] = context->accesser.deviceId; + jsonData[TAG_PEER_USER_SPACE_ID] = context->accesser.userId; + jsonData[TAG_TOKEN_ID] = context->accesser.tokenId; + + std::string plainText = jsonData.Dump(); + std::string cipherText; + int32_t ret = cryptoMgr_->EncryptMessage(plainText, cipherText); + if (ret != DM_OK) { + LOGI("DmAuthMessageProcessor::CreateMessageReqCredExchange encryptMessage failed."); + return ret; + } + jsonObject[TAG_DATA] = cipherText; + return ret; +} + +// Create 150 message. +int32_t DmAuthMessageProcessor::CreateMessageRspCredExchange(std::shared_ptr context, + JsonObject &jsonObject) +{ + LOGI("DmAuthMessageProcessor::CreateMessageRspCredExchange start."); + JsonObject jsonData; + if (context->accessee.isGenerateLnnCredential && context->accessee.bindLevel != static_cast(USER)) { + jsonData[TAG_LNN_PUBLIC_KEY] = context->accessee.lnnPublicKey; + } + jsonData[TAG_TRANSMIT_PUBLIC_KEY] = context->accessee.transmitPublicKey; + jsonData[TAG_DEVICE_ID] = context->accessee.deviceId; + jsonData[TAG_PEER_USER_SPACE_ID] = context->accessee.userId; + jsonData[TAG_TOKEN_ID] = context->accessee.tokenId; + + std::string plainText = jsonData.Dump(); + std::string cipherText; + LOGI("plainText=%{public}s", GetAnonyJsonString(plainText).c_str()); + int32_t ret = cryptoMgr_->EncryptMessage(plainText, cipherText); + if (ret != DM_OK) { + LOGI("DmAuthMessageProcessor::CreateMessageRspCredExchange encryptMessage failed."); + return ret; + } + jsonObject[TAG_DATA] = cipherText; + return ret; +} + +// Create 160 message. +int32_t DmAuthMessageProcessor::CreateMessageReqCredAuthStart(std::shared_ptr context, + JsonObject &jsonObject) +{ + std::string onTransmitData; + + JsonObject jsonData; + jsonObject[TAG_DATA] = context->transmitData; + return DM_OK; +} + +// Create 190 message. +int32_t DmAuthMessageProcessor::CreateMessageSyncResp(std::shared_ptr context, + JsonObject &jsonObject) +{ + DmAccess access; + if (context->direction == DM_AUTH_SINK) { + access = context->accessee; + } else { + access = context->accesser; + } + + std::string encSyncMsg; + int32_t ret = EncryptSyncMessage(context, access, encSyncMsg); + if (ret != DM_OK) { + LOGE("DmAuthMessageProcessor::CreateMessageSyncResp encrypt failed"); + return ret; + } + jsonObject[TAG_SYNC] = encSyncMsg; + return ret; +} + +// Create 200 message. +int32_t DmAuthMessageProcessor::CreateMessageFinish(std::shared_ptr context, + JsonObject &jsonObject) +{ + jsonObject[TAG_REPLY] = context->reply; + jsonObject[TAG_REASON] = context->reason; + return DM_OK; +} + +bool DmAuthMessageProcessor::CheckAccessValidityAndAssign(std::shared_ptr &context, DmAccess &access, + DmAccess &accessTmp) +{ + const DmAccess &selfAccess = (context->direction == DM_AUTH_SOURCE) ? context->accesser : context->accessee; + + bool isSame = accessTmp.dmVersion == access.dmVersion && + accessTmp.deviceName == access.deviceName && + Crypto::GetUdidHash(accessTmp.deviceId) == access.deviceIdHash && + accessTmp.userId == access.userId && + Crypto::GetAccountIdHash16(accessTmp.accountId) == access.accountIdHash && + Crypto::GetTokenIdHash(std::to_string(accessTmp.tokenId)) == access.tokenIdHash && + accessTmp.bundleName == access.bundleName && + accessTmp.pkgName == access.pkgName && + accessTmp.bindLevel == selfAccess.bindLevel; + if (isSame) { + access.transmitSessionKeyId = accessTmp.transmitSessionKeyId; + access.transmitSkTimeStamp = accessTmp.transmitSkTimeStamp; + access.transmitCredentialId = accessTmp.transmitCredentialId; + access.lnnSessionKeyId = accessTmp.lnnSessionKeyId; + access.lnnSkTimeStamp = accessTmp.lnnSkTimeStamp; + access.lnnCredentialId = accessTmp.lnnCredentialId; + } + return isSame; +} + +int32_t DmAuthMessageProcessor::ParseSyncMessage(std::shared_ptr &context, + DmAccess &access, JsonObject &jsonObject) +{ + DmAccess accessTmp; + if (ParseInfoToDmAccess(jsonObject, accessTmp) != DM_OK) { + LOGE("Parse DataSync prarm err"); + return ERR_DM_FAILED; + } + + if (!IsString(jsonObject, TAG_ACCESS)) { + LOGE("ParseSyncMessage TAG_ACCESS error"); + return ERR_DM_FAILED; + } + std::string srcAccessStr = jsonObject[TAG_ACCESS].Get(); + // Parse into access + ParseDmAccessToSync(srcAccessStr, accessTmp, false); + // check access validity + if (!CheckAccessValidityAndAssign(context, access, accessTmp)) { + LOGE("ParseSyncMessage CheckAccessValidityAndAssign error, data between two stages different, stop auth."); + return ERR_DM_FAILED; + } + ParseDmAccessToSync(srcAccessStr, access, true); + if (!IsString(jsonObject, TAG_ACL_CHECKSUM)) { // Re-parse the acl + LOGE("ParseSyncMessage TAG_ACL_CHECKSUM error"); + return ERR_DM_FAILED; + } + access.aclStrList = jsonObject[TAG_ACL_CHECKSUM].Get(); + + if (context->direction == DmAuthDirection::DM_AUTH_SOURCE) { + LOGI("Source parse sink user confirm opt"); + int32_t userConfirmOpt = static_cast(USER_OPERATION_TYPE_CANCEL_AUTH); + if (IsInt32(jsonObject, TAG_USER_CONFIRM_OPT)) { + userConfirmOpt = jsonObject[TAG_USER_CONFIRM_OPT].Get(); + } + if (userConfirmOpt == static_cast(USER_OPERATION_TYPE_ALLOW_AUTH) || + userConfirmOpt == static_cast(USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS)) { + context->confirmOperation = static_cast(userConfirmOpt); + } + } + ParseCert(jsonObject, context); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::DecryptSyncMessage(std::shared_ptr &context, + DmAccess &access, std::string &enSyncMsg) +{ + std::string syncMsgCompress = ""; + int32_t ret = cryptoMgr_->DecryptMessage(enSyncMsg, syncMsgCompress); + if (ret != DM_OK) { + LOGE("DecryptSyncMessage syncMsg error"); + return ret; + } + JsonObject plainJson(syncMsgCompress); + if (plainJson.IsDiscarded()) { + LOGE("DecryptSyncMessage plainJson error"); + return ERR_DM_FAILED; + } + if (!plainJson[TAG_COMPRESS_ORI_LEN].IsNumberInteger()) { + LOGE("DecryptSyncMessage TAG_COMPRESS_ORI_LEN json error"); + return ERR_DM_FAILED; + } + int32_t dataLen = plainJson[TAG_COMPRESS_ORI_LEN].Get(); + if (!plainJson[TAG_COMPRESS].IsString()) { + LOGE("DecryptSyncMessage TAG_COMPRESS_ORI_LEN json error"); + return ERR_DM_FAILED; + } + std::string compressMsg = plainJson[TAG_COMPRESS].Get(); + std::string compressBase64 = Base64Decode(compressMsg); + std::string syncMsg = DecompressSyncMsg(compressBase64, dataLen); + JsonObject jsonObject(syncMsg); + if (jsonObject.IsDiscarded()) { + LOGE("DmAuthMessageProcessor::DecryptSyncMessage jsonStr error"); + return ERR_DM_FAILED; + } + + ret = ParseSyncMessage(context, access, jsonObject); + if (ret != DM_OK) { + LOGE("DecryptSyncMessage ParseSyncMessage jsonStr error"); + return ret; + } + return DM_OK; +} + +// Parse 180 message, save remote encrypted quadruple, acl, sp skid +int32_t DmAuthMessageProcessor::ParseMessageSyncReq(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (!jsonObject[TAG_SYNC].IsString()) { + LOGE("ParseMessageSyncReq json error"); + return ERR_DM_FAILED; + } + std::string enSyncMsg = jsonObject[TAG_SYNC].Get(); + // Decrypt data and parse data into context + int32_t ret = DecryptSyncMessage(context, context->accesser, enSyncMsg); + if (ret != DM_OK) { + LOGE("DecryptSyncMessage enSyncMsg error"); + return ret; + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +// Parse 190 message save the remote encrypted quadruple, acl sp skid +int32_t DmAuthMessageProcessor::ParseMessageSyncResp(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (!jsonObject[TAG_SYNC].IsString()) { + LOGE("ParseMessageSyncResp json error"); + return ERR_DM_FAILED; + } + std::string enSyncMsg = jsonObject[TAG_SYNC].Get(); + // Decrypt data and parse data into context + int32_t ret = DecryptSyncMessage(context, context->accessee, enSyncMsg); + if (ret != DM_OK) { + LOGE("DecryptSyncMessage enSyncMsg error"); + return ret; + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +// Parse 200 message +int32_t DmAuthMessageProcessor::ParseMessageSinkFinish(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject[TAG_REPLY].IsNumberInteger()) { + context->reply = jsonObject[TAG_REPLY].Get(); + } + if (jsonObject[TAG_REASON].IsNumberInteger()) { + context->reason = jsonObject[TAG_REASON].Get(); + } + + /* In case of an exception, there may be a state waiting for an event. + In the normal process, no state is waiting for events. */ + if (context->reason != DM_OK) { + context->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +// Parse 201 message +int32_t DmAuthMessageProcessor::ParseMessageSrcFinish(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject[TAG_REPLY].IsNumberInteger()) { + context->reply = jsonObject[TAG_REPLY].Get(); + } + if (jsonObject[TAG_REASON].IsNumberInteger()) { + context->reason = jsonObject[TAG_REASON].Get(); + } + + /* In case of an exception, there may be a state waiting for an event. + In the normal process, no state is waiting for events. */ + if (context->reason != DM_OK) { + context->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CheckLogicalSessionId(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject[DM_TAG_LOGICAL_SESSION_ID].IsNumberInteger()) { + if (context->logicalSessionId != 0 && + jsonObject[DM_TAG_LOGICAL_SESSION_ID].Get() != context->logicalSessionId) { + return ERR_DM_PARSE_MESSAGE_FAILED; + } + } + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseNegotiateMessage( + const JsonObject &jsonObject, std::shared_ptr context) +{ + if (jsonObject[DM_TAG_LOGICAL_SESSION_ID].IsNumberInteger()) { + context->logicalSessionId = jsonObject[DM_TAG_LOGICAL_SESSION_ID].Get(); + context->requestId = static_cast(context->logicalSessionId); + } + if (IsString(jsonObject, TAG_PEER_PKG_NAME)) { + context->accessee.pkgName = jsonObject[TAG_PEER_PKG_NAME].Get(); + } + if (IsString(jsonObject, TAG_PEER_BUNDLE_NAME_V2)) { + context->accessee.bundleName = jsonObject[TAG_PEER_BUNDLE_NAME_V2].Get(); + } + if (IsInt32(jsonObject, TAG_PEER_DISPLAY_ID)) { + context->accessee.displayId = jsonObject[TAG_PEER_DISPLAY_ID].Get(); + } + if (IsString(jsonObject, TAG_HOST_PKGLABEL)) { + context->pkgLabel = jsonObject[TAG_HOST_PKGLABEL].Get(); + } + if (IsString(jsonObject, DM_BUSINESS_ID)) { + context->businessId = jsonObject[DM_BUSINESS_ID].Get(); + } + ParseAccesserInfo(jsonObject, context); + ParseUltrasonicSide(jsonObject, context); + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +void DmAuthMessageProcessor::ParseAccesserInfo(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject[TAG_PKG_NAME].IsString()) { + context->pkgName = jsonObject[TAG_PKG_NAME].Get(); + context->accesser.pkgName = context->pkgName; + context->accessee.pkgName = context->accesser.pkgName; + } + if (jsonObject[TAG_DM_VERSION_V2].IsString()) { + context->accesser.dmVersion = jsonObject[TAG_DM_VERSION_V2].Get(); + } + if (jsonObject[TAG_USER_ID].IsNumberInteger()) { + context->accesser.userId = jsonObject[TAG_USER_ID].Get(); + } + if (jsonObject[TAG_DEVICE_ID_HASH].IsString()) { + context->accesser.deviceIdHash = jsonObject[TAG_DEVICE_ID_HASH].Get(); + } + if (jsonObject[TAG_ACCOUNT_ID_HASH].IsString()) { + context->accesser.accountIdHash = jsonObject[TAG_ACCOUNT_ID_HASH].Get(); + } + if (jsonObject[TAG_TOKEN_ID_HASH].IsString()) { + context->accesser.tokenIdHash = jsonObject[TAG_TOKEN_ID_HASH].Get(); + } + if (jsonObject[TAG_BUNDLE_NAME_V2].IsString()) { + context->accesser.bundleName = jsonObject[TAG_BUNDLE_NAME_V2].Get(); + } + if (jsonObject[TAG_EXTRA_INFO].IsString()) { + context->accesser.extraInfo = jsonObject[TAG_EXTRA_INFO].Get(); + } +} + +void DmAuthMessageProcessor::ParseCert(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject[TAG_DM_CERT_CHAIN].IsString()) { + context->accesser.cert = jsonObject[TAG_DM_CERT_CHAIN].Get(); + } + if (jsonObject[TAG_IS_COMMON_FLAG].IsBoolean()) { + context->accesser.isCommonFlag = jsonObject[TAG_IS_COMMON_FLAG].Get(); + } +} + +void DmAuthMessageProcessor::ParseUltrasonicSide( + const JsonObject &jsonObject, std::shared_ptr context) +{ + if (!jsonObject[TAG_ULTRASONIC_SIDE].IsNumberInteger()) { + context->ultrasonicInfo = DmUltrasonicInfo::DM_Ultrasonic_Invalid; + return; + } + int32_t tempInfo = jsonObject[TAG_ULTRASONIC_SIDE].Get(); + if (tempInfo == DM_ULTRASONIC_REVERSE) { + context->ultrasonicInfo = DmUltrasonicInfo::DM_Ultrasonic_Reverse; + } else if (tempInfo == DM_ULTRASONIC_FORWARD) { + context->ultrasonicInfo = DmUltrasonicInfo::DM_Ultrasonic_Forward; + } else { + context->ultrasonicInfo = DmUltrasonicInfo::DM_Ultrasonic_Invalid; + } +} + +int32_t DmAuthMessageProcessor::ParseMessageRespAclNegotiate(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject[TAG_DEVICE_VERSION].IsString()) { + context->accessee.dmVersion = jsonObject[TAG_DEVICE_VERSION].Get(); + } + + if (jsonObject[TAG_DEVICE_NAME].IsString()) { + context->accessee.deviceName = jsonObject[TAG_DEVICE_NAME].Get(); + } + + if (jsonObject[TAG_DEVICE_ID_HASH].IsString()) { + context->accessee.deviceIdHash = jsonObject[TAG_DEVICE_ID_HASH].Get(); + } + + if (jsonObject[TAG_USER_ID].IsNumberInteger()) { + context->accessee.userId = jsonObject[TAG_USER_ID].Get(); + } + + if (jsonObject[TAG_ACCOUNT_ID_HASH].IsString()) { + context->accessee.accountIdHash = jsonObject[TAG_ACCOUNT_ID_HASH].Get(); + } + + if (jsonObject[TAG_TOKEN_ID_HASH].IsString()) { + context->accessee.tokenIdHash = jsonObject[TAG_TOKEN_ID_HASH].Get(); + } + + if (jsonObject[TAG_NETWORKID_ID].IsString()) { + context->accessee.networkId = jsonObject[TAG_NETWORKID_ID].Get(); + } + + if (jsonObject[TAG_IS_ONLINE].IsBoolean()) { + context->isOnline = jsonObject[TAG_IS_ONLINE].Get(); + } + + if (jsonObject[TAG_ACL_TYPE_LIST].IsString()) { + context->accessee.aclTypeList = jsonObject[TAG_ACL_TYPE_LIST].Get(); + } + + if (jsonObject[TAG_CERT_TYPE_LIST].IsString()) { + context->accessee.credTypeList = jsonObject[TAG_CERT_TYPE_LIST].Get(); + } + + if (jsonObject[TAG_LANGUAGE].IsString()) { + context->accessee.language = jsonObject[TAG_LANGUAGE].Get(); + } + + if (jsonObject[TAG_EXTRA_INFO].IsString()) { + context->accessee.extraInfo = jsonObject[TAG_EXTRA_INFO].Get(); + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageReqUserConfirm(const JsonObject &json, + std::shared_ptr context) +{ + if (json[TAG_DEVICE_TYPE].IsNumberInteger()) { + context->accesser.deviceType = json[TAG_DEVICE_TYPE].Get(); + } + if (json[TAG_DEVICE_NAME].IsString()) { + context->accesser.deviceName = json[TAG_DEVICE_NAME].Get(); + } + if (json[TAG_AUTH_TYPE].IsNumberInteger()) { + context->authType = static_cast(json[TAG_AUTH_TYPE].Get()); + } + if (json[TAG_ACL_TYPE_LIST].IsString()) { + context->accesser.aclTypeList = json[TAG_ACL_TYPE_LIST].Get(); + } + if (json[TAG_CERT_TYPE_LIST].IsString()) { + context->accesser.credTypeList = json[TAG_CERT_TYPE_LIST].Get(); + } + if (json[TAG_EXTRA_INFO].IsString()) { + context->accesser.extraInfo = json[TAG_EXTRA_INFO].Get(); + } + if (IsString(json, TAG_CUSTOM_DESCRIPTION)) { + context->customData = json[TAG_CUSTOM_DESCRIPTION].Get(); + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageRespUserConfirm(const JsonObject &json, + std::shared_ptr context) +{ + if (json[TAG_AUTH_TYPE_LIST].IsString()) { + auto strList = json[TAG_AUTH_TYPE_LIST].Get(); + context->authTypeList = stringToVectorAuthType(strList); + } + if (json[TAG_EXTRA_INFO].IsString()) { + context->accessee.extraInfo = json[TAG_EXTRA_INFO].Get(); + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageReqPinAuthStart(const JsonObject &json, + std::shared_ptr context) +{ + if (json[TAG_DATA].IsString()) { + context->transmitData = json[TAG_DATA].Get(); + } + if (context->authType == AUTH_TYPE_PIN_ULTRASONIC && context->ultrasonicInfo == DM_Ultrasonic_Reverse) { + context->authStateMachine->TransitionTo(std::make_shared()); + } else if (context->authType == AUTH_TYPE_PIN_ULTRASONIC && context->ultrasonicInfo == DM_Ultrasonic_Forward) { + context->authStateMachine->TransitionTo(std::make_shared()); + } else { + context->authStateMachine->TransitionTo(std::make_shared()); + } + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageRespPinAuthStart(const JsonObject &json, + std::shared_ptr context) +{ + if (json[TAG_DATA].IsString()) { + context->transmitData = json[TAG_DATA].Get(); + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageReqPinAuthNegotiate(const JsonObject &json, + std::shared_ptr context) +{ + if (json[TAG_DATA].IsString()) { + context->transmitData = json[TAG_DATA].Get(); + } + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageReverseUltrasonicStart(const JsonObject &json, + std::shared_ptr context) +{ + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageReverseUltrasonicDone(const JsonObject &json, + std::shared_ptr context) +{ + if (json[TAG_REPLY].IsNumberInteger()) { + context->reply = json[TAG_REPLY].Get(); + } + if (context->reply == DM_OK) { + context->authStateMachine->TransitionTo(std::make_shared()); + } + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageForwardUltrasonicStart(const JsonObject &json, + std::shared_ptr context) +{ + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseMessageForwardUltrasonicNegotiate(const JsonObject &json, + std::shared_ptr context) +{ + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageReqUserConfirm(std::shared_ptr context, JsonObject &json) +{ + json[TAG_AUTH_TYPE] = context->authType; + json[TAG_ACL_TYPE_LIST] = context->accesser.aclTypeList; + json[TAG_CERT_TYPE_LIST] = context->accesser.credTypeList; + json[TAG_DEVICE_TYPE] = context->accesser.deviceType; + json[TAG_DEVICE_NAME] = context->accesser.deviceName; + json[TAG_EXTRA_INFO] = context->accesser.extraInfo; + json[TAG_CUSTOM_DESCRIPTION] = context->customData; + + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageRespUserConfirm(std::shared_ptr context, JsonObject &json) +{ + json[TAG_AUTH_TYPE_LIST] = vectorAuthTypeToString(context->authTypeList); + json[TAG_EXTRA_INFO] = context->accessee.extraInfo; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageReqPinAuthStart(std::shared_ptr context, JsonObject &json) +{ + json[TAG_DATA] = context->transmitData; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageRespPinAuthStart(std::shared_ptr context, JsonObject &json) +{ + json[TAG_DATA] = context->transmitData; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageReqPinAuthNegotiate(std::shared_ptr context, + JsonObject &json) +{ + json[TAG_DATA] = context->transmitData; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageRespPinAuthNegotiate(std::shared_ptr context, + JsonObject &json) +{ + json[TAG_DATA] = context->transmitData; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageReverseUltrasonicStart(std::shared_ptr context, + JsonObject &json) +{ + json[TAG_REPLY] = context->reply; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageReverseUltrasonicDone(std::shared_ptr context, + JsonObject &json) +{ + json[TAG_REPLY] = context->reply; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageForwardUltrasonicStart(std::shared_ptr context, + JsonObject &json) +{ + json[TAG_REPLY] = context->reply; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateMessageForwardUltrasonicNegotiate(std::shared_ptr context, + JsonObject &json) +{ + json[TAG_REPLY] = context->reply; + return DM_OK; +} + +void DmAuthMessageProcessor::CreateAndSendMsg(DmMessageType msgType, std::shared_ptr context) +{ + auto message = CreateMessage(msgType, context); + int32_t ret = context->softbusConnector->GetSoftbusSession()->SendData(context->sessionId, message); + if (ret != DM_OK) { + if (context->direction == DM_AUTH_SOURCE) { + context->authStateMachine->TransitionTo(std::make_shared()); + } else { + context->authStateMachine->TransitionTo(std::make_shared()); + } + } +} + +std::string DmAuthMessageProcessor::CompressSyncMsg(std::string &inputStr) +{ + uint32_t srcLen = inputStr.size(); + uint32_t boundSize = compressBound(srcLen); // Maximum compression length + if (boundSize <= 0) { + LOGE("DmAuthMessageProcessor::CompressSyncMsg zlib compressBound failed"); + return ""; + } + std::string compressed(boundSize, '\0'); + + // Compress to reserved space + unsigned long destSize = boundSize; // Actual usable length + int32_t ret = compress(reinterpret_cast(&compressed[0]), &destSize, + reinterpret_cast(inputStr.data()), srcLen); + if (ret != Z_OK) { + LOGE("DmAuthMessageProcessor::CompressSyncMsg zlib compress failed"); + return ""; + } + compressed.resize(destSize); // Actual usage length + return compressed; +} + +std::string DmAuthMessageProcessor::DecompressSyncMsg(std::string& compressed, uint32_t oriLen) +{ + if (oriLen <= 0) { + LOGE("DmAuthMessageProcessor::DecompressSyncMsg decompress oriLen param error"); + return ""; + } + std::string decompressed; + decompressed.resize(oriLen); + unsigned long destLen = oriLen; // Actual usage length + int32_t ret = uncompress(reinterpret_cast(&decompressed[0]), &destLen, + reinterpret_cast(compressed.data()), // Skip header when decompressing + compressed.size()); + if (ret != Z_OK || destLen != oriLen) { + LOGE("DmAuthMessageProcessor::DecompressSyncMsg decompress failed"); + return ""; + } + return decompressed; +} + +std::string DmAuthMessageProcessor::Base64Encode(std::string &inputStr) +{ + // Convert input string to binary + const unsigned char* src = reinterpret_cast(inputStr.data()); + size_t srcLen = inputStr.size(); + + // Calculate the maximum length after base64 encoding + size_t maxEncodeLen = ((srcLen + 2) / 3) * 4 + 1; + std::vector buffer(maxEncodeLen); + + // Actual encoding length + size_t encodedLen = 0; + int32_t ret = mbedtls_base64_encode(buffer.data(), buffer.size(), &encodedLen, src, srcLen); + if (ret != 0) { + LOGE("DmAuthMessageProcessor::Base64Encode mbedtls_base64_encode failed"); + return ""; + } + return std::string(reinterpret_cast(buffer.data()), encodedLen); // No terminator needed +} + +std::string DmAuthMessageProcessor::Base64Decode(std::string &inputStr) +{ + // Convert input string to binary + const unsigned char* src = reinterpret_cast(inputStr.data()); + size_t srcLen = inputStr.size(); + + // Calculate the maximum length after base64 encoding + size_t maxEncodeLen = (srcLen / 4) * 3 + 1; + std::vector buffer(maxEncodeLen); + + // Actual encoding length + size_t decodedLen = 0; + int32_t ret = mbedtls_base64_decode(buffer.data(), buffer.size(), &decodedLen, src, srcLen); + if (ret != 0) { + LOGE("DmAuthMessageProcessor::Base64Decode mbedtls_base64_decode failed"); + return ""; + } + return std::string(reinterpret_cast(buffer.data()), decodedLen); // 无需终止符 +} + +int32_t DmAuthMessageProcessor::EncryptSyncMessage(std::shared_ptr &context, DmAccess &accessSide, + std::string &encSyncMsg) +{ + JsonObject syncMsgJson; + DmAccessToSync accessToSync; + SaveToDmAccessSync(accessToSync, context, accessSide); + + syncMsgJson[TAG_TRANSMIT_SK_ID] = std::to_string(accessSide.transmitSessionKeyId); + syncMsgJson[TAG_TRANSMIT_SK_TIMESTAMP] = accessSide.transmitSkTimeStamp; + syncMsgJson[TAG_TRANSMIT_CREDENTIAL_ID] = accessSide.transmitCredentialId; + // First certification + if (accessSide.isGenerateLnnCredential && accessSide.bindLevel != static_cast(USER)) { + syncMsgJson[TAG_LNN_SK_ID] = std::to_string(accessSide.lnnSessionKeyId); + syncMsgJson[TAG_LNN_SK_TIMESTAMP] = accessSide.lnnSkTimeStamp; + syncMsgJson[TAG_LNN_CREDENTIAL_ID] = accessSide.lnnCredentialId; + } + JsonObject accessJsonObj{}; + accessJsonObj = accessToSync; + syncMsgJson[TAG_DMVERSION] = accessSide.dmVersion; + syncMsgJson[TAG_ACCESS] = accessJsonObj.Dump(); + syncMsgJson[TAG_PROXY] = ""; // Reserved field, leave blank + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + std::string localUdid = static_cast(localDeviceId); + DmAccess &access = (context->accesser.deviceId == localUdid) ? context->accesser : context->accessee; + DmAccess &remoteAccess = (context->accesser.deviceId == localUdid) ? context->accessee : context->accesser; + std::string aclHashList; + int32_t ret = DeviceProfileConnector::GetInstance().GetAclListHashStr({localUdid, access.userId}, + {remoteAccess.deviceId, remoteAccess.userId}, aclHashList, DM_ACL_AGING_VERSION); + if (ret != DM_OK) { + LOGE("DmAuthMessageProcessor::EncryptSyncMessage GetAclListHashStr failed"); + return ERR_DM_FAILED; + } + + syncMsgJson[TAG_ACL_CHECKSUM] = aclHashList; + if (context->direction == DmAuthDirection::DM_AUTH_SINK) { + LOGI("Sink Send user confirm opt"); + syncMsgJson[TAG_USER_CONFIRM_OPT] = context->confirmOperation; + } + syncMsgJson[TAG_IS_COMMON_FLAG] = context->accesser.isCommonFlag; + syncMsgJson[TAG_DM_CERT_CHAIN] = context->accesser.cert; + std::string syncMsg = syncMsgJson.Dump(); + std::string compressMsg = CompressSyncMsg(syncMsg); + if (compressMsg.empty()) { + LOGE("DmAuthMessageProcessor::EncryptSyncMessage compress failed"); + return ERR_DM_FAILED; + } + JsonObject plainJson; + plainJson[TAG_COMPRESS_ORI_LEN] = syncMsg.size(); + plainJson[TAG_COMPRESS] = Base64Encode(compressMsg); + return cryptoMgr_->EncryptMessage(plainJson.Dump(), encSyncMsg); +} + +int32_t DmAuthMessageProcessor::ACLToStr(DistributedDeviceProfile::AccessControlProfile acl, std::string aclStr) +{ + DmAccessControlTable dmAcl; + dmAcl.accessControlId = acl.GetAccessControlId(); + dmAcl.accesserId = acl.GetAccesserId(); + dmAcl.accesseeId = acl.GetAccesseeId(); + dmAcl.deviceId = acl.GetTrustDeviceId(); + dmAcl.sessionKey = acl.GetSessionKey(); + dmAcl.bindType = static_cast(acl.GetBindType()); + dmAcl.authType = acl.GetAuthenticationType(); + dmAcl.deviceType = acl.GetDeviceIdType(); + dmAcl.deviceIdHash = acl.GetDeviceIdHash(); + dmAcl.status = acl.GetStatus(); + dmAcl.validPeriod = acl.GetValidPeriod(); + dmAcl.lastAuthTime = acl.GetLastAuthTime(); + dmAcl.bindLevel = acl.GetBindType(); + JsonObject aclJsonObj{}; + aclJsonObj = dmAcl; + aclStr = aclJsonObj.Dump(); + if (aclStr.empty()) { + LOGE("DmAuthMessageProcessor::ACLToStr normalized acl failed"); + return ERR_DM_FAILED; + } + return DM_OK; +} + +int32_t DmAuthMessageProcessor::CreateSyncMessage(std::shared_ptr context, JsonObject &jsonObject) +{ + DmAccess accessSide; + if (context->direction == DM_AUTH_SOURCE) { + accessSide = context->accesser; + } else { + accessSide = context->accessee; + } + std::string encSyncMsg; + int32_t ret = EncryptSyncMessage(context, accessSide, encSyncMsg); + if (ret != DM_OK) { + LOGE("DmAuthMessageProcessor::CreateSyncMessage encrypt failed"); + return ret; + } + jsonObject[TAG_SYNC] = encSyncMsg; + return DM_OK; +} + +int32_t DmAuthMessageProcessor::ParseAuthStartMessage(const JsonObject &jsonObject, + std::shared_ptr context) +{ + if (jsonObject.IsDiscarded() || !jsonObject.Contains(TAG_DATA) || + !jsonObject[TAG_DATA].IsString()) { + LOGE("DmAuthMessageProcessor::ParseAuthStartMessage Unlegal json string failed"); + return ERR_DM_FAILED; + } + context->transmitData = jsonObject[TAG_DATA].Get(); + + context->authStateMachine->TransitionTo(std::make_shared()); + return DM_OK; +} + + +void ToJson(JsonItemObject &itemObject, const DmAccessControlTable &table) +{ + itemObject["accessControlId"] = table.accessControlId; + itemObject["accesserId"] = table.accesserId; + itemObject["accesseeId"] = table.accesseeId; + itemObject["deviceId"] = table.deviceId; + itemObject["sessionKey"] = table.sessionKey; + itemObject["bindType"] = table.bindType; + itemObject["authType"] = table.authType; + itemObject["deviceType"] = table.deviceType; + itemObject["deviceIdHash"] = table.deviceIdHash; + itemObject["status"] = table.status; + itemObject["validPeriod"] = table.validPeriod; + itemObject["lastAuthTime"] = table.lastAuthTime; + itemObject["bindLevel"] = table.bindLevel; +} + +void FromJson(const JsonItemObject &itemObject, DmAccessControlTable &table) +{ + SetValueFromJson(itemObject, "accessControlId", &JsonItemObject::IsNumberInteger, table.accessControlId); + SetValueFromJson(itemObject, "accesserId", &JsonItemObject::IsNumberInteger, table.accesserId); + SetValueFromJson(itemObject, "accesseeId", &JsonItemObject::IsNumberInteger, table.accesseeId); + SetValueFromJson(itemObject, "deviceId", &JsonItemObject::IsNumberInteger, table.deviceId); + SetValueFromJson(itemObject, "sessionKey", &JsonItemObject::IsString, table.sessionKey); + SetValueFromJson(itemObject, "bindType", &JsonItemObject::IsNumberInteger, table.bindType); + SetValueFromJson(itemObject, "authType", &JsonItemObject::IsNumberInteger, table.authType); + SetValueFromJson(itemObject, "deviceType", &JsonItemObject::IsNumberInteger, table.deviceType); + SetValueFromJson(itemObject, "deviceIdHash", &JsonItemObject::IsString, table.deviceIdHash); + SetValueFromJson(itemObject, "status", &JsonItemObject::IsNumberInteger, table.status); + SetValueFromJson(itemObject, "validPeriod", &JsonItemObject::IsNumberInteger, table.validPeriod); + SetValueFromJson(itemObject, "lastAuthTime", &JsonItemObject::IsNumberInteger, table.lastAuthTime); + SetValueFromJson(itemObject, "bindLevel", &JsonItemObject::IsNumberInteger, table.bindLevel); +} + +void ToJson(JsonItemObject &itemObject, const DmAccessToSync &table) +{ + itemObject["deviceName"] = table.deviceName; + itemObject["deviceNameFull"] = table.deviceNameFull; + itemObject["deviceId"] = table.deviceId; + itemObject["userId"] = table.userId; + itemObject["accountId"] = table.accountId; + itemObject["tokenId"] = table.tokenId; + itemObject["bundleName"] = table.bundleName; + itemObject["pkgName"] = table.pkgName; + itemObject["bindLevel"] = table.bindLevel; + itemObject["sessionKeyId"] = table.sessionKeyId; + itemObject["skTimeStamp"] = table.skTimeStamp; +} + +void FromJson(const JsonItemObject &itemObject, DmAccessToSync &table) +{ + SetValueFromJson(itemObject, "deviceName", &JsonItemObject::IsString, table.deviceName); + SetValueFromJson(itemObject, "deviceNameFull", &JsonItemObject::IsString, table.deviceNameFull); + SetValueFromJson(itemObject, "deviceId", &JsonItemObject::IsString, table.deviceId); + SetValueFromJson(itemObject, "userId", &JsonItemObject::IsNumberInteger, table.userId); + SetValueFromJson(itemObject, "accountId", &JsonItemObject::IsString, table.accountId); + SetValueFromJson(itemObject, "tokenId", &JsonItemObject::IsNumberInteger, table.tokenId); + SetValueFromJson(itemObject, "bundleName", &JsonItemObject::IsString, table.bundleName); + SetValueFromJson(itemObject, "pkgName", &JsonItemObject::IsString, table.pkgName); + SetValueFromJson(itemObject, "bindLevel", &JsonItemObject::IsNumberInteger, table.bindLevel); + SetValueFromJson(itemObject, "sessionKeyId", &JsonItemObject::IsNumberInteger, table.sessionKeyId); + SetValueFromJson(itemObject, "skTimeStamp", &JsonItemObject::IsNumberInteger, table.skTimeStamp); +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication_v2/dm_auth_state.cpp b/services/implementation/src/authentication_v2/dm_auth_state.cpp new file mode 100644 index 0000000000000000000000000000000000000000..7ab8d7a8cda4cca04c3270a42e9d0aef58bf54ed --- /dev/null +++ b/services/implementation/src/authentication_v2/dm_auth_state.cpp @@ -0,0 +1,459 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "access_control_profile.h" +#include "hichain_auth_connector.h" +#include "multiple_user_connector.h" +#include "dm_crypto.h" +#include "dm_auth_state.h" +#include "dm_auth_context.h" +#include "dm_auth_manager_base.h" +#include "dm_auth_state_machine.h" +#include "dm_crypto.h" +#include "dm_softbus_cache.h" +#if defined(SUPPORT_SCREENLOCK) +#include "screenlock_manager.h" +#endif +#include "dm_log.h" +#include + +namespace OHOS { +namespace DistributedHardware { +// clone task timeout map +const std::map TASK_TIME_OUT_MAP = { + { std::string(AUTHENTICATE_TIMEOUT_TASK), CLONE_AUTHENTICATE_TIMEOUT }, + { std::string(NEGOTIATE_TIMEOUT_TASK), CLONE_NEGOTIATE_TIMEOUT }, + { std::string(CONFIRM_TIMEOUT_TASK), CLONE_CONFIRM_TIMEOUT }, + { std::string(ADD_TIMEOUT_TASK), CLONE_ADD_TIMEOUT }, + { std::string(WAIT_NEGOTIATE_TIMEOUT_TASK), CLONE_WAIT_NEGOTIATE_TIMEOUT }, + { std::string(WAIT_REQUEST_TIMEOUT_TASK), CLONE_WAIT_REQUEST_TIMEOUT }, + { std::string(WAIT_PIN_AUTH_TIMEOUT_TASK), CLONE_PIN_AUTH_TIMEOUT }, + { std::string(SESSION_HEARTBEAT_TIMEOUT_TASK), CLONE_SESSION_HEARTBEAT_TIMEOUT } +}; + +constexpr int32_t ONBINDRESULT_MAPPING_NUM = 2; +constexpr int32_t MS_PER_SECOND = 1000; +constexpr int32_t US_PER_MSECOND = 1000; +constexpr int32_t GET_SYSTEMTIME_MAX_NUM = 3; +constexpr const static char* ONBINDRESULT_MAPPING_LIST[ONBINDRESULT_MAPPING_NUM] = { + "CollaborationFwk", + "cast_engine_service", +}; + +const std::map NEW_AND_OLD_STATE_MAPPING = { + { DmAuthStateType::AUTH_SRC_FINISH_STATE, DmAuthStatus::STATUS_DM_AUTH_FINISH }, + { DmAuthStateType::AUTH_SINK_FINISH_STATE, DmAuthStatus::STATUS_DM_SINK_AUTH_FINISH }, + { DmAuthStateType::AUTH_IDLE_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_START_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_NEGOTIATE_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_CONFIRM_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_PIN_INPUT_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_START_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_DONE_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_PIN_AUTH_START_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_PIN_AUTH_MSG_NEGOTIATE_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_PIN_AUTH_DONE_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_CREDENTIAL_EXCHANGE_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_START_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_NEGOTIATE_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_DONE_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT }, + { DmAuthStateType::AUTH_SRC_DATA_SYNC_STATE, DmAuthStatus::STATUS_DM_AUTH_DEFAULT } +}; + +const std::map NEW_AND_OLD_REPLAY_MAPPING = { + { DM_ALREADY_AUTHED, SOFTBUS_OK }, + { SOFTBUS_OK, SOFTBUS_OK } +}; + +int32_t DmAuthState::GetTaskTimeout(std::shared_ptr context, const char* taskName, int32_t taskTimeOut) +{ + LOGI("GetTaskTimeout, taskName: %{public}s, authType_: %{public}d", taskName, context->authType); + if (DmAuthState::IsImportAuthCodeCompatibility(context->authType)) { + auto timeout = TASK_TIME_OUT_MAP.find(std::string(taskName)); + if (timeout != TASK_TIME_OUT_MAP.end()) { + return timeout->second; + } + } + return taskTimeOut; +} + +void DmAuthState::HandleAuthenticateTimeout(std::shared_ptr context, std::string name) +{ + LOGI("DmAuthContext::HandleAuthenticateTimeout start timer name %{public}s", name.c_str()); + context->timer->DeleteTimer(name); + context->reason = ERR_DM_TIME_OUT; + context->authStateMachine->NotifyEventFinish(DmEventType::ON_FAIL); + LOGI("DmAuthContext::HandleAuthenticateTimeout complete"); +} + +bool DmAuthState::IsScreenLocked() +{ + bool isLocked = false; +#if defined(SUPPORT_SCREENLOCK) + isLocked = OHOS::ScreenLock::ScreenLockManager::GetInstance()->IsScreenLocked(); +#endif + LOGI("IsScreenLocked isLocked: %{public}d.", isLocked); + return isLocked; +} + +void DmAuthState::SourceFinish(std::shared_ptr context) +{ + LOGI("SourceFinish reason:%{public}d, state:%{public}d", context->reason, context->state); + context->listener->OnAuthResult(context->processInfo, context->peerTargetId.deviceId, context->accessee.tokenIdHash, + GetOutputState(context->state), context->reason); + context->listener->OnBindResult(context->processInfo, context->peerTargetId, + GetOutputReplay(context->accesser.bundleName, context->reason), + GetOutputState(context->state), GenerateBindResultContent(context)); + context->successFinished = true; + + if (context->reason != DM_OK && context->reason != DM_ALREADY_AUTHED) { + // 根据凭据id 删除sink端多余的凭据 + context->hiChainAuthConnector->DeleteCredential(context->accesser.userId, + context->accesser.lnnCredentialId); + context->hiChainAuthConnector->DeleteCredential(context->accesser.userId, + context->accesser.transmitCredentialId); + // 根据skid删除sk，删除skid + DeviceProfileConnector::GetInstance().DeleteSessionKey(context->accesser.userId, + context->accesser.lnnSessionKeyId); + DeviceProfileConnector::GetInstance().DeleteSessionKey(context->accesser.userId, + context->accesser.transmitSessionKeyId); + } + LOGI("SourceFinish notify online"); + char deviceIdHash[DM_MAX_DEVICE_ID_LEN] = {0}; + Crypto::GetUdidHash(context->accessee.deviceId, reinterpret_cast(deviceIdHash)); + if (SoftbusCache::GetInstance().CheckIsOnline(std::string(deviceIdHash))) { + SetProcessInfo(context); + int32_t authForm = context->accesser.transmitBindType == DM_POINT_TO_POINT_TYPE ? + DmAuthForm::PEER_TO_PEER : context->accesser.transmitBindType; + context->softbusConnector->HandleDeviceOnline(context->accessee.deviceId, authForm); + } + + context->authUiStateMgr->UpdateUiState(DmUiStateMsg::MSG_CANCEL_PIN_CODE_INPUT); + context->timer->DeleteAll(); +} + +void DmAuthState::SinkFinish(std::shared_ptr context) +{ + LOGI("SinkFinish reason:%{public}d, state:%{public}d", context->reason, context->state); + context->processInfo.pkgName = context->accessee.pkgName; + context->listener->OnSinkBindResult(context->processInfo, context->peerTargetId, + GetOutputReplay(context->accessee.bundleName, context->reason), + GetOutputState(context->state), GenerateBindResultContent(context)); + context->successFinished = true; + if (context->reason != DM_OK) { + // 根据凭据id 删除sink端多余的凭据 + context->hiChainAuthConnector->DeleteCredential(context->accessee.userId, + context->accessee.lnnCredentialId); + context->hiChainAuthConnector->DeleteCredential(context->accessee.userId, + context->accessee.transmitCredentialId); + // 根据skid删除sk，删除skid + DeviceProfileConnector::GetInstance().DeleteSessionKey(context->accessee.userId, + context->accessee.lnnSessionKeyId); + DeviceProfileConnector::GetInstance().DeleteSessionKey(context->accessee.userId, + context->accessee.transmitSessionKeyId); + } else { + SetAclInfo(context); + if (NeedAgreeAcl(context)) { + context->authMessageProcessor->PutAccessControlList(context, + context->accessee, context->accesser.deviceId); + } + LOGI("SinkFinish notify online"); + char deviceIdHash[DM_MAX_DEVICE_ID_LEN] = {0}; + Crypto::GetUdidHash(context->accesser.deviceId, reinterpret_cast(deviceIdHash)); + if (SoftbusCache::GetInstance().CheckIsOnline(std::string(deviceIdHash))) { + SetProcessInfo(context); + int32_t authForm = context->accessee.transmitBindType == DM_POINT_TO_POINT_TYPE ? + DmAuthForm::PEER_TO_PEER : context->accessee.transmitBindType; + context->softbusConnector->HandleDeviceOnline(context->accesser.deviceId, authForm); + } + } + + context->authUiStateMgr->UpdateUiState(DmUiStateMsg::MSG_CANCEL_PIN_CODE_SHOW); + context->authUiStateMgr->UpdateUiState(DmUiStateMsg::MSG_CANCEL_CONFIRM_SHOW); + context->timer->DeleteAll(); + context->authMessageProcessor->CreateAndSendMsg(MSG_TYPE_AUTH_RESP_FINISH, context); // 发送201给source侧 +} + +std::string DmAuthState::GenerateBindResultContent(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ""); + DmAccess access = context->direction == DmAuthDirection::DM_AUTH_SOURCE ? + context->accessee : context->accesser; + JsonObject jsonObj; + LOGE("networkId: %{public}s", GetAnonyString(access.networkId).c_str()); + jsonObj[DM_BIND_RESULT_NETWORK_ID] = access.networkId; + if (access.deviceId.empty()) { + jsonObj[TAG_DEVICE_ID] = ""; + } else { + char deviceIdHash[DM_MAX_DEVICE_ID_LEN] = {0}; + Crypto::GetUdidHash(access.deviceId, reinterpret_cast(deviceIdHash)); + jsonObj[TAG_DEVICE_ID] = deviceIdHash; + } + jsonObj[TAG_CONFIRM_OPERATION_V2] = context->confirmOperation; + std::string content = jsonObj.Dump(); + return content; +} + +bool DmAuthState::NeedReqUserConfirm(std::shared_ptr context) +{ + // 不管是否有可信关系，都需要走pin码认证，主要指鸿蒙环PIN码导入场景 + if (DmAuthState::IsImportAuthCodeCompatibility(context->authType)) { + return true; + } + + // 有ACL，跳转到结束状态，发200报文，直接组网 + DmAccess access = context->direction == DM_AUTH_SOURCE ? context->accesser : context->accessee; + if (access.isAuthed) { + return false; + } + + return true; +} + +bool DmAuthState::NeedAgreeCredential(std::shared_ptr context) +{ + return context->needAgreeCredential; +} + +bool DmAuthState::NeedAgreeAcl(std::shared_ptr context) +{ + return (context->direction == DM_AUTH_SOURCE) ? !context->accesser.isAuthed : !context->accessee.isAuthed; +} + +bool DmAuthState::IsImportAuthCodeCompatibility(DmAuthType authType) +{ + if (authType == DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE || + authType == DmAuthType::AUTH_TYPE_NFC) { + return true; + } + return false; +} + +void DmAuthState::SetAclExtraInfo(std::shared_ptr context) +{ + DmAccess &access = (context->direction == DM_AUTH_SOURCE) ? context->accesser : context->accessee; + DmAccess &remoteAccess = (context->direction == DM_AUTH_SOURCE) ? context->accessee : context->accesser; + JsonObject jsonObj; + jsonObj[TAG_DMVERSION] = access.dmVersion; + access.extraInfo = jsonObj.Dump(); + remoteAccess.extraInfo = jsonObj.Dump(); +} + +void DmAuthState::SetAclInfo(std::shared_ptr context) +{ + DmAccess &access = (context->direction == DM_AUTH_SOURCE) ? context->accesser : context->accessee; + DmAccess &remoteAccess = (context->direction == DM_AUTH_SOURCE) ? context->accessee : context->accesser; + SetAclExtraInfo(context); + access.lnnBindType = GetAclBindType(context, access.lnnCredentialId); + remoteAccess.lnnBindType = GetAclBindType(context, remoteAccess.lnnCredentialId); + + access.transmitBindType = GetAclBindType(context, access.transmitCredentialId); + remoteAccess.transmitBindType = GetAclBindType(context, remoteAccess.transmitCredentialId); +} + +int32_t DmAuthState::GetAclBindType(std::shared_ptr context, std::string credId) +{ + DmAccess &access = (context->direction == DM_AUTH_SOURCE) ? context->accesser : context->accessee; + JsonObject result; + int32_t ret = context->hiChainAuthConnector->QueryCredInfoByCredId(access.userId, credId, result); + if (ret != DM_OK) { + LOGE("GetAclBindType QueryCredInfoByCredId failed, ret: %{public}d.", ret); + return DM_UNKNOWN_TYPE; + } + if (!result.Contains(credId)) { + LOGE("GetAclBindType result not contains credId."); + return DM_UNKNOWN_TYPE; + } + int32_t credType = result[credId][FILED_CRED_TYPE].Get(); + if (credType == DM_AUTH_CREDENTIAL_ACCOUNT_RELATED) { + return DM_SAME_ACCOUNT_TYPE; + } + if (credType == DM_AUTH_CREDENTIAL_ACCOUNT_UNRELATED) { + return DM_POINT_TO_POINT_TYPE; + } + if (credType == DM_AUTH_CREDENTIAL_ACCOUNT_ACROSS) { + return DM_SHARE; + } + return DM_UNKNOWN_TYPE; +} + +uint32_t DmAuthState::GetCredType(std::shared_ptr context, const JsonItemObject &credInfo) +{ + int32_t credType = credInfo[FILED_CRED_TYPE].Get(); + int32_t authorizedScope = credInfo[FILED_AUTHORIZED_SCOPE].Get(); + int32_t subject = credInfo[FILED_SUBJECT].Get(); + std::vector appList; + credInfo[FILED_AUTHORIZED_APP_LIST].Get(appList); + if (credType == ACCOUNT_RELATED && authorizedScope == SCOPE_USER) { + return DM_IDENTICAL_ACCOUNT; + } + if (credType == ACCOUNT_ACROSS && authorizedScope == SCOPE_USER && + context->direction == DM_AUTH_SOURCE && subject == SUBJECT_PRIMARY) { + return DM_SHARE; + } + if (credType == ACCOUNT_ACROSS && authorizedScope == SCOPE_USER && + context->direction == DM_AUTH_SINK && subject == SUBJECT_SECONDARY) { + return DM_SHARE; + } + if (credType == ACCOUNT_UNRELATED && (authorizedScope == SCOPE_APP || authorizedScope == SCOPE_USER) && + HaveSameTokenId(context, appList)) { + return DM_POINT_TO_POINT; + } + if (credType == ACCOUNT_UNRELATED && authorizedScope == SCOPE_USER && appList.empty()) { + return DM_LNN; + } + return DM_INVALIED_TYPE; +} + +uint32_t DmAuthState::GetCredentialType(std::shared_ptr context, const JsonItemObject &credInfo) +{ + CHECK_NULL_RETURN(context, DM_INVALIED_TYPE); + if (!credInfo.Contains(FILED_CRED_TYPE) || !credInfo[FILED_CRED_TYPE].IsNumberInteger() || + !credInfo.Contains(FILED_AUTHORIZED_SCOPE) || !credInfo[FILED_AUTHORIZED_SCOPE].IsNumberInteger() || + !credInfo.Contains(FILED_SUBJECT) || !credInfo[FILED_SUBJECT].IsNumberInteger()) { + LOGE("credType or authorizedScope invalid."); + return DM_INVALIED_TYPE; + } + return GetCredType(context, credInfo); +} + +bool DmAuthState::HaveSameTokenId(std::shared_ptr context, const std::vector &tokenList) +{ + // Store the token of src and sink. The size must be 2. + if (tokenList.size() != 2) { + LOGE("HaveSameTokenId invalid tokenList size."); + return false; + } + + // tokenIdList = [srcTokenId, sinkTokenId] + std::string srcTokenIdHash = Crypto::GetTokenIdHash(tokenList[0]); + std::string sinkTokenIdHash = Crypto::GetTokenIdHash(tokenList[1]); + + return ((srcTokenIdHash == context->accesser.tokenIdHash) && + (sinkTokenIdHash == context->accessee.tokenIdHash)) || + ((sinkTokenIdHash == context->accesser.tokenIdHash) && + (srcTokenIdHash == context->accessee.tokenIdHash)); +} + +int32_t DmAuthState::GetOutputState(int32_t state) +{ + LOGI("state %{public}d.", state); + auto it = NEW_AND_OLD_STATE_MAPPING.find(static_cast(state)); + if (it != NEW_AND_OLD_STATE_MAPPING.end()) { + return static_cast(it->second); + } + return static_cast(STATUS_DM_AUTH_DEFAULT); +} + +int32_t DmAuthState::GetOutputReplay(const std::string &processName, int32_t replay) +{ + LOGI("replay %{public}d.", replay); + bool needMapFlag = false; + for (uint16_t index = 0; index < ONBINDRESULT_MAPPING_NUM; ++index) { + if (std::string(ONBINDRESULT_MAPPING_LIST[index]) == processName) { + LOGI("processName %{public}s new protocol param convert to old protocol param.", processName.c_str()); + needMapFlag = true; + break; + } + } + if (needMapFlag) { + auto it = NEW_AND_OLD_REPLAY_MAPPING.find(replay); + if (it != NEW_AND_OLD_REPLAY_MAPPING.end()) { + return static_cast(it->second); + } + } + return replay; +} + +uint64_t DmAuthState::GetSysTimeMs() +{ + struct timeval time; + time.tv_sec = 0; + time.tv_usec = 0; + int32_t retryNum = 0; + while (retryNum < GET_SYSTEMTIME_MAX_NUM) { + if (gettimeofday(&time, nullptr) != 0) { + retryNum++; + LOGE("GetSysTimeMs failed. retryNum: %{public}d", retryNum); + continue; + } + return (uint64_t) time.tv_sec * MS_PER_SECOND + (uint64_t)time.tv_usec / US_PER_MSECOND; + } + return 0; +} + +void DmAuthState::DeleteAcl(std::shared_ptr context, + const DistributedDeviceProfile::AccessControlProfile &profile) +{ + CHECK_NULL_VOID(context); + LOGI("direction %{public}d.", static_cast(context->direction)); + CHECK_NULL_VOID(context->authMessageProcessor); + CHECK_NULL_VOID(context->hiChainAuthConnector); + int32_t userId = context->direction == DmAuthDirection::DM_AUTH_SOURCE ? + profile.GetAccesser().GetAccesserUserId() : profile.GetAccessee().GetAccesseeUserId(); + int32_t sessionKeyId = context->direction == DmAuthDirection::DM_AUTH_SOURCE ? + profile.GetAccesser().GetAccesserSessionKeyId() : profile.GetAccessee().GetAccesseeSessionKeyId(); + std::string credId = context->direction == DmAuthDirection::DM_AUTH_SOURCE ? + profile.GetAccesser().GetAccesserCredentialIdStr() : profile.GetAccessee().GetAccesseeCredentialIdStr(); + + context->authMessageProcessor->DeleteSessionKeyToDP(userId, sessionKeyId); + context->hiChainAuthConnector->DeleteCredential(userId, credId); + DeviceProfileConnector::GetInstance().DeleteAccessControlById(profile.GetAccessControlId()); +} + +void DmAuthState::SetProcessInfo(std::shared_ptr context) +{ + CHECK_NULL_VOID(context); + DmAccess localAccess = context->direction == DmAuthDirection::DM_AUTH_SOURCE ? + context->accesser : context->accessee; + ProcessInfo processInfo; + processInfo.userId = localAccess.userId; + uint32_t bindLevel = static_cast(localAccess.bindLevel); + if (bindLevel == APP || bindLevel == SERVICE) { + processInfo.pkgName = localAccess.pkgName; + } else if (bindLevel == USER) { + processInfo.pkgName = std::string(DM_PKG_NAME); + } else { + LOGE("bindlevel error %{public}d.", bindLevel); + return; + } + context->softbusConnector->SetProcessInfo(processInfo); +} + +void DmAuthState::FilterProfilesByContext( + std::vector &profiles, std::shared_ptr context) +{ + CHECK_NULL_VOID(context); + std::vector aclProfilesVec; + for (const auto &item : profiles) { + std::string accesserDeviceIdHash = Crypto::GetUdidHash(item.GetAccesser().GetAccesserDeviceId()); + std::string accesseeDeviceIdHash = Crypto::GetUdidHash(item.GetAccessee().GetAccesseeDeviceId()); + if ((context->accesser.deviceIdHash == accesserDeviceIdHash && + context->accessee.deviceIdHash == accesseeDeviceIdHash && + context->accesser.userId == item.GetAccesser().GetAccesserUserId() && + context->accessee.userId == item.GetAccessee().GetAccesseeUserId()) || + (context->accessee.deviceIdHash == accesserDeviceIdHash && + context->accesser.deviceIdHash == accesseeDeviceIdHash && + context->accessee.userId == item.GetAccesser().GetAccesserUserId() && + context->accesser.userId == item.GetAccessee().GetAccesseeUserId())) { + aclProfilesVec.push_back(item); + } + } + profiles.clear(); + profiles.assign(aclProfilesVec.begin(), aclProfilesVec.end()); +} +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/implementation/src/authentication_v2/dm_auth_state_machine.cpp b/services/implementation/src/authentication_v2/dm_auth_state_machine.cpp new file mode 100644 index 0000000000000000000000000000000000000000..74bba53bb67a377c515e9edb1541b0eb6a904926 --- /dev/null +++ b/services/implementation/src/authentication_v2/dm_auth_state_machine.cpp @@ -0,0 +1,417 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_log.h" +#include "dm_constants.h" +#include "dm_auth_state.h" +#include "dm_auth_context.h" +#include "dm_auth_manager_base.h" +#include "dm_auth_state_machine.h" + +namespace OHOS { +namespace DistributedHardware { + +DmAuthStateMachine::DmAuthStateMachine(std::shared_ptr context) +{ + exceptionEvent_= { + DmEventType::ON_ERROR, // Authentication error, there is a possibility of retry. + DmEventType::ON_TIMEOUT, + DmEventType::ON_FAIL, // Authentication failed + DmEventType::ON_SCREEN_LOCKED, + DmEventType::ON_ULTRASONIC_PIN_TIMEOUT, + }; + + running_ = true; + direction_ = context->direction; + + if (direction_ == DM_AUTH_SOURCE) { + this->InsertSrcTransTable(); + } else { + this->InsertSinkTransTable(); + } + + this->SetCurState(DmAuthStateType::AUTH_IDLE_STATE); + thread_ = std::thread(&DmAuthStateMachine::Run, this, context); +} + +DmAuthStateMachine::~DmAuthStateMachine() +{ + Stop(); +} + +void DmAuthStateMachine::InsertSrcTransTable() +{ + // Source-end state transition table + stateTransitionTable_.insert({ + {DmAuthStateType::AUTH_IDLE_STATE, {DmAuthStateType::AUTH_SRC_START_STATE}}, + {DmAuthStateType::AUTH_SRC_START_STATE, {DmAuthStateType::AUTH_SRC_NEGOTIATE_STATE}}, + {DmAuthStateType::AUTH_SRC_NEGOTIATE_STATE, {DmAuthStateType::AUTH_SRC_CONFIRM_STATE}}, + {DmAuthStateType::AUTH_SRC_CONFIRM_STATE, { + DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, + DmAuthStateType::AUTH_SRC_DATA_SYNC_STATE, + }}, + {DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, { + DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_START_STATE, + DmAuthStateType::AUTH_SRC_PIN_INPUT_STATE, + DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_START_STATE, + DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_START_STATE, + DmAuthStateType::AUTH_SRC_PIN_AUTH_START_STATE, + }}, + {DmAuthStateType::AUTH_SRC_PIN_INPUT_STATE, { + DmAuthStateType::AUTH_SRC_PIN_AUTH_START_STATE, + }}, + {DmAuthStateType::AUTH_SRC_PIN_AUTH_START_STATE, { + DmAuthStateType::AUTH_SRC_PIN_AUTH_MSG_NEGOTIATE_STATE, + DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SRC_PIN_AUTH_MSG_NEGOTIATE_STATE, { + DmAuthStateType::AUTH_SRC_PIN_AUTH_DONE_STATE, + DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SRC_PIN_AUTH_DONE_STATE, { + DmAuthStateType::AUTH_SRC_CREDENTIAL_EXCHANGE_STATE, + DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SRC_CREDENTIAL_EXCHANGE_STATE, { + DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_START_STATE, + DmAuthStateType::AUTH_SRC_DATA_SYNC_STATE, + }}, + {DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_START_STATE, + {DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_NEGOTIATE_STATE}}, + + {DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_NEGOTIATE_STATE, + {DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_DONE_STATE}}, + + {DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_DONE_STATE, + {DmAuthStateType::AUTH_SRC_DATA_SYNC_STATE, DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_NEGOTIATE_STATE}}, + + {DmAuthStateType::AUTH_SRC_DATA_SYNC_STATE, {DmAuthStateType::AUTH_SRC_FINISH_STATE}}, + + {DmAuthStateType::AUTH_SRC_FINISH_STATE, {}} + }); + + InsertUltrasonicSrcTransTable(); + + return; +} + +void DmAuthStateMachine::InsertUltrasonicSrcTransTable() +{ + stateTransitionTable_.insert({ + {DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_START_STATE, { + DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_DONE_STATE, + DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_DONE_STATE, { + DmAuthStateType::AUTH_SRC_PIN_AUTH_MSG_NEGOTIATE_STATE, + DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_START_STATE, { + DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_DONE_STATE, + }}, + {DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_DONE_STATE, { + DmAuthStateType::AUTH_SRC_PIN_AUTH_MSG_NEGOTIATE_STATE, + DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE, { + DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_START_STATE, + DmAuthStateType::AUTH_SRC_PIN_INPUT_STATE, + DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_START_STATE, + DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_START_STATE, + DmAuthStateType::AUTH_SRC_PIN_AUTH_START_STATE, + }} + }); + + return; +} + +void DmAuthStateMachine::InsertSinkTransTable() +{ + // Sink-end state transition table + stateTransitionTable_.insert({ + {DmAuthStateType::AUTH_IDLE_STATE, {DmAuthStateType::AUTH_SINK_NEGOTIATE_STATE}}, + {DmAuthStateType::AUTH_SINK_NEGOTIATE_STATE, { + DmAuthStateType::AUTH_SINK_CONFIRM_STATE, + }}, + {DmAuthStateType::AUTH_SINK_CONFIRM_STATE, { + DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE, + DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_START_STATE, + }}, + {DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE, { + DmAuthStateType::AUTH_SINK_PIN_DISPLAY_STATE, + DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_START_STATE, + DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_START_STATE, + DmAuthStateType::AUTH_SINK_PIN_AUTH_START_STATE, + }}, + {DmAuthStateType::AUTH_SINK_PIN_DISPLAY_STATE, { + DmAuthStateType::AUTH_SINK_PIN_AUTH_START_STATE, + }}, + {DmAuthStateType::AUTH_SINK_PIN_AUTH_START_STATE, { + DmAuthStateType::AUTH_SINK_PIN_AUTH_MSG_NEGOTIATE_STATE, + DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SINK_PIN_AUTH_MSG_NEGOTIATE_STATE, { + DmAuthStateType::AUTH_SINK_PIN_AUTH_DONE_STATE, + DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SINK_PIN_AUTH_DONE_STATE, { + DmAuthStateType::AUTH_SINK_CREDENTIAL_EXCHANGE_STATE, + DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_START_STATE, + DmAuthStateType::AUTH_SINK_FINISH_STATE, + }}, + {DmAuthStateType::AUTH_SINK_CREDENTIAL_EXCHANGE_STATE, { + DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_START_STATE, + }}, + {DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_START_STATE, { + DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_NEGOTIATE_STATE, + }}, + {DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_NEGOTIATE_STATE, + {DmAuthStateType::AUTH_SINK_DATA_SYNC_STATE, DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_START_STATE}}, + {DmAuthStateType::AUTH_SINK_DATA_SYNC_STATE, {DmAuthStateType::AUTH_SINK_FINISH_STATE}}, + {DmAuthStateType::AUTH_SINK_FINISH_STATE, {}} + }); + + InsertUltrasonicSinkTransTable(); + + return; +} + +void DmAuthStateMachine::InsertUltrasonicSinkTransTable() +{ + stateTransitionTable_.insert({ + {DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_START_STATE, { + DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_DONE_STATE, + DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_DONE_STATE, { + DmAuthStateType::AUTH_SINK_PIN_AUTH_MSG_NEGOTIATE_STATE, + DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_START_STATE, { + DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_DONE_STATE, + DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE, + }}, + {DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_DONE_STATE, { + DmAuthStateType::AUTH_SINK_PIN_AUTH_MSG_NEGOTIATE_STATE, + DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE, + }} + }); + return; +} + +// Notification status transition. The execution status corresponds to specific actions and exception handling. +int32_t DmAuthStateMachine::TransitionTo(std::shared_ptr state) +{ + int32_t ret = DM_OK; + DmAuthStateType nextState = state->GetStateType(); + { + std::lock_guard lock(stateMutex_); + // The states after the finish status are illegal states. + if (preState_ == DmAuthStateType::AUTH_SRC_FINISH_STATE || + preState_ == DmAuthStateType::AUTH_SINK_FINISH_STATE) { + LOGE("DmAuthStateMachine::TransitionTo next state is invalid."); + return ERR_DM_NEXT_STATE_INVALID; + } + if (this->CheckStateTransitValid(nextState)) { + LOGI("DmAuthStateMachine: The state transition from %{public}d to %{public}d.", preState_, nextState); + statesQueue_.push(state); + preState_ = nextState; + } else { + // The state transition is invalid. + LOGE("DmAuthStateMachine: The state transition does not meet the rule from %{public}d to %{public}d.", + preState_, nextState); + ret = ERR_DM_NEXT_STATE_INVALID; + reason = ERR_DM_NEXT_STATE_INVALID; + if (direction_ == DM_AUTH_SOURCE) { + statesQueue_.push(std::make_shared()); + preState_ = DmAuthStateType::AUTH_SRC_FINISH_STATE; + } else { + statesQueue_.push(std::make_shared()); + preState_ = DmAuthStateType::AUTH_SINK_FINISH_STATE; + } + } + } + stateCv_.notify_one(); + return ret; +} + +/* +Expected event in an action, which is used for blocking. +When the expected event is complete or other exceptions occur, the actual event is returned. +Other normal events continue to be blocked (only in the action). +*/ +DmEventType DmAuthStateMachine::WaitExpectEvent(DmEventType eventType) +{ + /* + 1. Actual event = Expected event, return actual event + 2. Actual event = Abnormal event (event timeout). The actual event is also returned. + 3. Actual event = Other events, continue to block, but there is a timeout limit. + */ + std::unique_lock lock(eventMutex_); + auto startTime = std::chrono::high_resolution_clock::now(); + while (running_.load()) { + eventCv_.wait(lock, [&] { + return !running_.load() || !eventQueue_.empty(); + }); + if (!running_.load()) { + return DmEventType::ON_FAIL; + } + + DmEventType actualEventType = eventQueue_.front(); + eventQueue_.pop(); + // Determine whether the event is an expected event or abnormal event in list. + if (actualEventType == eventType || (exceptionEvent_.find(actualEventType) != exceptionEvent_.end())) { + return actualEventType; + } + // Event Wait Timeout + auto elapsedTime = std::chrono::duration_cast( + std::chrono::high_resolution_clock::now() - startTime); + if (elapsedTime.count() >= EVENT_TIMEOUT) { + break; + } + } + return DmEventType::ON_TIMEOUT; +} + +/* +The event is invoked after the event is complete. +The event enumeration can be invoked only when the event is triggered. +If the event is an abnormal event, the reason or reply of the context must be recorded. +*/ +void DmAuthStateMachine::NotifyEventFinish(DmEventType eventType) +{ + LOGI("DmAuthStateMachine: NotifyEventFinish Event:%{public}d.", eventType); + { + std::unique_lock lock(eventMutex_); + eventQueue_.push(eventType); + } + eventCv_.notify_one(); + if (eventType == DmEventType::ON_FAIL) { + if (direction_ == DM_AUTH_SOURCE) { + this->TransitionTo(std::make_shared()); + } else { + this->TransitionTo(std::make_shared()); + } + } +} + +// Cyclically wait for state transition and execute action. +void DmAuthStateMachine::Run(std::shared_ptr context) +{ + while (running_.load()) { + context->state = static_cast(GetCurState()); + auto state = FetchAndSetCurState(); + if (!state.has_value()) { + break; + } + if (reason != DM_OK) { + context->reason = reason; + } + // Obtain the status and execute the status action. + DmAuthStateType stateType = state.value()->GetStateType(); + int32_t ret = state.value()->Action(context); + if (ret != DM_OK) { + LOGE("DmAuthStateMachine::Run err:%{public}d", ret); + if (context->reason == DM_OK) { + // If the context reason is not set, set action ret. + context->reason = ret; + } + context->successFinished = false; + if (context->direction == DM_AUTH_SOURCE) { + this->TransitionTo(std::make_shared()); + } else { + this->TransitionTo(std::make_shared()); + } + } else { + LOGI("DmAuthStateMachine::Run ok state:%{public}d", stateType); + } + } + LOGI("DmAuthStateMachine::Run end"); +} + +std::optional> DmAuthStateMachine::FetchAndSetCurState() +{ + std::unique_lock lock(stateMutex_); + stateCv_.wait(lock, [&] { + return !running_.load() || !statesQueue_.empty(); + }); + + if (!running_.load()) return std::nullopt; + + std::shared_ptr state = statesQueue_.front(); + statesQueue_.pop(); + SetCurState(state->GetStateType()); + return state; +} + +void DmAuthStateMachine::NotifyStateWait() +{ + std::lock_guard lock(stateMutex_); // Use locking to prevent signal loss + running_.store(false); + stateCv_.notify_all(); +} + +void DmAuthStateMachine::NotifyEventWait() +{ + std::lock_guard lock(eventMutex_); // Use locking to prevent signal loss + running_.store(false); + eventCv_.notify_all(); +} + +void DmAuthStateMachine::Stop() +{ + NotifyStateWait(); + NotifyEventWait(); + if (thread_.joinable()) { // Prevent dobule join + thread_.join(); + } +} + +void DmAuthStateMachine::SetCurState(DmAuthStateType state) +{ + LOGI("DmAuthStateMachine::SetCurState state: %{public}d", state); + curState_ = state; +} + +DmAuthStateType DmAuthStateMachine::GetCurState() +{ + return curState_; +} + +// Verify the validity of the next state transition. +bool DmAuthStateMachine::CheckStateTransitValid(DmAuthStateType nextState) +{ + // Check whether the next state is AuthSrcFinishState or AuthSinkFinishState + // which can directly switch to the state and return. + if (direction_ == DM_AUTH_SOURCE) { + if (nextState == DmAuthStateType::AUTH_SRC_FINISH_STATE) { + return true; + } + } else { + if (nextState == DmAuthStateType::AUTH_SINK_FINISH_STATE) { + return true; + } + } + + // Check whether the state transition table is met. + auto it = stateTransitionTable_.find(preState_); + if (it != stateTransitionTable_.end()) { + const std::set& allowedStates = it->second; + return allowedStates.find(nextState) != allowedStates.end(); + } + return false; +} +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/implementation/src/authentication_v2/dm_freeze_process.cpp b/services/implementation/src/authentication_v2/dm_freeze_process.cpp new file mode 100644 index 0000000000000000000000000000000000000000..20d627fa33ed118207884ffc1059836be16598ef --- /dev/null +++ b/services/implementation/src/authentication_v2/dm_freeze_process.cpp @@ -0,0 +1,332 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "dm_freeze_process.h" + +#include "cJSON.h" +#include "datetime_ex.h" +#include "dm_anonymous.h" +#include "dm_device_info.h" +#include "dm_error_type.h" +#include "dm_log.h" + +namespace OHOS { +namespace DistributedHardware { +namespace { +constexpr const char* BIND_FAILED_EVENTS_KEY = "bindFailedEvents"; +constexpr const char* FREEZE_STATE_KEY = "freezeState"; +constexpr const char* START_FREEZE_TIME_KEY = "startFreezeTimeStamp"; +constexpr const char* STOP_FREEZE_TIME_KEY = "stopFreezeTimeStamp"; +constexpr const char* FAILED_TIMES_STAMPS_KEY = "failedTimeStamps"; +constexpr const char* FREEZE_TIMES_STAMPS_KEY = "freezeTimeStamps"; +constexpr int32_t MAX_CONTINUOUS_BIND_FAILED_NUM = 2; +constexpr int64_t CONTINUEOUS_FAILED_INTERVAL = 6 * 60; +constexpr int64_t DATA_REFRESH_INTERVAL = 20 * 60; +constexpr int64_t NOT_FREEZE_DURATION_SEC = 0; +constexpr int64_t FIRST_FREEZE_DURATION_SEC = 60; +constexpr int64_t SECOND_FREEZE_DURATION_SEC = 3 * 60; +constexpr int64_t THIRD_FREEZE_DURATION_SEC = 5 * 60; +constexpr int64_t MAX_FREEZE_DURATION_SEC = 10 * 60; +} + +DM_IMPLEMENT_SINGLE_INSTANCE(FreezeProcess); + +int32_t FreezeProcess::SyncFreezeData() +{ + LOGI("called"); + std::string freezeStatesValue; + int32_t ret = KVAdapterManager::GetInstance().GetFreezeData(FREEZE_STATE_KEY, freezeStatesValue); + if (ret != DM_OK) { + LOGE("Get freeze states data failed, ret: %{public}d", ret); + return ret; + } + DeviceFreezeState freezeStateObj; + ret = ConvertJsonToDeviceFreezeState(freezeStatesValue, freezeStateObj); + if (ret != DM_OK) { + LOGE("ConvertJsonToDeviceFreezeState, ret: %{public}d", ret); + return ret; + } + { + std::lock_guard lock(freezeStateCacheMtx_); + freezeStateCache_ = freezeStateObj; + } + std::string bindFailedEventsValue; + ret = KVAdapterManager::GetInstance().GetFreezeData(BIND_FAILED_EVENTS_KEY, bindFailedEventsValue); + if (ret != DM_OK) { + LOGE("Get bind failed events data failed, ret: %{public}d", ret); + return ret; + } + BindFailedEvents bindFailedEventsObj; + ret = ConvertJsonToBindFailedEvents(bindFailedEventsValue, bindFailedEventsObj); + if (ret != DM_OK) { + LOGE("ConvertJsonToBindFailedEvents, ret: %{public}d", ret); + return ret; + } + std::lock_guard lock(bindFailedEventsCacheMtx_); + bindFailedEventsCache_ = bindFailedEventsObj; + LOGI("Sync freeze data success"); + return DM_OK; +} + +int32_t FreezeProcess::ConvertJsonToDeviceFreezeState(const std::string &result, DeviceFreezeState &freezeStateObj) +{ + if (result.empty()) { + LOGE("result is empty"); + return ERR_DM_FAILED; + } + JsonObject resultJson(result); + if (resultJson.IsDiscarded()) { + LOGE("resultJson parse failed"); + return ERR_DM_FAILED; + } + if (IsInt64(resultJson, START_FREEZE_TIME_KEY)) { + freezeStateObj.startFreezeTimeStamp = resultJson[START_FREEZE_TIME_KEY].Get(); + } + if (IsInt64(resultJson, STOP_FREEZE_TIME_KEY)) { + freezeStateObj.stopFreezeTimeStamp = resultJson[STOP_FREEZE_TIME_KEY].Get(); + } + LOGI("ConvertJsonToDeviceFreezeState success"); + return DM_OK; +} + +int32_t FreezeProcess::ConvertJsonToBindFailedEvents(const std::string &result, BindFailedEvents &bindFailedEventsObj) +{ + if (result.empty()) { + LOGE("result is empty"); + return ERR_DM_FAILED; + } + JsonObject resultJson(result); + if (resultJson.IsDiscarded()) { + LOGE("resultJson parse failed"); + return ERR_DM_FAILED; + } + if (IsArray(resultJson, FAILED_TIMES_STAMPS_KEY)) { + std::vector failedTimeStampsTmp; + resultJson[FAILED_TIMES_STAMPS_KEY].Get(failedTimeStampsTmp); + bindFailedEventsObj.failedTimeStamps = failedTimeStampsTmp; + } + if (IsArray(resultJson, FREEZE_TIMES_STAMPS_KEY)) { + std::vector freezeTimeStampsTmp; + resultJson[FREEZE_TIMES_STAMPS_KEY].Get(freezeTimeStampsTmp); + bindFailedEventsObj.freezeTimeStamps = freezeTimeStampsTmp; + } + LOGI("ConvertJsonToBindFailedEvents success"); + return DM_OK; +} + +bool FreezeProcess::IsFrozen() +{ + { + std::lock_guard lock(isSyncedMtx_); + if (!isSynced_) { + SyncFreezeData(); + isSynced_ = true; + } + } + int64_t stopFreezeTimeStamp = 0; + { + std::lock_guard lock(freezeStateCacheMtx_); + if (bindFailedEventsCache_.IsEmpty()) { + LOGI("bindFailedEventsCache is empty"); + return false; + } + stopFreezeTimeStamp = freezeStateCache_.stopFreezeTimeStamp; + } + int64_t nowTime = GetSecondsSince1970ToNow(); + bool isFrozen = nowTime > stopFreezeTimeStamp ? false : true; + if (CleanFreezeRecord(nowTime) != DM_OK) { + LOGE("CleanFreezeRecord failed"); + } + return isFrozen; +} + +int32_t FreezeProcess::CleanFreezeRecord(int64_t nowTime) +{ + int64_t reservedDataTimeStamp = nowTime - DATA_REFRESH_INTERVAL; + if (CleanBindFailedEvents(reservedDataTimeStamp) != DM_OK) { + LOGE("CleanBindFailedEvents failed"); + return ERR_DM_FAILED; + } + if (CleanFreezeState(reservedDataTimeStamp) != DM_OK) { + LOGE("CleanFreezeState failed"); + return ERR_DM_FAILED; + } + LOGI("CleanFreezeRecord success"); + return DM_OK; +} + +int32_t FreezeProcess::CleanBindFailedEvents(int64_t reservedDataTimeStamp) +{ + std::lock_guard lock(bindFailedEventsCacheMtx_); + if (bindFailedEventsCache_.IsEmpty()) { + LOGI("bindFailedEventsCache is empty, no need to clean"); + return DM_OK; + } + BindFailedEvents bindFailedEventsTmp = bindFailedEventsCache_; + int32_t needCleanBindFailedStampNum = std::count_if(bindFailedEventsTmp.failedTimeStamps.begin(), + bindFailedEventsTmp.failedTimeStamps.end(), + [reservedDataTimeStamp](int64_t v) { return v < reservedDataTimeStamp; }); + if (needCleanBindFailedStampNum == 0) { + LOGI("no stamp is before 20mins, no need to clean"); + return DM_OK; + } + bindFailedEventsTmp.failedTimeStamps.erase( + std::remove_if(bindFailedEventsTmp.failedTimeStamps.begin(), + bindFailedEventsTmp.failedTimeStamps.end(), + [reservedDataTimeStamp](int64_t n) { return n < reservedDataTimeStamp; }), + bindFailedEventsTmp.failedTimeStamps.end()); + bindFailedEventsTmp.freezeTimeStamps.erase( + std::remove_if(bindFailedEventsTmp.freezeTimeStamps.begin(), + bindFailedEventsTmp.freezeTimeStamps.end(), + [reservedDataTimeStamp](int64_t n) { return n < reservedDataTimeStamp; }), + bindFailedEventsTmp.freezeTimeStamps.end()); + std::string valueStr = ""; + ConvertBindFailedEventsToJson(bindFailedEventsTmp, valueStr); + if (KVAdapterManager::GetInstance().PutFreezeData(BIND_FAILED_EVENTS_KEY, valueStr) != DM_OK) { + LOGE("CleanBindFailedEvents within 20mins failed"); + return ERR_DM_FAILED; + } + bindFailedEventsCache_ = bindFailedEventsTmp; + LOGI("CleanBindFailedEvents success"); + return DM_OK; +} + +int32_t FreezeProcess::CleanFreezeState(int64_t reservedDataTimeStamp) +{ + std::lock_guard lock(freezeStateCacheMtx_); + if (freezeStateCache_.IsEmpty()) { + LOGI("freezeStateCache is empty, no need to clean"); + return DM_OK; + } + if (freezeStateCache_.startFreezeTimeStamp >= reservedDataTimeStamp) { + LOGI("startFreezeTimeStamp is in 20 mins, no need to clean"); + return DM_OK; + } + if (KVAdapterManager::GetInstance().DeleteFreezeData(FREEZE_STATE_KEY) != DM_OK) { + LOGE("delete freeze states data within 20mins failed"); + return ERR_DM_FAILED; + } + freezeStateCache_.Reset(); + LOGI("CleanFreezeState success"); + return DM_OK; +} + +void FreezeProcess::ConvertBindFailedEventsToJson(const BindFailedEvents &value, std::string &result) +{ + JsonObject jsonObj; + jsonObj[FAILED_TIMES_STAMPS_KEY] = value.failedTimeStamps; + jsonObj[FREEZE_TIMES_STAMPS_KEY] = value.freezeTimeStamps; + result = SafetyDump(jsonObj); +} + +void FreezeProcess::ConvertDeviceFreezeStateToJson(const DeviceFreezeState &value, std::string &result) +{ + JsonObject jsonObj; + jsonObj[START_FREEZE_TIME_KEY] = value.startFreezeTimeStamp; + jsonObj[STOP_FREEZE_TIME_KEY] = value.stopFreezeTimeStamp; + result = SafetyDump(jsonObj); +} + +int32_t FreezeProcess::DeleteFreezeRecord() +{ + if (KVAdapterManager::GetInstance().DeleteFreezeData(FREEZE_STATE_KEY) != DM_OK) { + LOGE("delete freezeStates data failed"); + return ERR_DM_FAILED; + } + { + std::lock_guard lock(freezeStateCacheMtx_); + freezeStateCache_.Reset(); + } + if (KVAdapterManager::GetInstance().DeleteFreezeData(BIND_FAILED_EVENTS_KEY) != DM_OK) { + LOGE("delete bindFailedEvents data failed"); + return ERR_DM_FAILED; + } + std::lock_guard lock(bindFailedEventsCacheMtx_); + bindFailedEventsCache_.Reset(); + return DM_OK; +} + +int32_t FreezeProcess::UpdateFreezeRecord() +{ + int64_t nowTime = GetSecondsSince1970ToNow(); + std::lock_guard lock(bindFailedEventsCacheMtx_); + BindFailedEvents bindFailedEventsTmp = bindFailedEventsCache_; + int64_t lastFreezeTimeStamps = 0; + if (!bindFailedEventsTmp.freezeTimeStamps.empty()) { + lastFreezeTimeStamps = bindFailedEventsTmp.freezeTimeStamps.back(); + } + int32_t continueBindFailedNum = std::count_if(bindFailedEventsTmp.failedTimeStamps.begin(), + bindFailedEventsTmp.failedTimeStamps.end(), + [nowTime, lastFreezeTimeStamps]( + int64_t v) { return v > nowTime - CONTINUEOUS_FAILED_INTERVAL && v > lastFreezeTimeStamps; }); + if (continueBindFailedNum < MAX_CONTINUOUS_BIND_FAILED_NUM) { + bindFailedEventsTmp.failedTimeStamps.push_back(nowTime); + std::string bindFailedEventsStr = ""; + ConvertBindFailedEventsToJson(bindFailedEventsTmp, bindFailedEventsStr); + if (KVAdapterManager::GetInstance().PutFreezeData(BIND_FAILED_EVENTS_KEY, bindFailedEventsStr) != DM_OK) { + LOGE("UpdateBindFailedEvents failed"); + return ERR_DM_FAILED; + } + bindFailedEventsCache_ = bindFailedEventsTmp; + return DM_OK; + } + bindFailedEventsTmp.failedTimeStamps.push_back(nowTime); + bindFailedEventsTmp.freezeTimeStamps.push_back(nowTime); + std::string bindFailedEventsStr = ""; + ConvertBindFailedEventsToJson(bindFailedEventsTmp, bindFailedEventsStr); + if (KVAdapterManager::GetInstance().PutFreezeData(BIND_FAILED_EVENTS_KEY, bindFailedEventsStr) != DM_OK) { + LOGE("UpdateBindFailedEvents failed"); + return ERR_DM_FAILED; + } + bindFailedEventsCache_ = bindFailedEventsTmp; + return UpdateFreezeState(nowTime); +} + +int32_t FreezeProcess::UpdateFreezeState(int64_t nowTime) +{ + std::lock_guard lock(freezeStateCacheMtx_); + DeviceFreezeState freezeStateTmp = freezeStateCache_; + int64_t nextFreezeTime = 0; + CalculateNextFreezeTime(freezeStateTmp.stopFreezeTimeStamp - freezeStateTmp.startFreezeTimeStamp, nextFreezeTime); + freezeStateTmp.startFreezeTimeStamp = nowTime; + freezeStateTmp.stopFreezeTimeStamp = nowTime + nextFreezeTime; + std::string freezeStateStr = ""; + ConvertDeviceFreezeStateToJson(freezeStateTmp, freezeStateStr); + if (KVAdapterManager::GetInstance().PutFreezeData(FREEZE_STATE_KEY, freezeStateStr) != DM_OK) { + LOGE("UpdateFreezeState failed"); + return ERR_DM_FAILED; + } + freezeStateCache_ = freezeStateTmp; + return DM_OK; +} + +void FreezeProcess::CalculateNextFreezeTime(int64_t nowFreezeTime, int64_t &nextFreezeTime) +{ + switch (nowFreezeTime) { + case NOT_FREEZE_DURATION_SEC: + nextFreezeTime = FIRST_FREEZE_DURATION_SEC; + break; + case FIRST_FREEZE_DURATION_SEC: + nextFreezeTime = SECOND_FREEZE_DURATION_SEC; + break; + case SECOND_FREEZE_DURATION_SEC: + nextFreezeTime = THIRD_FREEZE_DURATION_SEC; + break; + default: + nextFreezeTime = MAX_FREEZE_DURATION_SEC; + break; + } +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/authentication_v2/dm_negotiate_process.cpp b/services/implementation/src/authentication_v2/dm_negotiate_process.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f882e584a3a7266d81e081ccea8aecd24ef5e761 --- /dev/null +++ b/services/implementation/src/authentication_v2/dm_negotiate_process.cpp @@ -0,0 +1,289 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "dm_negotiate_process.h" + +namespace OHOS { +namespace DistributedHardware { +DM_IMPLEMENT_SINGLE_INSTANCE(NegotiateProcess); + +int32_t OnlyPinBind(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + context->needBind = true; + context->needAgreeCredential = false; + context->needAuth = false; + return DM_OK; +} + +int32_t EndBind(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + context->needBind = false; + context->needAgreeCredential = false; + context->needAuth = false; + context->reason = ERR_DM_BIND_TRUST_TARGET; + return ERR_DM_BIND_TRUST_TARGET; +} + +int32_t OnlyCredAuth(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + context->needBind = false; + context->needAgreeCredential = false; + context->needAuth = true; + return DM_OK; +} + +int32_t PinBindAndCredAuth(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + context->needBind = true; + context->needAgreeCredential = true; + context->needAuth = true; + return DM_OK; +} + +NegotiateProcess::NegotiateProcess() +{ + LOGI("start."); + handlers_[NegotiateSpec(CredType::DM_NO_CRED, AclType::DM_NO_ACL, AuthType::DM_INPUT_PINCODE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_NO_CRED, AclType::DM_NO_ACL, AuthType::DM_IMPORT_AUTHTYPE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_IDENTICAL_CREDTYPE, AclType::DM_NO_ACL, AuthType::DM_INPUT_PINCODE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_IDENTICAL_CREDTYPE, AclType::DM_NO_ACL, AuthType::DM_IMPORT_AUTHTYPE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_IDENTICAL_CREDTYPE, AclType::DM_IDENTICAL_ACL, AuthType::DM_INPUT_PINCODE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_IDENTICAL_CREDTYPE, AclType::DM_IDENTICAL_ACL, AuthType::DM_IMPORT_AUTHTYPE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_IDENTICAL_CREDTYPE, AclType::DM_P2P_ACL, AuthType::DM_INPUT_PINCODE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_IDENTICAL_CREDTYPE, AclType::DM_P2P_ACL, AuthType::DM_IMPORT_AUTHTYPE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_SHARE_CREDTYPE, AclType::DM_NO_ACL, AuthType::DM_INPUT_PINCODE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_SHARE_CREDTYPE, AclType::DM_NO_ACL, AuthType::DM_IMPORT_AUTHTYPE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_SHARE_CREDTYPE, AclType::DM_SHARE_ACL, AuthType::DM_INPUT_PINCODE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_SHARE_CREDTYPE, AclType::DM_SHARE_ACL, AuthType::DM_IMPORT_AUTHTYPE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_SHARE_CREDTYPE, AclType::DM_P2P_ACL, AuthType::DM_INPUT_PINCODE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_SHARE_CREDTYPE, AclType::DM_P2P_ACL, AuthType::DM_IMPORT_AUTHTYPE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_P2P_CREDTYPE, AclType::DM_NO_ACL, AuthType::DM_INPUT_PINCODE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_P2P_CREDTYPE, AclType::DM_NO_ACL, AuthType::DM_IMPORT_AUTHTYPE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_P2P_CREDTYPE, AclType::DM_P2P_ACL, AuthType::DM_INPUT_PINCODE)] = + std::make_unique(); + handlers_[NegotiateSpec(CredType::DM_P2P_CREDTYPE, AclType::DM_P2P_ACL, AuthType::DM_IMPORT_AUTHTYPE)] = + std::make_unique(); +} + +int32_t NegotiateProcess::HandleNegotiateResult(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + std::string credTypeList = context->direction == DmAuthDirection::DM_AUTH_SOURCE ? + context->accesser.credTypeList : context->accessee.credTypeList; + std::string aclTypeList = context->direction == DmAuthDirection::DM_AUTH_SOURCE ? + context->accesser.aclTypeList : context->accessee.aclTypeList; + CredType credType = ConvertCredType(credTypeList); + AclType aclType = ConvertAclType(aclTypeList); + AuthType authType = ConvertAuthType(context->authType); + LOGI("credType %{public}d, aclType %{public}d, authType %{public}d.", + static_cast(credType), static_cast(aclType), static_cast(authType)); + NegotiateSpec negotiateSpec(credType, aclType, authType); + auto handler = handlers_.find(negotiateSpec); + if (handler != handlers_.end()) { + return handler->second->NegotiateHandle(context); + } + return ERR_DM_CAPABILITY_NEGOTIATE_FAILED; +} + +CredType NegotiateProcess::ConvertCredType(const std::string &credType) +{ + LOGI("start credType %{public}s.", credType.c_str()); + CredType credTypeTemp = CredType::DM_NO_CRED; + if (credType.empty()) { + return credTypeTemp; + } + JsonObject credTypeJson; + credTypeJson.Parse(credType); + if (credTypeJson.IsDiscarded()) { + LOGE("Parse credType str failed."); + return credTypeTemp; + } + if (credTypeJson.Contains("identicalCredType")) { + credTypeTemp = CredType::DM_IDENTICAL_CREDTYPE; + } else if (credTypeJson.Contains("shareCredType")) { + credTypeTemp = CredType::DM_SHARE_CREDTYPE; + } else if (credTypeJson.Contains("pointTopointCredType")) { + credTypeTemp = CredType::DM_P2P_CREDTYPE; + } else { + credTypeTemp = CredType::DM_NO_CRED; + } + return credTypeTemp; +} + +AclType NegotiateProcess::ConvertAclType(const std::string &aclType) +{ + LOGI("start credType %{public}s.", aclType.c_str()); + AclType aclTypeTemp = AclType::DM_NO_ACL; + if (aclType.empty()) { + return aclTypeTemp; + } + JsonObject aclTypeJson; + aclTypeJson.Parse(aclType); + if (aclTypeJson.IsDiscarded()) { + LOGE("Parse credType str failed."); + return aclTypeTemp; + } + if (aclTypeJson.Contains("identicalAcl")) { + aclTypeTemp = AclType::DM_IDENTICAL_ACL; + } else if (aclTypeJson.Contains("shareAcl")) { + aclTypeTemp = AclType::DM_SHARE_ACL; + } else if (aclTypeJson.Contains("pointTopointAcl")) { + aclTypeTemp = AclType::DM_P2P_ACL; + } else { + aclTypeTemp = AclType::DM_NO_ACL; + } + return aclTypeTemp; +} + +AuthType NegotiateProcess::ConvertAuthType(const DmAuthType &authType) +{ + LOGI("start authType %{public}d.", static_cast(authType)); + AuthType authTypeTemp = AuthType::DM_INVALIED_AUTHTYPE; + if (authType == DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE || authType == DmAuthType::AUTH_TYPE_NFC) { + authTypeTemp = AuthType::DM_IMPORT_AUTHTYPE; + } else { + authTypeTemp = AuthType::DM_INPUT_PINCODE; + } + return authTypeTemp; +} + +int32_t NoCredNoAclInputAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return PinBindAndCredAuth(context); +} + +int32_t NoCredNoAclImportAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return PinBindAndCredAuth(context); +} + +int32_t IdentCredNoAclInputAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return OnlyCredAuth(context); +} + +int32_t IdentCredNoAclImportAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return PinBindAndCredAuth(context); +} + +int32_t IdentCredIdentAclInputAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return EndBind(context); +} + +int32_t IdentCredIdentAclImportAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return OnlyPinBind(context); +} + +int32_t IdentCredP2pAclInputAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return OnlyCredAuth(context); +} + +int32_t IdentCredP2pAclImportAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return OnlyPinBind(context); +} + +int32_t ShareCredNoAclInputAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return OnlyCredAuth(context); +} + +int32_t ShareCredNoAclImportAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return PinBindAndCredAuth(context); +} + +int32_t ShareCredShareAclInputAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return EndBind(context); +} + +int32_t ShareCredShareAclImportAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return OnlyPinBind(context); +} + +int32_t ShareCredP2pAclInputAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return OnlyCredAuth(context); +} + +int32_t ShareCredP2pAclImportAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return OnlyPinBind(context); +} + +int32_t P2pCredNoAclInputAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return PinBindAndCredAuth(context); +} + +int32_t P2pCredNoAclImportAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return PinBindAndCredAuth(context); +} + +int32_t P2pCredP2pAclInputAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return EndBind(context); +} + +int32_t P2pCredP2pAclImportAuthType::NegotiateHandle(std::shared_ptr context) +{ + CHECK_NULL_RETURN(context, ERR_DM_POINT_NULL); + return OnlyPinBind(context); +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/config/dm_config_manager.cpp b/services/implementation/src/config/dm_config_manager.cpp index 33705a784ee06997dd4b1caf400ec82bfb66bd02..3934c2e878cda4ae8531ed0099b250bae3e90bc0 100644 --- a/services/implementation/src/config/dm_config_manager.cpp +++ b/services/implementation/src/config/dm_config_manager.cpp @@ -97,12 +97,6 @@ void DmConfigManager::ParseAdapterConfig() } soLoadInfo[i].soPath = std::string(DM_LIB_LOAD_PATH); soAdapterLoadInfo_[soLoadInfo[i].soName] = soLoadInfo[i]; - LOGI("soAdapterLoadInfo name is: %{public}s", soLoadInfo[i].name.c_str()); - LOGI("soAdapterLoadInfo type is: %{public}s", soLoadInfo[i].type.c_str()); - LOGI("soAdapterLoadInfo version is: %{public}s", soLoadInfo[i].version.c_str()); - LOGI("soAdapterLoadInfo funcName is: %{public}s", soLoadInfo[i].funcName.c_str()); - LOGI("soAdapterLoadInfo soName is: %{public}s", soLoadInfo[i].soName.c_str()); - LOGI("soAdapterLoadInfo soPath is: %{public}s", soLoadInfo[i].soPath.c_str()); } } @@ -128,13 +122,6 @@ void DmConfigManager::ParseAuthConfig() } soLoadInfo[i].soPath = std::string(DM_LIB_LOAD_PATH); soAuthLoadInfo_[soLoadInfo[i].authType] = soLoadInfo[i]; - LOGI("soAuthLoadInfo name is: %{public}s", soLoadInfo[i].name.c_str()); - LOGI("soAuthLoadInfo type is: %{public}s", soLoadInfo[i].type.c_str()); - LOGI("soAuthLoadInfo version is: %{public}s", soLoadInfo[i].version.c_str()); - LOGI("soAuthLoadInfo funcName is: %{public}s", soLoadInfo[i].funcName.c_str()); - LOGI("soAuthLoadInfo soName is: %{public}s", soLoadInfo[i].soName.c_str()); - LOGI("soAuthLoadInfo soPath is: %{public}s", soLoadInfo[i].soPath.c_str()); - LOGI("soAuthLoadInfo authType is: %{public}d", soLoadInfo[i].authType); } } diff --git a/services/implementation/src/credential/dm_credential_manager.cpp b/services/implementation/src/credential/dm_credential_manager.cpp index ac77c2562d645022e758ac939484c4301fd48782..6df6c33ea139427dbf4290ef32247c44e68a3886 100644 --- a/services/implementation/src/credential/dm_credential_manager.cpp +++ b/services/implementation/src/credential/dm_credential_manager.cpp @@ -97,7 +97,7 @@ DmCredentialManager::~DmCredentialManager() int32_t DmCredentialManager::RequestCredential(const std::string &reqJsonStr, std::string &returnJsonStr) { - LOGI("start to request credential."); + LOGI("start."); char localDeviceId[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); JsonObject jsonObject(reqJsonStr); @@ -158,7 +158,7 @@ int32_t DmCredentialManager::ImportCredential(const std::string &pkgName, const int32_t DmCredentialManager::ImportRemoteCredentialExt(const std::string &credentialInfo) { - LOGI("ImportRemoteCredentialExt start."); + LOGI("start."); if (hiChainConnector_->addMultiMembersExt(credentialInfo) != DM_OK) { LOGE("Failed to add member to group."); return ERR_DM_FAILED; @@ -168,7 +168,7 @@ int32_t DmCredentialManager::ImportRemoteCredentialExt(const std::string &creden int32_t DmCredentialManager::ImportLocalCredential(const std::string &credentialInfo) { - LOGI("ImportLocalCredential start"); + LOGI(" start"); JsonObject jsonObject(credentialInfo); if (jsonObject.IsDiscarded()) { LOGE("credentialInfo string not a json type."); @@ -195,7 +195,7 @@ int32_t DmCredentialManager::ImportLocalCredential(const std::string &credential LOGI("ImportLocalCredential credentialData err"); return ERR_DM_FAILED; } - LOGI("ImportLocalCredential get credentialData success!"); + LOGI("get credentialData success!"); JsonObject jsonOutObj; if (GetCredentialData(credentialInfo, vecCredentialData[0], jsonOutObj) != DM_OK) { LOGE("failed to get credentialData field from input credential."); @@ -254,7 +254,7 @@ int32_t DmCredentialManager::DeleteCredential(const std::string &pkgName, const void DmCredentialManager::OnGroupResultExt(int32_t action, const std::string &resultInfo) { - LOGI("DmCredentialManager::OnGroupResultExt action %{public}d, resultInfo %{public}s.", action, resultInfo.c_str()); + LOGI("action %{public}d, resultInfo %{public}s.", action, resultInfo.c_str()); CHECK_NULL_VOID(listener_); listener_->OnCredentialResult(processInfo_, action, resultInfo); } @@ -262,7 +262,7 @@ void DmCredentialManager::OnGroupResultExt(int32_t action, const std::string &re void DmCredentialManager::OnGroupResult(int64_t requestId, int32_t action, const std::string &resultInfo) { - LOGI("DmCredentialManager::OnImportResult"); + LOGI("OnGroupResult"); if (requestId_ != requestId) { return; } @@ -280,7 +280,7 @@ int32_t DmCredentialManager::RegisterCredentialCallback(const std::string &pkgNa #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) MultipleUserConnector::GetCallerUserId(userId); #endif - LOGI("DmCredentialManager::RegisterCredentialCallback pkgName = %{public}s", GetAnonyString(pkgName).c_str()); + LOGI("pkgName = %{public}s", GetAnonyString(pkgName).c_str()); { std::lock_guard autoLock(locks_); processInfo_.pkgName = pkgName; @@ -296,7 +296,7 @@ int32_t DmCredentialManager::UnRegisterCredentialCallback(const std::string &pkg LOGE("DmCredentialManager::UnRegisterCredentialStateCallback input param is empty"); return ERR_DM_FAILED; } - LOGI("DmCredentialManager::UnRegisterCredentialStateCallback pkgName = %{public}s", + LOGI("pkgName = %{public}s", GetAnonyString(pkgName).c_str()); { std::lock_guard autoLock(locks_); diff --git a/services/implementation/src/cryptomgr/crypto_mgr.cpp b/services/implementation/src/cryptomgr/crypto_mgr.cpp index 91d35dee06ff9b250dc4346ff3b965c7ae3be67c..6cba98ca7f0589ce9fc24a7fc7fb0d9a6496207b 100644 --- a/services/implementation/src/cryptomgr/crypto_mgr.cpp +++ b/services/implementation/src/cryptomgr/crypto_mgr.cpp @@ -17,6 +17,7 @@ #include #include +#include #include "mbedtls/base64.h" #include "mbedtls/cipher.h" @@ -241,7 +242,7 @@ int32_t CryptoMgr::DecryptMessage(const std::string &inputMsg, std::string &outp } int32_t CryptoMgr::MbedAesGcmDecrypt(const AesGcmCipherKey *cipherKey, const unsigned char *cipherText, - uint32_t cipherTextSize, unsigned char *plain, uint32_t plainLen) + uint32_t cipherTextSize, unsigned char *plain, uint32_t &plainLen) { if ((cipherKey == NULL) || (cipherText == NULL) || (cipherTextSize <= OVERHEAD_LEN) || plain == NULL || (plainLen < cipherTextSize - OVERHEAD_LEN)) { @@ -267,9 +268,9 @@ int32_t CryptoMgr::MbedAesGcmDecrypt(const AesGcmCipherKey *cipherKey, const uns mbedtls_gcm_free(&aesContext); return ERR_DM_CRYPTO_OPT_FAILED; } - + plainLen = (uint32_t)actualPlainLen; mbedtls_gcm_free(&aesContext); - return actualPlainLen; + return DM_OK; } int32_t CryptoMgr::DoDecryptData(AesGcmCipherKey *cipherKey, const unsigned char *input, uint32_t inLen, @@ -285,10 +286,10 @@ int32_t CryptoMgr::DoDecryptData(AesGcmCipherKey *cipherKey, const unsigned char } uint32_t outLen = inLen - OVERHEAD_LEN; int32_t result = MbedAesGcmDecrypt(cipherKey, input, inLen, decryptData, outLen); - if (result <= 0) { + if (result != DM_OK) { return ERR_DM_CRYPTO_OPT_FAILED; } - *decryptLen = (uint32_t)result; + *decryptLen = outLen; return DM_OK; } @@ -308,6 +309,12 @@ int32_t CryptoMgr::SaveSessionKey(const uint8_t *sessionKey, const uint32_t keyL return DM_OK; } +std::vector CryptoMgr::GetSessionKey() +{ + std::lock_guard lock(sessionKeyMtx_); + return std::vector(sessionKey_.key, sessionKey_.key + sessionKey_.keyLen); +} + void CryptoMgr::ClearSessionKey() { std::lock_guard lock(sessionKeyMtx_); diff --git a/services/service/src/devicenamemgr/settings_data_event_monitor.cpp b/services/implementation/src/dependency/MSDP/spatial_location_callback_impl.cpp similarity index 32% rename from services/service/src/devicenamemgr/settings_data_event_monitor.cpp rename to services/implementation/src/dependency/MSDP/spatial_location_callback_impl.cpp index 421acfc7bf4f39a444fda0ad5b8fb988406f6fd4..43a8682b727296fe90310d5f8461ca68fedc5574 100644 --- a/services/service/src/devicenamemgr/settings_data_event_monitor.cpp +++ b/services/implementation/src/dependency/MSDP/spatial_location_callback_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,42 +13,53 @@ * limitations under the License. */ -#include "settings_data_event_monitor.h" - -#include "dm_log.h" +#include "spatial_location_callback_impl.h" +#include "dm_auth_state.h" +#include "multiple_user_connector.h" +#include "dm_auth_state_machine.h" namespace OHOS { namespace DistributedHardware { -SettingsDataEventMonitor::SettingsDataEventMonitor(std::shared_ptr localDeviceNameMgr, - SettingsDataMonitorType monitorType) - : localDeviceNameMgrWPtr_(localDeviceNameMgr), monitorType_(monitorType) +constexpr int32_t pinCodeLength = 6; + +SpatialLocationCallbackImpl::SpatialLocationCallbackImpl(std::shared_ptr context) +{ + LOGI("SpatialLocationCallbackImpl Init."); + context_ = context; +} + +SpatialLocationCallbackImpl::~SpatialLocationCallbackImpl() { - LOGI("Ctor SettingsDataEventMonitor, monitorType: %{public}d", (int32_t)monitorType); + LOGI("SpatialLocationCallbackImpl End."); } -void SettingsDataEventMonitor::OnChange() +void SpatialLocationCallbackImpl::OnPinCodeChanged(const Msdp::PinCodeResponse &pinCodeResponse) { - if (localDeviceNameMgrWPtr_.expired()) { - LOGE("localDeviceNameMgrWPtr_ expired"); + LOGI("Start."); + if (pinCodeResponse.pincode.length() != pinCodeLength) { + LOGE("OnPinCodeChanged pincode length error."); return; } - LOGI("Settings OnChange type: %{public}d", (int32_t)monitorType_); - std::shared_ptr localDevNameSPtr = localDeviceNameMgrWPtr_.lock(); - if (localDevNameSPtr == nullptr) { - LOGE("localDevNameSPtr is null!"); + if (!IsValidPinCodeStr(pinCodeResponse.pincode)) { + LOGE("OnPinCodeChanged pincode is invalid"); return; } - switch (monitorType_) { - case SettingsDataMonitorType::USER_DEFINED_DEVICE_NAME_MONITOR: - localDevNameSPtr->QueryLocalDeviceName(); - break; - case SettingsDataMonitorType::DISPLAY_DEVICE_NAME_MONITOR: - localDevNameSPtr->QueryLocalDisplayName(); - break; - default: - LOGE("unknwon monitor type"); - break; + if (context_ == nullptr) { + LOGE("OnPinCodeChanged context_ empty."); + return; + } + context_->pinCode = pinCodeResponse.pincode; + context_->authStateMachine->NotifyEventFinish(DmEventType::ON_ULTRASONIC_PIN_CHANGED); +} + +bool SpatialLocationCallbackImpl::IsValidPinCodeStr(const std::string &pinCodeStr) +{ + for (auto &digit : pinCodeStr) { + if (digit < '0' || digit > '9') { + return false; + } } + return true; } -} // DistributedHardware -} // OHOS \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp index e18cbf08bb5fe9b82792961a4148de55fb77024a..28759e22ccc46f9744215405d9a5787012705ddd 100644 --- a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp +++ b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp @@ -12,6 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#include #include "hichain_auth_connector.h" #include "dm_log.h" @@ -25,6 +27,7 @@ namespace OHOS { namespace DistributedHardware { std::shared_ptr HiChainAuthConnector::dmDeviceAuthCallback_ = nullptr; +std::map> HiChainAuthConnector::dmDeviceAuthCallbackMap_; std::mutex HiChainAuthConnector::dmDeviceAuthCallbackMutex_; void HiChainAuthConnector::FreeJsonString(char *jsonStr) @@ -47,6 +50,11 @@ HiChainAuthConnector::HiChainAuthConnector() HiChainAuthConnector::~HiChainAuthConnector() { + for (auto& pair : dmDeviceAuthCallbackMap_) { + pair.second = nullptr; + } + dmDeviceAuthCallbackMap_.clear(); + dmDeviceAuthCallback_ = nullptr; LOGI("HiChainAuthConnector::destructor."); } @@ -57,12 +65,51 @@ int32_t HiChainAuthConnector::RegisterHiChainAuthCallback(std::shared_ptr lock(dmDeviceAuthCallbackMutex_); + dmDeviceAuthCallback_ = nullptr; + return DM_OK; +} + +// 当前id为tokenId对应生成的requestId +int32_t HiChainAuthConnector::RegisterHiChainAuthCallbackById(int64_t id, + std::shared_ptr callback) +{ + std::lock_guard lock(dmDeviceAuthCallbackMutex_); + dmDeviceAuthCallbackMap_[id] = callback; + return DM_OK; +} + +int32_t HiChainAuthConnector::UnRegisterHiChainAuthCallbackById(int64_t id) +{ + std::lock_guard lock(dmDeviceAuthCallbackMutex_); + if (dmDeviceAuthCallbackMap_.find(id) != dmDeviceAuthCallbackMap_.end()) { + dmDeviceAuthCallbackMap_[id] = nullptr; + } + return DM_OK; +} + +std::shared_ptr HiChainAuthConnector::GetDeviceAuthCallback(int64_t id) +{ + if (dmDeviceAuthCallbackMap_.find(id) != dmDeviceAuthCallbackMap_.end()) { + LOGD("dmDeviceAuthCallbackMap_ id: %{public}" PRId64 ".", id); + return dmDeviceAuthCallbackMap_[id]; + } + LOGD("dmDeviceAuthCallbackMap_ not found, id: %{public}" + PRId64 ".", id); + // If the callback registered by the new protocol ID cannot be found, the callback registered + // by the old protocol is used. However, the old protocol callback may be empty. + return dmDeviceAuthCallback_; +} + +int32_t HiChainAuthConnector::AuthDevice(const std::string &pinCode, int32_t osAccountId, std::string udid, + int64_t requestId) { - LOGI("HiChainAuthConnector::AuthDevice start."); + LOGI("start, pinCode: %{public}s", GetAnonyString(pinCode).c_str()); JsonObject authParamJson; authParamJson["osAccountId"] = osAccountId; - authParamJson["pinCode"] = std::to_string(pinCode); + authParamJson["pinCode"] = pinCode; authParamJson["acquireType"] = AcquireType::P2P_BIND; std::string authParam = SafetyDump(authParamJson); LOGI("StartAuthDevice authParam %{public}s ,requestId %{public}" PRId64, GetAnonyString(authParam).c_str(), @@ -77,7 +124,7 @@ int32_t HiChainAuthConnector::AuthDevice(int32_t pinCode, int32_t osAccountId, s int32_t HiChainAuthConnector::ProcessAuthData(int64_t requestId, std::string authData, int32_t osAccountId) { - LOGI("HiChainAuthConnector::ProcessAuthData start."); + LOGI("start."); JsonObject jsonAuthParam; jsonAuthParam["osAccountId"] = osAccountId; jsonAuthParam["data"] = authData; @@ -89,60 +136,183 @@ int32_t HiChainAuthConnector::ProcessAuthData(int64_t requestId, std::string aut return DM_OK; } +int32_t HiChainAuthConnector::ProcessCredData(int64_t authReqId, const std::string &data) +{ + LOGI("start."); + const CredAuthManager *credAuthManager = GetCredAuthInstance(); + int32_t ret = credAuthManager->processCredData(authReqId, reinterpret_cast(data.c_str()), + data.length(), &deviceAuthCallback_); + if (ret != HC_SUCCESS) { + LOGE("Hichain processData failed ret %{public}d.", ret); + return ERR_DM_FAILED; + } + return DM_OK; +} + +int32_t HiChainAuthConnector::AddCredential(int32_t osAccountId, const std::string &authParams, std::string &credId) +{ + char *returnData = NULL; + const CredManager *credManager = GetCredMgrInstance(); + int32_t ret = credManager->addCredential(osAccountId, authParams.c_str(), &returnData); + if (ret != HC_SUCCESS || returnData == NULL) { + LOGE("Hichain addCredential failed ret %{public}d.", ret); + return ERR_DM_FAILED; + } + LOGI("success ret=%{public}d, returnData=%{public}s.", ret, GetAnonyString(returnData).c_str()); + credId = std::string(returnData); + credManager->destroyInfo(&returnData); + return DM_OK; +} + +int32_t HiChainAuthConnector::ExportCredential(int32_t osAccountId, const std::string &credId, std::string &publicKey) +{ + LOGI("start. osAccountId=%{public}d, credId=%{public}s", osAccountId, GetAnonyString(credId).c_str()); + char *returnData = NULL; + const CredManager *credManager = GetCredMgrInstance(); + int32_t ret = credManager->exportCredential(osAccountId, credId.c_str(), &returnData); + if (ret != HC_SUCCESS || returnData == NULL) { + LOGE("Hichain exportCredential failed ret %{public}d.", ret); + return ERR_DM_FAILED; + } + + JsonObject jsonAuthParam(returnData); + credManager->destroyInfo(&returnData); + if (jsonAuthParam.IsDiscarded() || !jsonAuthParam["keyValue"].IsString()) { + LOGE("Hichain exportCredential failed, returnData is invalid."); + return ERR_DM_FAILED; + } + + publicKey = jsonAuthParam["keyValue"].Get(); + LOGI("leave. publicKey=%{public}s", GetAnonyString(publicKey).c_str()); + return DM_OK; +} + +int32_t HiChainAuthConnector::AgreeCredential(int32_t osAccountId, const std::string selfCredId, + const std::string &authParams, std::string &credId) +{ + LOGI("start."); + char *returnData = NULL; + const CredManager *credManager = GetCredMgrInstance(); + int32_t ret = credManager->agreeCredential(osAccountId, selfCredId.c_str(), authParams.c_str(), &returnData); + if (ret != HC_SUCCESS || returnData == NULL) { + LOGE("Hichain agreeCredential failed ret %{public}d.", ret); + return ERR_DM_FAILED; + } + credId = returnData; + credManager->destroyInfo(&returnData); + LOGI("leave agreeCredId=%{public}s.", GetAnonyString(credId).c_str()); + return DM_OK; +} + +int32_t HiChainAuthConnector::DeleteCredential(int32_t osAccountId, const std::string &credId) +{ + LOGI("start. osAccountId=%{public}s, credId=%{public}s", GetAnonyInt32(osAccountId).c_str(), + GetAnonyString(credId).c_str()); + const CredManager *credManager = GetCredMgrInstance(); + int32_t ret = credManager->deleteCredential(osAccountId, credId.c_str()); + if (ret != HC_SUCCESS) { + LOGE("Hichain deleteCredential failed ret %{public}d.", ret); + return ERR_DM_FAILED; + } + return DM_OK; +} + +int32_t HiChainAuthConnector::AuthCredential(int32_t osAccountId, int64_t authReqId, const std::string &credId, + const std::string &pinCode) +{ + LOGI("start. osAccountId=%{public}s, credId=%{public}s", GetAnonyInt32(osAccountId).c_str(), + GetAnonyString(credId).c_str()); + if (credId.empty() && pinCode.empty()) { + LOGE("HiChainAuthConnector::AuthCredential failed, credId and pinCode is empty."); + return ERR_DM_FAILED; + } + + JsonObject jsonAuthParam; + if (!credId.empty()) { + jsonAuthParam["credId"] = credId; + } + if (!pinCode.empty()) { + jsonAuthParam["pinCode"] = pinCode; + } + std::string authParams = jsonAuthParam.Dump(); + + const CredAuthManager *credAuthManager = GetCredAuthInstance(); + int32_t ret = credAuthManager->authCredential(osAccountId, authReqId, authParams.c_str(), &deviceAuthCallback_); + if (ret != HC_SUCCESS) { + LOGE("HiChainAuthConnector::AuthCredential failed ret %{public}d.", ret); + return ERR_DM_FAILED; + } + return DM_OK; +} + +int32_t HiChainAuthConnector::AuthCredentialPinCode(int32_t osAccountId, int64_t authReqId, const std::string &pinCode) +{ + LOGI("start, pinCode: %{public}s", GetAnonyString(pinCode).c_str()); + if (pinCode.size() < MIN_PINCODE_SIZE) { + LOGE("HiChainAuthConnector::AuthCredentialPinCode failed, pinCode size is %{public}zu.", pinCode.size()); + return ERR_DM_FAILED; + } + + JsonObject jsonAuthParam; + + jsonAuthParam[FIELD_PIN_CODE] = pinCode; + jsonAuthParam[FIELD_SERVICE_PKG_NAME] = std::string(DM_PKG_NAME); + + std::string authParams = jsonAuthParam.Dump(); + + const CredAuthManager *credAuthManager = GetCredAuthInstance(); + int32_t ret = credAuthManager->authCredential(osAccountId, authReqId, authParams.c_str(), &deviceAuthCallback_); + if (ret != HC_SUCCESS) { + LOGE("HiChainAuthConnector::AuthCredential failed ret %{public}d.", ret); + return ERR_DM_FAILED; + } + + return DM_OK; +} + bool HiChainAuthConnector::onTransmit(int64_t requestId, const uint8_t *data, uint32_t dataLen) { LOGI("AuthDevice onTransmit, requestId %{public}" PRId64, requestId); - if (dmDeviceAuthCallback_ == nullptr) { + auto dmDeviceAuthCallback = GetDeviceAuthCallback(requestId); + if (dmDeviceAuthCallback == nullptr) { LOGE("HiChainAuthConnector::onTransmit dmDeviceAuthCallback_ is nullptr."); return false; } - return dmDeviceAuthCallback_->AuthDeviceTransmit(requestId, data, dataLen); + return dmDeviceAuthCallback->AuthDeviceTransmit(requestId, data, dataLen); } char *HiChainAuthConnector::onRequest(int64_t requestId, int operationCode, const char *reqParams) { - LOGI("HiChainAuthConnector::onRequest start."); - (void)requestId; - (void)reqParams; - if (dmDeviceAuthCallback_ == nullptr) { + LOGI("start."); + auto dmDeviceAuthCallback = GetDeviceAuthCallback(requestId); + if (dmDeviceAuthCallback == nullptr) { LOGE("HiChainAuthConnector::onRequest dmDeviceAuthCallback_ is nullptr."); return nullptr; } - JsonObject jsonObj; - int32_t pinCode = INVALID_PINCODE; - if (dmDeviceAuthCallback_->GetPinCode(pinCode) == ERR_DM_FAILED || pinCode == INVALID_PINCODE) { - jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_REJECTED; - } else { - jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_ACCEPTED; - jsonObj[FIELD_PIN_CODE] = std::to_string(pinCode); - } - std::string deviceId = ""; - dmDeviceAuthCallback_->GetRemoteDeviceId(deviceId); - jsonObj[FIELD_PEER_CONN_DEVICE_ID] = deviceId; - std::string jsonStr = SafetyDump(jsonObj); - char *buffer = strdup(jsonStr.c_str()); - return buffer; + return dmDeviceAuthCallback->AuthDeviceRequest(requestId, operationCode, reqParams); } void HiChainAuthConnector::onFinish(int64_t requestId, int operationCode, const char *returnData) { - LOGI("HiChainAuthConnector::onFinish reqId:%{public}" PRId64 ", operation:%{public}d.", + LOGI("reqId:%{public}" PRId64 ", operation:%{public}d.", requestId, operationCode); (void)returnData; - if (dmDeviceAuthCallback_ == nullptr) { + auto dmDeviceAuthCallback = GetDeviceAuthCallback(requestId); + if (dmDeviceAuthCallback == nullptr) { LOGE("HiChainAuthConnector::onFinish dmDeviceAuthCallback_ is nullptr."); return; } - dmDeviceAuthCallback_->AuthDeviceFinish(requestId); + dmDeviceAuthCallback->AuthDeviceFinish(requestId); } void HiChainAuthConnector::onError(int64_t requestId, int operationCode, int errorCode, const char *errorReturn) { - LOGI("HichainAuthenCallBack::onError reqId:%{public}" PRId64 ", operation:%{public}d, errorCode:%{public}d.", + LOGI("reqId:%{public}" PRId64 ", operation:%{public}d, errorCode:%{public}d.", requestId, operationCode, errorCode); (void)operationCode; (void)errorReturn; - if (dmDeviceAuthCallback_ == nullptr) { + auto dmDeviceAuthCallback = GetDeviceAuthCallback(requestId); + if (dmDeviceAuthCallback == nullptr) { LOGE("HiChainAuthConnector::onError dmDeviceAuthCallback_ is nullptr."); return; } @@ -150,22 +320,23 @@ void HiChainAuthConnector::onError(int64_t requestId, int operationCode, int err if (errorCode == PROOF_MISMATCH) { dmErrorCode = ERR_DM_HICHAIN_PROOFMISMATCH; } - dmDeviceAuthCallback_->AuthDeviceError(requestId, dmErrorCode); + dmDeviceAuthCallback->AuthDeviceError(requestId, dmErrorCode); } void HiChainAuthConnector::onSessionKeyReturned(int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen) { - LOGI("HiChainAuthConnector::onSessionKeyReturned start."); - if (dmDeviceAuthCallback_ == nullptr) { + LOGI("start."); + auto dmDeviceAuthCallback = GetDeviceAuthCallback(requestId); + if (dmDeviceAuthCallback == nullptr) { LOGE("HiChainAuthConnector::onSessionKeyReturned dmDeviceAuthCallback_ is nullptr."); return; } - dmDeviceAuthCallback_->AuthDeviceSessionKey(requestId, sessionKey, sessionKeyLen); + dmDeviceAuthCallback->AuthDeviceSessionKey(requestId, sessionKey, sessionKeyLen); } int32_t HiChainAuthConnector::GenerateCredential(std::string &localUdid, int32_t osAccountId, std::string &publicKey) { - LOGI("HiChainAuthConnector::GenerateCredential start."); + LOGI("start."); JsonObject jsonObj; jsonObj["osAccountId"] = osAccountId; jsonObj["deviceId"] = localUdid; @@ -185,24 +356,85 @@ int32_t HiChainAuthConnector::GenerateCredential(std::string &localUdid, int32_t LOGE("Decode generate return data jsonStr error."); return ERR_DM_FAILED; } - if (!IsInt32(jsonObject, "result") || !IsString(jsonObject, "publicKey") || - jsonObject["result"].Get() != HC_SUCCESS) { + if (!IsString(jsonObject, "publicKey")) { LOGE("Hichain generate public key jsonObject invalied."); return ERR_DM_FAILED; } - if (jsonObject["result"].Get() != 0) { - LOGE("Hichain generate public key failed"); + publicKey = jsonObject["publicKey"].Get(); + return DM_OK; +} + +int32_t HiChainAuthConnector::QueryCredentialInfo(int32_t userId, const JsonObject &queryParams, + JsonObject &resultJson) +{ + int32_t ret; + + const CredManager *cm = GetCredMgrInstance(); + char *credIdList = nullptr; + ret = cm->queryCredentialByParams(userId, queryParams.Dump().c_str(), + &credIdList); + if (ret != DM_OK) { + LOGE("HiChainAuthConnector::QueryCredentialInfo fail to query credential id list with ret %{public}d.", ret); + return ERR_DM_FAILED; + } + JsonObject credIdListJson(credIdList); + FreeJsonString(credIdList); + if (credIdListJson.IsDiscarded()) { + LOGE("HiChainAuthConnector::QueryCredentialInfo credential id list to jsonStr error"); return ERR_DM_FAILED; } - publicKey = jsonObject["publicKey"].Get(); + + for (const auto& element : credIdListJson.Items()) { + if (!element.IsString()) { + continue; + } + std::string credId = element.Get(); + + char *returnCredInfo = nullptr; + ret = cm->queryCredInfoByCredId(userId, credId.c_str(), &returnCredInfo); + if (ret != DM_OK) { + LOGE("HiChainAuthConnector::QueryCredentialInfo fail to query credential info."); + return ERR_DM_FAILED; + } + JsonObject credInfoJson(returnCredInfo); + FreeJsonString(returnCredInfo); + if (credInfoJson.IsDiscarded()) { + LOGE("HiChainAuthConnector::QueryCredentialInfo credential info jsonStr error"); + return ERR_DM_FAILED; + } + + resultJson.Insert(credId, credInfoJson); + } + return DM_OK; } -bool HiChainAuthConnector::QueryCredential(std::string &localUdid, int32_t osAccountId) +int32_t HiChainAuthConnector::QueryCredInfoByCredId(int32_t userId, std::string credId, JsonObject &resultJson) { - LOGI("HiChainAuthConnector::QueryCredential start."); + const CredManager *cm = GetCredMgrInstance(); + char *returnCredInfo = nullptr; + int32_t ret = cm->queryCredInfoByCredId(userId, credId.c_str(), &returnCredInfo); + if (ret != DM_OK) { + LOGE("[HICHAIN]::QueryCredInfoByCredId failed, ret: %{public}d.", ret); + return ret; + } + JsonObject credInfoJson(returnCredInfo); + FreeJsonString(returnCredInfo); + if (credInfoJson.IsDiscarded()) { + LOGE("QueryCredInfoByCredId credential info jsonStr error"); + return ERR_DM_FAILED; + } + resultJson.Insert(credId, credInfoJson); + return DM_OK; +} + +bool HiChainAuthConnector::QueryCredential(std::string &localUdid, int32_t osAccountId, int32_t peerOsAccountId) +{ + LOGI("start, deviceId: %{public}s, peerOsAccountId: %{public}s", + GetAnonyString(localUdid).c_str(), GetAnonyInt32(peerOsAccountId).c_str()); JsonObject jsonObj; jsonObj["osAccountId"] = osAccountId; + jsonObj["peerOsAccountId"] = peerOsAccountId; jsonObj["deviceId"] = localUdid; jsonObj["acquireType"] = AcquireType::P2P_BIND; jsonObj["flag"] = 1; @@ -220,11 +452,7 @@ bool HiChainAuthConnector::QueryCredential(std::string &localUdid, int32_t osAcc LOGE("Decode query return data jsonStr error."); return false; } - if (!IsInt32(jsonObject, "result") || jsonObject["result"].Get() == -1) { - LOGE("Hichain generate public key failed."); - return false; - } - if (!IsString(jsonObject, "publicKey") || jsonObject["result"].Get() == 1) { + if (!IsString(jsonObject, "publicKey")) { LOGI("Credential not exist."); return false; } @@ -233,7 +461,7 @@ bool HiChainAuthConnector::QueryCredential(std::string &localUdid, int32_t osAcc int32_t HiChainAuthConnector::GetCredential(std::string &localUdid, int32_t osAccountId, std::string &publicKey) { - LOGI("HiChainAuthConnector::GetCredential"); + LOGI("start"); JsonObject jsonObj; jsonObj["osAccountId"] = osAccountId; jsonObj["deviceId"] = localUdid; @@ -253,11 +481,7 @@ int32_t HiChainAuthConnector::GetCredential(std::string &localUdid, int32_t osAc LOGE("Decode query return data jsonStr error."); return ERR_DM_FAILED; } - if (!IsInt32(jsonObject, "result") || jsonObject["result"].Get() == -1) { - LOGE("Hichain generate public key failed."); - return ERR_DM_FAILED; - } - if (!IsString(jsonObject, "publicKey") || jsonObject["result"].Get() == 1) { + if (!IsString(jsonObject, "publicKey")) { LOGI("Credential not exist."); return ERR_DM_FAILED; } @@ -265,11 +489,14 @@ int32_t HiChainAuthConnector::GetCredential(std::string &localUdid, int32_t osAc return DM_OK; } -int32_t HiChainAuthConnector::ImportCredential(int32_t osAccountId, std::string deviceId, std::string publicKey) +int32_t HiChainAuthConnector::ImportCredential(int32_t osAccountId, int32_t peerOsAccountId, std::string deviceId, + std::string publicKey) { - LOGI("HiChainAuthConnector::ImportCredential"); + LOGI("start, deviceId: %{public}s, peerOsAccountId: %{public}d", + GetAnonyString(deviceId).c_str(), peerOsAccountId); JsonObject jsonObj; jsonObj["osAccountId"] = osAccountId; + jsonObj["peerOsAccountId"] = peerOsAccountId; jsonObj["deviceId"] = deviceId; jsonObj["acquireType"] = AcquireType::P2P_BIND; jsonObj["publicKey"] = publicKey; @@ -280,51 +507,28 @@ int32_t HiChainAuthConnector::ImportCredential(int32_t osAccountId, std::string FreeJsonString(returnData); return ERR_DM_FAILED; } - std::string returnDataStr = static_cast(returnData); FreeJsonString(returnData); - JsonObject jsonObject(returnDataStr); - if (jsonObject.IsDiscarded()) { - LOGE("Decode import return data jsonStr error."); - return ERR_DM_FAILED; - } - if (!IsInt32(jsonObject, "result")) { - LOGI("Hichain import public key jsonObject invalied."); - return ERR_DM_FAILED; - } - int32_t result = jsonObject["result"].Get(); - if (result != 0) { - LOGE("Hichain import public key result is %{public}d.", result); - return ERR_DM_FAILED; - } return DM_OK; } -int32_t HiChainAuthConnector::DeleteCredential(const std::string &deviceId, int32_t userId) +int32_t HiChainAuthConnector::DeleteCredential(const std::string &deviceId, int32_t userId, int32_t peerUserId) { - LOGI("DeleteCredential start."); + LOGI("start, deviceId: %{public}s, peerUserId: %{public}d", + GetAnonyString(deviceId).c_str(), peerUserId); JsonObject jsonObj; jsonObj["deviceId"] = deviceId; jsonObj["acquireType"] = AcquireType::P2P_BIND; jsonObj["osAccountId"] = userId; + jsonObj["peerOsAccountId"] = peerUserId; std::string requestParam = SafetyDump(jsonObj); char *returnData = nullptr; if (ProcessCredential(CRED_OP_DELETE, requestParam.c_str(), &returnData) != HC_SUCCESS) { LOGE("Hichain query credential failed."); FreeJsonString(returnData); - return false; - } - std::string returnDataStr = static_cast(returnData); - FreeJsonString(returnData); - JsonObject jsonObject(returnDataStr); - if (jsonObject.IsDiscarded()) { - LOGE("Decode import return data jsonStr error."); - return false; - } - if (!IsInt32(jsonObject, "result")) { - LOGI("Hichain delete credential result json key is invalid."); return ERR_DM_FAILED; } - return jsonObject["result"].Get(); + FreeJsonString(returnData); + return DM_OK; } } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/src/dependency/hichain/hichain_connector.cpp b/services/implementation/src/dependency/hichain/hichain_connector.cpp index 01430d31e8e7b357bbe84715c041f0fa9b778740..a8192e5f3304470e347b4c0bb17c8958576e6cd6 100644 --- a/services/implementation/src/dependency/hichain/hichain_connector.cpp +++ b/services/implementation/src/dependency/hichain/hichain_connector.cpp @@ -345,12 +345,13 @@ int32_t HiChainConnector::AddMember(const std::string &deviceId, const std::stri GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); std::string connectInfomation = GetConnectPara(deviceId, jsonObject[TAG_DEVICE_ID].Get()); - int32_t pinCode = jsonObject[PIN_CODE_KEY].Get(); + std::string pinCode = jsonObject[PIN_CODE_KEY].Get(); std::string groupId = jsonObject[TAG_GROUP_ID].Get(); + LOGI("pinCode: %{public}s", GetAnonyString(pinCode).c_str()); JsonObject jsonObj; jsonObj[FIELD_GROUP_ID] = groupId; jsonObj[FIELD_GROUP_TYPE] = GROUP_TYPE_PEER_TO_PEER_GROUP; - jsonObj[FIELD_PIN_CODE] = std::to_string(pinCode).c_str(); + jsonObj[FIELD_PIN_CODE] = pinCode; jsonObj[FIELD_IS_ADMIN] = false; jsonObj[FIELD_DEVICE_ID] = localDeviceId; jsonObj[FIELD_GROUP_NAME] = jsonObject[TAG_GROUP_NAME].Get(); @@ -487,12 +488,12 @@ char *HiChainConnector::onRequest(int64_t requestId, int operationCode, const ch return nullptr; } JsonObject jsonObj; - int32_t pinCode = INVALID_PINCODE; - if (hiChainConnectorCallback_->GetPinCode(pinCode) == ERR_DM_FAILED || pinCode == INVALID_PINCODE) { + std::string pinCode = ""; + if (hiChainConnectorCallback_->GetPinCode(pinCode) == ERR_DM_FAILED || pinCode == "") { jsonObj[FIELD_CONFIRMATION] = REQUEST_REJECTED; } else { jsonObj[FIELD_CONFIRMATION] = REQUEST_ACCEPTED; - jsonObj[FIELD_PIN_CODE] = std::to_string(pinCode); + jsonObj[FIELD_PIN_CODE] = pinCode; } char localDeviceId[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); @@ -566,6 +567,10 @@ int32_t HiChainConnector::GetSyncGroupList(std::vector &groupList, st bool HiChainConnector::IsDevicesInP2PGroup(const std::string &hostDevice, const std::string &peerDevice) { LOGI("HiChainConnector::IsDevicesInP2PGroup"); + if (hostDevice == peerDevice || peerDevice == "" || hostDevice == "") { + LOGE("invalid param"); + return false; + } std::vector hostGroupInfoList; GetRelatedGroups(hostDevice, hostGroupInfoList); std::vector peerGroupInfoList; @@ -907,7 +912,10 @@ int32_t HiChainConnector::ParseRemoteCredential(const int32_t groupType, const s JsonObject jsonObj; jsonObj[FIELD_GROUP_ID] = groupId; jsonObj[FIELD_GROUP_TYPE] = groupType; - jsonObj[FIELD_DEVICE_LIST] = jsonDeviceList[FIELD_DEVICE_LIST]; + std::string jsonStr = jsonDeviceList[FIELD_DEVICE_LIST].Dump(); + JsonObject jsonArray(JsonCreateType::JSON_CREATE_TYPE_ARRAY); + jsonArray.Parse(jsonStr); + jsonObj.Insert(FIELD_DEVICE_LIST, jsonArray); params = SafetyDump(jsonObj); osAccountUserId = MultipleUserConnector::GetCurrentAccountUserID(); if (osAccountUserId < 0) { @@ -1015,7 +1023,10 @@ int32_t HiChainConnector::ParseRemoteCredentialExt(const std::string &credential LOGE("Credentaildata or authType string key not exist!"); return ERR_DM_FAILED; } - jsonObj[FIELD_DEVICE_LIST] = jsonObject[FIELD_DEVICE_LIST]; + std::string jsonStr = jsonObject[FIELD_DEVICE_LIST].Dump(); + JsonObject jsonArray(JsonCreateType::JSON_CREATE_TYPE_ARRAY); + jsonArray.Parse(jsonStr); + jsonObj.Insert(FIELD_DEVICE_LIST, jsonArray); params = SafetyDump(jsonObj); return DM_OK; } diff --git a/services/implementation/src/dependency/softbus/softbus_connector.cpp b/services/implementation/src/dependency/softbus/softbus_connector.cpp index 03709fc16cfabefa7e52cc5960b6551e50528d37..db5974f1b4f14b041199f1eaf52a83bd7a5d4c43 100644 --- a/services/implementation/src/dependency/softbus/softbus_connector.cpp +++ b/services/implementation/src/dependency/softbus/softbus_connector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,6 +15,7 @@ #include "softbus_connector.h" +#include #include #include @@ -41,19 +42,30 @@ constexpr const char* BR_MAC = "BR_MAC"; constexpr const char* BLE_MAC = "BLE_MAC"; constexpr const char* ETH_IP = "ETH_IP"; constexpr const char* ETH_PORT = "ETH_PORT"; +constexpr const char* NCM_IP = "NCM_IP"; +constexpr const char* NCM_PORT = "NCM_PORT"; + +namespace { + const char* TAG_ACL = "accessControlTable"; + const char* TAG_DMVERSION = "dmVersion"; +} std::string SoftbusConnector::remoteUdidHash_ = ""; std::map> SoftbusConnector::discoveryDeviceInfoMap_ = {}; std::unordered_map SoftbusConnector::deviceUdidMap_ = {}; std::vector SoftbusConnector::processInfoVec_ = {}; +std::vector SoftbusConnector::processChangeInfoVec_ = {}; std::mutex SoftbusConnector::discoveryDeviceInfoMutex_; std::mutex SoftbusConnector::deviceUdidLocks_; std::mutex SoftbusConnector::processInfoVecMutex_; +std::mutex SoftbusConnector::processChangeInfoVecMutex_; +std::shared_ptr SoftbusConnector::connectorCallback_ = nullptr; SoftbusConnector::SoftbusConnector() { #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) softbusSession_ = std::make_shared(); + hiChainAuthConnector_ = std::make_shared(); #endif LOGD("SoftbusConnector constructor."); } @@ -63,6 +75,191 @@ SoftbusConnector::~SoftbusConnector() LOGD("SoftbusConnector destructor."); } +void SoftbusConnector::SyncAclList(int32_t userId, std::string credId, + int32_t sessionKeyId, int32_t aclId) +{ + LOGI("userId:%{public}d, credId:%{public}s, sessionKeyId:%{public}d, aclId:%{public}d", + userId, credId.c_str(), sessionKeyId, aclId); +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + // 根据skid删除sk，删除skid + int32_t ret = DeviceProfileConnector::GetInstance().DeleteSessionKey(userId, sessionKeyId); + if (ret != DM_OK) { + LOGE("SyncAclList DeleteSessionKey failed."); + } + if (hiChainAuthConnector_ != nullptr) { + // 根据凭据id 删除sink端多余的凭据 + ret = hiChainAuthConnector_->DeleteCredential(userId, credId); + if (ret != DM_OK) { + LOGE("SyncAclList DeleteCredential failed."); + } + } + // 删除本条acl + DeviceProfileConnector::GetInstance().DeleteAccessControlById(aclId); +#endif +} + + +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) +int32_t SoftbusConnector::SyncLocalAclList5_1_0(const std::string localUdid, const std::string remoteUdid, + DistributedDeviceProfile::AccessControlProfile &localAcl, std::vector &acLStrList) +{ + bool res = DeviceProfileConnector::GetInstance().ChecksumAcl(localAcl, acLStrList); + if (res) { + return DM_OK; + } + if (localAcl.GetAccesser().GetAccesserDeviceId() == localUdid && + localAcl.GetAccessee().GetAccesseeDeviceId() == remoteUdid) { + LOGI("SyncLocalAclListProcess Src."); + SyncAclList(localAcl.GetAccesser().GetAccesserUserId(), + localAcl.GetAccesser().GetAccesserCredentialIdStr(), + localAcl.GetAccesser().GetAccesserSessionKeyId(), localAcl.GetAccessControlId()); + } + if (localAcl.GetAccesser().GetAccesserDeviceId() == remoteUdid && + localAcl.GetAccessee().GetAccesseeDeviceId() == localUdid) { + LOGI("SyncLocalAclListProcess Sink."); + SyncAclList(localAcl.GetAccessee().GetAccesseeUserId(), + localAcl.GetAccessee().GetAccesseeCredentialIdStr(), + localAcl.GetAccessee().GetAccesseeSessionKeyId(), localAcl.GetAccessControlId()); + } + return DM_OK; +} + +int32_t SoftbusConnector::ParaseAclChecksumList(const std::string &jsonString, + std::vector &remoteAllAclList) +{ + JsonObject aclChecksumjson(JsonCreateType::JSON_CREATE_TYPE_ARRAY); + aclChecksumjson.Parse(jsonString); + if (aclChecksumjson.IsDiscarded()) { + LOGE("ParseSyncMessage aclChecksumjson error"); + return ERR_DM_FAILED; + } + DeviceProfileConnector::GetInstance().AclHashVecFromJson(aclChecksumjson, remoteAllAclList); + return DM_OK; +} + +int32_t SoftbusConnector::GetLocalVersion(const std::string localUdid, const std::string remoteUdid, + std::string &localVersion, DistributedDeviceProfile::AccessControlProfile &localAcl) +{ + int32_t ret = ERR_DM_FAILED; + if (localAcl.GetAccesser().GetAccesserDeviceId() == localUdid && + localAcl.GetAccessee().GetAccesseeDeviceId() == remoteUdid) { + std::string extraInfo = localAcl.GetAccesser().GetAccesserExtraData(); + ret = DeviceProfileConnector::GetInstance().GetVersionByExtra(extraInfo, localVersion); + } else if (localAcl.GetAccesser().GetAccesserDeviceId() == remoteUdid && + localAcl.GetAccessee().GetAccesseeDeviceId() == localUdid) { + std::string extraInfo = localAcl.GetAccessee().GetAccesseeExtraData(); + ret = DeviceProfileConnector::GetInstance().GetVersionByExtra(extraInfo, localVersion); + } + return DM_OK; +} +#endif + +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) +void SoftbusConnector::SortAclListDesc(const std::vector &remoteAllAclList, + std::vector &aclVerDesc, std::map &remoteAllAclMap) +{ + aclVerDesc.clear(); + remoteAllAclMap.clear(); + for (const auto &item : remoteAllAclList) { + aclVerDesc.push_back(item.version); + remoteAllAclMap[item.version] = item; + } + + std::sort(aclVerDesc.begin(), aclVerDesc.end(), [](const std::string &a, const std::string &b) { + return CompareVersion(a, b); + }); +} + +std::string SoftbusConnector::MatchTargetVersion(const std::string &localVersion, + const std::vector &remoteVerDesc) +{ + if (remoteVerDesc.empty()) { + return localVersion; + } + + // if local version bigger than remote max version, use remote max version to process acl aging. + if (CompareVersion(localVersion, remoteVerDesc[0])) { + return remoteVerDesc[0]; + } + + // if local version equal or smaller than remote max version, use local version to process acl aging. + return localVersion; +} +#endif + +int32_t SoftbusConnector::SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList) +{ +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + std::vector remoteAllAclList; + int32_t ret = ParaseAclChecksumList(remoteAclList, remoteAllAclList); + if (ret != DM_OK) { + LOGE("SyncLocalAclListProcess TAG_ACL error"); + return ret; + } + + std::vector aclVerDesc; + std::map remoteAllAclMap; + SortAclListDesc(remoteAllAclList, aclVerDesc, remoteAllAclMap); + std::string matchVersion = MatchTargetVersion(DM_ACL_AGING_VERSION, aclVerDesc); + + std::vector remoteAclHashList = {}; + if (remoteAllAclMap.find(matchVersion) != remoteAllAclMap.end()) { + remoteAclHashList = remoteAllAclMap[matchVersion].aclHashList; + } + std::vector localAclList = + DeviceProfileConnector::GetInstance().GetAclList(localDevUserInfo.deviceId, localDevUserInfo.userId, + remoteDevUserInfo.deviceId, remoteDevUserInfo.userId); + + for (auto &localAcl : localAclList) { + int32_t versionNum = 0; + if (!GetVersionNumber(matchVersion, versionNum)) { + LOGE("SyncLocalAclList GetVersionNumber error"); + continue; + } + switch (versionNum) { + case DM_VERSION_INT_5_1_0: + ret = SyncLocalAclList5_1_0(localDevUserInfo.deviceId, remoteDevUserInfo.deviceId, localAcl, + remoteAclHashList); + default: + LOGE("versionNum is invaild, ver: %{public}d", versionNum); + break; + } + } + return DM_OK; +#else + (void)localDevUserInfo; + (void)remoteDevUserInfo; + (void)remoteAclList; + return DM_OK; +#endif +} + +int32_t SoftbusConnector::GetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList) +{ +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + return DeviceProfileConnector::GetInstance().GetAclListHashStr(localDevUserInfo, remoteDevUserInfo, aclList); +#else + (void)localDevUserInfo; + (void)remoteDevUserInfo; + (void)aclList; + return DM_OK; +#endif +} + +int32_t SoftbusConnector::RegisterConnectorCallback(std::shared_ptr callback) +{ + connectorCallback_ = callback; + return DM_OK; +} + +int32_t SoftbusConnector::UnRegisterConnectorCallback() +{ + connectorCallback_ = nullptr; + return DM_OK; +} + int32_t SoftbusConnector::RegisterSoftbusStateCallback(const std::shared_ptr callback) { deviceStateManagerCallback_ = callback; @@ -79,36 +276,95 @@ void SoftbusConnector::JoinLnn(const std::string &deviceId, bool isForceJoin) { std::string connectAddr; LOGI("start, deviceId: %{public}s.", GetAnonyString(deviceId).c_str()); - ConnectionAddr *addrInfo = GetConnectAddr(deviceId, connectAddr); + auto addrInfo = GetConnectAddr(deviceId, connectAddr); if (addrInfo == nullptr) { LOGE("addrInfo is nullptr."); return; } - if (Crypto::ConvertHexStringToBytes(addrInfo->info.ble.udidHash, UDID_HASH_LEN, + if (addrInfo->type == ConnectionAddrType::CONNECTION_ADDR_BLE && + Crypto::ConvertHexStringToBytes(addrInfo->info.ble.udidHash, UDID_HASH_LEN, remoteUdidHash_.c_str(), remoteUdidHash_.length()) != DM_OK) { LOGE("convert remoteUdid hash failed, remoteUdidHash_: %{public}s.", GetAnonyString(remoteUdidHash_).c_str()); return; } - int32_t ret = ::JoinLNN(DM_PKG_NAME, addrInfo, OnSoftbusJoinLNNResult, isForceJoin); + int32_t ret = ::JoinLNN(DM_PKG_NAME, addrInfo.get(), OnSoftbusJoinLNNResult, isForceJoin); if (ret != DM_OK) { LOGE("[SOFTBUS]JoinLNN failed, ret: %{public}d.", ret); } return; } +void SoftbusConnector::JoinLnn(const std::string &deviceId, const std::string &remoteUdidHash) +{ + std::string connectAddr; + LOGI("start, deviceId: %{public}s.", GetAnonyString(deviceId).c_str()); + auto addrInfo = GetConnectAddr(deviceId, connectAddr); + if (addrInfo == nullptr) { + LOGE("addrInfo is nullptr."); + return; + } + if (addrInfo->type == ConnectionAddrType::CONNECTION_ADDR_BLE && + Crypto::ConvertHexStringToBytes(addrInfo->info.ble.udidHash, UDID_HASH_LEN, + remoteUdidHash.c_str(), remoteUdidHash.length()) != DM_OK) { + LOGE("convert remoteUdid hash failed, remoteUdidHash_: %{public}s.", GetAnonyString(remoteUdidHash).c_str()); + return; + } + int32_t ret = ::JoinLNN(DM_PKG_NAME, addrInfo.get(), OnSoftbusJoinLNNResult, false); + if (ret != DM_OK) { + LOGE("[SOFTBUS]JoinLNN failed, ret: %{public}d.", ret); + } + return; +} + +void SoftbusConnector::JoinLNNBySkId(int32_t sessionId, int32_t sessionKeyId, int32_t remoteSessionKeyId, + std::string udid, std::string udidHash) +{ + LOGI("start, JoinLNNBySkId sessionId: %{public}d, udid: %{public}s.", sessionId, GetAnonyString(udid).c_str()); + std::string connectAddr; + auto addrInfo = GetConnectAddr(udid, connectAddr); + if (addrInfo == nullptr) { + LOGE("addrInfo is nullptr."); + return; + } + LOGI("addrInfo->type: %{public}d", addrInfo->type); + if (addrInfo->type == CONNECTION_ADDR_BLE) { + if (Crypto::ConvertHexStringToBytes(addrInfo->info.ble.udidHash, UDID_HASH_LEN, udidHash.c_str(), + udidHash.length()) != DM_OK) { + LOGE("convert remoteUdid hash failed, udidHash: %{public}s.", GetAnonyString(udidHash).c_str()); + return; + } + } + + if (sessionKeyId > 0 && remoteSessionKeyId > 0) { + addrInfo->deviceKeyId.hasDeviceKeyId = true; // 总线修改后适配 + addrInfo->deviceKeyId.localDeviceKeyId = sessionKeyId; // 总线修改后适配 + addrInfo->deviceKeyId.remoteDeviceKeyId = remoteSessionKeyId; // 总线修改后适配 + LOGI("sessionKeyId valid"); + } else { + addrInfo->deviceKeyId.hasDeviceKeyId = false; // 总线修改后适配 + addrInfo->deviceKeyId.localDeviceKeyId = 0; // 总线修改后适配 + addrInfo->deviceKeyId.remoteDeviceKeyId = 0; // 总线修改后适配 + } + int32_t ret = ::JoinLNN(DM_PKG_NAME, addrInfo.get(), OnSoftbusJoinLNNResult, false); + if (ret != DM_OK) { + LOGE("[SOFTBUS]JoinLNNBySkId failed, ret: %{public}d.", ret); + } +} + void SoftbusConnector::JoinLnnByHml(int32_t sessionId, int32_t sessionKeyId, int32_t remoteSessionKeyId) { LOGI("start, JoinLnnByHml sessionId: %{public}d.", sessionId); ConnectionAddr addrInfo; addrInfo.type = CONNECTION_ADDR_SESSION_WITH_KEY; addrInfo.info.session.sessionId = sessionId; + addrInfo.deviceKeyId.hasDeviceKeyId = true; if (sessionKeyId > 0 && remoteSessionKeyId > 0) { - addrInfo.info.session.localDeviceKeyId = sessionKeyId; - addrInfo.info.session.remoteDeviceKeyId = remoteSessionKeyId; + addrInfo.deviceKeyId.localDeviceKeyId = sessionKeyId; + addrInfo.deviceKeyId.remoteDeviceKeyId = remoteSessionKeyId; LOGI("sessionKeyId valid"); } else { - addrInfo.info.session.localDeviceKeyId = 0; - addrInfo.info.session.remoteDeviceKeyId = 0; + addrInfo.deviceKeyId.localDeviceKeyId = 0; + addrInfo.deviceKeyId.remoteDeviceKeyId = 0; } int32_t ret = ::JoinLNN(DM_PKG_NAME, &addrInfo, OnSoftbusJoinLNNResult, false); if (ret != DM_OK) { @@ -159,52 +415,70 @@ ConnectionAddr *SoftbusConnector::GetConnectAddrByType(DeviceInfo *deviceInfo, C return nullptr; } -ConnectionAddr *SoftbusConnector::GetConnectAddr(const std::string &deviceId, std::string &connectAddr) +std::shared_ptr SoftbusConnector::GetDeviceInfoFromMap(const std::string &deviceId) { - DeviceInfo *deviceInfo = nullptr; - { - std::lock_guard lock(discoveryDeviceInfoMutex_); - auto iter = discoveryDeviceInfoMap_.find(deviceId); - if (iter == discoveryDeviceInfoMap_.end()) { - LOGE("deviceInfo not found by deviceId: %{public}s.", GetAnonyString(deviceId).c_str()); - return nullptr; - } - deviceInfo = iter->second.get(); + std::lock_guard lock(discoveryDeviceInfoMutex_); + auto iter = discoveryDeviceInfoMap_.find(deviceId); + if (iter == discoveryDeviceInfoMap_.end()) { + LOGE("deviceInfo not found by deviceId: %{public}s.", GetAnonyString(deviceId).c_str()); + return nullptr; + } + return iter->second; +} + +std::shared_ptr SoftbusConnector::SetAddrAndJson(const ConnectionAddr *addr, + JsonObject &jsonPara, std::string &connectAddr) +{ + if (addr == nullptr) { + LOGE("Param not valid, addr is null."); + return nullptr; } - if (deviceInfo->addrNum <= 0 || deviceInfo->addrNum >= CONNECTION_ADDR_MAX) { - LOGE("deviceInfo addrNum not valid, addrNum: %{public}d.", deviceInfo->addrNum); + std::shared_ptr connectAddrPtr = std::make_shared(); + *connectAddrPtr = *addr; + connectAddr = jsonPara.Dump(); + return connectAddrPtr; +} + +std::shared_ptr SoftbusConnector::GetConnectAddr(const std::string &deviceId, std::string &connectAddr) +{ + std::shared_ptr deviceInfo = GetDeviceInfoFromMap(deviceId); + if (deviceInfo == nullptr || deviceInfo->addrNum <= 0 || deviceInfo->addrNum >= CONNECTION_ADDR_MAX) { + LOGE("deviceInfo addrNum not valid, addrNum: %{public}d.", (deviceInfo != nullptr) ? deviceInfo->addrNum : 0); return nullptr; } JsonObject jsonPara; - ConnectionAddr *addr = GetConnectAddrByType(deviceInfo, ConnectionAddrType::CONNECTION_ADDR_ETH); + ConnectionAddr *addr = GetConnectAddrByType(deviceInfo.get(), ConnectionAddrType::CONNECTION_ADDR_ETH); if (addr != nullptr) { LOGI("[SOFTBUS]get ETH ConnectionAddr for deviceId: %{public}s.", GetAnonyString(deviceId).c_str()); jsonPara[ETH_IP] = addr->info.ip.ip; jsonPara[ETH_PORT] = addr->info.ip.port; - connectAddr = SafetyDump(jsonPara); - return addr; + return SetAddrAndJson(addr, jsonPara, connectAddr); } - addr = GetConnectAddrByType(deviceInfo, ConnectionAddrType::CONNECTION_ADDR_WLAN); + addr = GetConnectAddrByType(deviceInfo.get(), ConnectionAddrType::CONNECTION_ADDR_WLAN); if (addr != nullptr) { jsonPara[WIFI_IP] = addr->info.ip.ip; jsonPara[WIFI_PORT] = addr->info.ip.port; LOGI("[SOFTBUS]get WLAN ConnectionAddr for deviceId: %{public}s.", GetAnonyString(deviceId).c_str()); - connectAddr = SafetyDump(jsonPara); - return addr; + return SetAddrAndJson(addr, jsonPara, connectAddr); } - addr = GetConnectAddrByType(deviceInfo, ConnectionAddrType::CONNECTION_ADDR_BR); + addr = GetConnectAddrByType(deviceInfo.get(), ConnectionAddrType::CONNECTION_ADDR_BR); if (addr != nullptr) { jsonPara[BR_MAC] = addr->info.br.brMac; LOGI("[SOFTBUS]get BR ConnectionAddr for deviceId: %{public}s.", GetAnonyString(deviceId).c_str()); - connectAddr = SafetyDump(jsonPara); - return addr; + return SetAddrAndJson(addr, jsonPara, connectAddr); } - addr = GetConnectAddrByType(deviceInfo, ConnectionAddrType::CONNECTION_ADDR_BLE); + addr = GetConnectAddrByType(deviceInfo.get(), ConnectionAddrType::CONNECTION_ADDR_BLE); if (addr != nullptr) { jsonPara[BLE_MAC] = addr->info.ble.bleMac; - connectAddr = SafetyDump(jsonPara); addr->info.ble.priority = BLE_PRIORITY_HIGH; - return addr; + return SetAddrAndJson(addr, jsonPara, connectAddr); + } + addr = GetConnectAddrByType(deviceInfo.get(), ConnectionAddrType::CONNECTION_ADDR_NCM); + if (addr != nullptr) { + LOGI("[SOFTBUS]get NCM ConnectionAddr for deviceId: %{public}s.", GetAnonyString(deviceId).c_str()); + jsonPara[NCM_IP] = addr->info.ip.ip; + jsonPara[NCM_PORT] = addr->info.ip.port; + return SetAddrAndJson(addr, jsonPara, connectAddr); } LOGE("[SOFTBUS]failed to get ConnectionAddr for deviceId: %{public}s.", GetAnonyString(deviceId).c_str()); return nullptr; @@ -257,9 +531,25 @@ void SoftbusConnector::ConvertDeviceInfoToDmDevice(const DeviceInfo &deviceInfo, void SoftbusConnector::OnSoftbusJoinLNNResult(ConnectionAddr *addr, const char *networkId, int32_t result) { + (void)networkId; + LOGI("[SOFTBUS]OnSoftbusJoinLNNResult, result: %{public}d.", result); +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + if (addr == nullptr) { + LOGE("addr is null."); + return; + } + if (addr->type != CONNECTION_ADDR_SESSION_WITH_KEY) { + LOGI("addr type is not session."); + return; + } + int32_t sessionId = addr->info.session.sessionId; + CHECK_NULL_VOID(connectorCallback_); + connectorCallback_->OnSoftbusJoinLNNResult(sessionId, networkId, result); +#else (void)addr; (void)networkId; - LOGD("[SOFTBUS]OnSoftbusJoinLNNResult, result: %{public}d.", result); + (void)result; +#endif } std::string SoftbusConnector::GetDeviceUdidByUdidHash(const std::string &udidHash) @@ -270,7 +560,7 @@ std::string SoftbusConnector::GetDeviceUdidByUdidHash(const std::string &udidHas return iter.first; } } - LOGE("fail to GetUdidByUdidHash, udidHash: %{public}s", GetAnonyString(udidHash).c_str()); + LOGE("failed, udidHash: %{public}s", GetAnonyString(udidHash).c_str()); return udidHash; } @@ -356,7 +646,7 @@ int32_t SoftbusConnector::AddMemberToDiscoverMap(const std::string &deviceId, st std::string SoftbusConnector::GetNetworkIdByDeviceId(const std::string &deviceId) { - LOGI("SoftbusConnector::GetNetworkIdByDeviceId"); + LOGI("start"); int32_t deviceCount = 0; NodeBasicInfo *nodeInfo = nullptr; if (GetAllNodeDeviceInfo(DM_PKG_NAME, &nodeInfo, &deviceCount) != DM_OK) { @@ -381,58 +671,129 @@ std::string SoftbusConnector::GetNetworkIdByDeviceId(const std::string &deviceId void SoftbusConnector::SetProcessInfo(ProcessInfo processInfo) { - LOGI("SoftbusConnector::SetProcessInfo"); + LOGI("start"); std::lock_guard lock(processInfoVecMutex_); processInfoVec_.push_back(processInfo); } void SoftbusConnector::SetProcessInfoVec(std::vector processInfoVec) { - LOGI("SoftbusConnector::SetProcessInfoVec"); + LOGI("start"); std::lock_guard lock(processInfoVecMutex_); processInfoVec_ = processInfoVec; } std::vector SoftbusConnector::GetProcessInfo() { - LOGI("In"); + LOGI("start"); std::lock_guard lock(processInfoVecMutex_); return processInfoVec_; } void SoftbusConnector::ClearProcessInfo() { - LOGI("In"); + LOGI("start"); std::lock_guard lock(processInfoVecMutex_); processInfoVec_.clear(); } +void SoftbusConnector::SetChangeProcessInfo(ProcessInfo processInfo) +{ + LOGI("start"); + std::lock_guard lock(processChangeInfoVecMutex_); + processChangeInfoVec_.push_back(processInfo); +} + +std::vector SoftbusConnector::GetChangeProcessInfo() +{ + LOGI("start"); + std::lock_guard lock(processChangeInfoVecMutex_); + return processChangeInfoVec_; +} + +void SoftbusConnector::ClearChangeProcessInfo() +{ + LOGI("start"); + std::lock_guard lock(processChangeInfoVecMutex_); + processChangeInfoVec_.clear(); +} + void SoftbusConnector::HandleDeviceOnline(std::string deviceId, int32_t authForm) { - LOGI("SoftbusConnector::HandleDeviceOnline"); + LOGI("start"); deviceStateManagerCallback_->OnDeviceOnline(deviceId, authForm); return; } void SoftbusConnector::HandleDeviceOffline(std::string deviceId) { - LOGI("SoftbusConnector::HandleDeviceOffline"); + LOGI("start"); deviceStateManagerCallback_->OnDeviceOffline(deviceId); return; } void SoftbusConnector::DeleteOffLineTimer(std::string &udidHash) { - LOGI("SoftbusConnector::DeleteOffLineTimer"); + LOGI("start"); remoteUdidHash_ = udidHash; if (deviceStateManagerCallback_ != nullptr) { deviceStateManagerCallback_->DeleteOffLineTimer(udidHash); } } -bool SoftbusConnector::CheckIsOnline(const std::string &targetDeviceId) +bool SoftbusConnector::CheckIsNeedJoinLnn(const std::string &udid, const std::string &deviceId) +{ + if (udid.empty() || deviceId.empty()) { + return false; + } + std::string connectAddr; + auto addrInfo = GetConnectAddr(deviceId, connectAddr); + if (addrInfo == nullptr) { + LOGE("addrInfo is nullptr."); + return false; + } + std::string networkId = ""; + SoftbusCache::GetInstance().GetNetworkIdFromCache(udid, networkId); + if (networkId.empty()) { + LOGI("networkId is empty: %{public}s", GetAnonyString(udid).c_str()); + return true; + } + int32_t networkType = -1; + int32_t ret = GetNodeKeyInfo(DM_PKG_NAME, networkId.c_str(), NodeDeviceInfoKey::NODE_KEY_NETWORK_TYPE, + reinterpret_cast(&networkType), LNN_COMMON_LEN); + if (ret != DM_OK || networkType < 0) { + LOGE("[SOFTBUS]GetNodeKeyInfo networkType failed, ret:%{public}d.", ret); + return false; + } + uint32_t addrTypeMask = 0; + switch (addrInfo->type) { + case CONNECTION_ADDR_WLAN: + addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_WIFI; + break; + case CONNECTION_ADDR_BR: + addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BR; + break; + case CONNECTION_ADDR_BLE: + addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BLE; + break; + case CONNECTION_ADDR_NCM: + addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_USB; + break; + default: + LOGE("Unknown addr type."); + return false; + } + LOGI("GetNetworkTypeByNetworkId networkType %{public}d, addrTypeMask %{public}d.", networkType, addrTypeMask); + if ((static_cast(networkType) & addrTypeMask) != 0x0) { + return false; + } + return true; +} + +// isHash：传入的deviceId是否为哈希值 +bool SoftbusConnector::CheckIsOnline(const std::string &targetDeviceIdHash, bool isHash) { - LOGI("Check the device is online."); + LOGI("start."); int32_t deviceCount = 0; NodeBasicInfo *nodeInfo = nullptr; if (GetAllNodeDeviceInfo(DM_PKG_NAME, &nodeInfo, &deviceCount) != DM_OK) { @@ -447,7 +808,8 @@ bool SoftbusConnector::CheckIsOnline(const std::string &targetDeviceId) LOGE("[SOFTBUS]GetNodeKeyInfo failed."); } std::string udid = reinterpret_cast(mUdid); - if (udid == targetDeviceId) { + if ((isHash == false && udid == targetDeviceIdHash) || + (isHash == true && Crypto::Sha256(udid).find(targetDeviceIdHash) == 0)) { LOGI("The device is online."); FreeNodeInfo(nodeInfo); return true; @@ -458,9 +820,14 @@ bool SoftbusConnector::CheckIsOnline(const std::string &targetDeviceId) return false; } +bool SoftbusConnector::CheckIsOnline(const std::string &targetDeviceId) +{ + return CheckIsOnline(targetDeviceId, false); +} + DmDeviceInfo SoftbusConnector::GetDeviceInfoByDeviceId(const std::string &deviceId) { - LOGI("SoftbusConnector::GetDeviceInfoBydeviceId"); + LOGI("start"); DmDeviceInfo info; int32_t deviceCount = 0; NodeBasicInfo *nodeInfo = nullptr; diff --git a/services/implementation/src/dependency/softbus/softbus_session.cpp b/services/implementation/src/dependency/softbus/softbus_session.cpp index 125ffce5a8fd7babde8ad1b45e138d223af4218d..1563f8b861969b505a82fda35348ba07a38436ca 100644 --- a/services/implementation/src/dependency/softbus/softbus_session.cpp +++ b/services/implementation/src/dependency/softbus/softbus_session.cpp @@ -23,9 +23,6 @@ #include "json_object.h" #include "softbus_connector.h" #include "softbus_error_code.h" -#ifndef DEVICE_MANAGER_COMMON_FLAG -#include "session_ex.h" -#endif namespace OHOS { namespace DistributedHardware { @@ -33,48 +30,9 @@ std::shared_ptr SoftbusSession::sessionCallback_ = null constexpr const char* DM_HITRACE_AUTH_TO_OPPEN_SESSION = "DM_HITRACE_AUTH_TO_OPPEN_SESSION"; constexpr int32_t MAX_DATA_LEN = 65535; -static void OnShutdown(int32_t socket, ShutdownReason reason) -{ - LOGI("[SOFTBUS]OnShutdown socket : %{public}d, reason: %{public}d", socket, (int32_t)reason); - SoftbusSession::OnSessionClosed(socket); -} - -static void OnBytes(int32_t socket, const void *data, uint32_t dataLen) -{ - LOGI("[SOFTBUS]OnBytes socket : %{public}d", socket); - SoftbusSession::OnBytesReceived(socket, data, dataLen); -} - -static void OnQos(int32_t socket, QoSEvent eventId, const QosTV *qos, uint32_t qosCount) -{ - LOGI("[SOFTBUS]OnQos, socket: %{public}d, QoSEvent: %{public}d, qosCount: %{public}u", socket, (int32_t)eventId, - qosCount); - if (qosCount > QOS_TYPE_BUTT) { - LOGE("OnQos invalid qosCount"); - return; - } - for (uint32_t idx = 0; idx < qosCount; idx++) { - LOGI("QosTV: type: %{public}d, value: %{public}d", (int32_t)qos[idx].qos, qos[idx].value); - } -} - SoftbusSession::SoftbusSession() { LOGD("SoftbusSession constructor."); - if (memset_s(&iSocketListener_, sizeof(ISocketListener), 0, sizeof(ISocketListener)) != DM_OK) { - LOGE("SoftbusSession::SoftbusSession memset_s failed."); - return; - } - - iSocketListener_.OnShutdown = OnShutdown; - iSocketListener_.OnBytes = OnBytes; - iSocketListener_.OnQos = OnQos; - iSocketListener_.OnFile = nullptr; - iSocketListener_.OnMessage = nullptr; - iSocketListener_.OnBind = nullptr; - iSocketListener_.OnStream = nullptr; - iSocketListener_.OnError = nullptr; - iSocketListener_.OnNegotiate = nullptr; } SoftbusSession::~SoftbusSession() @@ -99,12 +57,12 @@ int32_t SoftbusSession::OpenAuthSession(const std::string &deviceId) DmTraceStart(std::string(DM_HITRACE_AUTH_TO_OPPEN_SESSION)); int32_t sessionId = -1; std::string connectAddr; - ConnectionAddr *addrInfo = SoftbusConnector::GetConnectAddr(deviceId, connectAddr); + auto addrInfo = SoftbusConnector::GetConnectAddr(deviceId, connectAddr); if (addrInfo == nullptr) { LOGE("[SOFTBUS]addrInfo is nullptr. sessionId: %{public}d.", sessionId); return sessionId; } - sessionId = ::OpenAuthSession(DM_SESSION_NAME, addrInfo, 1, nullptr); + sessionId = ::OpenAuthSession(DM_SESSION_NAME, addrInfo.get(), 1, nullptr); if (sessionId < 0) { LOGE("[SOFTBUS]open session error, sessionId: %{public}d.", sessionId); return sessionId; @@ -114,29 +72,6 @@ int32_t SoftbusSession::OpenAuthSession(const std::string &deviceId) return sessionId; } -int32_t SoftbusSession::OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m) -{ -#ifdef DEVICE_MANAGER_COMMON_FLAG - LOGE("[SOFTBUS] OpenAuthSessionWithPara no implement"); - return SOFTBUS_NOT_IMPLEMENT; -#else - DmTraceStart(std::string(DM_HITRACE_AUTH_TO_OPPEN_SESSION)); - LinkPara para; - para.type = PARA_ACTION; - para.action.actionId = actionId; - para.enable160M = isEnable160m; - para.accountInfo = false; - int32_t sessionId = ::OpenAuthSessionWithPara(DM_SESSION_NAME, ¶); - if (sessionId < 0) { - LOGE("[SOFTBUS]open session error, sessionId: %{public}d.", sessionId); - return sessionId; - } - DmTraceEnd(); - LOGI("OpenAuthSessionWithPara success. sessionId: %{public}d.", sessionId); - return sessionId; -#endif -} - int32_t SoftbusSession::CloseAuthSession(int32_t sessionId) { LOGI("CloseAuthSession."); @@ -161,20 +96,6 @@ int32_t SoftbusSession::GetPeerDeviceId(int32_t sessionId, std::string &peerDevI int32_t SoftbusSession::SendData(int32_t sessionId, std::string &message) { - JsonObject jsonObject(message); - if (jsonObject.IsDiscarded()) { - LOGE("extrasJson error, message: %{public}s.", GetAnonyString(message).c_str()); - return ERR_DM_FAILED; - } - if (!IsInt32(jsonObject, TAG_MSG_TYPE)) { - LOGE("SoftbusSession::SendData err json string."); - return ERR_DM_FAILED; - } - int32_t msgType = jsonObject[TAG_MSG_TYPE].Get(); - LOGI("start, msgType: %{public}d.", msgType); - if (sessionCallback_->GetIsCryptoSupport()) { - LOGI("SendData Start encryption."); - } int32_t ret = SendBytes(sessionId, message.c_str(), strlen(message.c_str())); if (ret != DM_OK) { LOGE("[SOFTBUS]SendBytes failed."); @@ -195,9 +116,13 @@ int32_t SoftbusSession::SendHeartbeatData(int32_t sessionId, std::string &messag int SoftbusSession::OnSessionOpened(int sessionId, int result) { + LOGI("OnSessionOpened, success, sessionId: %{public}d, result: %{public}d.", sessionId, result); + if (sessionCallback_ == nullptr) { + LOGI("Session callback is not registered."); + return DM_OK; + } int32_t sessionSide = GetSessionSide(sessionId); sessionCallback_->OnSessionOpened(sessionId, sessionSide, result); - LOGD("OnSessionOpened, success, sessionId: %{public}d.", sessionId); return DM_OK; } @@ -206,36 +131,7 @@ void SoftbusSession::OnSessionClosed(int sessionId) LOGI("OnSessionClosed, sessionId: %{public}d.", sessionId); CHECK_NULL_VOID(sessionCallback_); sessionCallback_->OnSessionClosed(sessionId); -} - -void SoftbusSession::OnBytesReceived(int sessionId, const void *data, unsigned int dataLen) -{ - if (sessionId < 0 || data == nullptr || dataLen <= 0 || dataLen > MAX_DATA_LEN) { - LOGI("[SOFTBUS]fail to receive data from softbus with sessionId: %{public}d, dataLen: %{public}d.", sessionId, - dataLen); - return; - } - LOGI("start, sessionId: %{public}d, dataLen: %{public}d.", sessionId, dataLen); - if (sessionCallback_->GetIsCryptoSupport()) { - LOGI("Start decryption."); - } - std::string message = std::string(reinterpret_cast(data), dataLen); - JsonObject jsonObject(message); - if (jsonObject.IsDiscarded()) { - LOGE("DecodeRequestAuth jsonStr error"); - return; - } - if (!IsInt32(jsonObject, TAG_MSG_TYPE)) { - LOGE("err json string, first time"); - return; - } - if (jsonObject[TAG_MSG_TYPE].Get() == AUTH_DEVICE_REQ_NEGOTIATE || - jsonObject[TAG_MSG_TYPE].Get() == AUTH_DEVICE_RESP_NEGOTIATE) { - sessionCallback_->OnAuthDeviceDataReceived(sessionId, message); - } else { - sessionCallback_->OnDataReceived(sessionId, message); - } - LOGI("completed."); + return; } } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/src/device_manager_service_impl.cpp b/services/implementation/src/device_manager_service_impl.cpp index 0d6451e7a6f95d3fa831ae8ff4924f63f91e0345..0d38868934dd057183e676d037900ceca26f7396 100644 --- a/services/implementation/src/device_manager_service_impl.cpp +++ b/services/implementation/src/device_manager_service_impl.cpp @@ -15,9 +15,15 @@ #include "device_manager_service_impl.h" +#include +#include +#include #include #include "app_manager.h" +#include "bundle_mgr_interface.h" +#include "bundle_mgr_proxy.h" +#include "dm_error_type.h" #include "dm_anonymous.h" #include "dm_constants.h" #include "dm_crypto.h" @@ -26,17 +32,91 @@ #include "dm_radar_helper.h" #include "dm_softbus_cache.h" #include "multiple_user_connector.h" +#include "iservice_registry.h" +#include "system_ability_definition.h" #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) #include "dm_common_event_manager.h" #include "parameter.h" +#include "dm_random.h" #include "common_event_support.h" +#include "ffrt.h" using namespace OHOS::EventFwk; #endif namespace OHOS { namespace DistributedHardware { + +namespace { + // One year 365 * 24 * 60 * 60 constexpr int32_t MAX_ALWAYS_ALLOW_SECONDS = 31536000; +constexpr int32_t BROADCAST_CREDID_LENGTH = 6; +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; +constexpr int32_t MSG_TYPE_RESP_ACL_NEGOTIATE = 90; +constexpr int32_t MSG_TYPE_REQ_AUTH_TERMINATE = 104; +constexpr int32_t AUTH_SRC_FINISH_STATE = 12; +constexpr int32_t MAX_DATA_LEN = 65535; +constexpr int32_t ULTRASONIC_AUTHTYPE = 6; +constexpr const char* DM_TAG_LOGICAL_SESSION_ID = "logicalSessionId"; +constexpr const char* DM_TAG_PEER_DISPLAY_ID = "peerDisplayId"; +constexpr const char* DM_TAG_ACCESSEE_USER_ID = "accesseeUserId"; +constexpr const char* DM_TAG_EXTRA_INFO = "extraInfo"; +constexpr const char* CHANGE_PINTYPE = "1"; +constexpr const char* BIND_CALLER_USERID = "bindCallerUserId"; +// currently, we just support one bind session in one device at same time +constexpr size_t MAX_NEW_PROC_SESSION_COUNT_TEMP = 1; +const int32_t USLEEP_TIME_US_500000 = 500000; // 500ms +const int32_t OPEN_AUTH_SESSION_TIMEOUT = 15000; // 15000ms + +const std::map BUNDLENAME_MAPPING = { + { "wear_link_service", "watch_system_service" } +}; + +static bool IsMessageOldVersion(const JsonObject &jsonObject, std::shared_ptr session) +{ + std::string dmVersion = ""; + std::string edition = ""; + if (jsonObject[TAG_DMVERSION].IsString()) { + dmVersion = jsonObject[TAG_DMVERSION].Get(); + } + if (jsonObject[TAG_EDITION].IsString()) { + edition = jsonObject[TAG_EDITION].Get(); + } + dmVersion = AuthManagerBase::ConvertSrcVersion(dmVersion, edition); + + // Assign the physical session version and release the semaphore. + session->version_ = dmVersion; + + // If the version number is higher than 5.0.4 (the highest version of the old protocol), + // there is no need to switch to the old protocol. + if (CompareVersion(dmVersion, DM_VERSION_5_0_OLD_MAX) == true) { + return false; + } + + return true; +} + +std::string CreateTerminateMessage(void) +{ + JsonObject jsonObject; + jsonObject[TAG_MSG_TYPE] = MSG_TYPE_REQ_AUTH_TERMINATE; + jsonObject[TAG_REPLY] = ERR_DM_VERSION_INCOMPATIBLE; + jsonObject[TAG_AUTH_FINISH] = false; + + return jsonObject.Dump(); +} + +} + +Session::Session(int sessionId, std::string deviceId) +{ + sessionId_ = sessionId; + deviceId_ = deviceId; +} DeviceManagerServiceImpl::DeviceManagerServiceImpl() { @@ -48,9 +128,339 @@ DeviceManagerServiceImpl::~DeviceManagerServiceImpl() LOGI("DeviceManagerServiceImpl destructor"); } +static uint64_t StringToUint64(const std::string& str) +{ + // Calculate the length of the substring, taking the minimum of the string length and 8 + size_t subStrLength = std::min(str.length(), static_cast(8U)); + + // Extract substring + std::string substr = str.substr(str.length() - subStrLength); + + // Convert substring to uint64_t + uint64_t result = 0; + for (size_t i = 0; i < subStrLength; ++i) { + result <<= 8; // Shift left 8 bits + result |= static_cast(substr[i]); + } + + return result; +} + + +static uint64_t GetTokenId(bool isSrcSide, int32_t displayId, std::string &bundleName) +{ + uint64_t tokenId = 0; + if (isSrcSide) { + // src end + tokenId = IPCSkeleton::GetCallingTokenID(); + } else { + // sink end + int64_t tmpTokenId; + // get userId + int32_t targetUserId = AuthManagerBase::DmGetUserId(displayId); + if (targetUserId == -1) { + return tokenId; + } + if (AppManager::GetInstance().GetHapTokenIdByName(targetUserId, bundleName, 0, tmpTokenId) == DM_OK) { + tokenId = static_cast(tmpTokenId); + } else if (AppManager::GetInstance().GetNativeTokenIdByName(bundleName, tmpTokenId) == DM_OK) { + tokenId = static_cast(tmpTokenId); + } else { + // get deviceId, take the 8 character value as tokenId + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + std::string deviceId = std::string(localDeviceId); + if (deviceId.length() != 0) { + tokenId = StringToUint64(deviceId); + } + } + } + return tokenId; +} + +void DeviceManagerServiceImpl::NotifyCleanEvent(uint64_t logicalSessionId) +{ + LOGI("logicalSessionId: %{public}" PRIu64 ".", logicalSessionId); + ffrt::submit([=]() { CleanAuthMgrByLogicalSessionId(logicalSessionId); }); +} + +void DeviceManagerServiceImpl::ImportConfig(std::shared_ptr authMgr, uint64_t tokenId, + const std::string &pkgName) +{ + // Import configuration + std::lock_guard configsLock(configsMapMutex_); + if (configsMap_.find(tokenId) != configsMap_.end()) { + authMgr->ImportAuthCode(configsMap_[tokenId]->pkgName, configsMap_[tokenId]->authCode); + authMgr->RegisterAuthenticationType(configsMap_[tokenId]->authenticationType); + LOGI("import authCode Successful tokenId %{public}s, pkgName %{public}s, authCode %{public}s.", + GetAnonyInt32(tokenId).c_str(), pkgName.c_str(), GetAnonyString(configsMap_[tokenId]->authCode).c_str()); + configsMap_[tokenId] = nullptr; + configsMap_.erase(tokenId); + return; + } + for (auto it = configsMap_.begin(); it != configsMap_.end();) { + if (it->second != nullptr && pkgName == it->second->pkgName) { + authMgr->ImportAuthCode(it->second->pkgName, it->second->authCode); + authMgr->RegisterAuthenticationType(it->second->authenticationType); + LOGI("import authCode by pkgName Successful."); + it->second = nullptr; + it = configsMap_.erase(it); + return; + } else { + ++it; + } + } +} + +void DeviceManagerServiceImpl::ImportAuthCodeToConfig(std::shared_ptr authMgr, uint64_t tokenId) +{ + if (authMgr == nullptr) { + LOGE("authMgr is null."); + return; + } + std::string pkgName; + std::string authCode; + authMgr->GetAuthCodeAndPkgName(pkgName, authCode); + std::lock_guard configsLock(configsMapMutex_); + if (configsMap_.find(tokenId) == configsMap_.end()) { + configsMap_[tokenId] = std::make_shared(); + } + configsMap_[tokenId]->pkgName = pkgName; + configsMap_[tokenId]->authCode = authCode; +} + +int32_t DeviceManagerServiceImpl::InitNewProtocolAuthMgr(bool isSrcSide, uint64_t tokenId, uint64_t logicalSessionId, + const std::string &pkgName) +{ + LOGI("isSrcSide:%{public}d, tokenId: %{public}" PRIu64 ", logicalSesId: %{public}" PRIu64 ", pkgname:%{public}s", + isSrcSide, tokenId, logicalSessionId, pkgName.c_str()); + std::shared_ptr authMgr = nullptr; + // Create a new auth_mgr, create authMgr + if (isSrcSide) { + // src end + authMgr = std::make_shared(softbusConnector_, hiChainConnector_, + listener_, hiChainAuthConnector_); + } else { + // sink end + authMgr = std::make_shared(softbusConnector_, hiChainConnector_, + listener_, hiChainAuthConnector_); + } + CleanNotifyCallback cleanNotifyCallback = [=](const auto &logicalSessionId) { + this->NotifyCleanEvent(logicalSessionId); + }; + // Register resource destruction notification function + authMgr->RegisterCleanNotifyCallback(cleanNotifyCallback); + CHECK_NULL_RETURN(hiChainAuthConnector_, ERR_DM_POINT_NULL); + hiChainAuthConnector_->RegisterHiChainAuthCallbackById(logicalSessionId, authMgr); + LOGI("Initialize authMgr token: %{public}" PRId64 ".", tokenId); + ImportConfig(authMgr, tokenId, pkgName); + { + std::lock_guard lock(authMgrMapMtx_); + authMgrMap_[tokenId] = authMgr; + } + return DM_OK; +} + +int32_t DeviceManagerServiceImpl::InitOldProtocolAuthMgr(uint64_t tokenId, const std::string &pkgName) +{ + LOGI("tokenId: %{public}" PRIu64 ", pkgname:%{public}s", tokenId, pkgName.c_str()); + if (authMgr_ == nullptr) { + CreateGlobalClassicalAuthMgr(); + } + authMgr_->PrepareSoftbusSessionCallback(); + { + std::lock_guard lock(authMgrMapMtx_); + authMgrMap_[tokenId] = authMgr_; + } + ImportConfig(authMgr_, tokenId, pkgName); + { + // The value of logicalSessionId in the old protocol is always 0. + std::lock_guard tokenIdLock(logicalSessionId2TokenIdMapMtx_); + logicalSessionId2TokenIdMap_[0] = tokenId; + } + return DM_OK; +} + +int32_t DeviceManagerServiceImpl::InitAndRegisterAuthMgr(bool isSrcSide, uint64_t tokenId, + std::shared_ptr session, uint64_t logicalSessionId, const std::string &pkgName) +{ + if (session == nullptr) { + LOGE("InitAndRegisterAuthMgr, The physical link is not created."); + return ERR_DM_AUTH_OPEN_SESSION_FAILED; + } + // If version is empty, allow creation for the first time, create a new protocol auth_mgr to negotiate version; + // subsequent creations wait, and directly use version to create the corresponding auth_mgr after release. + if (session->version_ == "") { + bool expected = false; + if (session->flag_.compare_exchange_strong(expected, true)) { + LOGI("The physical link is being created and the dual-end device version is aligned."); + } else { + // Do not allow simultaneous version negotiation, return error directly + LOGE("Version negotiation is not allowed at the same time."); + return ERR_DM_AUTH_BUSINESS_BUSY; + } + } + { + std::lock_guard lock(authMgrMapMtx_); + if (authMgrMap_.find(tokenId) != authMgrMap_.end()) { + // authMgr_ has been created, indicating that a binding event already exists. + // Other requests are rejected, and an error code is returned. + LOGE("BindTarget failed, this device is being bound. Please try again later."); + return ERR_DM_AUTH_BUSINESS_BUSY; + } + if (authMgrMap_.size() > MAX_NEW_PROC_SESSION_COUNT_TEMP) { + LOGE("Other bind session exist, can not start new one."); + return ERR_DM_AUTH_BUSINESS_BUSY; + } + } + if (session->version_ == "" || CompareVersion(session->version_, DM_VERSION_5_0_OLD_MAX)) { + return InitNewProtocolAuthMgr(isSrcSide, tokenId, logicalSessionId, pkgName); + } + LOGI("InitAndRegisterAuthMgr old authMgr."); + return InitOldProtocolAuthMgr(tokenId, pkgName); +} + +void DeviceManagerServiceImpl::CleanSessionMap(int sessionId, std::shared_ptr session) +{ + session->logicalSessionCnt_.fetch_sub(1); + if (session->logicalSessionCnt_.load(std::memory_order_relaxed) == 0) { + usleep(USLEEP_TIME_US_500000); + CHECK_NULL_VOID(softbusConnector_); + softbusConnector_->GetSoftbusSession()->CloseAuthSession(sessionId); + std::lock_guard lock(mapMutex_); + if (sessionsMap_.find(sessionId) != sessionsMap_.end()) { + sessionsMap_[sessionId] = nullptr; + sessionsMap_.erase(sessionId); + } + if (deviceId2SessionIdMap_.find(session->deviceId_) != deviceId2SessionIdMap_.end()) { + deviceId2SessionIdMap_.erase(session->deviceId_); + } + } + return; +} + +void DeviceManagerServiceImpl::CleanSessionMapByLogicalSessionId(uint64_t logicalSessionId) +{ + { + std::lock_guard tokenIdLock(logicalSessionId2TokenIdMapMtx_); + logicalSessionId2TokenIdMap_.erase(logicalSessionId); + } + int32_t sessionId = 0; + { + std::lock_guard sessionIdLock(logicalSessionId2SessionIdMapMtx_); + if (logicalSessionId2SessionIdMap_.find(logicalSessionId) == logicalSessionId2SessionIdMap_.end()) { + return; + } + sessionId = logicalSessionId2SessionIdMap_[logicalSessionId]; + logicalSessionId2SessionIdMap_.erase(logicalSessionId); + } + auto session = GetCurSession(sessionId); + if (session != nullptr) { + CleanSessionMap(sessionId, session); + } + return; +} + +void DeviceManagerServiceImpl::CleanAuthMgrByLogicalSessionId(uint64_t logicalSessionId) +{ + uint64_t tokenId = 0; + { + std::lock_guard tokenIdLock(logicalSessionId2TokenIdMapMtx_); + if (logicalSessionId2TokenIdMap_.find(logicalSessionId) != logicalSessionId2TokenIdMap_.end()) { + tokenId = logicalSessionId2TokenIdMap_[logicalSessionId]; + } else { + LOGE("logicalSessionId(%{public}" PRIu64 ") can not find the tokenId.", logicalSessionId); + return; + } + } + + CleanSessionMapByLogicalSessionId(logicalSessionId); + if (logicalSessionId == 0 && authMgr_ != nullptr) { + authMgr_->SetTransferReady(true); + authMgr_->ClearSoftbusSessionCallback(); + } + hiChainAuthConnector_->UnRegisterHiChainAuthCallbackById(logicalSessionId); + { + std::lock_guard lock(authMgrMapMtx_); + if (authMgrMap_.find(tokenId) != authMgrMap_.end()) { + authMgrMap_[tokenId] = nullptr; + authMgrMap_.erase(tokenId); + } + } + return; +} + +std::shared_ptr DeviceManagerServiceImpl::GetAuthMgr() +{ + uint64_t tokenId = IPCSkeleton::GetCallingTokenID(); + { + std::lock_guard lock(authMgrMapMtx_); + if (authMgrMap_.find(tokenId) != authMgrMap_.end()) { + LOGI("authMgrMap_ token: %{public}" PRId64 ".", tokenId); + return authMgrMap_[tokenId]; + } + } + LOGE("authMgrMap_ not found, token: %{public}" PRId64 ".", tokenId); + return nullptr; +} + +// Needed in the callback function +std::shared_ptr DeviceManagerServiceImpl::GetAuthMgrByTokenId(uint64_t tokenId) +{ + { + std::lock_guard lock(authMgrMapMtx_); + if (authMgrMap_.find(tokenId) != authMgrMap_.end()) { + LOGI("authMgrMap_ token: %{public}" PRId64 ".", tokenId); + return authMgrMap_[tokenId]; + } + } + LOGE("authMgrMap_ not found, token: %{public}" PRId64 ".", tokenId); + return nullptr; +} + +std::shared_ptr DeviceManagerServiceImpl::GetCurrentAuthMgr() +{ + uint64_t tokenId = 0; + { + std::lock_guard tokenIdLock(logicalSessionId2TokenIdMapMtx_); + if (logicalSessionId2TokenIdMap_.find(0) != logicalSessionId2TokenIdMap_.end()) { + tokenId = logicalSessionId2TokenIdMap_[0]; + } + } + { + std::lock_guard lock(authMgrMapMtx_); + for (auto &pair : authMgrMap_) { + if (pair.first != tokenId) { + return pair.second; + } + } + } + return authMgr_; +} + +static uint64_t GenerateRandNum(int sessionId) +{ + // Get the current timestamp + auto timestamp = std::chrono::duration_cast(std::chrono::high_resolution_clock::now(). + time_since_epoch()).count(); + + // Generate random numbers + std::random_device rd; + std::mt19937 gen(rd()); + std::uniform_int_distribution<> rand_dis(1, 0xFFFFFFFF); + uint32_t randomNumber = static_cast(rand_dis(gen)); + + // Combination of random numbers + uint64_t randNum = (static_cast(timestamp) << 32) | + (static_cast(sessionId) << 16) | + static_cast(randomNumber); + + return randNum; +} + int32_t DeviceManagerServiceImpl::Initialize(const std::shared_ptr &listener) { - LOGI("DeviceManagerServiceImpl Initialize"); + LOGI("Initialize"); if (softbusConnector_ == nullptr) { softbusConnector_ = std::make_shared(); } @@ -68,13 +478,6 @@ int32_t DeviceManagerServiceImpl::Initialize(const std::shared_ptrRegisterSoftbusStateCallback(); } - if (authMgr_ == nullptr) { - authMgr_ = std::make_shared(softbusConnector_, hiChainConnector_, listener, - hiChainAuthConnector_); - softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(authMgr_); - hiChainConnector_->RegisterHiChainCallback(authMgr_); - hiChainAuthConnector_->RegisterHiChainAuthCallback(authMgr_); - } if (credentialMgr_ == nullptr) { credentialMgr_ = std::make_shared(hiChainConnector_, listener); } @@ -83,19 +486,69 @@ int32_t DeviceManagerServiceImpl::Initialize(const std::shared_ptrClearSoftbusSessionCallback(); + } LOGI("Init success, singleton initialized"); return DM_OK; } +void DeviceManagerServiceImpl::ReleaseMaps() +{ + { + std::lock_guard lock(authMgrMapMtx_); + for (auto& pair : authMgrMap_) { + pair.second = nullptr; + } + authMgrMap_.clear(); + } + for (auto& pair : sessionsMap_) { + pair.second = nullptr; + } + sessionsMap_.clear(); + { + std::lock_guard configsLock(configsMapMutex_); + for (auto& pair : configsMap_) { + pair.second = nullptr; + } + configsMap_.clear(); + } + deviceId2SessionIdMap_.clear(); + deviceIdMutexMap_.clear(); + sessionEnableMutexMap_.clear(); + sessionEnableCvMap_.clear(); + { + std::lock_guard tokenIdLock(logicalSessionId2TokenIdMapMtx_); + logicalSessionId2TokenIdMap_.clear(); + } + { + std::lock_guard sessionIdLock(logicalSessionId2SessionIdMapMtx_); + logicalSessionId2SessionIdMap_.clear(); + } +} + void DeviceManagerServiceImpl::Release() { - LOGI("DeviceManagerServiceImpl Release"); + LOGI("Release"); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) commonEventManager_ = nullptr; #endif - softbusConnector_->GetSoftbusSession()->UnRegisterSessionCallback(); - hiChainConnector_->UnRegisterHiChainCallback(); + if (softbusConnector_ != nullptr) { + softbusConnector_->UnRegisterConnectorCallback(); + softbusConnector_->UnRegisterSoftbusStateCallback(); + if (softbusConnector_->GetSoftbusSession() != nullptr) { + softbusConnector_->GetSoftbusSession()->UnRegisterSessionCallback(); + } + } + if (hiChainConnector_ != nullptr) { + hiChainConnector_->UnRegisterHiChainCallback(); + } + if (hiChainAuthConnector_ != nullptr) { + hiChainAuthConnector_->UnRegisterHiChainAuthCallback(); + } authMgr_ = nullptr; + ReleaseMaps(); deviceStateMgr_ = nullptr; softbusConnector_ = nullptr; abilityMgr_ = nullptr; @@ -112,7 +565,16 @@ int32_t DeviceManagerServiceImpl::UnAuthenticateDevice(const std::string &pkgNam pkgName.c_str(), GetAnonyString(udid).c_str()); return ERR_DM_INPUT_PARA_INVALID; } - return authMgr_->UnAuthenticateDevice(pkgName, udid, bindLevel); + auto authMgr = GetAuthMgr(); + if (authMgr == nullptr) { + LOGE("authMgr is nullptr, invoke the old protocal."); + if (authMgr_ == nullptr) { + LOGE("classical authMgr_ is nullptr"); + return ERR_DM_POINT_NULL; + } + return authMgr_->UnAuthenticateDevice(pkgName, udid, bindLevel); + } + return authMgr->UnAuthenticateDevice(pkgName, udid, bindLevel); } int32_t DeviceManagerServiceImpl::StopAuthenticateDevice(const std::string &pkgName) @@ -121,7 +583,12 @@ int32_t DeviceManagerServiceImpl::StopAuthenticateDevice(const std::string &pkgN LOGE("DeviceManagerServiceImpl::StopAuthenticateDevice failed"); return ERR_DM_INPUT_PARA_INVALID; } - return authMgr_->StopAuthenticateDevice(pkgName); + auto authMgr = GetAuthMgr(); + if (authMgr == nullptr) { + LOGE("authMgr is nullptr"); + return ERR_DM_POINT_NULL; + } + return authMgr->StopAuthenticateDevice(pkgName); } int32_t DeviceManagerServiceImpl::UnBindDevice(const std::string &pkgName, const std::string &udid, @@ -133,7 +600,9 @@ int32_t DeviceManagerServiceImpl::UnBindDevice(const std::string &pkgName, const return ERR_DM_INPUT_PARA_INVALID; } std::string extra = ""; - return authMgr_->UnBindDevice(pkgName, udid, bindLevel, extra); + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + return DeleteAclV2(pkgName, std::string(localDeviceId), udid, bindLevel, extra); } int32_t DeviceManagerServiceImpl::UnBindDevice(const std::string &pkgName, const std::string &udid, @@ -144,7 +613,9 @@ int32_t DeviceManagerServiceImpl::UnBindDevice(const std::string &pkgName, const pkgName.c_str(), GetAnonyString(udid).c_str()); return ERR_DM_INPUT_PARA_INVALID; } - return authMgr_->UnBindDevice(pkgName, udid, bindLevel, extra); + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + return DeleteAclV2(pkgName, std::string(localDeviceId), udid, bindLevel, extra); } int32_t DeviceManagerServiceImpl::SetUserOperation(std::string &pkgName, int32_t action, @@ -155,15 +626,34 @@ int32_t DeviceManagerServiceImpl::SetUserOperation(std::string &pkgName, int32_t "%{public}s", pkgName.c_str(), params.c_str()); return ERR_DM_INPUT_PARA_INVALID; } - if (authMgr_ != nullptr) { - authMgr_->OnUserOperation(action, params); + auto authMgr = GetCurrentAuthMgr(); + if (authMgr != nullptr) { + authMgr->OnUserOperation(action, params); } return DM_OK; } +void DeviceManagerServiceImpl::CreateGlobalClassicalAuthMgr() +{ + LOGI("global classical authMgr_ not exit, create one"); + CHECK_NULL_VOID(softbusConnector_); + CHECK_NULL_VOID(hiChainConnector_); + CHECK_NULL_VOID(hiChainAuthConnector_); + // Create old auth_mar, only create an independent one + authMgr_ = std::make_shared(softbusConnector_, hiChainConnector_, listener_, + hiChainAuthConnector_); + CleanNotifyCallback cleanNotifyCallback = [=](const auto &logicalSessionId) { + this->NotifyCleanEvent(logicalSessionId); + }; + authMgr_->RegisterCleanNotifyCallback(cleanNotifyCallback); + softbusConnector_->RegisterConnectorCallback(authMgr_); + softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(authMgr_); + hiChainConnector_->RegisterHiChainCallback(authMgr_); + hiChainAuthConnector_->RegisterHiChainAuthCallback(authMgr_); +} + void DeviceManagerServiceImpl::HandleOffline(DmDeviceState devState, DmDeviceInfo &devInfo) { - LOGI("DeviceManagerServiceImpl::HandleOffline"); std::string trustDeviceId = deviceStateMgr_->GetUdidByNetWorkId(std::string(devInfo.networkId)); LOGI("deviceStateMgr Udid: %{public}s", GetAnonyString(trustDeviceId).c_str()); if (trustDeviceId == "") { @@ -172,17 +662,17 @@ void DeviceManagerServiceImpl::HandleOffline(DmDeviceState devState, DmDeviceInf } std::string udisHash = softbusConnector_->GetDeviceUdidHashByUdid(trustDeviceId); if (memcpy_s(devInfo.deviceId, DM_MAX_DEVICE_ID_LEN, udisHash.c_str(), udisHash.length()) != 0) { - LOGE("get deviceId: %{public}s failed", GetAnonyString(udisHash).c_str()); return; } char localUdid[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localUdid, DEVICE_UUID_LENGTH); std::string requestDeviceId = std::string(localUdid); - std::map userIdAndBindLevel = - DeviceProfileConnector::GetInstance().GetUserIdAndBindLevel(requestDeviceId, trustDeviceId); ProcessInfo processInfo; processInfo.pkgName = std::string(DM_PKG_NAME); processInfo.userId = MultipleUserConnector::GetFirstForegroundUserId(); + uint32_t bindType = DeviceProfileConnector::GetInstance().CheckBindType(trustDeviceId, requestDeviceId); + std::map userIdAndBindLevel = + DeviceProfileConnector::GetInstance().GetUserIdAndBindLevel(requestDeviceId, trustDeviceId); if (userIdAndBindLevel.empty() || userIdAndBindLevel.find(processInfo.userId) == userIdAndBindLevel.end()) { userIdAndBindLevel[processInfo.userId] = INVALIED_TYPE; } @@ -192,13 +682,18 @@ void DeviceManagerServiceImpl::HandleOffline(DmDeviceState devState, DmDeviceInf devInfo.authForm = DmAuthForm::IDENTICAL_ACCOUNT; processInfo.userId = item.first; softbusConnector_->SetProcessInfo(processInfo); - } else if (static_cast(item.second) == DEVICE) { + } else if (static_cast(item.second) == USER && bindType == SHARE_TYPE) { + LOGI("The offline device is device bind level and share bind type."); + devInfo.authForm = DmAuthForm::SHARE; + processInfo.userId = item.first; + softbusConnector_->SetProcessInfo(processInfo); + } else if (static_cast(item.second) == USER && bindType != SHARE_TYPE) { LOGI("The offline device is device bind type."); devInfo.authForm = DmAuthForm::PEER_TO_PEER; processInfo.userId = item.first; softbusConnector_->SetProcessInfo(processInfo); } else if (static_cast(item.second) == SERVICE || static_cast(item.second) == APP) { - LOGI("The offline device is APP_PEER_TO_PEER_TYPE bind type."); + LOGI("The offline device is PEER_TO_PEER_TYPE bind type, %{public}" PRIu32, item.second); std::vector processInfoVec = DeviceProfileConnector::GetInstance().GetProcessInfoFromAclByUserId(requestDeviceId, trustDeviceId, item.first); @@ -210,8 +705,7 @@ void DeviceManagerServiceImpl::HandleOffline(DmDeviceState devState, DmDeviceInf void DeviceManagerServiceImpl::HandleOnline(DmDeviceState devState, DmDeviceInfo &devInfo) { - LOGI("DeviceManagerServiceImpl::HandleOnline networkId: %{public}s.", - GetAnonyString(devInfo.networkId).c_str()); + LOGI("networkId: %{public}s.", GetAnonyString(devInfo.networkId).c_str()); std::string trustDeviceId = ""; if (softbusConnector_->GetUdidByNetworkId(devInfo.networkId, trustDeviceId) != DM_OK) { LOGE("HandleOnline get udid failed."); @@ -226,10 +720,16 @@ void DeviceManagerServiceImpl::HandleOnline(DmDeviceState devState, DmDeviceInfo GetDevUdid(localUdid, DEVICE_UUID_LENGTH); std::string requestDeviceId = std::string(localUdid); uint32_t bindType = DeviceProfileConnector::GetInstance().CheckBindType(trustDeviceId, requestDeviceId); - LOGI("The online device bind type is %{public}d.", bindType); + LOGI("The online device bind type is %{public}" PRIu32, bindType); ProcessInfo processInfo; processInfo.pkgName = std::string(DM_PKG_NAME); processInfo.userId = MultipleUserConnector::GetFirstForegroundUserId(); + SetOnlineProcessInfo(bindType, processInfo, devInfo, requestDeviceId, trustDeviceId, devState); +} + +void DeviceManagerServiceImpl::SetOnlineProcessInfo(const uint32_t &bindType, ProcessInfo &processInfo, + DmDeviceInfo &devInfo, const std::string &requestDeviceId, const std::string &trustDeviceId, DmDeviceState devState) +{ if (bindType == IDENTICAL_ACCOUNT_TYPE) { devInfo.authForm = DmAuthForm::IDENTICAL_ACCOUNT; softbusConnector_->SetProcessInfo(processInfo); @@ -239,26 +739,53 @@ void DeviceManagerServiceImpl::HandleOnline(DmDeviceState devState, DmDeviceInfo } else if (bindType == DEVICE_ACROSS_ACCOUNT_TYPE) { devInfo.authForm = DmAuthForm::ACROSS_ACCOUNT; softbusConnector_->SetProcessInfo(processInfo); - } else if (bindType == APP_PEER_TO_PEER_TYPE) { + } else if (bindType == APP_PEER_TO_PEER_TYPE || bindType == SERVICE_PEER_TO_PEER_TYPE) { std::vector processInfoVec = DeviceProfileConnector::GetInstance().GetProcessInfoFromAclByUserId(requestDeviceId, trustDeviceId, MultipleUserConnector::GetFirstForegroundUserId()); softbusConnector_->SetProcessInfoVec(processInfoVec); devInfo.authForm = DmAuthForm::PEER_TO_PEER; - } else if (bindType == APP_ACROSS_ACCOUNT_TYPE) { + } else if (bindType == APP_ACROSS_ACCOUNT_TYPE || bindType == SERVICE_ACROSS_ACCOUNT_TYPE) { std::vector processInfoVec = DeviceProfileConnector::GetInstance().GetProcessInfoFromAclByUserId(requestDeviceId, trustDeviceId, MultipleUserConnector::GetFirstForegroundUserId()); softbusConnector_->SetProcessInfoVec(processInfoVec); devInfo.authForm = DmAuthForm::ACROSS_ACCOUNT; + } else if (bindType == SHARE_TYPE) { + if (CheckSharePeerSrc(trustDeviceId, requestDeviceId)) { + LOGI("ProcessDeviceStateChange authForm is share, peer is src."); + return; + } + devInfo.authForm = DmAuthForm::SHARE; + softbusConnector_->SetProcessInfo(processInfo); } - LOGI("DeviceManagerServiceImpl::HandleOnline success devInfo auform %{public}d.", devInfo.authForm); + LOGI("HandleOnline success devInfo authForm is %{public}d.", devInfo.authForm); deviceStateMgr_->HandleDeviceStatusChange(devState, devInfo); + return; +} + +bool DeviceManagerServiceImpl::CheckSharePeerSrc(const std::string &peerUdid, const std::string &localUdid) +{ + std::vector profiles = + DeviceProfileConnector::GetInstance().GetAccessControlProfile(); + for (auto &aclItem : profiles) { + if (aclItem.GetBindType() == DM_SHARE && aclItem.GetTrustDeviceId() == peerUdid) { + if (aclItem.GetAccesser().GetAccesserDeviceId() == peerUdid && + aclItem.GetAccessee().GetAccesseeDeviceId() == localUdid) { + return true; + } + if (aclItem.GetAccesser().GetAccesserDeviceId() == localUdid && + aclItem.GetAccessee().GetAccesseeDeviceId() == peerUdid) { + return false; + } + } + } + return false; } void DeviceManagerServiceImpl::HandleDeviceStatusChange(DmDeviceState devState, DmDeviceInfo &devInfo) { - LOGI("DeviceManagerServiceImpl::HandleDeviceStatusChange start, devState = %{public}d, networkId: %{public}s.", + LOGI("start, devState = %{public}d, networkId: %{public}s.", devState, GetAnonyString(devInfo.networkId).c_str()); if (deviceStateMgr_ == nullptr) { LOGE("deviceStateMgr_ is nullpter!"); @@ -277,7 +804,7 @@ void DeviceManagerServiceImpl::HandleDeviceStatusChange(DmDeviceState devState, ProcessInfo processInfo; processInfo.pkgName = std::string(DM_PKG_NAME); processInfo.userId = MultipleUserConnector::GetFirstForegroundUserId(); - softbusConnector_->SetProcessInfo(processInfo); + softbusConnector_->SetChangeProcessInfo(processInfo); deviceStateMgr_->HandleDeviceStatusChange(devState, devInfo); } } @@ -299,6 +826,16 @@ std::string DeviceManagerServiceImpl::GetUdidHashByNetworkId(const std::string & int DeviceManagerServiceImpl::OnSessionOpened(int sessionId, int result) { + { + std::lock_guard lock(sessionEnableMutexMap_[sessionId]); + if (result == 0) { + LOGE("OnSessionOpened successful, sessionId: %{public}d", sessionId); + } else { + LOGE("OnSessionOpened failed, sessionId: %{public}d, res: %{public}d", sessionId, result); + } + sessionEnableCvReadyMap_[sessionId] = true; + sessionEnableCvMap_[sessionId].notify_all(); + } std::string peerUdid = ""; softbusConnector_->GetSoftbusSession()->GetPeerDeviceId(sessionId, peerUdid); struct RadarInfo info = { @@ -311,6 +848,15 @@ int DeviceManagerServiceImpl::OnSessionOpened(int sessionId, int result) if (!DmRadarHelper::GetInstance().ReportAuthSessionOpenCb(info)) { LOGE("ReportAuthSessionOpenCb failed"); } + + // Get the remote deviceId, sink end gives sessionsMap[deviceId] = session; + { + std::lock_guard lock(mapMutex_); + if (sessionsMap_.find(sessionId) == sessionsMap_.end()) { + sessionsMap_[sessionId] = std::make_shared(sessionId, peerUdid); + } + } + return SoftbusSession::OnSessionOpened(sessionId, result); } @@ -319,9 +865,316 @@ void DeviceManagerServiceImpl::OnSessionClosed(int sessionId) SoftbusSession::OnSessionClosed(sessionId); } +static JsonObject GetJsonObjectFromData(const void *data, unsigned int dataLen) +{ + std::string message = std::string(reinterpret_cast(data), dataLen); + return JsonObject(message); +} + +// When downgrading the version, determine whether it is src or sink based on the message. +// src: Received 90 message. +// sink: Received 80 message. +static bool IsAuthManagerSourceByMessage(int32_t msgType) +{ + return msgType == MSG_TYPE_RESP_ACL_NEGOTIATE; +} + +// Get the current session object +std::shared_ptr DeviceManagerServiceImpl::GetCurSession(int sessionId) +{ + std::shared_ptr curSession = nullptr; + // Get the remote deviceId, sink end gives sessionsMap[deviceId] = session; + { + std::lock_guard lock(mapMutex_); + if (sessionsMap_.find(sessionId) != sessionsMap_.end()) { + curSession = sessionsMap_[sessionId]; + } else { + LOGE("OnBytesReceived, The local session cannot be found."); + } + } + return curSession; +} + +std::shared_ptr DeviceManagerServiceImpl::GetAuthMgrByMessage(int32_t msgType, + uint64_t logicalSessionId, const JsonObject &jsonObject, std::shared_ptr curSession) +{ + uint64_t tokenId = 0; + if (msgType == MSG_TYPE_REQ_ACL_NEGOTIATE) { + std::string bundleName; + int32_t displayId = 0; + if (jsonObject[TAG_PEER_BUNDLE_NAME_V2].IsString()) { + bundleName = jsonObject[TAG_PEER_BUNDLE_NAME_V2].Get(); + } + if (jsonObject[DM_TAG_PEER_DISPLAY_ID].IsNumberInteger()) { + displayId = jsonObject[DM_TAG_PEER_DISPLAY_ID].Get(); + } + tokenId = GetTokenId(false, displayId, bundleName); + if (tokenId == 0) { + LOGE("GetAuthMgrByMessage, Get tokenId failed."); + return nullptr; + } + if (InitAndRegisterAuthMgr(false, tokenId, curSession, logicalSessionId, "") != DM_OK) { + return nullptr; + } + curSession->logicalSessionSet_.insert(logicalSessionId); + std::lock_guard tokenIdLock(logicalSessionId2TokenIdMapMtx_); + if (logicalSessionId2TokenIdMap_.find(logicalSessionId) != logicalSessionId2TokenIdMap_.end()) { + LOGE("GetAuthMgrByMessage, logicalSessionId exists in logicalSessionId2TokenIdMap_."); + return nullptr; + } + logicalSessionId2TokenIdMap_[logicalSessionId] = tokenId; + } else { + if (curSession->logicalSessionSet_.find(logicalSessionId) == curSession->logicalSessionSet_.end()) { + LOGE("GetAuthMgrByMessage, The logical session ID does not exist in the physical session."); + return nullptr; + } + std::lock_guard tokenIdLock(logicalSessionId2TokenIdMapMtx_); + tokenId = logicalSessionId2TokenIdMap_[logicalSessionId]; + } + + return GetAuthMgrByTokenId(tokenId); +} + +int32_t DeviceManagerServiceImpl::GetLogicalIdAndTokenIdBySessionId(uint64_t &logicalSessionId, + uint64_t &tokenId, int32_t sessionId) +{ + std::lock_guard sessionIdLock(logicalSessionId2SessionIdMapMtx_); + for (auto& pair : logicalSessionId2SessionIdMap_) { + if (pair.second == sessionId) { + logicalSessionId = pair.first; + std::lock_guard tokenIdLock(logicalSessionId2TokenIdMapMtx_); + tokenId = logicalSessionId2TokenIdMap_[logicalSessionId]; + } + } + if (logicalSessionId == 0 || tokenId == 0) { + LOGE("can not find logicalSessionId and tokenId."); + return ERR_DM_AUTH_FAILED; + } + return DM_OK; +} + +int32_t DeviceManagerServiceImpl::TransferSrcOldAuthMgr(std::shared_ptr curSession) +{ + // New Old Receive 90, destroy new authMgr, create old authMgr, source side + // The old protocol has only one session, reverse lookup logicalSessionId and tokenId + CHECK_NULL_RETURN(curSession, ERR_DM_POINT_NULL); + int sessionId = curSession->sessionId_; + uint64_t logicalSessionId = 0; + uint64_t tokenId = 0; + int32_t ret = GetLogicalIdAndTokenIdBySessionId(logicalSessionId, tokenId, sessionId); + if (ret != DM_OK) { + LOGE("failed, logicalSessionId: %{public}" PRIu64 ", tokenId: %{public}" PRIu64 "", logicalSessionId, tokenId); + return ret; + } + std::string pkgName; + PeerTargetId peerTargetId; + std::map bindParam; + auto authMgr = GetAuthMgrByTokenId(tokenId); + if (authMgr == nullptr) { + LOGE("DeviceManagerServiceImpl::TransferSrcOldAuthMgr authManager is nullptr"); + return ERR_DM_POINT_NULL; + } + authMgr->GetBindTargetParams(pkgName, peerTargetId, bindParam); + int32_t authType = -1; + authMgr->ParseAuthType(bindParam, authType); + ImportAuthCodeToConfig(authMgr, tokenId); + { + std::lock_guard lock(authMgrMapMtx_); + authMgrMap_.erase(tokenId); + } + if (InitAndRegisterAuthMgr(true, tokenId, curSession, logicalSessionId, "") != DM_OK) { + return ERR_DM_AUTH_FAILED; + } + + ret = TransferByAuthType(authType, curSession, authMgr, bindParam, logicalSessionId); + if (ret != DM_OK) { + LOGE("DeviceManagerServiceImpl::TransferByAuthType TransferByAuthType failed."); + return ret; + } + authMgr->DeleteTimer(); + authMgr = nullptr; + if (authMgr_->BindTarget(pkgName, peerTargetId, bindParam, sessionId, 0) != DM_OK) { + LOGE("DeviceManagerServiceImpl::TransferSrcOldAuthMgr authManager BindTarget failed"); + return ERR_DM_AUTH_FAILED; + } + + if (authType == DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE) { + int32_t sessionSide = GetSessionSide(curSession->sessionId_); + authMgr_->OnSessionOpened(curSession->sessionId_, sessionSide, 0); + } + + LOGI("src transfer to old version success"); + authMgr_->SetTransferReady(false); + return DM_OK; +} + +int32_t DeviceManagerServiceImpl::TransferByAuthType(int32_t authType, + std::shared_ptr curSession, std::shared_ptr authMgr, + std::map &bindParam, uint64_t logicalSessionId) +{ + int sessionId = curSession->sessionId_; + if (authType == DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE) { + authMgr_->EnableInsensibleSwitching(); + curSession->logicalSessionSet_.insert(0); + { + std::lock_guard sessionIdLock(logicalSessionId2SessionIdMapMtx_); + logicalSessionId2SessionIdMap_[0] = sessionId; + } + authMgr->OnSessionDisable(); + } else { + authMgr_->DisableInsensibleSwitching(); + // send stop message + // Cannot stop using the new protocol. The new protocol is a signal mechanism and cannot be stopped serially. + // There will be a delay, causing new objects to be created before the stop is complete. + // Then the timeout mechanism of the new protocol will stop SoftBus again. + std::string endMessage = CreateTerminateMessage(); + CHECK_NULL_RETURN(softbusConnector_, ERR_DM_POINT_NULL); + (void)softbusConnector_->GetSoftbusSession()->SendData(sessionId, endMessage); + // Close new protocol session + CleanAuthMgrByLogicalSessionId(logicalSessionId); + } + if (authType == ULTRASONIC_AUTHTYPE) { + int32_t ret = ChangeUltrasonicTypeToPin(bindParam); + if (ret != DM_OK) { + LOGE("DeviceManagerServiceImpl::TransferSrcOldAuthMgr ChangeUltrasonicTypeToPin failed."); + return ret; + } + } + return DM_OK; +} + +int32_t DeviceManagerServiceImpl::ChangeUltrasonicTypeToPin(std::map &bindParam) +{ + auto iter = bindParam.find(PARAM_KEY_AUTH_TYPE); + if (iter == bindParam.end()) { + LOGE("DeviceManagerServiceImpl::ChangeUltrasonicTypeToPin bindParam:%{public}s not exist.", + PARAM_KEY_AUTH_TYPE); + return ERR_DM_AUTH_FAILED; + } + iter->second = CHANGE_PINTYPE; + LOGI("bindParam:%{public}s PINTYPE.", PARAM_KEY_AUTH_TYPE); + return DM_OK; +} + +int32_t DeviceManagerServiceImpl::TransferSinkOldAuthMgr(const JsonObject &jsonObject, + std::shared_ptr curSession) +{ + // Old New Received 80, New Old authMgr, Sink End + std::string bundleName; + if (jsonObject[TAG_BUNDLE_NAME].IsString()) { + bundleName = jsonObject[TAG_BUNDLE_NAME].Get(); + } else if (jsonObject[TAG_PEER_BUNDLE_NAME].IsString()) { + bundleName = jsonObject[TAG_PEER_BUNDLE_NAME].Get(); + } else if (jsonObject[TAG_HOST_PKGLABEL].IsString()) { + bundleName = jsonObject[TAG_HOST_PKGLABEL].Get(); + } else { + LOGE("DeviceManagerServiceImpl::TransferSinkOldAuthMgr can not find bundleName."); + return ERR_DM_AUTH_FAILED; + } + if (softbusConnector_ == nullptr) { + LOGE("softbusConnector_ is nullpter!"); + return ERR_DM_AUTH_FAILED; + } + int32_t deviceType = softbusConnector_->GetLocalDeviceTypeId(); + if (deviceType == DmDeviceType::DEVICE_TYPE_WATCH && + BUNDLENAME_MAPPING.find(bundleName) != BUNDLENAME_MAPPING.end()) { + bundleName = BUNDLENAME_MAPPING.find(bundleName)->second; + } + uint64_t tokenId = GetTokenId(false, -1, bundleName); + if (InitAndRegisterAuthMgr(false, tokenId, curSession, 0, bundleName) != DM_OK) { + // Internal error log printing completed + return ERR_DM_AUTH_FAILED; + } + + // Parameter 2 sessionSide is 0, authMgr_ is empty, it must be the sink end. + // The src end will create the protocol object when BindTarget. + authMgr_->OnSessionOpened(curSession->sessionId_, 0, 0); + LOGI("sink transfer to old version success"); + authMgr_->SetTransferReady(false); + return DM_OK; +} + +int32_t DeviceManagerServiceImpl::TransferOldAuthMgr(int32_t msgType, const JsonObject &jsonObject, + std::shared_ptr curSession) +{ + int ret = DM_OK; + if ((authMgr_ == nullptr || authMgr_->IsTransferReady()) && + (msgType == MSG_TYPE_REQ_ACL_NEGOTIATE || msgType == MSG_TYPE_RESP_ACL_NEGOTIATE)) { + if (IsMessageOldVersion(jsonObject, curSession)) { + if (IsAuthManagerSourceByMessage(msgType)) { + ret = TransferSrcOldAuthMgr(curSession); + } else { + ret = TransferSinkOldAuthMgr(jsonObject, curSession); + } + } + } + + return ret; +} + + void DeviceManagerServiceImpl::OnBytesReceived(int sessionId, const void *data, unsigned int dataLen) { - SoftbusSession::OnBytesReceived(sessionId, data, dataLen); + if (sessionId < 0 || data == nullptr || dataLen <= 0 || dataLen > MAX_DATA_LEN) { + LOGE("[OnBytesReceived] Fail to receive data from softbus with sessionId: %{public}d, dataLen: %{public}d.", + sessionId, dataLen); + return; + } + + LOGI("start, sessionId: %{public}d, dataLen: %{public}d.", sessionId, dataLen); + + JsonObject jsonObject = GetJsonObjectFromData(data, dataLen); + if (jsonObject.IsDiscarded() || !IsInt32(jsonObject, TAG_MSG_TYPE)) { + LOGE("OnBytesReceived, MSG_TYPE parse failed."); + return; + } + int32_t msgType = jsonObject[TAG_MSG_TYPE].Get(); + uint64_t logicalSessionId = 0; + if (IsUint64(jsonObject, DM_TAG_LOGICAL_SESSION_ID)) { + logicalSessionId = jsonObject[DM_TAG_LOGICAL_SESSION_ID].Get(); + } + + std::shared_ptr curSession = GetCurSession(sessionId); + if (curSession == nullptr) { + LOGE("InitAndRegisterAuthMgr, The physical link is not created."); + return; + } + + std::shared_ptr authMgr = nullptr; + if (logicalSessionId != 0) { + authMgr = GetAuthMgrByMessage(msgType, logicalSessionId, jsonObject, curSession); + if (authMgr == nullptr) { + return; + } + if (msgType == MSG_TYPE_REQ_ACL_NEGOTIATE || msgType == MSG_TYPE_RESP_ACL_NEGOTIATE) { + curSession->version_ = DM_CURRENT_VERSION; + } + } else { + /** +        Monitor old messages on ports 80/90 +        1. New-to-old: When the src side receives a 90 message and detects a version mismatch, it receives + the 90 message, destroys the current new authMgr, creates a new old protocol authMgr, and re-BindTarget. +        2. Old-to-new: When the sink side receives an 80 message and detects a version mismatch, it receives the 80 + message, directly creates a new old protocol authMgr, and re-OnSessionOpened and OnBytesReceived. +        */ + if (curSession->version_ == "") { + if (TransferOldAuthMgr(msgType, jsonObject, curSession) != DM_OK) { + LOGE("DeviceManagerServiceImpl::OnBytesReceived TransferOldAuthMgr failed"); + return; + } + } else { + LOGI("Reuse Old AuthMgr, sessionId: %{public}d.", sessionId); + } + authMgr = authMgr_; + } + + std::string message = std::string(reinterpret_cast(data), dataLen); + if (msgType == AUTH_DEVICE_REQ_NEGOTIATE || msgType == AUTH_DEVICE_RESP_NEGOTIATE) { + authMgr->OnAuthDeviceDataReceived(sessionId, message); + } else { + authMgr->OnDataReceived(sessionId, message); + } + return; } int32_t DeviceManagerServiceImpl::RequestCredential(const std::string &reqJsonStr, std::string &returnJsonStr) @@ -456,11 +1309,12 @@ int32_t DeviceManagerServiceImpl::RegisterUiStateCallback(const std::string &pkg LOGE("RegisterUiStateCallback failed, pkgName is empty"); return ERR_DM_INPUT_PARA_INVALID; } - if (authMgr_ == nullptr) { - LOGE("authMgr_ is nullptr"); + auto authMgr = GetCurrentAuthMgr(); + if (authMgr == nullptr) { + LOGE("authMgr is nullptr"); return ERR_DM_POINT_NULL; } - return authMgr_->RegisterUiStateCallback(pkgName); + return authMgr->RegisterUiStateCallback(pkgName); } int32_t DeviceManagerServiceImpl::UnRegisterUiStateCallback(const std::string &pkgName) @@ -469,11 +1323,12 @@ int32_t DeviceManagerServiceImpl::UnRegisterUiStateCallback(const std::string &p LOGE("UnRegisterUiStateCallback failed, pkgName is empty"); return ERR_DM_INPUT_PARA_INVALID; } - if (authMgr_ == nullptr) { - LOGE("authMgr_ is nullptr"); + auto authMgr = GetCurrentAuthMgr(); + if (authMgr == nullptr) { + LOGE("authMgr is nullptr"); return ERR_DM_POINT_NULL; } - return authMgr_->UnRegisterUiStateCallback(pkgName); + return authMgr->UnRegisterUiStateCallback(pkgName); } int32_t DeviceManagerServiceImpl::PraseNotifyEventJson(const std::string &event, JsonObject &jsonObject) @@ -524,7 +1379,7 @@ int32_t DeviceManagerServiceImpl::NotifyEvent(const std::string &pkgName, const int32_t DeviceManagerServiceImpl::GetGroupType(std::vector &deviceList) { - LOGI("GetGroupType begin"); + LOGI("begin"); if (softbusConnector_ == nullptr || hiChainConnector_ == nullptr) { LOGE("softbusConnector_ or hiChainConnector_ is nullptr"); return ERR_DM_POINT_NULL; @@ -563,6 +1418,16 @@ int32_t DeviceManagerServiceImpl::GetUdidHashByNetWorkId(const char *networkId, return DM_OK; } +std::shared_ptr DeviceManagerServiceImpl::GetConfigByTokenId() +{ + uint64_t tokenId = IPCSkeleton::GetCallingTokenID(); + std::lock_guard configsLock(configsMapMutex_); + if (configsMap_.find(tokenId) == configsMap_.end()) { + configsMap_[tokenId] = std::make_shared(); + } + return configsMap_[tokenId]; +} + int32_t DeviceManagerServiceImpl::ImportAuthCode(const std::string &pkgName, const std::string &authCode) { if (pkgName.empty() || authCode.empty()) { @@ -570,52 +1435,375 @@ int32_t DeviceManagerServiceImpl::ImportAuthCode(const std::string &pkgName, con return ERR_DM_INPUT_PARA_INVALID; } - return authMgr_->ImportAuthCode(pkgName, authCode); + LOGI("pkgName is %{public}s, authCode is %{public}s", + pkgName.c_str(), GetAnonyString(authCode).c_str()); + auto authMgr = GetAuthMgr(); + if (authMgr != nullptr) { + authMgr->ImportAuthCode(pkgName, authCode); + } + auto config = GetConfigByTokenId(); + config->pkgName = pkgName; + config->authCode = authCode; // If registered multiple times, only the last one is kept + return DM_OK; } int32_t DeviceManagerServiceImpl::ExportAuthCode(std::string &authCode) { - int32_t ret = authMgr_->GeneratePincode(); + 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; } -int32_t DeviceManagerServiceImpl::BindTarget(const std::string &pkgName, const PeerTargetId &targetId, +static JsonObject GetExtraJsonObject(const std::map &bindParam) +{ + std::string extra; + auto iter = bindParam.find(PARAM_KEY_BIND_EXTRA_DATA); + if (iter != bindParam.end()) { + extra = iter->second; + } else { + extra = ConvertMapToJsonString(bindParam); + } + + return JsonObject(extra); +} + +static int32_t GetHmlInfo(const JsonObject &jsonObject, bool &hmlEnable160M, int32_t &hmlActionId) +{ + if (jsonObject[PARAM_KEY_HML_ENABLE_160M].IsBoolean()) { + hmlEnable160M = jsonObject[PARAM_KEY_HML_ENABLE_160M].Get(); + LOGI("hmlEnable160M %{public}d", hmlEnable160M); + } + if (!IsString(jsonObject, PARAM_KEY_HML_ACTIONID)) { + LOGE("PARAM_KEY_HML_ACTIONID is not string"); + return ERR_DM_INPUT_PARA_INVALID; + } + std::string actionIdStr = jsonObject[PARAM_KEY_HML_ACTIONID].Get(); + if (!IsNumberString(actionIdStr)) { + LOGE("PARAM_KEY_HML_ACTIONID is not number"); + return ERR_DM_INPUT_PARA_INVALID; + } + int32_t actionId = std::atoi(actionIdStr.c_str()); + if (actionId <= 0) { + LOGE("PARAM_KEY_HML_ACTIONID is <= 0"); + return ERR_DM_INPUT_PARA_INVALID; + } + hmlActionId = actionId; + return DM_OK; +} + +static bool IsHmlSessionType(const JsonObject &jsonObject) +{ + std::string connSessionType; + if (jsonObject[PARAM_KEY_CONN_SESSIONTYPE].IsString()) { + connSessionType = jsonObject[PARAM_KEY_CONN_SESSIONTYPE].Get(); + LOGI("connSessionType %{public}s", connSessionType.c_str()); + } + return connSessionType == CONN_SESSION_TYPE_HML; +} + +int DeviceManagerServiceImpl::OpenAuthSession(const std::string& deviceId, const std::map &bindParam) { - if (pkgName.empty()) { - LOGE("BindTarget failed, pkgName is empty"); + bool hmlEnable160M = false; + int32_t hmlActionId = 0; + int invalidSessionId = -1; + JsonObject jsonObject = GetExtraJsonObject(bindParam); + if (jsonObject.IsDiscarded()) { + LOGE("extra string not a json type."); + return invalidSessionId; + } + if (softbusConnector_ == nullptr) { + return invalidSessionId; + } + if (IsHmlSessionType(jsonObject)) { + auto ret = GetHmlInfo(jsonObject, hmlEnable160M, hmlActionId); + if (ret != DM_OK) { + LOGE("OpenAuthSession failed, GetHmlInfo failed."); + return ret; + } + LOGI("hmlActionId %{public}d, hmlEnable160M %{public}d", hmlActionId, hmlEnable160M); + CHECK_NULL_RETURN(listener_, ERR_DM_FAILED); + return listener_->OpenAuthSessionWithPara(deviceId, hmlActionId, hmlEnable160M); + } else { + return softbusConnector_->GetSoftbusSession()->OpenAuthSession(deviceId); + } +} + +std::shared_ptr DeviceManagerServiceImpl::GetOrCreateSession(const std::string& deviceId, + const std::map &bindParam) +{ + std::shared_ptr instance; + int sessionId = -1; + // Acquire global lock to ensure thread safety for maps + { + std::lock_guard lock(mapMutex_); + if (deviceId2SessionIdMap_.find(deviceId) != deviceId2SessionIdMap_.end()) { + sessionId = deviceId2SessionIdMap_[deviceId]; + } + if (sessionsMap_.find(sessionId) != sessionsMap_.end()) { + return sessionsMap_[sessionId]; + } + } + + // Get the lock corresponding to deviceId + std::mutex& device_mutex = deviceIdMutexMap_[deviceId]; + std::lock_guard lock(device_mutex); + + // Check again whether the corresponding object already exists (because other threads may have created it during + // the lock acquisition in the previous step) + { + std::lock_guard lock(mapMutex_); + if (deviceId2SessionIdMap_.find(deviceId) != deviceId2SessionIdMap_.end()) { + sessionId = deviceId2SessionIdMap_[deviceId]; + } + if (sessionsMap_.find(sessionId) != sessionsMap_.end()) { + return sessionsMap_[sessionId]; + } + + sessionId = OpenAuthSession(deviceId, bindParam); + if (sessionId < 0) { + LOGE("OpenAuthSession failed, stop the authentication"); + return nullptr; + } + + std::unique_lock cvLock(sessionEnableMutexMap_[sessionId]); + sessionEnableCvReadyMap_[sessionId] = false; + if (sessionEnableCvMap_[sessionId].wait_for(cvLock, std::chrono::milliseconds(OPEN_AUTH_SESSION_TIMEOUT), + [&] { return sessionEnableCvReadyMap_[sessionId]; })) { + LOGI("session enable, sessionId: %{public}d.", sessionId); + } else { + LOGE("wait session enable timeout or enable fail, sessionId: %{public}d.", sessionId); + return nullptr; + } + sessionEnableCvReadyMap_.erase(sessionId); + instance = std::make_shared(sessionId, deviceId); + deviceId2SessionIdMap_[deviceId] = sessionId; + sessionsMap_[sessionId] = instance; + } + return instance; +} + +int32_t DeviceManagerServiceImpl::GetDeviceInfo(const PeerTargetId &targetId, std::string &addrType, + std::string &deviceId, std::shared_ptr deviceInfo, int32_t &index) +{ + ConnectionAddr addr; + if (!targetId.wifiIp.empty() && targetId.wifiIp.length() <= IP_STR_MAX_LEN) { + LOGI("parse wifiIp: %{public}s.", GetAnonyString(targetId.wifiIp).c_str()); + if (!addrType.empty()) { + addr.type = static_cast(std::atoi(addrType.c_str())); + } else { + addr.type = ConnectionAddrType::CONNECTION_ADDR_WLAN; + } + if (memcpy_s(addr.info.ip.ip, IP_STR_MAX_LEN, targetId.wifiIp.c_str(), targetId.wifiIp.length()) != 0) { + LOGE("get ip addr: %{public}s failed", GetAnonyString(targetId.wifiIp).c_str()); + return ERR_DM_SECURITY_FUNC_FAILED; + } + addr.info.ip.port = targetId.wifiPort; + deviceInfo->addr[index] = addr; + deviceId = targetId.wifiIp; + index++; + } else if (!targetId.brMac.empty() && targetId.brMac.length() <= BT_MAC_LEN) { + LOGI("parse brMac: %{public}s.", GetAnonyString(targetId.brMac).c_str()); + addr.type = ConnectionAddrType::CONNECTION_ADDR_BR; + if (memcpy_s(addr.info.br.brMac, BT_MAC_LEN, targetId.brMac.c_str(), targetId.brMac.length()) != 0) { + LOGE("get brMac addr: %{public}s failed", GetAnonyString(targetId.brMac).c_str()); + return ERR_DM_SECURITY_FUNC_FAILED; + } + deviceInfo->addr[index] = addr; + deviceId = targetId.brMac; + index++; + } else if (!targetId.bleMac.empty() && targetId.bleMac.length() <= BT_MAC_LEN) { + LOGI("parse bleMac: %{public}s.", GetAnonyString(targetId.bleMac).c_str()); + addr.type = ConnectionAddrType::CONNECTION_ADDR_BLE; + if (memcpy_s(addr.info.ble.bleMac, BT_MAC_LEN, targetId.bleMac.c_str(), targetId.bleMac.length()) != 0) { + LOGE("get bleMac addr: %{public}s failed", GetAnonyString(targetId.bleMac).c_str()); + return ERR_DM_SECURITY_FUNC_FAILED; + } + if (!targetId.deviceId.empty()) { + Crypto::ConvertHexStringToBytes(addr.info.ble.udidHash, UDID_HASH_LEN, + targetId.deviceId.c_str(), targetId.deviceId.length()); + } + deviceInfo->addr[index] = addr; + deviceId = targetId.bleMac; + index++; + } else { + LOGE("DeviceManagerServiceImpl::GetDeviceInfo failed, not addr."); return ERR_DM_INPUT_PARA_INVALID; } - return authMgr_->BindTarget(pkgName, targetId, bindParam); + return DM_OK; } -void DeviceManagerServiceImpl::PutIdenticalAccountToAcl(std::string requestDeviceId, std::string trustDeviceId) +bool DeviceManagerServiceImpl::IsAuthNewVersion(int32_t bindLevel, std::string localUdid, std::string remoteUdid, + int32_t tokenId, int32_t userId) { - LOGI("DeviceManagerServiceImpl::PutIdenticalAccountAcl start."); - char localDeviceId[DEVICE_UUID_LENGTH] = {0}; - Crypto::GetUdidHash(requestDeviceId, reinterpret_cast(localDeviceId)); - std::string localUdidHash = std::string(localDeviceId); - DmAclInfo aclInfo; - aclInfo.bindType = IDENTICAL_ACCOUNT; - aclInfo.trustDeviceId = trustDeviceId; - aclInfo.authenticationType = ALLOW_AUTH_ALWAYS; - aclInfo.deviceIdHash = localUdidHash; - DmAccesser accesser; - accesser.requestUserId = MultipleUserConnector::GetFirstForegroundUserId(); - accesser.requestAccountId = MultipleUserConnector::GetOhosAccountIdByUserId(accesser.requestUserId); - MultipleUserConnector::SetSwitchOldUserId(accesser.requestUserId); - MultipleUserConnector::SetSwitchOldAccountId(accesser.requestAccountId); - accesser.requestDeviceId = requestDeviceId; - DmAccessee accessee; - accessee.trustDeviceId = trustDeviceId; - DeviceProfileConnector::GetInstance().PutAccessControlList(aclInfo, accesser, accessee); + std::string extraInfo = DeviceProfileConnector::GetInstance().IsAuthNewVersion( + bindLevel, localUdid, remoteUdid, tokenId, userId); + JsonObject extraInfoJson(extraInfo); + if (extraInfoJson.IsDiscarded()) { + LOGE("IsAuthNewVersion extraInfoJson error"); + return false; + } + if (!extraInfoJson[TAG_DMVERSION].IsString()) { + LOGE("IsAuthNewVersion PARAM_KEY_OS_VERSION error"); + return false; + } + std::string dmVersion = extraInfoJson[TAG_DMVERSION].Get(); + if (CompareVersion(dmVersion, std::string(DM_VERSION_5_1_0)) || dmVersion == std::string(DM_VERSION_5_1_0)) { + return true; + } + return false; +} + +int32_t DeviceManagerServiceImpl::ParseConnectAddr(const PeerTargetId &targetId, std::string &deviceId, + const std::map &bindParam) +{ + std::string addrType; + if (bindParam.count(PARAM_KEY_CONN_ADDR_TYPE) != 0) { + addrType = bindParam.at(PARAM_KEY_CONN_ADDR_TYPE); + } + + std::shared_ptr deviceInfo = std::make_shared(); + int32_t index = 0; + int32_t ret = GetDeviceInfo(targetId, addrType, deviceId, deviceInfo, index); + if (ret != DM_OK) { + LOGE("GetDeviceInfo failed, ret: %{public}d", ret); + } + deviceInfo->addrNum = static_cast(index); + if (softbusConnector_->AddMemberToDiscoverMap(deviceId, deviceInfo) != DM_OK) { + LOGE("DeviceManagerServiceImpl::ParseConnectAddr failed, AddMemberToDiscoverMap failed."); + return ERR_DM_INPUT_PARA_INVALID; + } + deviceInfo = nullptr; + return DM_OK; +} + +void DeviceManagerServiceImpl::SaveTokenIdAndSessionId(uint64_t &tokenId, + int32_t &sessionId, uint64_t &logicalSessionId) +{ + { + std::lock_guard tokenIdLock(logicalSessionId2TokenIdMapMtx_); + logicalSessionId2TokenIdMap_[logicalSessionId] = tokenId; + } + { + std::lock_guard sessionIdLock(logicalSessionId2SessionIdMapMtx_); + logicalSessionId2SessionIdMap_[logicalSessionId] = sessionId; + } +} + +bool DeviceManagerServiceImpl::ParseConnectAddrAndSetProcessInfo(const PeerTargetId &targetId, + PeerTargetId &targetIdTmp, const std::map &bindParam, ProcessInfo &processInfo, + const std::string &pkgName) +{ + processInfo.pkgName = pkgName; + if (bindParam.count(BIND_CALLER_USERID) != 0) { + processInfo.userId = std::atoi(bindParam.at(BIND_CALLER_USERID).c_str()); + } + std::string deviceId = ""; + if (ParseConnectAddr(targetId, deviceId, bindParam) == DM_OK) { + targetIdTmp.deviceId = deviceId; + } else { + if (targetId.deviceId.empty()) { + LOGE("DeviceManagerServiceImpl::BindTarget failed, ParseConnectAddr failed."); + OnAuthResultAndOnBindResult(processInfo, targetId, targetId.deviceId, ERR_DM_INPUT_PARA_INVALID); + return false; + } + } + return true; +} + +void DeviceManagerServiceImpl::OnAuthResultAndOnBindResult(const ProcessInfo &processInfo, const PeerTargetId &targetId, + const std::string &deviceId, int32_t reason) +{ + CHECK_NULL_VOID(listener_); + listener_->OnAuthResult(processInfo, deviceId, "", DmAuthStatus::STATUS_DM_AUTH_DEFAULT, reason); + listener_->OnBindResult(processInfo, targetId, reason, DmAuthStatus::STATUS_DM_AUTH_DEFAULT, ""); +} + +void DeviceManagerServiceImpl::BindTargetImpl(uint64_t tokenId, const std::string &pkgName, + const PeerTargetId &targetId, const std::map &bindParam) +{ + PeerTargetId targetIdTmp = const_cast(targetId); + ProcessInfo processInfo; + if (!ParseConnectAddrAndSetProcessInfo(targetId, targetIdTmp, bindParam, processInfo, pkgName)) { + return; + } + // Created only at the source end. The same target device will not be created repeatedly with the new protocol. + std::shared_ptr curSession = GetOrCreateSession(targetIdTmp.deviceId, bindParam); + if (curSession == nullptr) { + LOGE("Failed to create the session. Target deviceId: %{public}s.", + GetAnonyString(targetIdTmp.deviceId).c_str()); + OnAuthResultAndOnBindResult(processInfo, targetId, targetIdTmp.deviceId, ERR_DM_TIME_OUT); + return; + } + + // Logical session random number + int sessionId = curSession->sessionId_; + uint64_t logicalSessionId = 0; + if (curSession->version_ == "" || CompareVersion(curSession->version_, DM_VERSION_5_0_OLD_MAX)) { + logicalSessionId = GenerateRandNum(sessionId); + if (curSession->logicalSessionSet_.find(logicalSessionId) != curSession->logicalSessionSet_.end()) { + LOGE("Failed to create the logical session."); + softbusConnector_->GetSoftbusSession()->CloseAuthSession(sessionId); + OnAuthResultAndOnBindResult(processInfo, targetId, targetIdTmp.deviceId, ERR_DM_INPUT_PARA_INVALID); + return; + } + } + + // Create on the src end. + int32_t ret = InitAndRegisterAuthMgr(true, tokenId, curSession, logicalSessionId, ""); + if (ret != DM_OK) { + LOGE("InitAndRegisterAuthMgr failed, ret %{public}d.", ret); + softbusConnector_->GetSoftbusSession()->CloseAuthSession(sessionId); + OnAuthResultAndOnBindResult(processInfo, targetId, targetIdTmp.deviceId, ret); + return; + } + curSession->logicalSessionSet_.insert(logicalSessionId); + curSession->logicalSessionCnt_.fetch_add(1); + SaveTokenIdAndSessionId(tokenId, sessionId, logicalSessionId); + auto authMgr = GetAuthMgrByTokenId(tokenId); + if (authMgr == nullptr) { + CleanAuthMgrByLogicalSessionId(logicalSessionId); + OnAuthResultAndOnBindResult(processInfo, targetId, targetIdTmp.deviceId, ERR_DM_POINT_NULL); + return; + } + authMgr->SetBindTargetParams(targetId); + if ((ret = authMgr->BindTarget(pkgName, targetIdTmp, bindParam, sessionId, logicalSessionId)) != DM_OK) { + LOGE("authMgr BindTarget failed, ret %{public}d.", ret); + CleanAuthMgrByLogicalSessionId(logicalSessionId); + OnAuthResultAndOnBindResult(processInfo, targetId, targetIdTmp.deviceId, ret); + } + LOGI("end, tokenId %{public}" PRId64".", tokenId); + return; +} + +int32_t DeviceManagerServiceImpl::BindTarget(const std::string &pkgName, const PeerTargetId &targetId, + const std::map &bindParam) +{ + if (pkgName.empty()) { + LOGE("BindTarget failed, pkgName is empty."); + return ERR_DM_INPUT_PARA_INVALID; + } + DmBindCallerInfo bindCallerInfo; + GetBindCallerInfo(bindCallerInfo, pkgName); + std::map bindParamTmp; + SetBindCallerInfoToBindParam(bindParam, bindParamTmp, bindCallerInfo); + uint64_t tokenId = IPCSkeleton::GetCallingTokenID(); + { + std::lock_guard lock(authMgrMapMtx_); + if (authMgrMap_.find(tokenId) != authMgrMap_.end()) { + LOGE("BindTarget failed, this device is being bound. please try again later."); + return ERR_DM_AUTH_BUSINESS_BUSY; + } + } + std::thread newThread(&DeviceManagerServiceImpl::BindTargetImpl, this, tokenId, pkgName, targetId, bindParamTmp); + newThread.detach(); + return DM_OK; } int32_t DeviceManagerServiceImpl::DpAclAdd(const std::string &udid) { - LOGI("DeviceManagerServiceImpl DpAclAdd start."); + LOGI("start udid %{public}s.", GetAnonyString(udid).c_str()); MultipleUserConnector::SetSwitchOldUserId(MultipleUserConnector::GetCurrentAccountUserID()); MultipleUserConnector::SetSwitchOldAccountId(MultipleUserConnector::GetOhosAccountId()); if (deviceStateMgr_->CheckIsOnline(udid)) { @@ -626,7 +1814,6 @@ int32_t DeviceManagerServiceImpl::DpAclAdd(const std::string &udid) softbusConnector_->SetProcessInfo(processInfo); deviceStateMgr_->OnDeviceOnline(udid, DmAuthForm::IDENTICAL_ACCOUNT); } - LOGI("DeviceManagerServiceImpl::DpAclAdd completed"); return DM_OK; } @@ -640,11 +1827,10 @@ int32_t DeviceManagerServiceImpl::IsSameAccount(const std::string &udid) return DeviceProfileConnector::GetInstance().IsSameAccount(udid); } -uint64_t DeviceManagerServiceImpl::GetTokenIdByNameAndDeviceId(std::string pkgName, - std::string requestDeviceId) +uint64_t DeviceManagerServiceImpl::GetTokenIdByNameAndDeviceId(std::string extra, std::string requestDeviceId) { - if (pkgName.empty()) { - LOGE("DeviceManagerServiceImpl::GetTokenIdByNameAndDeviceId error: pkgName."); + if (extra.empty()) { + LOGE("DeviceManagerServiceImpl::GetTokenIdByNameAndDeviceId error: extra."); return ERR_DM_INPUT_PARA_INVALID; } @@ -653,7 +1839,7 @@ uint64_t DeviceManagerServiceImpl::GetTokenIdByNameAndDeviceId(std::string pkgNa return ERR_DM_INPUT_PARA_INVALID; } - return DeviceProfileConnector::GetInstance().GetTokenIdByNameAndDeviceId(pkgName, requestDeviceId); + return DeviceProfileConnector::GetInstance().GetTokenIdByNameAndDeviceId(extra, requestDeviceId); } std::unordered_map DeviceManagerServiceImpl::GetAppTrustDeviceIdList( @@ -675,8 +1861,9 @@ void DeviceManagerServiceImpl::HandleIdentAccountLogout(const std::string &local { LOGI("localUdid %{public}s, localUserId %{public}d, peerUdid %{public}s, peerUserId %{public}d.", GetAnonyString(localUdid).c_str(), localUserId, GetAnonyString(peerUdid).c_str(), peerUserId); + DmOfflineParam offlineParam; bool notifyOffline = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, - peerUdid, peerUserId); + peerUdid, peerUserId, offlineParam); if (notifyOffline) { ProcessInfo processInfo; processInfo.pkgName = std::string(DM_PKG_NAME); @@ -686,33 +1873,55 @@ void DeviceManagerServiceImpl::HandleIdentAccountLogout(const std::string &local CHECK_NULL_VOID(deviceStateMgr_); deviceStateMgr_->OnDeviceOffline(peerUdid); } + CHECK_NULL_VOID(hiChainConnector_); + hiChainConnector_->DeleteAllGroup(localUserId); + CHECK_NULL_VOID(hiChainAuthConnector_); + hiChainAuthConnector_->DeleteCredential(peerUdid, localUserId, peerUserId); + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); } -void DeviceManagerServiceImpl::HandleUserRemoved(int32_t preUserId) +void DeviceManagerServiceImpl::HandleUserRemoved(std::vector peerUdids, int32_t preUserId) { LOGI("PreUserId %{public}d.", preUserId); char localDeviceId[DEVICE_UUID_LENGTH]; GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); std::string localUdid = reinterpret_cast(localDeviceId); - DeviceProfileConnector::GetInstance().DeleteAclForUserRemoved(localUdid, preUserId); + std::multimap peerUserIdMap; // key: peerUdid value: peerUserId + DmOfflineParam offlineParam; + DeviceProfileConnector::GetInstance().DeleteAclForUserRemoved(localUdid, preUserId, peerUdids, peerUserIdMap, + offlineParam); CHECK_NULL_VOID(hiChainConnector_); hiChainConnector_->DeleteAllGroup(preUserId); + + if (peerUserIdMap.empty()) { + LOGE("peerUserIdMap is empty"); + return; + } + CHECK_NULL_VOID(hiChainAuthConnector_); + for (const auto &item : peerUserIdMap) { + hiChainAuthConnector_->DeleteCredential(item.first, preUserId, item.second); + } + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); } void DeviceManagerServiceImpl::HandleRemoteUserRemoved(int32_t userId, const std::string &remoteUdid) { LOGI("remoteUdid %{public}s, userId %{public}d", GetAnonyString(remoteUdid).c_str(), userId); std::vector localUserIds; - DeviceProfileConnector::GetInstance().DeleteAclForRemoteUserRemoved(remoteUdid, userId, localUserIds); + DmOfflineParam offlineParam; + DeviceProfileConnector::GetInstance().DeleteAclForRemoteUserRemoved(remoteUdid, userId, localUserIds, offlineParam); if (localUserIds.empty()) { return; } - CHECK_NULL_VOID(hiChainConnector_); + CHECK_NULL_VOID(hiChainAuthConnector_); std::vector> delInfoVec; for (int32_t localUserId : localUserIds) { delInfoVec.push_back(std::pair(localUserId, remoteUdid)); + hiChainAuthConnector_->DeleteCredential(remoteUdid, localUserId, userId); } + CHECK_NULL_VOID(hiChainConnector_); hiChainConnector_->DeleteGroupByACL(delInfoVec, localUserIds); + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); } void DeviceManagerServiceImpl::HandleUserSwitched(const std::vector &deviceVec, @@ -724,53 +1933,51 @@ void DeviceManagerServiceImpl::HandleUserSwitched(const std::vector GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); std::string localUdid = static_cast(localDeviceId); DeviceProfileConnector::GetInstance().HandleUserSwitched(localUdid, deviceVec, currentUserId, beforeUserId); - CHECK_NULL_VOID(hiChainConnector_); - hiChainConnector_->DeleteAllGroup(beforeUserId); } void DeviceManagerServiceImpl::ScreenCommonEventCallback(std::string commonEventType) { if (commonEventType == EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_LOCKED) { - LOGI("DeviceManagerServiceImpl::ScreenCommonEventCallback on screen locked."); - if (authMgr_ != nullptr) { - authMgr_->OnScreenLocked(); - return; - } else { - LOGE("authMgr_ is null, cannot call OnScreenLocked."); + LOGI("on screen locked."); + std::lock_guard lock(authMgrMapMtx_); + for (auto& pair : authMgrMap_) { + if (pair.second != nullptr) { + LOGI("tokenId: %{public}" PRId64 ".", pair.first); + pair.second->OnScreenLocked(); + } } + return; } - LOGI("DeviceManagerServiceImpl::ScreenCommonEventCallback error."); + LOGI("error."); } -int32_t DeviceManagerServiceImpl::CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, +bool DeviceManagerServiceImpl::CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) { return DeviceProfileConnector::GetInstance().CheckIsSameAccount(caller, srcUdid, callee, sinkUdid); } -int32_t DeviceManagerServiceImpl::CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, +bool DeviceManagerServiceImpl::CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) { CHECK_NULL_RETURN(hiChainConnector_, ERR_DM_POINT_NULL); - bool ret = hiChainConnector_->IsDevicesInP2PGroup(srcUdid, sinkUdid); - if (!ret) { - int32_t checkRet = DeviceProfileConnector::GetInstance().CheckAccessControl(caller, - srcUdid, callee, sinkUdid); - return checkRet; + if (!hiChainConnector_->IsDevicesInP2PGroup(srcUdid, sinkUdid)) { + return DeviceProfileConnector::GetInstance().CheckAccessControl(caller, srcUdid, callee, sinkUdid); } else { - return DM_OK; + return true; } } void DeviceManagerServiceImpl::HandleDeviceNotTrust(const std::string &udid) { - LOGI("DeviceManagerServiceImpl::HandleDeviceNotTrust udid: %{public}s.", GetAnonyString(udid).c_str()); + LOGI("udid: %{public}s.", GetAnonyString(udid).c_str()); if (udid.empty()) { LOGE("HandleDeviceNotTrust udid is empty."); return; } - CHECK_NULL_VOID(authMgr_); - authMgr_->HandleDeviceNotTrust(udid); + DeviceProfileConnector::GetInstance().DeleteAccessControlList(udid); + CHECK_NULL_VOID(hiChainConnector_); + hiChainConnector_->DeleteAllGroupByUdid(udid); } int32_t DeviceManagerServiceImpl::GetBindLevel(const std::string &pkgName, const std::string &localUdid, @@ -789,6 +1996,17 @@ std::map DeviceManagerServiceImpl::GetDeviceIdAndBindLevel return DeviceProfileConnector::GetInstance().GetDeviceIdAndBindLevel(userIds, localUdid); } +std::vector DeviceManagerServiceImpl::GetDeviceIdByUserIdAndTokenId(int32_t userId, + int32_t tokenId) +{ + char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localUdidTemp); + std::vector userIds; + userIds.push_back(userId); + return DeviceProfileConnector::GetInstance().GetDeviceIdAndUdidListByTokenId(userIds, localUdid, tokenId); +} + std::multimap DeviceManagerServiceImpl::GetDeviceIdAndUserId(int32_t userId, const std::string &accountId) { @@ -812,8 +2030,10 @@ void DeviceManagerServiceImpl::HandleAccountLogoutEvent(int32_t remoteUserId, co SoftbusCache::GetInstance().GetUuidByUdid(remoteUdid, uuid); listener_->OnDeviceTrustChange(remoteUdid, uuid, DmAuthForm::IDENTICAL_ACCOUNT); for (const auto &item : devIdAndUserMap) { + DmOfflineParam offlineParam; + LOGI("remoteUdid %{public}s.", GetAnonyString(remoteUdid).c_str()); bool notifyOffline = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(item.first, item.second, - remoteUdid, remoteUserId); + remoteUdid, remoteUserId, offlineParam); if (notifyOffline) { ProcessInfo processInfo; processInfo.pkgName = std::string(DM_PKG_NAME); @@ -823,6 +2043,11 @@ void DeviceManagerServiceImpl::HandleAccountLogoutEvent(int32_t remoteUserId, co CHECK_NULL_VOID(deviceStateMgr_); deviceStateMgr_->OnDeviceOffline(remoteUdid); } + CHECK_NULL_VOID(hiChainConnector_); + hiChainConnector_->DeleteAllGroup(item.second); + CHECK_NULL_VOID(hiChainAuthConnector_); + hiChainAuthConnector_->DeleteCredential(remoteUdid, item.second, remoteUserId); + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); } } @@ -842,54 +2067,137 @@ DmAuthForm DeviceManagerServiceImpl::ConvertBindTypeToAuthForm(int32_t bindType) return authForm; } +int32_t DeviceManagerServiceImpl::DeleteGroup(const std::string &pkgName, const std::string &deviceId) +{ + LOGI("start"); + if (pkgName.empty()) { + LOGE("Invalid parameter, pkgName is empty."); + return ERR_DM_FAILED; + } + std::vector groupList; + CHECK_NULL_RETURN(hiChainConnector_, ERR_DM_POINT_NULL); + hiChainConnector_->GetRelatedGroups(deviceId, groupList); + for (const auto &item : groupList) { + std::string groupId = item.groupId; + hiChainConnector_->DeleteGroup(groupId); + } + return DM_OK; +} + void DeviceManagerServiceImpl::HandleDevUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid) { char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); std::string localUdid = std::string(localUdidTemp); - int32_t bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid); - if (static_cast(bindType) == DM_INVALIED_BINDTYPE) { + DmOfflineParam offlineParam; + int32_t bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent( + remoteUserId, remoteUdid, localUdid, offlineParam); + if (static_cast(bindType) == DM_INVALIED_TYPE) { LOGE("Invalied bindtype."); return; } - CHECK_NULL_VOID(authMgr_); - authMgr_->DeleteGroup(DM_PKG_NAME, remoteUdid); + DeleteGroup(DM_PKG_NAME, remoteUdid); + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); } void DeviceManagerServiceImpl::HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId) { + LOGI("tokenId = %{public}d.", tokenId); char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); std::string localUdid = std::string(localUdidTemp); - ProcessInfo processInfo = + DmOfflineParam offlineParam = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, localUdid); - if (processInfo.pkgName.empty()) { - LOGE("Pkgname is empty."); - return; + + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); + + //first, not app/service/user/DM_IDENTICAL_ACCOUNT acl, determin if need clear lnn acl + if (offlineParam.allLeftAppOrSvrAclInfos.empty() && offlineParam.allUserAclInfos.empty() && + !offlineParam.allLnnAclInfos.empty()) { + LOGI("No acl exist, clear lnn acl"); + DeleteSkCredAndAcl(offlineParam.allLnnAclInfos); + } + + //second, not user/DM_IDENTICAL_ACCOUNT acl, but app/service acl exist + //determin if need report offline to unbind bundle + if (!offlineParam.allLeftAppOrSvrAclInfos.empty() && offlineParam.allUserAclInfos.empty()) { + LOGI("after clear target acl, No user acl exist, report offline"); + CHECK_NULL_VOID(softbusConnector_); + softbusConnector_->SetProcessInfoVec(offlineParam.processVec); + softbusConnector_->HandleDeviceOffline(remoteUdid); + } + //third, not lnn acl, determin if delete Credential + if (offlineParam.allLnnAclInfos.empty()) { + CHECK_NULL_VOID(hiChainAuthConnector_); + hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID(), + remoteUserId); } - CHECK_NULL_VOID(softbusConnector_); - softbusConnector_->SetProcessInfo(processInfo); - softbusConnector_->HandleDeviceOffline(remoteUdid); } void DeviceManagerServiceImpl::HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, int32_t peerTokenId) { - LOGI("HandleAppUnBindEvent peerTokenId = %{public}d.", peerTokenId); + LOGI("DeviceManagerServiceImpl::HandleAppUnBindEvent remoteUserId: %{public}s, remoteUdid: %{public}s," + "tokenId = %{public}s, peerTokenId = %{public}s.", GetAnonyInt32(remoteUserId).c_str(), + GetAnonyString(remoteUdid).c_str(), GetAnonyInt32(tokenId).c_str(), GetAnonyInt32(peerTokenId).c_str()); char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); std::string localUdid = std::string(localUdidTemp); - ProcessInfo processInfo = + DmOfflineParam offlineParam = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, - tokenId, localUdid, peerTokenId); - if (processInfo.pkgName.empty()) { - LOGE("Pkgname is empty."); - return; + tokenId, localUdid, peerTokenId); + + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); + //first, not app/service/user/DM_IDENTICAL_ACCOUNT acl, determin if need clear lnn acl + if (offlineParam.allLeftAppOrSvrAclInfos.empty() && offlineParam.allUserAclInfos.empty() && + !offlineParam.allLnnAclInfos.empty()) { + LOGI("No acl exist, clear lnn acl"); + DeleteSkCredAndAcl(offlineParam.allLnnAclInfos); + } + + //second, not user/DM_IDENTICAL_ACCOUNT acl, but app/service acl exist + //determin if need report offline to unbind bundle + if (!offlineParam.allLeftAppOrSvrAclInfos.empty() && offlineParam.allUserAclInfos.empty()) { + LOGI("after clear target acl, No user acl exist, report offline"); + CHECK_NULL_VOID(softbusConnector_); + softbusConnector_->SetProcessInfoVec(offlineParam.processVec); + softbusConnector_->HandleDeviceOffline(remoteUdid); + } + //third, not lnn acl, determin if delete Credential + if (offlineParam.allLnnAclInfos.empty()) { + CHECK_NULL_VOID(hiChainAuthConnector_); + hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID(), + remoteUserId); + } +} + +void DeviceManagerServiceImpl::HandleServiceUnBindEvent(int32_t userId, const std::string &remoteUdid, + int32_t remoteTokenId) +{ + LOGI("remoteTokenId = %{public}d, userId: %{public}d, remoteUdid: %{public}s.", + remoteTokenId, userId, GetAnonyString(remoteUdid).c_str()); + char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localUdidTemp); + DmOfflineParam offlineParam = + DeviceProfileConnector::GetInstance().HandleServiceUnBindEvent(userId, remoteUdid, localUdid, remoteTokenId); + + //first, app/service acl exist, determin if need local acl + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); + //second, not app/service/user/DM_IDENTICAL_ACCOUNT acl exist, determin if need clear lnn acl + if (offlineParam.allLeftAppOrSvrAclInfos.empty() && offlineParam.allUserAclInfos.empty()) { + LOGI("No acl exist, clear lnn acl"); + DeleteSkCredAndAcl(offlineParam.allLnnAclInfos); + } + + //Third, not user/DM_IDENTICAL_ACCOUNT acl exist but app/service acl exist, + //determin if need report offline to unbind bundle + if (!offlineParam.allLeftAppOrSvrAclInfos.empty() && offlineParam.allUserAclInfos.empty()) { + LOGI("after clear target acl, No user acl exist, report offline"); + softbusConnector_->SetProcessInfoVec(offlineParam.processVec); + softbusConnector_->HandleDeviceOffline(remoteUdid); } - CHECK_NULL_VOID(softbusConnector_); - softbusConnector_->SetProcessInfo(processInfo); - softbusConnector_->HandleDeviceOffline(remoteUdid); } void DeviceManagerServiceImpl::HandleSyncUserIdEvent(const std::vector &foregroundUserIds, @@ -912,8 +2220,10 @@ void DeviceManagerServiceImpl::HandleSyncUserIdEvent(const std::vector if (isCheckUserStatus) { MultipleUserConnector::ClearLockedUser(localUserIds); } + DmOfflineParam offlineParam; DeviceProfileConnector::GetInstance().UpdateACL(localUdid, localUserIds, remoteUdid, - rmtFrontUserIdsTemp, rmtBackUserIdsTemp); + rmtFrontUserIdsTemp, rmtBackUserIdsTemp, offlineParam); + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); DeviceProfileConnector::GetInstance().HandleSyncBackgroundUserIdEvent(rmtBackUserIdsTemp, remoteUdid, localUserIds, localUdid); DeviceProfileConnector::GetInstance().HandleSyncForegroundUserIdEvent(rmtFrontUserIdsTemp, remoteUdid, @@ -957,6 +2267,20 @@ void DeviceManagerServiceImpl::HandleDeviceScreenStatusChange(DmDeviceInfo &devI deviceStateMgr_->HandleDeviceScreenStatusChange(devInfo); } +int32_t DeviceManagerServiceImpl::SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList) +{ + CHECK_NULL_RETURN(softbusConnector_, ERR_DM_POINT_NULL); + return softbusConnector_->SyncLocalAclListProcess(localDevUserInfo, remoteDevUserInfo, remoteAclList); +} + +int32_t DeviceManagerServiceImpl::GetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList) +{ + CHECK_NULL_RETURN(softbusConnector_, ERR_DM_POINT_NULL); + return softbusConnector_->GetAclListHash(localDevUserInfo, remoteDevUserInfo, aclList); +} + void DeviceManagerServiceImpl::HandleCredentialAuthStatus(const std::string &deviceList, uint16_t deviceTypeId, int32_t errcode) { @@ -968,32 +2292,33 @@ int32_t DeviceManagerServiceImpl::ProcessAppUnintall(const std::string &appId, i { CHECK_NULL_RETURN(listener_, ERR_DM_POINT_NULL); std::vector profiles = - DeviceProfileConnector::GetInstance().GetAllAccessControlProfile(); + DeviceProfileConnector::GetInstance().GetAllAclIncludeLnnAcl(); LOGI("delete ACL size is %{public}zu, appId %{public}s", profiles.size(), GetAnonyString(appId).c_str()); if (profiles.size() == 0) { return DM_OK; } + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localDeviceId); std::vector> delACLInfoVec; std::vector userIdVec; - for (auto &item : profiles) { - int64_t tokenId = item.GetAccesser().GetAccesserTokenId(); - if (accessTokenId != static_cast(tokenId)) { - continue; + std::map delProfileMap; + DeleteAclByTokenId(accessTokenId, profiles, delProfileMap, delACLInfoVec, userIdVec); + for (auto item : delProfileMap) { + DmOfflineParam lnnAclParam; + bool isLastLnnAcl = false; + for (auto it : profiles) { + CheckIsLastLnnAcl(it, item.second, lnnAclParam, isLastLnnAcl, localUdid); } - DeviceProfileConnector::GetInstance().DeleteAccessControlById(item.GetAccessControlId()); - listener_->OnAppUnintall(item.GetAccesser().GetAccesserBundleName()); - if (item.GetBindLevel() == DEVICE) { - userIdVec.push_back(item.GetAccesser().GetAccesserUserId()); - delACLInfoVec.push_back(std::pair(item.GetAccesser().GetAccesserUserId(), - item.GetAccessee().GetAccesseeDeviceId())); + if (!isLastLnnAcl) { + DeleteSkCredAndAcl(lnnAclParam.needDelAclInfos); } } + if (delACLInfoVec.size() == 0) { - LOGI("delACLInfoVec is empty"); return DM_OK; } if (userIdVec.size() == 0) { - LOGI("userIdVec is empty"); return DM_OK; } CHECK_NULL_RETURN(hiChainConnector_, ERR_DM_POINT_NULL); @@ -1001,6 +2326,205 @@ int32_t DeviceManagerServiceImpl::ProcessAppUnintall(const std::string &appId, i return DM_OK; } +int32_t DeviceManagerServiceImpl::ProcessAppUninstall(int32_t userId, int32_t accessTokenId) +{ + LOGE("DeviceManagerServiceImpl::ProcessAppUninstall userId = %{public}s, accessTokenId = %{public}s.", + GetAnonyInt32(userId).c_str(), GetAnonyInt32(accessTokenId).c_str()); + CHECK_NULL_RETURN(listener_, ERR_DM_POINT_NULL); + std::vector profiles = + DeviceProfileConnector::GetInstance().GetAllAclIncludeLnnAcl(); + LOGI("delete ACL size is %{public}zu", profiles.size()); + if (profiles.size() == 0) { + return DM_OK; + } + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localDeviceId); + std::vector> delACLInfoVec; + std::vector userIdVec; + GetDelACLInfoVec(accessTokenId, profiles, delACLInfoVec, userIdVec, userId); + + if (delACLInfoVec.size() == 0 || userIdVec.size() == 0) { + return DM_OK; + } + + CHECK_NULL_RETURN(hiChainConnector_, ERR_DM_POINT_NULL); + hiChainConnector_->DeleteGroupByACL(delACLInfoVec, userIdVec); + return DM_OK; +} + +void DeviceManagerServiceImpl::ProcessUnBindApp(int32_t userId, int32_t accessTokenId, + const std::string &extra, const std::string &udid) +{ + LOGI("DeviceManagerServiceImpl::ProcessUnBindApp userId = %{public}s, accessTokenId = %{public}s," + "extra = %{public}s.", GetAnonyInt32(userId).c_str(), GetAnonyInt32(accessTokenId).c_str(), + GetAnonyString(extra).c_str()); + + JsonObject extraInfoJson(extra); + if (extraInfoJson.IsDiscarded()) { + LOGE("ParseExtra extraInfoJson error"); + HandleAppUnBindEvent(userId, udid, accessTokenId); + return; + } + if (extraInfoJson.Contains(TAG_PEER_TOKENID) && extraInfoJson[TAG_PEER_TOKENID].IsNumberInteger()) { + uint64_t peerTokenId = extraInfoJson[TAG_PEER_TOKENID].Get(); + HandleAppUnBindEvent(userId, udid, accessTokenId, static_cast(peerTokenId)); + } + return; +} + +void DeviceManagerServiceImpl::CheckIsLastLnnAcl(DistributedDeviceProfile::AccessControlProfile profile, + DistributedDeviceProfile::AccessControlProfile delProfile, DmOfflineParam &lnnAclParam, bool &isLastLnnAcl, + const std::string &localUdid) +{ + if (DeviceProfileConnector::GetInstance().IsLnnAcl(profile) && CheckLnnAcl(delProfile, profile)) { + if (profile.GetAccesser().GetAccesserDeviceId() == localUdid) { + DeviceProfileConnector::GetInstance().CacheAcerAclId(profile, lnnAclParam.needDelAclInfos); + } + if (profile.GetAccessee().GetAccesseeDeviceId() == localUdid) { + DeviceProfileConnector::GetInstance().CacheAceeAclId(profile, lnnAclParam.needDelAclInfos); + } + } + if (!DeviceProfileConnector::GetInstance().IsLnnAcl(profile) && CheckLnnAcl(delProfile, profile)) { + isLastLnnAcl = true; + } +} + +void DeviceManagerServiceImpl::DeleteAclByTokenId(const int32_t accessTokenId, + std::vector &profiles, + std::map &delProfileMap, + std::vector> &delACLInfoVec, std::vector &userIdVec) +{ + for (auto &item : profiles) { + int64_t accesssertokenId = item.GetAccesser().GetAccesserTokenId(); + int64_t accessseetokenId = item.GetAccessee().GetAccesseeTokenId(); + if (accessTokenId != static_cast(accesssertokenId) && + accessTokenId != static_cast(accessseetokenId)) { + continue; + } + if (accessTokenId == static_cast(accesssertokenId)) { + DmOfflineParam offlineParam; + delProfileMap[item.GetAccessControlId()] = item; + DeviceProfileConnector::GetInstance().CacheAcerAclId(item, offlineParam.needDelAclInfos); + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); + listener_->OnAppUnintall(item.GetAccesser().GetAccesserBundleName()); + if (item.GetBindLevel() == USER) { + userIdVec.push_back(item.GetAccesser().GetAccesserUserId()); + delACLInfoVec.push_back(std::pair(item.GetAccesser().GetAccesserUserId(), + item.GetAccessee().GetAccesseeDeviceId())); + } + } + if (accessTokenId == static_cast(accessseetokenId)) { + DmOfflineParam offlineParam; + DeviceProfileConnector::GetInstance().CacheAceeAclId(item, offlineParam.needDelAclInfos); + delProfileMap[item.GetAccessControlId()] = item; + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); + listener_->OnAppUnintall(item.GetAccessee().GetAccesseeBundleName()); + if (item.GetBindLevel() == USER) { + userIdVec.push_back(item.GetAccessee().GetAccesseeUserId()); + delACLInfoVec.push_back(std::pair(item.GetAccessee().GetAccesseeUserId(), + item.GetAccesser().GetAccesserDeviceId())); + } + } + } + for (auto item : delProfileMap) { + for (auto it = profiles.begin(); it != profiles.end();) { + if (item.first == it->GetAccessControlId()) { + it = profiles.erase(it); + } else { + it++; + } + } + } +} + +void DeviceManagerServiceImpl::GetDelACLInfoVec(const int32_t &accessTokenId, + std::vector &profiles, + std::vector> &delACLInfoVec, std::vector &userIdVec, + const uint32_t &userId) +{ + std::map delProfileMap; + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localDeviceId); + for (auto &item : profiles) { + int64_t accesssertokenId = item.GetAccesser().GetAccesserTokenId(); + int64_t accessseetokenId = item.GetAccessee().GetAccesseeTokenId(); + if (accessTokenId != static_cast(accesssertokenId) && + accessTokenId != static_cast(accessseetokenId)) { + continue; + } + if (accessTokenId == static_cast(accesssertokenId) && + userId == item.GetAccesser().GetAccesserUserId() && + localUdid == item.GetAccessee().GetAccesseeDeviceId()) { + DmOfflineParam offlineParam; + delProfileMap[item.GetAccessControlId()] = item; + DeviceProfileConnector::GetInstance().CacheAcerAclId(item, offlineParam.needDelAclInfos); + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); + if (item.GetBindLevel() == USER) { + userIdVec.push_back(item.GetAccessee().GetAccesseeUserId()); + delACLInfoVec.push_back(std::pair(item.GetAccessee().GetAccesseeUserId(), + item.GetAccesser().GetAccesserDeviceId())); + } + } + if (accessTokenId == static_cast(accessseetokenId) && + userId == item.GetAccessee().GetAccesseeUserId() && + localUdid == item.GetAccesser().GetAccesserDeviceId()) { + DmOfflineParam offlineParam; + DeviceProfileConnector::GetInstance().CacheAceeAclId(item, offlineParam.needDelAclInfos); + delProfileMap[item.GetAccessControlId()] = item; + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); + if (item.GetBindLevel() == USER) { + userIdVec.push_back(item.GetAccesser().GetAccesserUserId()); + delACLInfoVec.push_back(std::pair(item.GetAccesser().GetAccesserUserId(), + item.GetAccessee().GetAccesseeDeviceId())); + } + } + } + DeleteAclByDelProfileMap(delProfileMap, profiles, localUdid); +} + +void DeviceManagerServiceImpl::DeleteAclByDelProfileMap( + const std::map &delProfileMap, + std::vector &profiles, const std::string &localUdid) +{ + for (auto item : delProfileMap) { + for (auto it = profiles.begin(); it != profiles.end();) { + if (item.first == it->GetAccessControlId()) { + it = profiles.erase(it); + } else { + it++; + } + } + } + for (auto item : delProfileMap) { + DmOfflineParam lnnAclParam; + bool isLastLnnAcl = false; + for (auto it : profiles) { + CheckIsLastLnnAcl(it, item.second, lnnAclParam, isLastLnnAcl, localUdid); + } + if (!isLastLnnAcl) { + DeleteSkCredAndAcl(lnnAclParam.needDelAclInfos); + } + } +} + +bool DeviceManagerServiceImpl::CheckLnnAcl(DistributedDeviceProfile::AccessControlProfile delProfile, + DistributedDeviceProfile::AccessControlProfile lastprofile) +{ + if ((delProfile.GetAccesser().GetAccesserDeviceId() == lastprofile.GetAccesser().GetAccesserDeviceId() && + delProfile.GetAccesser().GetAccesserUserId() == lastprofile.GetAccesser().GetAccesserUserId() && + delProfile.GetAccessee().GetAccesseeDeviceId() == lastprofile.GetAccessee().GetAccesseeDeviceId() && + delProfile.GetAccessee().GetAccesseeUserId() == lastprofile.GetAccessee().GetAccesseeUserId()) || + (delProfile.GetAccesser().GetAccesserDeviceId() == lastprofile.GetAccessee().GetAccesseeDeviceId() && + delProfile.GetAccesser().GetAccesserUserId() == lastprofile.GetAccessee().GetAccesseeUserId() && + delProfile.GetAccessee().GetAccesseeDeviceId() == lastprofile.GetAccesser().GetAccesserDeviceId() && + delProfile.GetAccessee().GetAccesseeUserId() == lastprofile.GetAccesser().GetAccesserUserId())) { + return true; + } + return false; +} + std::multimap DeviceManagerServiceImpl::GetDeviceIdAndUserId(int32_t localUserId) { LOGI("localUserId %{public}d.", localUserId); @@ -1028,31 +2552,54 @@ void DeviceManagerServiceImpl::HandleDeviceUnBind(int32_t bindType, const std::s int32_t DeviceManagerServiceImpl::RegisterAuthenticationType(int32_t authenticationType) { - CHECK_NULL_RETURN(authMgr_, ERR_DM_POINT_NULL); - return authMgr_->RegisterAuthenticationType(authenticationType); + if (authenticationType != USER_OPERATION_TYPE_ALLOW_AUTH && + authenticationType != USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS) { + LOGE("Invalid parameter."); + return ERR_DM_INPUT_PARA_INVALID; + } + auto authMgr = GetAuthMgr(); + if (authMgr == nullptr) { + auto config = GetConfigByTokenId(); + config->authenticationType = authenticationType; // only the last registration is retained + return DM_OK; + } + return authMgr->RegisterAuthenticationType(authenticationType); } void DeviceManagerServiceImpl::DeleteAlwaysAllowTimeOut() { - LOGI("Start DeleteAlwaysAllowTimeOut"); + LOGI("Start"); std::vector profiles = DeviceProfileConnector::GetInstance().GetAllAccessControlProfile(); std::string remoteUdid = ""; + int32_t remoteUserId = -1; int64_t currentTime = std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(); + int32_t currentUserId = MultipleUserConnector::GetCurrentAccountUserID(); + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localDeviceId); for (auto &item : profiles) { if (item.GetBindType() == DM_IDENTICAL_ACCOUNT) { continue; } if ((currentTime - item.GetLastAuthTime()) > MAX_ALWAYS_ALLOW_SECONDS && item.GetLastAuthTime() > 0) { DeviceProfileConnector::GetInstance().DeleteAccessControlById(item.GetAccessControlId()); + if (item.GetAccesser().GetAccesserUserId() == currentUserId && + item.GetAccesser().GetAccesserDeviceId() == localUdid) { + remoteUserId = item.GetAccessee().GetAccesseeUserId(); + } + if (item.GetAccessee().GetAccesseeUserId() == currentUserId && + item.GetAccessee().GetAccesseeDeviceId() == localUdid) { + remoteUserId = item.GetAccesser().GetAccesserUserId(); + } remoteUdid = item.GetTrustDeviceId(); - CheckDeleteCredential(remoteUdid); + CheckDeleteCredential(remoteUdid, remoteUserId); } } } -void DeviceManagerServiceImpl::CheckDeleteCredential(const std::string &remoteUdid) +void DeviceManagerServiceImpl::CheckDeleteCredential(const std::string &remoteUdid, int32_t remoteUserId) { std::vector profiles = DeviceProfileConnector::GetInstance().GetAllAccessControlProfile(); @@ -1064,7 +2611,78 @@ void DeviceManagerServiceImpl::CheckDeleteCredential(const std::string &remoteUd } if (!leftAcl) { LOGI("CheckDeleteCredential delete credential"); - hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID()); + hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID(), + remoteUserId); + } +} + +void DeviceManagerServiceImpl::HandleCredentialDeleted(const char *credId, const char *credInfo, + const std::string &localUdid, std::string &remoteUdid) +{ + std::vector profiles = + DeviceProfileConnector::GetInstance().GetAccessControlProfile(); + JsonObject jsonObject; + jsonObject.Parse(std::string(credInfo)); + if (jsonObject.IsDiscarded()) { + LOGE("credInfo prase error."); + return; + } + std::string deviceIdTag = "deviceId"; + std::string userIdTag = "osAccountId"; + int32_t localUserId = MultipleUserConnector::GetCurrentAccountUserID(); + int32_t userId = 0; + if (IsString(jsonObject, deviceIdTag)) { + remoteUdid = jsonObject[deviceIdTag].Get(); + } + if (IsInt32(jsonObject, userIdTag)) { + userId = jsonObject[userIdTag].Get(); + } + + for (const auto &item : profiles) { + if (item.GetBindType() != DM_SHARE) { + continue; + } + if ((item.GetAccesser().GetAccesserCredentialIdStr() == credId && + item.GetAccesser().GetAccesserDeviceId() == localUdid && + item.GetAccesser().GetAccesserUserId() == localUserId && + item.GetAccessee().GetAccesseeUserId() == userId && + item.GetAccessee().GetAccesseeDeviceId() == remoteUdid) || + (item.GetAccessee().GetAccesseeCredentialIdStr() == credId && + item.GetAccessee().GetAccesseeDeviceId() == localUdid && + item.GetAccessee().GetAccesseeUserId() == localUserId && + item.GetAccesser().GetAccesserUserId() == userId && + item.GetAccesser().GetAccesserDeviceId() == remoteUdid)) { + DeviceProfileConnector::GetInstance().DeleteAccessControlById(item.GetAccessControlId()); + } + } +} + +void DeviceManagerServiceImpl::HandleShareUnbindBroadCast(const std::string &credId, const int32_t &userId, + const std::string &localUdid) +{ + std::vector profiles = + DeviceProfileConnector::GetInstance().GetAccessControlProfile(); + int32_t localUserId = MultipleUserConnector::GetCurrentAccountUserID(); + for (const auto &item : profiles) { + if (item.GetBindType() != DM_SHARE) { + continue; + } + std::string accesserCredId = ""; + std::string accesseeCredId = ""; + for (int32_t i = 0; i < BROADCAST_CREDID_LENGTH; i++) { + accesserCredId += item.GetAccesser().GetAccesserCredentialIdStr()[i]; + accesseeCredId += item.GetAccessee().GetAccesseeCredentialIdStr()[i]; + } + if (accesserCredId == credId && item.GetAccessee().GetAccesseeDeviceId() == localUdid && + item.GetAccessee().GetAccesseeUserId() == localUserId && + item.GetAccesser().GetAccesserUserId() == userId) { + DeviceProfileConnector::GetInstance().DeleteAccessControlById(item.GetAccessControlId()); + } + if (accesseeCredId == credId && item.GetAccesser().GetAccesserDeviceId() == localUdid && + item.GetAccesser().GetAccesserUserId() == localUserId && + item.GetAccessee().GetAccesseeUserId() == userId) { + DeviceProfileConnector::GetInstance().DeleteAccessControlById(item.GetAccessControlId()); + } } } @@ -1079,6 +2697,253 @@ int32_t DeviceManagerServiceImpl::CheckDeviceInfoPermission(const std::string &l return DM_OK; } +int32_t DeviceManagerServiceImpl::DeleteAcl(const std::string &pkgName, const std::string &localUdid, + const std::string &remoteUdid, int32_t bindLevel, const std::string &extra) +{ + LOGI("pkgName %{public}s, localUdid %{public}s, remoteUdid %{public}s, bindLevel %{public}d.", + pkgName.c_str(), GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), bindLevel); + if (static_cast(bindLevel) == USER) { + DeleteGroup(pkgName, remoteUdid); + } + DmOfflineParam offlineParam = + DeviceProfileConnector::GetInstance().DeleteAccessControlList(pkgName, localUdid, remoteUdid, bindLevel, extra); + if (offlineParam.bindType == INVALIED_TYPE) { + LOGE("Acl not contain the pkgname bind data."); + return ERR_DM_FAILED; + } + CHECK_NULL_RETURN(softbusConnector_, ERR_DM_POINT_NULL); + CHECK_NULL_RETURN(hiChainAuthConnector_, ERR_DM_POINT_NULL); + if (static_cast(bindLevel) == APP) { + ProcessInfo processInfo; + processInfo.pkgName = pkgName; + processInfo.userId = MultipleUserConnector::GetFirstForegroundUserId(); + if (offlineParam.leftAclNumber != 0) { + LOGI("The pkgName unbind app-level type leftAclNumber not zero."); + softbusConnector_->SetProcessInfoVec(offlineParam.processVec); + softbusConnector_->HandleDeviceOffline(remoteUdid); + return DM_OK; + } + if (offlineParam.leftAclNumber == 0) { + LOGI("The pkgName unbind app-level type leftAclNumber is zero."); + softbusConnector_->SetProcessInfoVec(offlineParam.processVec); + hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID(), + offlineParam.peerUserId); + return DM_OK; + } + } + if (static_cast(bindLevel) == USER && offlineParam.leftAclNumber != 0) { + LOGI("Unbind deivce-level, retain identical account bind type."); + return DM_OK; + } + if (static_cast(bindLevel) == USER && offlineParam.leftAclNumber == 0) { + LOGI("Unbind deivce-level, retain null."); + hiChainAuthConnector_->DeleteCredential(remoteUdid, MultipleUserConnector::GetCurrentAccountUserID(), + offlineParam.peerUserId); + return DM_OK; + } + return ERR_DM_FAILED; +} + +int32_t DeviceManagerServiceImpl::DeleteSkCredAndAcl(const std::vector &acls) +{ + LOGI("start."); + int32_t ret = DM_OK; + if (acls.empty()) { + return ret; + } + CHECK_NULL_RETURN(hiChainAuthConnector_, ERR_DM_POINT_NULL); + for (auto item : acls) { + ret = DeviceProfileConnector::GetInstance().DeleteSessionKey(item.userId, item.skId); + if (ret != DM_OK) { + LOGE("DeleteSessionKey err, userId:%{public}d, skId:%{public}d, ret:%{public}d", item.userId, item.skId, + ret); + } + ret = hiChainAuthConnector_->DeleteCredential(item.userId, item.credId); + if (ret != DM_OK) { + LOGE("DeletecredId err, userId:%{public}d, credId:%{public}s, ret:%{public}d", item.userId, + item.credId.c_str(), ret); + } + DeviceProfileConnector::GetInstance().DeleteAccessControlById(item.accessControlId); + } + return ret; +} + +int32_t DeviceManagerServiceImpl::DeleteAclForProcV2(const std::string &localUdid, uint32_t localTokenId, + const std::string &remoteUdid, int32_t bindLevel, const std::string &extra, int32_t userId) +{ + DmOfflineParam offlineParam = DeviceProfileConnector::GetInstance().FilterNeedDeleteACL( + localUdid, localTokenId, remoteUdid, extra); + + //first, clear the unbind sk/cred/acl + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); + + //second, not app/service/user/DM_IDENTICAL_ACCOUNT acl exist, determin if need clear lnn acl + if (offlineParam.allLeftAppOrSvrAclInfos.empty() && offlineParam.allUserAclInfos.empty()) { + LOGI("No acl exist, clear lnn acl"); + DeleteSkCredAndAcl(offlineParam.allLnnAclInfos); + } + + //third, not user/DM_IDENTICAL_ACCOUNT acl exist but app/service acl exist + //determin if need report offline to unbind bundle + if (offlineParam.allUserAclInfos.empty() && !offlineParam.allLeftAppOrSvrAclInfos.empty()) { + LOGI("after clear target acl, No user acl exist, report offline"); + softbusConnector_->SetProcessInfoVec(offlineParam.processVec); + softbusConnector_->HandleDeviceOffline(remoteUdid); + } + return DM_OK; +} + +int32_t DeviceManagerServiceImpl::DeleteAclV2(const std::string &pkgName, const std::string &localUdid, + const std::string &remoteUdid, int32_t bindLevel, const std::string &extra) +{ + LOGI("pkgName %{public}s, localUdid %{public}s, remoteUdid %{public}s, bindLevel %{public}d.", + pkgName.c_str(), GetAnonyString(localUdid).c_str(), GetAnonyString(remoteUdid).c_str(), bindLevel); + uint32_t tokenId = 0; + MultipleUserConnector::GetTokenId(tokenId); + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); + bool isNewVersion = IsAuthNewVersion(bindLevel, localUdid, remoteUdid, tokenId, userId); + if (!isNewVersion) { + return DeleteAcl(pkgName, localUdid, remoteUdid, bindLevel, extra); + } + return DeleteAclForProcV2(localUdid, tokenId, remoteUdid, bindLevel, extra, userId); +} + +void DeviceManagerServiceImpl::HandleCommonEventBroadCast(const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds, const std::string &remoteUdid) +{ + LOGI("remote udid: %{public}s, foregroundUserIds: %{public}s, backgroundUserIds: %{public}s", + GetAnonyString(remoteUdid).c_str(), GetIntegerList(foregroundUserIds).c_str(), + GetIntegerList(backgroundUserIds).c_str()); + std::vector rmtFrontUserIdsTemp(foregroundUserIds.begin(), foregroundUserIds.end()); + std::vector rmtBackUserIdsTemp(backgroundUserIds.begin(), backgroundUserIds.end()); + std::vector localUserIds; + int32_t ret = MultipleUserConnector::GetForegroundUserIds(localUserIds); + if (ret != DM_OK) { + LOGE("Get foreground userids failed, ret: %{public}d", ret); + return; + } + char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localUdidTemp); + MultipleUserConnector::ClearLockedUser(localUserIds); + DmOfflineParam offlineParam; + DeviceProfileConnector::GetInstance().UpdateACL(localUdid, localUserIds, remoteUdid, + rmtFrontUserIdsTemp, rmtBackUserIdsTemp, offlineParam); + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); + DeviceProfileConnector::GetInstance().HandleSyncBackgroundUserIdEvent(rmtBackUserIdsTemp, remoteUdid, + localUserIds, localUdid); + DeviceProfileConnector::GetInstance().HandleSyncForegroundUserIdEvent(rmtFrontUserIdsTemp, remoteUdid, + localUserIds, localUdid); +} + +void DeviceManagerServiceImpl::GetBindCallerInfo(DmBindCallerInfo &bindCallerInfo, const std::string &pkgName) +{ + int32_t userId = -1; + MultipleUserConnector::GetCallerUserId(userId); + uint32_t callingTokenId = 0; + MultipleUserConnector::GetCallingTokenId(callingTokenId); + bool isSystemSA = false; + std::string bundleName = ""; + AppManager::GetInstance().GetCallerName(isSystemSA, bundleName); + std::string processName = ""; + AppManager::GetInstance().GetCallerProcessName(processName); + int32_t bindLevel = static_cast(DmRole::DM_ROLE_FA); + if (AppManager::GetInstance().IsSystemApp()) { + bindLevel = static_cast(DmRole::DM_ROLE_FA); + } + if (AppManager::GetInstance().IsSystemSA()) { + bindLevel = static_cast(DmRole::DM_ROLE_SA); + } + if (AuthManagerBase::CheckProcessNameInWhiteList(bundleName)) { + bindLevel = static_cast(DmRole::DM_ROLE_USER); + } + std::string hostPkgLabel = GetBundleLable(pkgName); + bindCallerInfo.userId = userId; + bindCallerInfo.tokenId = static_cast(callingTokenId); + bindCallerInfo.bindLevel = bindLevel; + bindCallerInfo.bundleName = bundleName; + bindCallerInfo.hostPkgLabel = hostPkgLabel; + bindCallerInfo.processName = processName; + bindCallerInfo.isSystemSA = isSystemSA; + LOGI("userId %{public}d, tokenId %{public}d, bindLevel %{public}d, bundleName %{public}s, hostPkgLabel %{public}s," + "processName %{public}s, isSystemSA %{public}d", userId, callingTokenId, bindLevel, + GetAnonyString(bundleName).c_str(), GetAnonyString(hostPkgLabel).c_str(), GetAnonyString(processName).c_str(), + isSystemSA); +} + +std::string DeviceManagerServiceImpl::GetBundleLable(const std::string &bundleName) +{ + auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + if (samgr == nullptr) { + LOGE("Get ability manager failed"); + return bundleName; + } + + sptr object = samgr->GetSystemAbility(BUNDLE_MGR_SERVICE_SYS_ABILITY_ID); + if (object == nullptr) { + LOGE("object is NULL."); + return bundleName; + } + + sptr bms = iface_cast(object); + if (bms == nullptr) { + LOGE("bundle manager service is NULL."); + return bundleName; + } + + auto bundleResourceProxy = bms->GetBundleResourceProxy(); + if (bundleResourceProxy == nullptr) { + LOGE("GetBundleResourceProxy fail"); + return bundleName; + } + AppExecFwk::BundleResourceInfo resourceInfo; + auto result = bundleResourceProxy->GetBundleResourceInfo(bundleName, + static_cast(OHOS::AppExecFwk::ResourceFlag::GET_RESOURCE_INFO_ALL), resourceInfo); + if (result != ERR_OK) { + LOGE("GetBundleResourceInfo failed"); + return bundleName; + } + LOGI("bundle resource label is %{public}s ", (resourceInfo.label).c_str()); + return resourceInfo.label; +} + +void DeviceManagerServiceImpl::SetBindCallerInfoToBindParam(const std::map &bindParam, + std::map &bindParamTmp, const DmBindCallerInfo &bindCallerInfo) +{ + bindParamTmp = const_cast &>(bindParam); + bindParamTmp["bindCallerUserId"] = std::to_string(bindCallerInfo.userId); + bindParamTmp["bindCallerTokenId"] = std::to_string(bindCallerInfo.tokenId); + bindParamTmp["bindCallerBindLevel"] = std::to_string(bindCallerInfo.bindLevel); + bindParamTmp["bindCallerBundleName"] = bindCallerInfo.bundleName; + bindParamTmp["bindCallerHostPkgLabel"] = bindCallerInfo.hostPkgLabel; + bindParamTmp["bindCallerProcessName"] = bindCallerInfo.processName; + bindParamTmp["bindCallerIsSystemSA"] = bindCallerInfo.isSystemSA; +} + +bool DeviceManagerServiceImpl::CheckSrcAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + return DeviceProfileConnector::GetInstance().CheckSrcAccessControl(caller, srcUdid, callee, sinkUdid); +} + +bool DeviceManagerServiceImpl::CheckSinkAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + return DeviceProfileConnector::GetInstance().CheckSinkAccessControl(caller, srcUdid, callee, sinkUdid); +} + +bool DeviceManagerServiceImpl::CheckSrcIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + return DeviceProfileConnector::GetInstance().CheckSrcIsSameAccount(caller, srcUdid, callee, sinkUdid); +} + +bool DeviceManagerServiceImpl::CheckSinkIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + return DeviceProfileConnector::GetInstance().CheckSinkIsSameAccount(caller, srcUdid, callee, sinkUdid); +} + extern "C" IDeviceManagerServiceImpl *CreateDMServiceObject(void) { return new DeviceManagerServiceImpl; diff --git a/services/implementation/src/device_manager_service_impl_lite.cpp b/services/implementation/src/device_manager_service_impl_lite.cpp index f82b8f95f8e5a3b54080465a7bc02b4c04cef5b6..279490b25ce189ac03908dc4af5583fcce3e4ff6 100644 --- a/services/implementation/src/device_manager_service_impl_lite.cpp +++ b/services/implementation/src/device_manager_service_impl_lite.cpp @@ -330,6 +330,16 @@ int32_t DeviceManagerServiceImpl::ImportAuthCode(const std::string &pkgName, con return DM_OK; } +void DeviceManagerServiceImpl::HandleCredentialDeleted(const char *credId, const char *credInfo, + const std::string &localUdid, std::string &remoteUdid) +{ + (void)credId; + (void)credInfo; + (void)localUdid; + (void)remoteUdid; + return; +} + int32_t DeviceManagerServiceImpl::ExportAuthCode(std::string &authCode) { (void)authCode; @@ -396,10 +406,17 @@ int32_t DeviceManagerServiceImpl::IsSameAccount(const std::string &udid) return DM_OK; } -uint64_t DeviceManagerServiceImpl::GetTokenIdByNameAndDeviceId(std::string pkgName, - std::string requestDeviceId) +std::vector DeviceManagerServiceImpl::GetDeviceIdByUserIdAndTokenId(int32_t userId, int32_t tokenId) { - (void)pkgName; + (void)userId; + (void)tokenId; + std::vector tmp; + return tmp; +} + +uint64_t DeviceManagerServiceImpl::GetTokenIdByNameAndDeviceId(std::string extra, std::string requestDeviceId) +{ + (void)extra; (void)requestDeviceId; return 0; } @@ -410,24 +427,24 @@ void DeviceManagerServiceImpl::ScreenCommonEventCallback(std::string commonEvent return; } -int32_t DeviceManagerServiceImpl::CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, +bool DeviceManagerServiceImpl::CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) { (void)caller; (void)srcUdid; (void)callee; (void)sinkUdid; - return DM_OK; + return true; } -int32_t DeviceManagerServiceImpl::CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, +bool DeviceManagerServiceImpl::CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) { (void)caller; (void)srcUdid; (void)callee; (void)sinkUdid; - return DM_OK; + return true; } void DeviceManagerServiceImpl::HandleDeviceNotTrust(const std::string &udid) @@ -499,8 +516,9 @@ void DeviceManagerServiceImpl::HandleIdentAccountLogout(const std::string &local return; } -void DeviceManagerServiceImpl::HandleUserRemoved(int32_t preUserId) +void DeviceManagerServiceImpl::HandleUserRemoved(std::vector peerUdids, int32_t preUserId) { + (void)peerUdids; (void)preUserId; return; } @@ -526,6 +544,24 @@ int32_t DeviceManagerServiceImpl::StopAuthenticateDevice(const std::string &pkgN return 0; } +int32_t DeviceManagerServiceImpl::SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList) +{ + (void)localDevUserInfo; + (void)remoteDevUserInfo; + (void)remoteAclList; + return 0; +} + +int32_t DeviceManagerServiceImpl::GetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList) +{ + (void)localDevUserInfo; + (void)remoteDevUserInfo; + (void)aclList; + return 0; +} + void DeviceManagerServiceImpl::HandleCredentialAuthStatus(const std::string &deviceList, uint16_t deviceTypeId, int32_t errcode) { @@ -542,6 +578,23 @@ int32_t DeviceManagerServiceImpl::ProcessAppUnintall(const std::string &appId, i return 0; } +int32_t DeviceManagerServiceImpl::ProcessAppUninstall(int32_t userId, int32_t accessTokenId) +{ + (void)userId; + (void)accessTokenId; + return 0; +} + +void DeviceManagerServiceImpl::ProcessUnBindApp(int32_t userId, int32_t accessTokenId, const std::string &extra, + const std::string &udid) +{ + (void)userId; + (void)accessTokenId; + (void)extra; + (void)udid; + return; +} + void DeviceManagerServiceImpl::HandleSyncUserIdEvent(const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, const std::string &remoteUdid, bool isCheckUserStatus) { @@ -552,6 +605,15 @@ void DeviceManagerServiceImpl::HandleSyncUserIdEvent(const std::vector return; } +void DeviceManagerServiceImpl::HandleShareUnbindBroadCast(const std::string &credId, const int32_t &userId, + const std::string &localUdid) +{ + (void)credId; + (void)userId; + (void)localUdid; + return; +} + void DeviceManagerServiceImpl::HandleRemoteUserRemoved(int32_t preUserId, const std::string &remoteUdid) { (void)preUserId; @@ -599,9 +661,10 @@ void DeviceManagerServiceImpl::DeleteAlwaysAllowTimeOut() return; } -void DeviceManagerServiceImpl::CheckDeleteCredential(const std::string &remoteUdid) +void DeviceManagerServiceImpl::CheckDeleteCredential(const std::string &remoteUdid, int32_t remoteUserId) { (void)remoteUdid; + (void)remoteUserId; return; } @@ -613,6 +676,64 @@ int32_t DeviceManagerServiceImpl::CheckDeviceInfoPermission(const std::string &l return DM_OK; } +void DeviceManagerServiceImpl::HandleServiceUnBindEvent(int32_t userId, const std::string &remoteUdid, + int32_t remoteTokenId) +{ + (void)userId; + (void)remoteUdid; + (void)remoteTokenId; + return; +} + +void DeviceManagerServiceImpl::HandleCommonEventBroadCast(const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds, const std::string &remoteUdid) +{ + (void)foregroundUserIds; + (void)backgroundUserIds; + (void)remoteUdid; + return; +} + +bool DeviceManagerServiceImpl::CheckSrcAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + (void)caller; + (void)srcUdid; + (void)callee; + (void)sinkUdid; + return true; +} + +bool DeviceManagerServiceImpl::CheckSinkAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + (void)caller; + (void)srcUdid; + (void)callee; + (void)sinkUdid; + return true; +} + +bool DeviceManagerServiceImpl::CheckSrcIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + (void)caller; + (void)srcUdid; + (void)callee; + (void)sinkUdid; + return true; +} + +bool DeviceManagerServiceImpl::CheckSinkIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + (void)caller; + (void)srcUdid; + (void)callee; + (void)sinkUdid; + return true; +} + extern "C" IDeviceManagerServiceImpl *CreateDMServiceObject(void) { return new DeviceManagerServiceImpl; diff --git a/services/implementation/src/devicestate/dm_device_state_manager.cpp b/services/implementation/src/devicestate/dm_device_state_manager.cpp index 736c75c9dc073558fb88dad4dfb26a720cce4bdb..573c677571df67fc10e416f0ad22e881f392e2ec 100644 --- a/services/implementation/src/devicestate/dm_device_state_manager.cpp +++ b/services/implementation/src/devicestate/dm_device_state_manager.cpp @@ -62,7 +62,7 @@ int32_t DmDeviceStateManager::RegisterSoftbusStateCallback() void DmDeviceStateManager::SaveOnlineDeviceInfo(const DmDeviceInfo &info) { - LOGI("SaveOnlineDeviceInfo begin, deviceId = %{public}s", GetAnonyString(std::string(info.deviceId)).c_str()); + LOGI("begin, deviceId = %{public}s", GetAnonyString(std::string(info.deviceId)).c_str()); std::string udid; if (SoftbusConnector::GetUdidByNetworkId(info.networkId, udid) == DM_OK) { std::string uuid; @@ -73,7 +73,7 @@ void DmDeviceStateManager::SaveOnlineDeviceInfo(const DmDeviceInfo &info) remoteDeviceInfos_[uuid] = saveInfo; stateDeviceInfos_[udid] = saveInfo; } - LOGI("SaveOnlineDeviceInfo complete, networkId = %{public}s, udid = %{public}s, uuid = %{public}s", + LOGI("complete, networkId = %{public}s, udid = %{public}s, uuid = %{public}s", GetAnonyString(std::string(info.networkId)).c_str(), GetAnonyString(udid).c_str(), GetAnonyString(uuid).c_str()); } @@ -81,7 +81,7 @@ void DmDeviceStateManager::SaveOnlineDeviceInfo(const DmDeviceInfo &info) void DmDeviceStateManager::DeleteOfflineDeviceInfo(const DmDeviceInfo &info) { - LOGI("DeleteOfflineDeviceInfo begin, deviceId = %{public}s", GetAnonyString(std::string(info.deviceId)).c_str()); + LOGI("begin, deviceId = %{public}s", GetAnonyString(std::string(info.deviceId)).c_str()); std::lock_guard mutexLock(remoteDeviceInfosMutex_); std::string deviceId = std::string(info.deviceId); for (auto iter: remoteDeviceInfos_) { @@ -102,7 +102,7 @@ void DmDeviceStateManager::DeleteOfflineDeviceInfo(const DmDeviceInfo &info) void DmDeviceStateManager::OnDeviceOnline(std::string deviceId, int32_t authForm) { - LOGI("DmDeviceStateManager::OnDeviceOnline, deviceId = %{public}s", GetAnonyString(deviceId).c_str()); + LOGI("OnDeviceOnline, deviceId = %{public}s", GetAnonyString(deviceId).c_str()); DmDeviceInfo devInfo = softbusConnector_->GetDeviceInfoByDeviceId(deviceId); if (devInfo.deviceId[0] == '\0') { LOGE("deviceId is empty."); @@ -121,7 +121,7 @@ void DmDeviceStateManager::OnDeviceOnline(std::string deviceId, int32_t authForm void DmDeviceStateManager::OnDeviceOffline(std::string deviceId) { - LOGI("DmDeviceStateManager::OnDeviceOffline, deviceId = %{public}s", GetAnonyString(deviceId).c_str()); + LOGI("OnDeviceOffline, deviceId = %{public}s", GetAnonyString(deviceId).c_str()); DmDeviceInfo devInfo; { std::lock_guard mutexLock(remoteDeviceInfosMutex_); @@ -161,7 +161,7 @@ void DmDeviceStateManager::HandleDeviceStatusChange(DmDeviceState devState, DmDe case DEVICE_INFO_CHANGED: ChangeDeviceInfo(devInfo); ProcessDeviceStateChange(devState, devInfo); - softbusConnector_->ClearProcessInfo(); + softbusConnector_->ClearChangeProcessInfo(); break; default: LOGE("HandleDeviceStatusChange error, unknown device state = %{public}d", devState); @@ -171,11 +171,16 @@ void DmDeviceStateManager::HandleDeviceStatusChange(DmDeviceState devState, DmDe void DmDeviceStateManager::ProcessDeviceStateChange(const DmDeviceState devState, const DmDeviceInfo &devInfo) { - LOGI("ProcessDeviceStateChange begin, devState = %{public}d networkId: %{public}s.", devState, + LOGI("begin, devState = %{public}d networkId: %{public}s.", devState, GetAnonyString(devInfo.networkId).c_str()); CHECK_NULL_VOID(softbusConnector_); CHECK_NULL_VOID(listener_); - std::vector processInfoVec = softbusConnector_->GetProcessInfo(); + std::vector processInfoVec; + if (devState == DEVICE_INFO_CHANGED) { + processInfoVec = softbusConnector_->GetChangeProcessInfo(); + } else { + processInfoVec = softbusConnector_->GetProcessInfo(); + } for (const auto &item : processInfoVec) { if (!item.pkgName.empty()) { LOGI("ProcessDeviceStateChange, pkgName = %{public}s", item.pkgName.c_str()); @@ -240,7 +245,8 @@ void DmDeviceStateManager::RegisterOffLineTimer(const DmDeviceInfo &deviceInfo) } } if (stateTimerInfoMap_.find(std::string(udidHash)) == stateTimerInfoMap_.end()) { - std::string timerName = std::string(STATE_TIMER_PREFIX) + GetAnonyString(std::string(udidHash)); + std::string sha256UdidHash = Crypto::Sha256(std::string(udidHash)); + std::string timerName = std::string(STATE_TIMER_PREFIX) + sha256UdidHash.substr(0, sha256UdidHash.size() / 2); StateTimerInfo stateTimer = { .timerName = timerName, .networkId = deviceInfo.networkId, @@ -306,10 +312,11 @@ void DmDeviceStateManager::DeleteTimeOutGroup(std::string name) hiChainConnector_->DeleteTimeOutGroup((idIter->second).c_str()); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) DeleteGroupByDP(idIter->second); - uint32_t res = DeviceProfileConnector::GetInstance().DeleteTimeOutAcl(idIter->second); + DmOfflineParam offlineParam; + uint32_t res = DeviceProfileConnector::GetInstance().DeleteTimeOutAcl(idIter->second, offlineParam); if (res == 0) { - hiChainAuthConnector_->DeleteCredential(idIter->second, - MultipleUserConnector::GetCurrentAccountUserID()); + DeleteCredential(offlineParam, idIter->second); + DeleteSkCredAndAcl(offlineParam.needDelAclInfos); } #endif stateTimerInfoMap_.erase(iter); @@ -318,29 +325,64 @@ void DmDeviceStateManager::DeleteTimeOutGroup(std::string name) } } +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) +void DmDeviceStateManager::DeleteCredential(DmOfflineParam offlineParam, const std::string &deviceId) +{ + if (offlineParam.skIdVec.empty()) { + CHECK_NULL_VOID(hiChainAuthConnector_); + hiChainAuthConnector_->DeleteCredential(deviceId, MultipleUserConnector::GetCurrentAccountUserID(), + offlineParam.peerUserId); + } +} + +int32_t DmDeviceStateManager::DeleteSkCredAndAcl(const std::vector &acls) +{ + LOGI("DeleteSkCredAndAcl start."); + int32_t ret = DM_OK; + if (acls.empty()) { + return ret; + } + CHECK_NULL_RETURN(hiChainAuthConnector_, ERR_DM_POINT_NULL); + for (auto item : acls) { + ret = DeviceProfileConnector::GetInstance().DeleteSessionKey(item.userId, item.skId); + if (ret != DM_OK) { + LOGE("DeleteSessionKey err, userId:%{public}d, skId:%{public}d, ret:%{public}d", item.userId, item.skId, + ret); + } + ret = hiChainAuthConnector_->DeleteCredential(item.userId, item.credId); + if (ret != DM_OK) { + LOGE("DeletecredId err, userId:%{public}d, credId:%{public}s, ret:%{public}d", item.userId, + item.credId.c_str(), ret); + } + DeviceProfileConnector::GetInstance().DeleteAccessControlById(item.accessControlId); + } + return ret; +} +#endif + void DmDeviceStateManager::StartEventThread() { - LOGI("StartEventThread begin"); + LOGD("StartEventThread begin"); eventTask_.threadRunning_ = true; eventTask_.queueThread_ = std::thread([this]() { this->ThreadLoop(); }); - LOGI("StartEventThread complete"); + LOGD("StartEventThread complete"); } void DmDeviceStateManager::StopEventThread() { - LOGI("StopEventThread begin"); + LOGD("StopEventThread begin"); eventTask_.threadRunning_ = false; eventTask_.queueCond_.notify_all(); eventTask_.queueFullCond_.notify_all(); if (eventTask_.queueThread_.joinable()) { eventTask_.queueThread_.join(); } - LOGI("StopEventThread complete"); + LOGD("StopEventThread complete"); } int32_t DmDeviceStateManager::AddTask(const std::shared_ptr &task) { - LOGI("AddTask begin, eventId: %{public}d", task->GetEventId()); + LOGD("AddTask begin, eventId: %{public}d", task->GetEventId()); { std::unique_lock lock(eventTask_.queueMtx_); while (eventTask_.queue_.size() >= DM_EVENT_QUEUE_CAPACITY) { @@ -349,13 +391,13 @@ int32_t DmDeviceStateManager::AddTask(const std::shared_ptr &task) eventTask_.queue_.push(task); } eventTask_.queueCond_.notify_one(); - LOGI("AddTask complete"); + LOGD("AddTask complete"); return DM_OK; } void DmDeviceStateManager::ThreadLoop() { - LOGI("ThreadLoop begin"); + LOGD("ThreadLoop begin"); int32_t ret = pthread_setname_np(pthread_self(), THREAD_LOOP); if (ret != DM_OK) { LOGE("ThreadLoop setname failed."); @@ -377,16 +419,16 @@ void DmDeviceStateManager::ThreadLoop() RunTask(task); } } - LOGI("ThreadLoop end"); + LOGD("ThreadLoop end"); } void DmDeviceStateManager::RunTask(const std::shared_ptr &task) { - LOGI("RunTask begin, eventId: %{public}d", task->GetEventId()); + LOGD("RunTask begin, eventId: %{public}d", task->GetEventId()); if (task->GetEventId() == DM_NOTIFY_EVENT_ONDEVICEREADY) { OnDbReady(std::string(DM_PKG_NAME), task->GetDeviceId()); } - LOGI("RunTask complete"); + LOGD("RunTask complete"); } DmAuthForm DmDeviceStateManager::GetAuthForm(const std::string &networkId) @@ -412,7 +454,7 @@ DmAuthForm DmDeviceStateManager::GetAuthForm(const std::string &networkId) int32_t DmDeviceStateManager::ProcNotifyEvent(const int32_t eventId, const std::string &deviceId) { - LOGI("ProcNotifyEvent in, eventId: %{public}d", eventId); + LOGD("ProcNotifyEvent in, eventId: %{public}d", eventId); return AddTask(std::make_shared(eventId, deviceId)); } @@ -457,7 +499,7 @@ void DmDeviceStateManager::ChangeDeviceInfo(const DmDeviceInfo &info) std::string DmDeviceStateManager::GetUdidByNetWorkId(std::string networkId) { - LOGI("DmDeviceStateManager::GetUdidByNetWorkId networkId %{public}s", GetAnonyString(networkId).c_str()); + LOGI("networkId %{public}s", GetAnonyString(networkId).c_str()); { std::lock_guard mutexLock(remoteDeviceInfosMutex_); for (auto &iter : stateDeviceInfos_) { @@ -475,7 +517,7 @@ int32_t DmDeviceStateManager::DeleteGroupByDP(const std::string &deviceId) { std::vector profiles = DeviceProfileConnector::GetInstance().GetAccessControlProfile(); - LOGI("DeleteGroupByDP, AccessControlProfile size is %{public}zu", profiles.size()); + LOGI("AccessControlProfile size is %{public}zu", profiles.size()); std::vector delPkgNameVec; for (auto &item : profiles) { std::string trustDeviceId = item.GetTrustDeviceId(); diff --git a/services/implementation/src/i18n/dm_language_manager.cpp b/services/implementation/src/i18n/dm_language_manager.cpp index 77f080ee5c412b3ddfe41d4c13262a97bb2aee2b..6e2f6637bfd63ff8f3f17aa7d487f7611f7044bd 100644 --- a/services/implementation/src/i18n/dm_language_manager.cpp +++ b/services/implementation/src/i18n/dm_language_manager.cpp @@ -18,8 +18,10 @@ #include "cJSON.h" #include +#include "dm_anonymous.h" #include "dm_constants.h" #include "dm_log.h" +#include "json_object.h" #include "parameter.h" namespace OHOS { @@ -125,6 +127,28 @@ std::string DmLanguageManager::GetTextBySystemLanguage(const std::string &text) return ""; } +std::string DmLanguageManager::GetTextBySystemLanguage(const std::string &text, const std::string &language) +{ + if (text.empty()) { + return ""; + } + JsonObject jsonObject(text); + if (jsonObject.IsDiscarded()) { + LOGI("the text is not a jsonStr"); + return text; + } + if (IsString(jsonObject, language)) { + return jsonObject[language].Get(); + } + if (IsString(jsonObject, DEFAULT_LANGUAGE)) { + return jsonObject[DEFAULT_LANGUAGE].Get(); + } + if (IsString(jsonObject, LANGUAGE_EN)) { + return jsonObject[LANGUAGE_EN].Get(); + } + return ""; +} + std::string DmLanguageManager::GetTextBySystemLocale(const cJSON *const textObj, const std::set &localeSet) { @@ -144,5 +168,56 @@ std::string DmLanguageManager::GetTextBySystemLocale(const cJSON *const textObj, } return ""; } + +std::string DmLanguageManager::GetSystemLanguage() +{ + std::string language = GetSystemParam(SYSTEM_LANGUAGE_KEY); + language = language.empty() ? DEFAULT_LANGUAGE : language; + std::set localeSet; + GetLocaleByLanguage(language, localeSet); + if (localeSet.size() > 0) { + std::string languageLocale = GetSystemParam(SYSTEM_LANGUAGE_LOCALE_KEY); + if (localeSet.find(languageLocale) != localeSet.end()) { + return languageLocale; + } + return *localeSet.begin(); + } + return language; +} + +std::string DmLanguageManager::GetTextByLanguage(const std::string &text, const std::string &language) +{ + if (text.empty()) { + return ""; + } + cJSON *textObj = cJSON_Parse(text.c_str()); + if (textObj == NULL) { + LOGE("parse text failed"); + return text; + } + std::string resultText = text; + + cJSON *languageJson = cJSON_GetObjectItem(textObj, language.c_str()); + if (languageJson != NULL && cJSON_IsString(languageJson)) { + resultText = std::string(languageJson->valuestring); + cJSON_Delete(textObj); + return resultText; + } + cJSON *defaultJson = cJSON_GetObjectItem(textObj, DEFAULT_LANGUAGE.c_str()); + if (defaultJson != NULL && cJSON_IsString(defaultJson)) { + resultText = std::string(defaultJson->valuestring); + cJSON_Delete(textObj); + return resultText; + } + cJSON *enJson = cJSON_GetObjectItem(textObj, LANGUAGE_EN.c_str()); + if (enJson != NULL && cJSON_IsString(enJson)) { + resultText = std::string(enJson->valuestring); + cJSON_Delete(textObj); + return resultText; + } + cJSON_Delete(textObj); + return ""; +} + } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index 62d980a618db79db640d156c849c6727fb36c653..c6d338d2fafeea7f9daae5f86fddc1164a82c1e5 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -44,10 +44,10 @@ if (defined(ohos_lite)) { "${utils_path}/include/fwkload/lite", "${utils_path}/include/kvadapter", "${utils_path}/include/timer/lite", + "${json_path}/include", "${innerkits_path}/native_cpp/include", "${innerkits_path}/native_cpp/include/ipc", "${innerkits_path}/native_cpp/include/ipc/lite", - "//third_party/json/include", "//third_party/bounds_checking_function/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", @@ -59,6 +59,7 @@ if (defined(ohos_lite)) { "//foundation/distributedshedule/samgr_lite/interfaces/kits/samgr", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "${devicemanager_path}/radar/include", + "${devicemanager_path}/services/implementation/include/authentication_v2", "${softbuscache_parh}/include", ] @@ -92,6 +93,7 @@ if (defined(ohos_lite)) { deps = [ "${devicemanager_path}/radar:devicemanagerradar", "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", "//base/security/device_auth/services:deviceauth_sdk", @@ -147,6 +149,7 @@ if (defined(ohos_lite)) { "${common_path}/include/ipc/standard", "${devicemanager_path}/commondependency/include", "${devicemanager_path}/radar/include", + "${devicemanager_path}/services/implementation/include/authentication_v2", "${innerkits_path}/native_cpp/include", "${servicesimpl_path}/include/dependency/deviceprofile", "${softbuscache_parh}/include", @@ -154,9 +157,22 @@ if (defined(ohos_lite)) { "${utils_path}/include/crypto", "${utils_path}/include/kvadapter", "${utils_path}/include/timer", + "${json_path}/include", ] } - + config("cflags_config") { + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + "-ffunction-sections", + "-fdata-sections", + "-fvisibility=hidden", + "-Oz", + "-flto", + ] + ldflags = [ "-flto" ] + } ohos_shared_library("devicemanagerservice") { branch_protector_ret = "pac_ret" @@ -180,6 +196,8 @@ if (defined(ohos_lite)) { "-Wl,-z,now", ] + configs = [ ":cflags_config" ] + sources = [ "${common_path}/src/dfx/standard/dm_hidumper.cpp", "${common_path}/src/dm_anonymous.cpp", @@ -190,8 +208,6 @@ if (defined(ohos_lite)) { "src/device_manager_service_listener.cpp", "src/devicenamemgr/device_name_change_monitor.cpp", "src/devicenamemgr/device_name_manager.cpp", - "src/devicenamemgr/local_device_name_mgr.cpp", - "src/devicenamemgr/settings_data_event_monitor.cpp", "src/discovery/discovery_filter.cpp", "src/discovery/discovery_manager.cpp", "src/hichain/hichain_listener.cpp", @@ -226,7 +242,9 @@ if (defined(ohos_lite)) { deps = [ "${devicemanager_path}/commondependency:devicemanagerdependency", "${devicemanager_path}/radar:devicemanagerradar", + "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", ] @@ -235,9 +253,8 @@ if (defined(ohos_lite)) { "ability_base:want", "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", + "bundle_framework:appexecfwk_base", "cJSON:cjson", - "c_utils:utils", - "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", @@ -292,7 +309,152 @@ if (defined(ohos_lite)) { defines += [ "DEVICE_MANAGER_COMMON_FLAG" ] } - public_external_deps = [ "cJSON:cjson" ] + if (device_manager_feature_product == "default") { + defines += [ "SUPPORT_WISEDEVICE" ] + } + + subsystem_name = "distributedhardware" + + part_name = "device_manager" + } + + ohos_shared_library("devicemanagerservicetest") { + branch_protector_ret = "pac_ret" + + sanitize = { + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + integer_overflow = true + ubsan = true + } + + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + ] + + ldflags = [ + "-Wl,-z,relro", + "-Wl,-z,now", + ] + + sources = [ + "${common_path}/src/dfx/standard/dm_hidumper.cpp", + "${common_path}/src/dm_anonymous.cpp", + "${common_path}/src/ipc/standard/ipc_cmd_register.cpp", + "${common_path}/src/ipc/standard/ipc_model_codec.cpp", + "src/advertise/advertise_manager.cpp", + "src/device_manager_service.cpp", + "src/device_manager_service_listener.cpp", + "src/devicenamemgr/device_name_change_monitor.cpp", + "src/devicenamemgr/device_name_manager.cpp", + "src/discovery/discovery_filter.cpp", + "src/discovery/discovery_manager.cpp", + "src/hichain/hichain_listener.cpp", + "src/ipc/standard/ipc_cmd_parser.cpp", + "src/ipc/standard/ipc_server_client_proxy.cpp", + "src/ipc/standard/ipc_server_listener.cpp", + "src/ipc/standard/ipc_server_stub.cpp", + "src/notify/device_manager_service_notify.cpp", + "src/permission/standard/permission_manager.cpp", + "src/pinholder/pin_holder.cpp", + "src/pinholder/pin_holder_session.cpp", + "src/publishcommonevent/dm_account_common_event.cpp", + "src/publishcommonevent/dm_datashare_common_event.cpp", + "src/publishcommonevent/dm_package_common_event.cpp", + "src/publishcommonevent/dm_screen_common_event.cpp", + "src/relationshipsyncmgr/dm_comm_tool.cpp", + "src/relationshipsyncmgr/dm_transport.cpp", + "src/relationshipsyncmgr/dm_transport_msg.cpp", + "src/relationshipsyncmgr/relationship_sync_mgr.cpp", + "src/softbus/mine_softbus_listener.cpp", + "src/softbus/softbus_listener.cpp", + ] + + public_configs = [ ":devicemanagerservice_config" ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerservice\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [ + "${devicemanager_path}/commondependency:devicemanagerdependency", + "${devicemanager_path}/radar:devicemanagerradar", + "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + "${softbuscache_parh}:dmdevicecache", + "${utils_path}:devicemanagerutils", + ] + + external_deps = [ + "ability_base:want", + "access_token:libaccesstoken_sdk", + "access_token:libtokenid_sdk", + "cJSON:cjson", + "c_utils:utils", + "common_event_service:cesfwk_innerkits", + "data_share:datashare_common", + "data_share:datashare_consumer", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "ffrt:libffrt", + "hicollie:libhicollie", + "hilog:libhilog", + "init:libbeget_proxy", + "init:libbegetutil", + "ipc:ipc_core", + "ipc:ipc_single", + "openssl:libcrypto_shared", + "os_account:libaccountkits", + "os_account:os_account_innerkits", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] + + if ((support_bluetooth || support_wifi) && + device_manager_feature_product == "default") { + sources += [ + "src/publishcommonevent/dm_publish_common_event.cpp", + "src/softbus/softbus_publish.cpp", + ] + } + + if (support_bluetooth && device_manager_feature_product == "default") { + defines += [ "SUPPORT_BLUETOOTH" ] + external_deps += [ "bluetooth:btframework" ] + } + + if (support_wifi && device_manager_feature_product == "default") { + defines += [ "SUPPORT_WIFI" ] + external_deps += [ "wifi:wifi_sdk" ] + } + + if (device_manager_feature_product == "default") { + defines += [ "SUPPORT_WISEDEVICE" ] + } + + if (support_power_manager) { + defines += [ "SUPPORT_POWER_MANAGER" ] + external_deps += [ "power_manager:powermgr_client" ] + } + + if (support_memmgr) { + defines += [ "SUPPORT_MEMMGR" ] + external_deps += [ "memmgr:memmgrclient" ] + } + + if (device_manager_common) { + defines += [ "DEVICE_MANAGER_COMMON_FLAG" ] + } subsystem_name = "distributedhardware" diff --git a/services/service/include/device_manager_service.h b/services/service/include/device_manager_service.h index a78a2152c9017520061b8ccc003ed17176ff24b6..d2bec5c497ddfae1a362f4bb9df9696c83cc05e4 100644 --- a/services/service/include/device_manager_service.h +++ b/services/service/include/device_manager_service.h @@ -30,6 +30,7 @@ #include "device_manager_service_listener.h" #include "idevice_manager_service_impl.h" #include "hichain_listener.h" +#include "i_dm_check_api_white_list.h" #include "i_dm_service_impl_ext_resident.h" #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) #include "dm_account_common_event.h" @@ -58,15 +59,15 @@ public: void InitHichainListener(); - void RegisterCallerAppId(const std::string &pkgName); + DM_EXPORT void RegisterCallerAppId(const std::string &pkgName); - void UnRegisterCallerAppId(const std::string &pkgName); + DM_EXPORT void UnRegisterCallerAppId(const std::string &pkgName); void UninitSoftbusListener(); int32_t InitDMServiceListener(); - void UninitDMServiceListener(); + DM_EXPORT void UninitDMServiceListener(); int32_t GetTrustedDeviceList(const std::string &pkgName, const std::string &extra, std::vector &deviceList); @@ -99,6 +100,11 @@ public: int32_t UnBindDevice(const std::string &pkgName, const std::string &udidHash, const std::string &extra); + int32_t ValidateUnBindDeviceParams(const std::string &pkgName, const std::string &udidHash); + + int32_t ValidateUnBindDeviceParams(const std::string &pkgName, const std::string &udidHash, + const std::string &extra); + int32_t SetUserOperation(std::string &pkgName, int32_t action, const std::string ¶ms); void HandleDeviceStatusChange(DmDeviceState devState, DmDeviceInfo &devInfo); @@ -192,7 +198,9 @@ public: bool CheckIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee); void HandleDeviceNotTrust(const std::string &msg); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + void HandleCredentialDeleted(const char *credId, const char *credInfo); void HandleDeviceTrustedChange(const std::string &msg); + bool ParseRelationShipChangeType(const RelationShipChangeMsg &relationShipMsg); void HandleUserIdCheckSumChange(const std::string &msg); void HandleUserStop(int32_t stopUserId, const std::string &stopEventUdid); void HandleUserStop(int32_t stopUserId, const std::string &stopEventUdid, @@ -206,8 +214,16 @@ public: void SubscribePackageCommonEvent(); int32_t GetNetworkIdByUdid(const std::string &pkgName, const std::string &udid, std::string &networkId); void HandleCredentialAuthStatus(const std::string &deviceList, uint16_t deviceTypeId, int32_t errcode); + int32_t SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList); + int32_t GetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList); void ProcessSyncUserIds(const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, const std::string &remoteUdid); + + void ProcessUninstApp(int32_t userId, int32_t tokenId); + void ProcessUnBindApp(int32_t userId, int32_t tokenId, const std::string &extra, const std::string &udid); + int32_t SetLocalDisplayNameToSoftbus(const std::string &displayName); void RemoveNotifyRecord(const ProcessInfo &processInfo); int32_t RegDevStateCallbackToService(const std::string &pkgName); @@ -236,12 +252,24 @@ public: bool IsPC(); int32_t GetDeviceNetworkIdList(const std::string &pkgName, const NetworkIdQueryFilter &queryFilter, std::vector &networkIds); - + void ProcessSyncAccountLogout(const std::string &accountId, const std::string &peerUdid, int32_t userId); + int32_t OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m); + int32_t UnRegisterPinHolderCallback(const std::string &pkgName); + void ProcessReceiveRspAppUninstall(const std::string &remoteUdid); + void ProcessReceiveRspAppUnbind(const std::string &remoteUdid); + void ProcessCommonUserStatusEvent(const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds, const std::string &remoteUdid); + int32_t GetLocalDeviceName(std::string &deviceName); + bool CheckSrcAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee); + bool CheckSinkAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee); + bool CheckSrcIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee); + bool CheckSinkIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee); private: bool IsDMServiceImplReady(); bool IsDMImplSoLoaded(); bool IsDMServiceAdapterSoLoaded(); bool IsDMServiceAdapterResidentLoad(); + bool IsMsgEmptyAndDMServiceImplReady(const std::string &msg); void UnloadDMServiceImplSo(); void UnloadDMServiceAdapterResident(); void SendUnBindBroadCast(const std::vector &peerUdids, int32_t userId, uint64_t tokenId, @@ -250,8 +278,11 @@ private: int32_t bindLevel, uint64_t peerTokenId); void SendDeviceUnBindBroadCast(const std::vector &peerUdids, int32_t userId); void SendAppUnBindBroadCast(const std::vector &peerUdids, int32_t userId, uint64_t tokenId); + int32_t CalculateBroadCastDelayTime(); void SendAppUnBindBroadCast(const std::vector &peerUdids, int32_t userId, uint64_t tokenId, uint64_t peerTokenId); + void SendAppUnInstallBroadCast(const std::vector &peerUdids, int32_t userId, + uint64_t tokenId); void SendServiceUnBindBroadCast(const std::vector &peerUdids, int32_t userId, uint64_t tokenId); void SendAccountLogoutBroadCast(const std::vector &peerUdids, const std::string &accountId, const std::string &accountName, int32_t userId); @@ -283,12 +314,17 @@ private: #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) void SubscribeAccountCommonEvent(); - void AccountCommonEventCallback(const std::string commonEventType, int32_t currentUserId, int32_t beforeUserId); + void SendShareTypeUnBindBroadCast(const char *credId, const int32_t localUserId, + const std::vector &peerUdids); + DM_EXPORT void AccountCommonEventCallback(const std::string commonEventType, + int32_t currentUserId, int32_t beforeUserId); void SubscribeScreenLockEvent(); void ScreenCommonEventCallback(std::string commonEventType); - void ConvertUdidHashToAnoyDeviceId(DmDeviceInfo &deviceInfo); - int32_t ConvertUdidHashToAnoyDeviceId(const std::string &udidHash, std::string &anoyDeviceId); - int32_t GetUdidHashByAnoyDeviceId(const std::string &anoyDeviceId, std::string &udidHash); + DM_EXPORT void ConvertUdidHashToAnoyDeviceId(DmDeviceInfo &deviceInfo); + DM_EXPORT int32_t ConvertUdidHashToAnoyDeviceId(const std::string &udidHash, + std::string &anoyDeviceId); + DM_EXPORT int32_t GetUdidHashByAnoyDeviceId(const std::string &anoyDeviceId, + std::string &udidHash); void HandleAccountLogout(int32_t userId, const std::string &accountId, const std::string &accountName); void HandleUserRemoved(int32_t removedUserId); /** @@ -300,6 +336,7 @@ private: void HandleUserSwitched(int32_t curUserId, int32_t preUserId); void HandleUserIdsBroadCast(const std::vector &remoteUserIdInfos, const std::string &remoteUdid, bool isNeedResponse); + void HandleShareUnbindBroadCast(const int32_t userId, const std::string &credId); void NotifyRemoteLocalUserSwitch(int32_t curUserId, int32_t preUserId, const std::vector &peerUdids, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds); void NotifyRemoteLocalUserSwitchByWifi(int32_t curUserId, int32_t preUserId, @@ -315,6 +352,19 @@ private: void InitServiceInfos(const std::vector &dpLocalServiceItems, std::vector &serviceInfos); void HandleUserSwitched(); + + void NotifyRemoteUninstallApp(int32_t userId, int32_t tokenId); + void NotifyRemoteUninstallAppByWifi(int32_t userId, int32_t tokenId, + const std::map &wifiDevices); + int32_t SendUninstAppByWifi(int32_t userId, int32_t tokenId, const std::string &networkId); + + void GetNotifyRemoteUnBindAppWay(int32_t userId, int32_t tokenId, + std::map &wifiDevices, bool &isBleWay); + void NotifyRemoteUnBindAppByWifi(int32_t userId, int32_t tokenId, std::string extra, + const std::map &wifiDevices); + int32_t SendUnBindAppByWifi(int32_t userId, int32_t tokenId, std::string extra, + const std::string &networkId, const std::string &udid); + void NotifyRemoteLocalUserSwitch(const std::string &localUdid, const std::vector &peerUdids, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds); void NotifyRemoteLocalUserSwitchByWifi(const std::string &localUdid, @@ -334,13 +384,43 @@ private: void HandleUserStopBroadCast(int32_t stopUserId, const std::string &remoteUdid); void NotifyRemoteLocalUserStopByWifi(const std::string &localUdid, const std::map &wifiDevices, int32_t stopUserId); + + void HandleAccountCommonEvent(const std::string commonEventType); + bool IsUserStatusChanged(std::vector foregroundUserVec, std::vector backgroundUserVec); + void NotifyRemoteAccountCommonEvent(const std::string commonEventType, const std::string &localUdid, + const std::vector &peerUdids, const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds); + void NotifyRemoteAccountCommonEventByWifi(const std::string &localUdid, + const std::map &wifiDevices, const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds); + int32_t SendAccountCommonEventByWifi(const std::string &networkId, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds); + void HandleCommonEventTimeout(const std::string &localUdid, const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds, const std::string &udid); + void UpdateAcl(const std::string &localUdid, const std::vector &peerUdids, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds); + void HandleCommonEventBroadCast(const std::vector &remoteUserIdInfos, + const std::string &remoteUdid, bool isNeedResponse); + void SendCommonEventBroadCast(const std::vector &peerUdids, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, + bool isNeedResponse); + #if defined(SUPPORT_BLUETOOTH) || defined(SUPPORT_WIFI) void SubscribePublishCommonEvent(); void QueryDependsSwitchState(); #endif // SUPPORT_BLUETOOTH SUPPORT_WIFI - void SubscribeDataShareCommonEvent(); + DM_EXPORT void SubscribeDataShareCommonEvent(); #endif - void CheckRegisterInfoWithWise(int32_t curUserId); + void HandleNetworkConnected(int32_t networkStatus); + void NotifyRemoteLocalLogout(const std::vector &peerUdids, + const std::string &accountIdHash, const std::string &accountName, int32_t userId); + void CheckPermission(bool &isOnlyShowNetworkId); +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) && !defined(DEVICE_MANAGER_COMMON_FLAG) + bool IsCallerInWhiteList(); + bool IsDMAdapterCheckApiWhiteListLoaded(); +#endif + bool GetAccessUdidByNetworkId(const std::string &srcNetWorkId, std::string &srcUdid, + const std::string &sinkNetWorkId, std::string &sinkUdid); private: bool isImplsoLoaded_ = false; @@ -349,6 +429,7 @@ private: std::mutex isImplLoadLock_; std::mutex isAdapterResidentLoadLock_; std::mutex hichainListenerLock_; + std::mutex userVecLock_; std::shared_ptr advertiseMgr_; std::shared_ptr discoveryMgr_; std::shared_ptr softbusListener_; @@ -362,13 +443,24 @@ private: std::shared_ptr accountCommonEventManager_; std::shared_ptr packageCommonEventManager_; std::shared_ptr screenCommonEventManager_; + std::vector foregroundUserVec_; + std::vector backgroundUserVec_; + std::mutex broadCastLock_; + int64_t SendLastBroadCastTime_ = 0; + int64_t lastDelayTime_ = 0; #if defined(SUPPORT_BLUETOOTH) || defined(SUPPORT_WIFI) std::shared_ptr publshCommonEventManager_; #endif // SUPPORT_BLUETOOTH SUPPORT_WIFI - std::shared_ptr dataShareCommonEventManager_; + DM_EXPORT std::shared_ptr dataShareCommonEventManager_; #endif std::string localNetWorkId_ = ""; std::shared_ptr timer_; +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) && !defined(DEVICE_MANAGER_COMMON_FLAG) + bool isAdapterCheckApiWhiteListSoLoaded_ = false; + void *checkApiWhiteListSoHandle_ = nullptr; + std::mutex isAdapterCheckApiWhiteListLoadedLock_; + std::shared_ptr dmCheckApiWhiteList_; +#endif }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/include/device_manager_service_listener.h b/services/service/include/device_manager_service_listener.h index 648d1283a11a7e188efa9ab3e4797a38acd4f1f6..fbf03d22ab075989afc2b3f3cefeca6d724a6801 100644 --- a/services/service/include/device_manager_service_listener.h +++ b/services/service/include/device_manager_service_listener.h @@ -36,7 +36,7 @@ namespace OHOS { namespace DistributedHardware { -class DeviceManagerServiceListener : public IDeviceManagerServiceListener { +class DM_EXPORT DeviceManagerServiceListener : public IDeviceManagerServiceListener { public: DeviceManagerServiceListener() {}; virtual ~DeviceManagerServiceListener() {}; @@ -59,11 +59,11 @@ public: void OnCredentialResult(const ProcessInfo &processInfo, int32_t action, const std::string &resultInfo) override; - void OnBindResult(const ProcessInfo &processInfo, const PeerTargetId &targetId, int32_t result, - int32_t status, std::string content) override; + DM_EXPORT void OnBindResult(const ProcessInfo &processInfo, + const PeerTargetId &targetId, int32_t result, int32_t status, std::string content) override; - void OnUnbindResult(const ProcessInfo &processInfo, const PeerTargetId &targetId, int32_t result, - std::string content) override; + DM_EXPORT void OnUnbindResult(const ProcessInfo &processInfo, + const PeerTargetId &targetId, int32_t result, std::string content) override; void OnPinHolderCreate(const ProcessInfo &processInfo, const std::string &deviceId, DmPinType pinType, const std::string &payload) override; @@ -90,6 +90,9 @@ public: void OnSetRemoteDeviceNameResult(const ProcessInfo &processInfo, const std::string &deviceId, const std::string &deviceName, int32_t code) override; + std::string GetLocalDisplayDeviceNameForPrivacy() override; + int32_t OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m) override; + private: void ConvertDeviceInfoToDeviceBasicInfo(const std::string &pkgName, const DmDeviceInfo &info, DmDeviceBasicInfo &deviceBasicInfo); @@ -104,7 +107,8 @@ private: const DmDeviceInfo &deviceInfo); void RemoveOnlinePkgName(const DmDeviceInfo &info); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) - int32_t ConvertUdidHashToAnoyAndSave(const std::string &pkgName, DmDeviceInfo &deviceInfo); + DM_EXPORT int32_t ConvertUdidHashToAnoyAndSave(const std::string &pkgName, + DmDeviceInfo &deviceInfo); int32_t ConvertUdidHashToAnoyDeviceId(const std::string &pkgName, const std::string &udidHash, std::string &anoyDeviceId); #endif diff --git a/services/service/include/devicenamemgr/device_name_manager.h b/services/service/include/devicenamemgr/device_name_manager.h index 78e93663e33709c78bc5bdc40f83b951e0708e64..8e3f85a0fc15defcd638cdc0cde42c592fbd14a8 100644 --- a/services/service/include/devicenamemgr/device_name_manager.h +++ b/services/service/include/devicenamemgr/device_name_manager.h @@ -43,6 +43,9 @@ public: int32_t InitDeviceNameWhenNameChange(int32_t userId); int32_t ModifyUserDefinedName(const std::string &deviceName); int32_t RestoreLocalDeviceName(); + int32_t InitDeviceNameWhenLanguageOrRegionChanged(); + std::string GetUserDefinedDeviceName(); + std::string GetLocalDisplayDeviceNameForPrivacy(); private: DeviceNameManager() = default; @@ -55,6 +58,23 @@ private: std::string GetLocalDisplayDeviceName(const std::string &prefixName, const std::string &subffixName, int32_t maxNamelength); std::string SubstrByBytes(const std::string &str, int32_t maxNumBytes); + /** + * @brief Convert the raw string to whole character, consider character encoding, such as One Chinese + * letter maybe encoded to 3 bytes. + * + * @param str raw string + * @return std::string string in encoded letter. + */ + std::vector ConvertToWholeCharacter(const std::string &str); + /** + * @brief anonymize the string middle part, left begin and end 3 letter, the middle part set "***" + * + * @param str the raw string + * @return std::string the string processed + */ + std::string AnoyPrivacyString(const std::string &str); + std::string GenLocalAnoyDeviceNameWithNickAndMarketName(const std::string &nickName, + const std::string &marketName); std::string GetSystemLanguage(); std::string GetSystemRegion(); diff --git a/services/service/include/devicenamemgr/local_device_name_mgr.h b/services/service/include/devicenamemgr/local_device_name_mgr.h deleted file mode 100644 index 53f7a61536ab71c44dbd1925157063ce1ec9cdac..0000000000000000000000000000000000000000 --- a/services/service/include/devicenamemgr/local_device_name_mgr.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_DEVICE_NAME_MGR_H -#define OHOS_DEVICE_NAME_MGR_H - -#include "datashare_helper.h" - -namespace OHOS { -namespace DistributedHardware { -class LocalDeviceNameMgr : public std::enable_shared_from_this { -public: - LocalDeviceNameMgr(); - virtual ~LocalDeviceNameMgr(); - int32_t QueryLocalDeviceName(); - void RegisterDeviceNameChangeCb(); - int32_t QueryLocalDisplayName(); - void RegisterDisplayNameChangeCb(); - std::string GetLocalDisplayName() const; - std::string GetLocalDeviceName() const; - -private: - std::shared_ptr GetDataShareHelper(); - int32_t GetDeviceNameFromDataShareHelper(std::shared_ptr dataShareHelper, - std::shared_ptr uri, const char *key, std::string &deviceName); - int32_t GetDefaultDeviceName(std::shared_ptr dataShareHelper, - std::string &deviceName); - int32_t GetUserDefinedDeviceName(std::shared_ptr dataShareHelper, - std::string &deviceName); - int32_t GetDisplayDeviceName(std::shared_ptr dataShareHelper, - std::string &deviceName); - int32_t GetActiveOsAccountIds(); -private: - static std::mutex devNameMtx_; - std::string localDeviceName_; - std::string localDisplayName_; -}; -} // DistributedHardware -} // OHOS - -#endif // OHOS_DEVICE_NAME_MGR_H \ No newline at end of file diff --git a/services/service/include/hichain/hichain_listener.h b/services/service/include/hichain/hichain_listener.h index 07f40880374ea6eedc08237991f7229c4900bedf..cc43346a26077da6088c62513d889081af95b9f4 100644 --- a/services/service/include/hichain/hichain_listener.h +++ b/services/service/include/hichain/hichain_listener.h @@ -58,6 +58,7 @@ public: HichainListener(); ~HichainListener(); void RegisterDataChangeCb(); + void RegisterCredentialCb(); void DeleteAllGroup(const std::string &localUdid, const std::vector &backgroundUserIds); int32_t GetRelatedGroups(int32_t userId, const std::string &deviceId, std::vector &groupList); @@ -69,9 +70,11 @@ public: int64_t GenRequestId(); static void OnHichainDeviceUnBound(const char *peerUdid, const char *groupInfo); + static void OnCredentialDeleted(const char *credId, const char *credInfo); private: const DeviceGroupManager *deviceGroupManager_ = nullptr; + const CredManager *credManager_ = nullptr; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/include/idevice_manager_service_impl.h b/services/service/include/idevice_manager_service_impl.h index 8ba83a8ad6a0aa4af697ef96f6397610f935a8c4..0a49ec5153d0c4d5d011319dcae2b570f206e349 100644 --- a/services/service/include/idevice_manager_service_impl.h +++ b/services/service/include/idevice_manager_service_impl.h @@ -221,11 +221,11 @@ public: virtual std::unordered_map GetAppTrustDeviceIdList(std::string pkgname) = 0; virtual int32_t DpAclAdd(const std::string &udid) = 0; virtual int32_t IsSameAccount(const std::string &udid) = 0; - virtual uint64_t GetTokenIdByNameAndDeviceId(std::string pkgName, std::string requestDeviceId) = 0; + virtual uint64_t GetTokenIdByNameAndDeviceId(std::string extra, std::string requestDeviceId) = 0; virtual void ScreenCommonEventCallback(std::string commonEventType) = 0; - virtual int32_t CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + virtual bool CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) = 0; - virtual int32_t CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + virtual bool CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, const DmAccessCallee &callee, const std::string &sinkUdid) = 0; virtual void HandleDeviceNotTrust(const std::string &udid) = 0; virtual std::multimap GetDeviceIdAndUserId(int32_t userId, @@ -240,26 +240,51 @@ public: const std::string &udid, uint64_t &tokenId) = 0; virtual void HandleIdentAccountLogout(const std::string &localUdid, int32_t localUserId, const std::string &peerUdid, int32_t peerUserId) = 0; - virtual void HandleUserRemoved(int32_t preUserId) = 0; + virtual void HandleUserRemoved(std::vector peerUdids, int32_t preUserId) = 0; virtual void HandleDeviceScreenStatusChange(DmDeviceInfo &devInfo) = 0; virtual void HandleUserSwitched(const std::vector &deviceVec, int32_t currentUserId, int32_t beforeUserId) = 0; virtual int32_t StopAuthenticateDevice(const std::string &pkgName) = 0; virtual void HandleCredentialAuthStatus(const std::string &deviceList, uint16_t deviceTypeId, int32_t errcode) = 0; + virtual int32_t SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList) = 0; + virtual int32_t GetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList) = 0; virtual int32_t ProcessAppUnintall(const std::string &appId, int32_t accessTokenId) = 0; + virtual int32_t ProcessAppUninstall(int32_t userId, int32_t accessTokenId) = 0; + virtual void ProcessUnBindApp(int32_t userId, int32_t accessTokenId, const std::string &extra, + const std::string &udid) = 0; + virtual void HandleSyncUserIdEvent(const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, const std::string &remoteUdid, bool isCheckUserStatus) = 0; virtual void HandleRemoteUserRemoved(int32_t userId, const std::string &remoteUdid) = 0; virtual std::map GetDeviceIdAndBindLevel(int32_t userId) = 0; + virtual std::vector GetDeviceIdByUserIdAndTokenId(int32_t userId, int32_t tokenId) = 0; virtual std::multimap GetDeviceIdAndUserId(int32_t localUserId) = 0; virtual int32_t SaveOnlineDeviceInfo(const std::vector &deviceList) = 0; virtual void HandleDeviceUnBind(int32_t bindType, const std::string &peerUdid, const std::string &localUdid, int32_t localUserId, const std::string &localAccountId) = 0; virtual int32_t RegisterAuthenticationType(int32_t authenticationType) = 0; virtual void DeleteAlwaysAllowTimeOut() = 0; - virtual void CheckDeleteCredential(const std::string &remoteUdid) = 0; + virtual void CheckDeleteCredential(const std::string &remoteUdid, int32_t remoteUserId) = 0; + virtual void HandleCredentialDeleted(const char *credId, const char *credInfo, const std::string &localUdid, + std::string &remoteUdid) = 0; + virtual void HandleShareUnbindBroadCast(const std::string &credId, const int32_t &userId, + const std::string &localUdid) = 0; virtual int32_t CheckDeviceInfoPermission(const std::string &localUdid, const std::string &peerDeviceId) = 0; + virtual void HandleServiceUnBindEvent(int32_t userId, const std::string &remoteUdid, + int32_t remoteTokenId) = 0; + virtual void HandleCommonEventBroadCast(const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds, const std::string &remoteUdid) = 0; + virtual bool CheckSrcAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) = 0; + virtual bool CheckSinkAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) = 0; + virtual bool CheckSrcIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) = 0; + virtual bool CheckSinkIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) = 0; }; using CreateDMServiceFuncPtr = IDeviceManagerServiceImpl *(*)(void); diff --git a/services/service/include/ipc/standard/ipc_server_stub.h b/services/service/include/ipc/standard/ipc_server_stub.h index ae1a1eaecb9ae901a57489d02a501f1b0d185965..4756323015470d3d3237c4062accb45a41c08fe8 100644 --- a/services/service/include/ipc/standard/ipc_server_stub.h +++ b/services/service/include/ipc/standard/ipc_server_stub.h @@ -166,6 +166,7 @@ private: std::map> appRecipient_; std::map> dmListener_; std::set systemSA_; + int64_t startBeginTime_ = 0; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/include/permission/lite/permission_manager.h b/services/service/include/permission/lite/permission_manager.h index 0ed954a15b539974404371f5395a127ef495636a..212506b7db10724be699897945e5570e16f4678f 100644 --- a/services/service/include/permission/lite/permission_manager.h +++ b/services/service/include/permission/lite/permission_manager.h @@ -39,6 +39,7 @@ public: bool CheckProcessNameValidOnGetDeviceInfo(const std::string &processName); bool CheckProcessNameValidModifyLocalDeviceName(const std::string &processName); bool CheckProcessNameValidModifyRemoteDeviceName(const std::string &processName); + bool CheckProcessNameValidPutDeviceProfileInfoList(const std::string &processName); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/include/permission/standard/permission_manager.h b/services/service/include/permission/standard/permission_manager.h index 89cc1f47e2c3cb38fbd2e7475c044099d1b39f4a..ca52cd98711b2137aecc93490f003481dddc4f8e 100644 --- a/services/service/include/permission/standard/permission_manager.h +++ b/services/service/include/permission/standard/permission_manager.h @@ -38,6 +38,7 @@ public: bool CheckProcessNameValidOnGetDeviceInfo(const std::string &processName); bool CheckProcessNameValidModifyLocalDeviceName(const std::string &processName); bool CheckProcessNameValidModifyRemoteDeviceName(const std::string &processName); + bool CheckProcessNameValidPutDeviceProfileInfoList(const std::string &processName); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/include/pinholder/pin_holder.h b/services/service/include/pinholder/pin_holder.h index 250a4b5f0dc097cdc60f2cbdc069af3be601cef6..027295911319db3783250dd170cd5d4cee975410 100644 --- a/services/service/include/pinholder/pin_holder.h +++ b/services/service/include/pinholder/pin_holder.h @@ -48,6 +48,7 @@ public: int32_t DestroyPinHolder(const std::string &pkgName, const PeerTargetId &targetId, DmPinType pinType, const std::string &payload); int32_t NotifyPinHolderEvent(const std::string &pkgName, const std::string &event); + int32_t UnRegisterPinHolderCallback(const std::string &pkgName); public: void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result); void OnSessionClosed(int32_t sessionId); diff --git a/services/service/include/pinholder/pin_holder_session.h b/services/service/include/pinholder/pin_holder_session.h index c7570a8c640c38f81f74c8f885d3c33d4b4d5614..f4b20b967426fc39ee44c78c62dd461bd0bffdf1 100644 --- a/services/service/include/pinholder/pin_holder_session.h +++ b/services/service/include/pinholder/pin_holder_session.h @@ -16,6 +16,8 @@ #ifndef OHOS_PIN_HOLDER_SESSION_H #define OHOS_PIN_HOLDER_SESSION_H +#include + #include "dm_device_info.h" #include "pinholder_session_callback.h" @@ -74,6 +76,7 @@ private: private: static std::shared_ptr pinholderSessionCallback_; + static std::mutex pinHolderSessionLock_; }; } } diff --git a/services/service/include/publishcommonevent/dm_datashare_common_event.h b/services/service/include/publishcommonevent/dm_datashare_common_event.h index ac984fc82254c8deff52ee3568bff44c0dce5cb8..a8013c325df6a7eee8311f190dfc5e84e7ab3f24 100644 --- a/services/service/include/publishcommonevent/dm_datashare_common_event.h +++ b/services/service/include/publishcommonevent/dm_datashare_common_event.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef OHOS_DM_DATASAHRE_COMMON_EVENT_H -#define OHOS_DM_DATASAHRE_COMMON_EVENT_H +#ifndef OHOS_DM_DATASHARE_COMMON_EVENT_H +#define OHOS_DM_DATASHARE_COMMON_EVENT_H #include "common_event_manager.h" #include "system_ability_status_change_stub.h" @@ -24,7 +24,7 @@ namespace DistributedHardware { using OHOS::EventFwk::CommonEventData; using OHOS::EventFwk::CommonEventSubscriber; using OHOS::EventFwk::CommonEventSubscribeInfo; -using DataShareEventCallback = std::function; +using DataShareEventCallback = std::function; class DmDataShareEventSubscriber : public CommonEventSubscriber { public: @@ -71,4 +71,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_DATASAHRE_COMMON_EVENT_H +#endif // OHOS_DM_DATASHARE_COMMON_EVENT_H diff --git a/services/service/include/relationshipsyncmgr/dm_comm_tool.h b/services/service/include/relationshipsyncmgr/dm_comm_tool.h index a4cd2befb5933de1b4db8080a18f5b70e4a23390..ca1136c1307ee80cf48903d9ad271f31cc814a31 100644 --- a/services/service/include/relationshipsyncmgr/dm_comm_tool.h +++ b/services/service/include/relationshipsyncmgr/dm_comm_tool.h @@ -16,12 +16,16 @@ #ifndef OHOS_DM_COMM_TOOL_H #define OHOS_DM_COMM_TOOL_H +#include +#include #include "dm_transport.h" #include "dm_transport_msg.h" +#include "ffrt.h" + namespace OHOS { namespace DistributedHardware { - +using EventCallback = std::function; class DMCommTool : public std::enable_shared_from_this { public: DMCommTool(); @@ -32,6 +36,12 @@ public: int32_t SendUserIds(const std::string rmtNetworkId, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds); + + int32_t SendUninstAppObj(int32_t userId, int32_t tokenId, const std::string &networkId); + + int32_t SendUnBindAppObj(int32_t userId, int32_t tokenId, const std::string &extra, const std::string &networkId, + const std::string &udid); + void RspLocalFrontOrBackUserIds(const std::string rmtNetworkId, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, int32_t socketId); int32_t CreateUserStopMessage(int32_t stopUserId, std::string &msgStr); @@ -41,6 +51,11 @@ public: void ProcessReceiveUserStopEvent(const std::shared_ptr commMsg); void RspUserStop(const std::string rmtNetworkId, int32_t socketId, int32_t stopUserId); void ProcessResponseUserStopEvent(const std::shared_ptr commMsg); + int32_t RspAppUninstall(const std::string rmtNetworkId, int32_t socketId); + int32_t RspAppUnbind(const std::string rmtNetworkId, int32_t socketId); + void StopSocket(const std::string &networkId); + void ProcessReceiveRspAppUninstallEvent(const std::shared_ptr commMsg); + void ProcessReceiveRspAppUnbindEvent(const std::shared_ptr commMsg); class DMCommToolEventHandler : public AppExecFwk::EventHandler { public: @@ -48,7 +63,12 @@ public: std::shared_ptr dmCommToolPtr); ~DMCommToolEventHandler() override = default; void ProcessEvent(const AppExecFwk::InnerEvent::Pointer &event) override; + void HandleEvent(const std::shared_ptr &dmCommToolPtr, uint32_t eventId, + const std::shared_ptr &commMsg, const UserIdsMsg &userIdsMsg); + void HandleLocalUserIdEvent(const std::shared_ptr &dmCommToolPtr, uint32_t eventId, + const std::shared_ptr &commMsg, const UserIdsMsg &userIdsMsg); private: + void ParseUserIdsMsg(std::shared_ptr commMsg, UserIdsMsg &userIdsMsg); std::weak_ptr dmCommToolWPtr_; }; std::shared_ptr GetEventHandler(); @@ -56,9 +76,18 @@ public: void ProcessReceiveUserIdsEvent(const std::shared_ptr commMsg); void ProcessResponseUserIdsEvent(const std::shared_ptr commMsg); + int32_t SendLogoutAccountInfo(const std::string &rmtNetworkId, const std::string &accountId, int32_t userId); + void ProcessReceiveLogoutEvent(const std::shared_ptr commMsg); + int32_t StartCommonEvent(std::string commonEventType, EventCallback eventCallback); + void ProcessReceiveCommonEvent(const std::shared_ptr commMsg); + void ProcessResponseCommonEvent(const std::shared_ptr commMsg); + void ProcessReceiveUninstAppEvent(const std::shared_ptr commMsg); + void ProcessReceiveUnBindAppEvent(const std::shared_ptr commMsg); private: std::shared_ptr dmTransportPtr_; std::shared_ptr eventHandler_; + mutable std::mutex eventMutex_; + std::shared_ptr eventQueue_; }; } // DistributedHardware } // OHOS diff --git a/services/service/include/relationshipsyncmgr/dm_transport.h b/services/service/include/relationshipsyncmgr/dm_transport.h index 5bc97dfd0f152cc388257e71106ee66fc7623989..68eea2a4c8b6412a704b06695ee76c59c2dd54c2 100644 --- a/services/service/include/relationshipsyncmgr/dm_transport.h +++ b/services/service/include/relationshipsyncmgr/dm_transport.h @@ -46,6 +46,7 @@ private: std::string GetRemoteNetworkIdBySocketId(int32_t socketId); void ClearDeviceSocketOpened(const std::string &remoteDevId, int32_t socketId); void HandleReceiveMessage(const int32_t socketId, const std::string &payload); + int32_t StartSocketInner(const std::string &rmtNetworkId, int32_t &socketId); private: std::mutex rmtSocketIdMtx_; diff --git a/services/service/include/relationshipsyncmgr/dm_transport_msg.h b/services/service/include/relationshipsyncmgr/dm_transport_msg.h index a4fb17712aa2588c93032584145189ab3bafd231..755c3a9e23b02b518c3831153adf573d6b3ca42a 100644 --- a/services/service/include/relationshipsyncmgr/dm_transport_msg.h +++ b/services/service/include/relationshipsyncmgr/dm_transport_msg.h @@ -24,9 +24,10 @@ namespace DistributedHardware { struct UserIdsMsg { std::vector foregroundUserIds; std::vector backgroundUserIds; - UserIdsMsg() : foregroundUserIds({}), backgroundUserIds({}) {} - UserIdsMsg(std::vector foregroundUserIds, std::vector backgroundUserIds) - : foregroundUserIds(foregroundUserIds), backgroundUserIds(backgroundUserIds) {} + bool isNewEvent; + UserIdsMsg() : foregroundUserIds({}), backgroundUserIds({}), isNewEvent(false) {} + UserIdsMsg(std::vector foregroundUserIds, std::vector backgroundUserIds, bool isNewEvent) + : foregroundUserIds(foregroundUserIds), backgroundUserIds(backgroundUserIds), isNewEvent(isNewEvent) {} }; void ToJson(cJSON *jsonObject, const UserIdsMsg &userIdsMsg); @@ -64,6 +65,41 @@ struct NotifyUserIds { void ToJson(cJSON *jsonObject, const NotifyUserIds &userIds); void FromJson(const cJSON *jsonObject, NotifyUserIds &userIds); + +struct LogoutAccountMsg { + std::string accountId; + int32_t userId; + LogoutAccountMsg() : userId(-1) {} + LogoutAccountMsg(const std::string &accountId, int32_t userId) + : accountId(accountId), userId(userId) {} +}; + +void ToJson(cJSON *jsonObject, const LogoutAccountMsg &accountInfo); +void FromJson(const cJSON *jsonObject, LogoutAccountMsg &accountInfo); + +struct UninstAppMsg { + int32_t userId_; + int32_t tokenId_; + UninstAppMsg() : userId_(-1), tokenId_(-1) {} + UninstAppMsg(int32_t userId, int32_t tokenId) + : userId_(userId), tokenId_(tokenId) {} +}; + +void ToJson(cJSON *jsonObject, const UninstAppMsg &uninstAppMsg); +void FromJson(const cJSON *jsonObject, UninstAppMsg &uninstAppMsg); + +struct UnBindAppMsg { + int32_t userId_; + int32_t tokenId_; + std::string extra_; + std::string udid_; + UnBindAppMsg() : userId_(-1), tokenId_(-1), extra_(""), udid_("") {} + UnBindAppMsg(int32_t userId, int32_t tokenId, const std::string &extra, const std::string &udid) + : userId_(userId), tokenId_(tokenId), extra_(extra), udid_(udid) {} +}; + +void ToJson(cJSON *jsonObject, const UnBindAppMsg &unBindAppMsg); +void FromJson(const cJSON *jsonObject, UnBindAppMsg &unBindAppMsg); } // DistributedHardware } // OHOS #endif \ No newline at end of file diff --git a/services/service/include/relationshipsyncmgr/relationship_sync_mgr.h b/services/service/include/relationshipsyncmgr/relationship_sync_mgr.h index d0787d446100bd24d710f928f2ad4c4cd86a33fb..2d0591a97afdc016435be7a2909a66f632330d3e 100644 --- a/services/service/include/relationshipsyncmgr/relationship_sync_mgr.h +++ b/services/service/include/relationshipsyncmgr/relationship_sync_mgr.h @@ -17,8 +17,11 @@ #define OHOS_RELATIONSHIP_SYNC_MGR_H #include +#include +#include #include "cJSON.h" #include "dm_single_instance.h" +#include "dm_timer.h" namespace OHOS { namespace DistributedHardware { enum class RelationShipChangeType : uint32_t { @@ -30,7 +33,8 @@ enum class RelationShipChangeType : uint32_t { APP_UNINSTALL = 5, SYNC_USERID = 6, STOP_USER = 7, - TYPE_MAX = 8 + SHARE_UNBIND = 8, + TYPE_MAX = 9 }; struct UserIdInfo { @@ -58,6 +62,9 @@ struct RelationShipChangeMsg { bool syncUserIdFlag; // The foreground and background user id infos std::vector userIdInfos; + std::string credId; + bool isNewEvent; + uint8_t broadCastId; explicit RelationShipChangeMsg(); bool ToBroadcastPayLoad(uint8_t *&msg, uint32_t &len) const; @@ -68,29 +75,44 @@ struct RelationShipChangeMsg { void ToAccountLogoutPayLoad(uint8_t *&msg, uint32_t &len) const; void ToDeviceUnbindPayLoad(uint8_t *&msg, uint32_t &len) const; void ToAppUnbindPayLoad(uint8_t *&msg, uint32_t &len) const; + void ToAppUninstallPayLoad(uint8_t *&msg, uint32_t &len) const; + void ToServiceUnbindPayLoad(uint8_t *&msg, uint32_t &len) const; bool ToSyncFrontOrBackUserIdPayLoad(uint8_t *&msg, uint32_t &len) const; void ToDelUserPayLoad(uint8_t *&msg, uint32_t &len) const; void ToStopUserPayLoad(uint8_t *&msg, uint32_t &len) const; + void ToShareUnbindPayLoad(uint8_t *&msg, uint32_t &len) const; cJSON *ToPayLoadJson() const; bool FromAccountLogoutPayLoad(const cJSON *payloadJson); bool FromDeviceUnbindPayLoad(const cJSON *payloadJson); bool FromAppUnbindPayLoad(const cJSON *payloadJson); + bool FromServiceUnbindPayLoad(const cJSON *payloadJson); bool FromSyncFrontOrBackUserIdPayLoad(const cJSON *payloadJson); bool FromDelUserPayLoad(const cJSON *payloadJson); bool FromStopUserPayLoad(const cJSON *payloadJson); + bool FromShareUnbindPayLoad(const cJSON *payloadJson); + bool FromAppUninstallPayLoad(const cJSON *payloadJson); + bool GetBroadCastId(const cJSON *payloadJson, uint32_t userIdNum); std::string ToJson() const; bool FromJson(const std::string &msgJson); const std::string ToString() const; + const std::string ToMapKey() const; }; class ReleationShipSyncMgr { DM_DECLARE_SINGLE_INSTANCE(ReleationShipSyncMgr); public: - std::string SyncTrustRelationShip(const RelationShipChangeMsg &msg); + std::string SyncTrustRelationShip(RelationShipChangeMsg &msg); RelationShipChangeMsg ParseTrustRelationShipChange(const std::string &msgJson); + bool IsNewBroadCastId(const RelationShipChangeMsg &msg); +private: + void HandleRecvBroadCastTimeout(const std::string &key); + bool GetCurrentTimeSec(int32_t &sec); + std::map recvBroadCastIdMap_; + std::shared_ptr timer_; + std::mutex lock_; }; const std::string GetUserIdInfoList(const std::vector &list); diff --git a/services/service/include/softbus/softbus_listener.h b/services/service/include/softbus/softbus_listener.h index 55850a37a94937b45ec8b035355d16daccdf49d7..e6e2ffbd76c8e59aa0db1ec2aa8bb972edda602e 100644 --- a/services/service/include/softbus/softbus_listener.h +++ b/services/service/include/softbus/softbus_listener.h @@ -75,6 +75,27 @@ public: DmDeviceInfo &devInfo); static void UpdateDeviceName(NodeBasicInfo *info); + /** + * @brief notify the received acl hash info + * + * @param localDevUserInfo local device udid and userid + * @param remoteDevUserInfo remote device udid and userid + * @param remoteAclList the received acl hash info + * @return int32_t 0 for success + */ + static int32_t OnSyncLocalAclList(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList); + /** + * @brief create the local acl hash info + * + * @param localDevUserInfo local device udid and userid + * @param remoteDevUserInfo remote device udid and userid + * @param aclList the created acl hash info + * @return int32_t 0 for success + */ + static int32_t OnGetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList); + int32_t InitSoftbusListener(); int32_t GetTrustedDeviceList(std::vector &deviceInfoList); int32_t GetLocalDeviceInfo(DmDeviceInfo &deviceInfo); diff --git a/services/service/src/advertise/advertise_manager.cpp b/services/service/src/advertise/advertise_manager.cpp index 5a852f18adb047af3a5521b06d68ad603321c5bd..769ba0ba5c2ff3ab9aadee7ab59a06ae4937ed4f 100644 --- a/services/service/src/advertise/advertise_manager.cpp +++ b/services/service/src/advertise/advertise_manager.cpp @@ -42,11 +42,11 @@ AdvertiseManager::~AdvertiseManager() int32_t AdvertiseManager::StartAdvertising(const std::string &pkgName, const std::map &advertiseParam) { - LOGI("AdvertiseManager::StartAdvertising begin for pkgName = %{public}s.", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } + LOGI("begin for pkgName = %{public}s.", pkgName.c_str()); DmPublishInfo dmPubInfo; ConfigAdvParam(advertiseParam, &dmPubInfo, pkgName); std::string capability = DM_CAPABILITY_OSD; @@ -66,7 +66,7 @@ int32_t AdvertiseManager::StartAdvertising(const std::string &pkgName, int32_t ret = softbusListener_->PublishSoftbusLNN(dmPubInfo, capability, customData); if (ret != DM_OK) { - LOGE("StartAdvertising failed, softbus publish lnn ret: %{public}d", ret); + LOGE("failed, softbus publish lnn ret: %{public}d", ret); return ret; } @@ -128,12 +128,11 @@ void AdvertiseManager::ConfigAdvParam(const std::map & int32_t AdvertiseManager::StopAdvertising(const std::string &pkgName, int32_t publishId) { - LOGI("AdvertiseManager::StopDiscovering begin for pkgName = %{public}s, publishId = %{public}d.", pkgName.c_str(), - publishId); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } + LOGI("begin for pkgName = %{public}s, publishId = %{public}d.", pkgName.c_str(), publishId); int32_t innerPublishId = GetAndRemoveInnerPublishId(pkgName, publishId); if (innerPublishId == DM_INVALID_FLAG_ID) { LOGE("Failed: cannot find pkgName in cache map."); @@ -145,7 +144,7 @@ int32_t AdvertiseManager::StopAdvertising(const std::string &pkgName, int32_t pu void AdvertiseManager::HandleAutoStopAdvertise(const std::string &timerName, const std::string &pkgName, int32_t publishId) { - LOGI("HandleAutoStopAdvertise, auto stop advertise task timeout, timerName=%{public}s", timerName.c_str()); + LOGI("auto stop advertise task timeout, timerName=%{public}s", timerName.c_str()); StopAdvertising(pkgName, publishId); } @@ -197,11 +196,11 @@ int32_t AdvertiseManager::GetAndRemoveInnerPublishId(const std::string &pkgName, void AdvertiseManager::ClearPublishIdCache(const std::string &pkgName) { - LOGI("Begin for pkgName = %{public}s.", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return; } + LOGI("Begin for pkgName = %{public}s.", pkgName.c_str()); std::lock_guard autoLock(pubMapLock_); for (auto iter : pkgName2PubIdMap_[pkgName]) { softbusListener_->StopPublishSoftbusLNN(iter.second); diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 493f45f5536f3ec6aaa61f1cfd2809021f8181d8..c32ff62d28d9928ff9ba0a52d9e2c805201924fa 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -19,6 +19,7 @@ #include #include #include "app_manager.h" +#include "dm_constants.h" #include "dm_crypto.h" #include "dm_hidumper.h" #include "dm_softbus_cache.h" @@ -61,6 +62,9 @@ constexpr const char* LIB_IMPL_NAME = "libdevicemanagerserviceimpl.so"; #endif constexpr const char* LIB_DM_ADAPTER_NAME = "libdevicemanageradapter.z.so"; constexpr const char* LIB_DM_RESIDENT_NAME = "libdevicemanagerresident.z.so"; +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) && !defined(DEVICE_MANAGER_COMMON_FLAG) +constexpr const char* LIB_DM_CHECK_API_WHITE_LIST_NAME = "libdm_check_api_whitelist.z.so"; +#endif namespace OHOS { namespace DistributedHardware { @@ -73,15 +77,23 @@ namespace { constexpr const char *NETWORKID = "NETWORK_ID"; constexpr uint32_t INVALIED_BIND_LEVEL = 0; constexpr uint32_t DM_IDENTICAL_ACCOUNT = 1; + constexpr uint32_t DM_SHARE = 2; const std::string USERID_CHECKSUM_NETWORKID_KEY = "networkId"; const std::string USERID_CHECKSUM_DISCOVER_TYPE_KEY = "discoverType"; - constexpr uint32_t USERID_CHECKSUM_DISCOVERY_TYPE_WIFI_MASK = 0b0010; - constexpr uint32_t USERID_SYNC_DISCOVERY_TYPE_BLE_MASK = 0b0100; const std::string DHARD_WARE_PKG_NAME = "ohos.dhardware"; const std::string USERID_CHECKSUM_ISCHANGE_KEY = "ischange"; constexpr const char* USER_SWITCH_BY_WIFI_TIMEOUT_TASK = "deviceManagerTimer:userSwitchByWifi"; constexpr const char* USER_STOP_BY_WIFI_TIMEOUT_TASK = "deviceManagerTimer:userStopByWifi"; + constexpr const char* APP_UNINSTALL_BY_WIFI_TIMEOUT_TASK = "deviceManagerTimer:appUninstallByWifi"; + constexpr const char* APP_UNBIND_BY_WIFI_TIMEOUT_TASK = "deviceManagerTimer:appUnbindByWifi"; + constexpr const char* ACCOUNT_COMMON_EVENT_BY_WIFI_TIMEOUT_TASK = "deviceManagerTimer:accountCommonEventByWifi"; const int32_t USER_SWITCH_BY_WIFI_TIMEOUT_S = 2; + const int32_t SEND_DELAY_MAX_TIME = 5; + const int32_t SEND_DELAY_MIN_TIME = 0; + const int32_t DELAY_TIME_SEC_CONVERSION = 1000000; // 1000*1000 +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) && !defined(DEVICE_MANAGER_COMMON_FLAG) + const std::string GET_LOCAL_DEVICE_NAME_API_NAME = "GetLocalDeviceName"; +#endif } DeviceManagerService::~DeviceManagerService() @@ -132,6 +144,7 @@ void DeviceManagerService::InitHichainListener() hichainListener_ = std::make_shared(); } hichainListener_->RegisterDataChangeCb(); + hichainListener_->RegisterCredentialCb(); } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) @@ -161,19 +174,27 @@ void DeviceManagerService::SubscribePublishCommonEvent() return; } #endif // SUPPORT_BLUETOOTH SUPPORT_WIFI -void DeviceManagerService::SubscribeDataShareCommonEvent() +DM_EXPORT void DeviceManagerService::SubscribeDataShareCommonEvent() { LOGI("DeviceManagerServiceImpl::SubscribeDataShareCommonEvent"); if (dataShareCommonEventManager_ == nullptr) { dataShareCommonEventManager_ = std::make_shared(); } - DataShareEventCallback callback = [=](const auto &arg1) { + DataShareEventCallback callback = [=](const auto &arg1, const auto &arg2) { if (arg1 == CommonEventSupport::COMMON_EVENT_DATA_SHARE_READY) { DeviceNameManager::GetInstance().DataShareReady(); } + if (arg1 == CommonEventSupport::COMMON_EVENT_LOCALE_CHANGED) { + DeviceNameManager::GetInstance().InitDeviceNameWhenLanguageOrRegionChanged(); + } + if (arg1 == CommonEventSupport::COMMON_EVENT_CONNECTIVITY_CHANGE) { + this->HandleNetworkConnected(arg2); + } }; std::vector commonEventVec; commonEventVec.emplace_back(CommonEventSupport::COMMON_EVENT_DATA_SHARE_READY); + commonEventVec.emplace_back(CommonEventSupport::COMMON_EVENT_LOCALE_CHANGED); + commonEventVec.emplace_back(CommonEventSupport::COMMON_EVENT_CONNECTIVITY_CHANGE); if (dataShareCommonEventManager_->SubscribeDataShareCommonEvent(commonEventVec, callback)) { LOGI("subscribe datashare common event success"); } @@ -184,7 +205,6 @@ void DeviceManagerService::SubscribeDataShareCommonEvent() #if defined(SUPPORT_BLUETOOTH) || defined(SUPPORT_WIFI) void DeviceManagerService::QueryDependsSwitchState() { - LOGI("DeviceManagerService::QueryDependsSwitchState start."); std::shared_ptr publishSubScriber = publshCommonEventManager_->GetSubscriber(); CHECK_NULL_VOID(publishSubScriber); auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); @@ -260,6 +280,13 @@ int32_t DeviceManagerService::InitDMServiceListener() } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) DMCommTool::GetInstance()->Init(); + int32_t retFront = MultipleUserConnector::GetForegroundUserIds(foregroundUserVec_); + int32_t retBack = MultipleUserConnector::GetBackgroundUserIds(backgroundUserVec_); + MultipleUserConnector::ClearLockedUser(foregroundUserVec_, backgroundUserVec_); + if (retFront != DM_OK || retBack != DM_OK) { + LOGE("retFront: %{public}d, retBack: %{public}d, frontuserids: %{public}s, backuserids: %{public}s", + retFront, retBack, GetIntegerList(foregroundUserVec_).c_str(), GetIntegerList(backgroundUserVec_).c_str()); + } int32_t currentUserId = MultipleUserConnector::GetFirstForegroundUserId(); if (IsPC() && !MultipleUserConnector::IsUserUnlocked(currentUserId)) { HandleUserStopEvent(currentUserId); @@ -269,7 +296,7 @@ int32_t DeviceManagerService::InitDMServiceListener() return DM_OK; } -void DeviceManagerService::UninitDMServiceListener() +DM_EXPORT void DeviceManagerService::UninitDMServiceListener() { listener_ = nullptr; advertiseMgr_ = nullptr; @@ -281,12 +308,12 @@ void DeviceManagerService::UninitDMServiceListener() LOGI("Uninit."); } -void DeviceManagerService::RegisterCallerAppId(const std::string &pkgName) +DM_EXPORT void DeviceManagerService::RegisterCallerAppId(const std::string &pkgName) { AppManager::GetInstance().RegisterCallerAppId(pkgName); } -void DeviceManagerService::UnRegisterCallerAppId(const std::string &pkgName) +DM_EXPORT void DeviceManagerService::UnRegisterCallerAppId(const std::string &pkgName) { AppManager::GetInstance().UnRegisterCallerAppId(pkgName); } @@ -295,7 +322,6 @@ int32_t DeviceManagerService::GetTrustedDeviceList(const std::string &pkgName, c std::vector &deviceList) { (void)extra; - LOGI("Begin for pkgName = %{public}s.", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -321,13 +347,11 @@ int32_t DeviceManagerService::GetTrustedDeviceList(const std::string &pkgName, c return DM_OK; } if (!onlineDeviceList.empty() && IsDMServiceImplReady()) { - std::string queryPkgName = GetSubStr(pkgName, PICKER_PROXY_SPLIT, 1); - queryPkgName = queryPkgName.empty() ? pkgName : queryPkgName; std::unordered_map udidMap; - if (PermissionManager::GetInstance().CheckWhiteListSystemSA(queryPkgName)) { + if (PermissionManager::GetInstance().CheckWhiteListSystemSA(pkgName)) { udidMap = dmServiceImpl_->GetAppTrustDeviceIdList(std::string(ALL_PKGNAME)); } else { - udidMap = dmServiceImpl_->GetAppTrustDeviceIdList(queryPkgName); + udidMap = dmServiceImpl_->GetAppTrustDeviceIdList(pkgName); } for (auto item : onlineDeviceList) { #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) @@ -348,7 +372,6 @@ int32_t DeviceManagerService::GetAllTrustedDeviceList(const std::string &pkgName std::vector &deviceList) { (void)extra; - LOGI("Begin for pkgName = %{public}s.", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName or extra is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -420,16 +443,18 @@ int32_t DeviceManagerService::GetDeviceInfo(const std::string &networkId, DmDevi } return ret; } - int32_t permissionRet = dmServiceImpl_->CheckDeviceInfoPermission(localUdid, peerDeviceId); - if (permissionRet != DM_OK) { - std::string processName = ""; - if (PermissionManager::GetInstance().GetCallerProcessName(processName) != DM_OK) { - LOGE("Get caller process name failed."); - return ret; - } - if (!PermissionManager::GetInstance().CheckProcessNameValidOnGetDeviceInfo(processName)) { - LOGE("The caller: %{public}s is not in white list.", processName.c_str()); - return ret; + if (!AppManager::GetInstance().IsSystemSA()) { + int32_t permissionRet = dmServiceImpl_->CheckDeviceInfoPermission(localUdid, peerDeviceId); + if (permissionRet != DM_OK) { + std::string processName = ""; + if (PermissionManager::GetInstance().GetCallerProcessName(processName) != DM_OK) { + LOGE("Get caller process name failed."); + return ret; + } + if (!PermissionManager::GetInstance().CheckProcessNameValidOnGetDeviceInfo(processName)) { + LOGE("The caller: %{public}s is not in white list.", processName.c_str()); + return ret; + } } } ret = softbusListener_->GetDeviceInfo(networkId, info); @@ -443,10 +468,7 @@ int32_t DeviceManagerService::GetLocalDeviceInfo(DmDeviceInfo &info) { LOGD("Begin."); bool isOnlyShowNetworkId = false; - if (!PermissionManager::GetInstance().CheckNewPermission()) { - LOGE("The caller does not have permission to call GetLocalDeviceInfo."); - isOnlyShowNetworkId = true; - } + CheckPermission(isOnlyShowNetworkId); CHECK_NULL_RETURN(softbusListener_, ERR_DM_POINT_NULL); int32_t ret = softbusListener_->GetLocalDeviceInfo(info); if (ret != DM_OK) { @@ -491,6 +513,71 @@ int32_t DeviceManagerService::GetLocalDeviceInfo(DmDeviceInfo &info) return DM_OK; } +void DeviceManagerService::CheckPermission(bool &isOnlyShowNetworkId) +{ +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) && !defined(DEVICE_MANAGER_COMMON_FLAG) + if (!PermissionManager::GetInstance().CheckNewPermission() && !IsCallerInWhiteList()) { + LOGE("The caller does not have permission to call GetLocalDeviceInfo."); + isOnlyShowNetworkId = true; + } +#else + if (!PermissionManager::GetInstance().CheckNewPermission()) { + LOGE("The caller does not have permission to call GetLocalDeviceInfo."); + isOnlyShowNetworkId = true; + } +#endif +} + +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) && !defined(DEVICE_MANAGER_COMMON_FLAG) +bool DeviceManagerService::IsCallerInWhiteList() +{ + if (!IsDMAdapterCheckApiWhiteListLoaded()) { + LOGE("DMAdapterCheckApiWhiteListLoad failed."); + return false; + } + std::string callerName; + if (AppManager::GetInstance().GetCallerProcessName(callerName) != DM_OK) { + LOGE("GetCallerProcessName failed."); + return false; + } + return dmCheckApiWhiteList_->IsCallerInWhiteList(callerName, GET_LOCAL_DEVICE_NAME_API_NAME); +} + +bool DeviceManagerService::IsDMAdapterCheckApiWhiteListLoaded() +{ + LOGD("Start."); + std::lock_guard lock(isAdapterCheckApiWhiteListLoadedLock_); + if (isAdapterCheckApiWhiteListSoLoaded_ && (dmCheckApiWhiteList_ != nullptr)) { + return true; + } + checkApiWhiteListSoHandle_ = dlopen(LIB_DM_CHECK_API_WHITE_LIST_NAME, RTLD_NOW | RTLD_NODELETE | RTLD_NOLOAD); + if (checkApiWhiteListSoHandle_ == nullptr) { + checkApiWhiteListSoHandle_ = dlopen(LIB_DM_CHECK_API_WHITE_LIST_NAME, RTLD_NOW | RTLD_NODELETE); + } + if (checkApiWhiteListSoHandle_ == nullptr) { + LOGE("load dm check api white list so failed."); + return false; + } + if (dlerror() != nullptr) { + dlclose(checkApiWhiteListSoHandle_); + checkApiWhiteListSoHandle_ = nullptr; + LOGE("open dm check api white list so failed. err: %{public}s", dlerror()); + return false; + } + auto func = (CreateDMCheckApiWhiteListFuncPtr)dlsym(checkApiWhiteListSoHandle_, "CreateDMCheckApiWhiteListObject"); + if (func == nullptr || dlerror() != nullptr) { + dlclose(checkApiWhiteListSoHandle_); + checkApiWhiteListSoHandle_ = nullptr; + LOGE("Create object function is not exist. err: %{public}s", (dlerror() == nullptr ? "null" : dlerror())); + return false; + } + dmCheckApiWhiteList_ = std::shared_ptr(func()); + isAdapterCheckApiWhiteListSoLoaded_ = true; + LOGI("Success."); + return true; +} +#endif + int32_t DeviceManagerService::GetUdidByNetworkId(const std::string &pkgName, const std::string &netWorkId, std::string &udid) { @@ -702,18 +789,9 @@ int32_t DeviceManagerService::BindDevice(const std::string &pkgName, int32_t aut int32_t DeviceManagerService::UnBindDevice(const std::string &pkgName, const std::string &udidHash) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { - LOGE("The caller does not have permission to call UnBindDevice."); - return ERR_DM_NO_PERMISSION; - } - LOGI("Begin for pkgName = %{public}s, udidHash = %{public}s", pkgName.c_str(), GetAnonyString(udidHash).c_str()); - if (pkgName.empty() || udidHash.empty()) { - LOGE("DeviceManagerService::UnBindDevice error: Invalid parameter, pkgName: %{public}s", pkgName.c_str()); - return ERR_DM_INPUT_PARA_INVALID; - } - if (!IsDMServiceImplReady()) { - LOGE("UnBindDevice failed, instance not init or init failed."); - return ERR_DM_NOT_INIT; + int32_t result = ValidateUnBindDeviceParams(pkgName, udidHash); + if (result != DM_OK) { + return result; } std::string realDeviceId = udidHash; #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) @@ -731,41 +809,39 @@ int32_t DeviceManagerService::UnBindDevice(const std::string &pkgName, const std char localUdid[DEVICE_UUID_LENGTH] = {0}; GetDevUdid(localUdid, DEVICE_UUID_LENGTH); uint64_t tokenId = 0; - std::string unbindPkgName = GetSubStr(pkgName, PICKER_PROXY_SPLIT, 1); - unbindPkgName = unbindPkgName.empty() ? pkgName : unbindPkgName; - int32_t bindLevel = dmServiceImpl_->GetBindLevel(unbindPkgName, std::string(localUdid), udid, tokenId); + int32_t bindLevel = dmServiceImpl_->GetBindLevel(pkgName, std::string(localUdid), udid, tokenId); LOGI("UnAuthenticateDevice get bindlevel %{public}d.", bindLevel); if (bindLevel == INVALIED_BIND_LEVEL) { LOGE("UnAuthenticateDevice failed, Acl not contain the bindLevel %{public}d.", bindLevel); return ERR_DM_FAILED; } - if (dmServiceImpl_->UnBindDevice(unbindPkgName, udid, bindLevel) != DM_OK) { - LOGE("dmServiceImpl_ UnBindDevice failed."); - return ERR_DM_FAILED; - } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) std::vector peerUdids; peerUdids.emplace_back(udid); - SendUnBindBroadCast(peerUdids, MultipleUserConnector::GetCurrentAccountUserID(), tokenId, bindLevel); + + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); + std::map wifiDevices; + bool isBleActive = false; + GetNotifyRemoteUnBindAppWay(userId, tokenId, wifiDevices, isBleActive); + if (isBleActive) { + SendUnBindBroadCast(peerUdids, userId, tokenId, bindLevel); + } else { + NotifyRemoteUnBindAppByWifi(userId, tokenId, "", wifiDevices); + } #endif + if (dmServiceImpl_->UnBindDevice(pkgName, udid, bindLevel) != DM_OK) { + LOGE("dmServiceImpl_ UnBindDevice failed."); + return ERR_DM_FAILED; + } return DM_OK; } int32_t DeviceManagerService::UnBindDevice(const std::string &pkgName, const std::string &udidHash, const std::string &extra) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { - LOGE("The caller does not have permission to call UnBindDevice."); - return ERR_DM_NO_PERMISSION; - } - LOGI("Begin for pkgName = %{public}s, udidHash = %{public}s", pkgName.c_str(), GetAnonyString(udidHash).c_str()); - if (pkgName.empty() || udidHash.empty()) { - LOGE("DeviceManagerService::UnBindDevice error: Invalid parameter, pkgName: %{public}s", pkgName.c_str()); - return ERR_DM_INPUT_PARA_INVALID; - } - if (!IsDMServiceImplReady()) { - LOGE("UnBindDevice failed, instance not init or init failed."); - return ERR_DM_NOT_INIT; + int32_t result = ValidateUnBindDeviceParams(pkgName, udidHash, extra); + if (result != DM_OK) { + return result; } std::string realDeviceId = udidHash; #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) @@ -790,16 +866,64 @@ int32_t DeviceManagerService::UnBindDevice(const std::string &pkgName, const std return ERR_DM_FAILED; } [[maybe_unused]] uint64_t peerTokenId = dmServiceImpl_->GetTokenIdByNameAndDeviceId(extra, udid); - if (dmServiceImpl_->UnBindDevice(pkgName, udid, bindLevel, extra) != DM_OK) { - LOGE("dmServiceImpl_ UnBindDevice failed."); - return ERR_DM_FAILED; - } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) std::vector peerUdids; peerUdids.emplace_back(udid); - SendUnBindBroadCast(peerUdids, MultipleUserConnector::GetCurrentAccountUserID(), tokenId, - bindLevel, peerTokenId); + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); + std::map wifiDevices; + bool isBleActive = false; + GetNotifyRemoteUnBindAppWay(userId, tokenId, wifiDevices, isBleActive); + if (isBleActive) { + SendUnBindBroadCast(peerUdids, MultipleUserConnector::GetCurrentAccountUserID(), tokenId, + bindLevel, peerTokenId); + } else { + NotifyRemoteUnBindAppByWifi(userId, tokenId, extra, wifiDevices); + } #endif + if (dmServiceImpl_->UnBindDevice(pkgName, udid, bindLevel, extra) != DM_OK) { + LOGE("dmServiceImpl_ UnBindDevice failed."); + return ERR_DM_FAILED; + } + return DM_OK; +} + +int32_t DeviceManagerService::ValidateUnBindDeviceParams(const std::string &pkgName, const std::string &udidHash) +{ + LOGI("DeviceManagerService::ValidateUnBindDeviceParams pkgName: %{public}s, udidHash: %{public}s", + GetAnonyString(pkgName).c_str(), GetAnonyString(udidHash).c_str()); + if (!PermissionManager::GetInstance().CheckNewPermission()) { + LOGE("The caller does not have permission to call UnBindDevice."); + return ERR_DM_NO_PERMISSION; + } + if (pkgName.empty() || udidHash.empty()) { + LOGE("DeviceManagerService::UnBindDevice error: Invalid parameter, pkgName: %{public}s", pkgName.c_str()); + return ERR_DM_INPUT_PARA_INVALID; + } + if (!IsDMServiceImplReady()) { + LOGE("UnBindDevice failed, instance not init or init failed."); + return ERR_DM_NOT_INIT; + } + return DM_OK; +} + +int32_t DeviceManagerService::ValidateUnBindDeviceParams(const std::string &pkgName, const std::string &udidHash, + const std::string &extra) +{ + LOGI("DeviceManagerService::ValidateUnBindDeviceParams pkgName: %{public}s, udidHash: %{public}s, " + "extra: %{public}s", GetAnonyString(pkgName).c_str(), GetAnonyString(udidHash).c_str(), + GetAnonyString(extra).c_str()); + if (!PermissionManager::GetInstance().CheckNewPermission()) { + LOGE("The caller does not have permission to call UnBindDevice."); + return ERR_DM_NO_PERMISSION; + } + if (pkgName.empty() || udidHash.empty()) { + LOGE("DeviceManagerService::UnBindDevice error: Invalid parameter, pkgName: %{public}s", pkgName.c_str()); + return ERR_DM_INPUT_PARA_INVALID; + } + if (!IsDMServiceImplReady()) { + LOGE("UnBindDevice failed, instance not init or init failed."); + return ERR_DM_NOT_INIT; + } return DM_OK; } @@ -825,7 +949,7 @@ int32_t DeviceManagerService::SetUserOperation(std::string &pkgName, int32_t act void DeviceManagerService::HandleDeviceStatusChange(DmDeviceState devState, DmDeviceInfo &devInfo) { - LOGI("DeviceManagerService::HandleDeviceStatusChange start, devState = %{public}d", devState); + LOGD("start, devState = %{public}d", devState); if (IsDMServiceImplReady()) { dmServiceImpl_->HandleDeviceStatusChange(devState, devInfo); } @@ -863,19 +987,17 @@ void DeviceManagerService::OnBytesReceived(int sessionId, const void *data, unsi int DeviceManagerService::OnPinHolderSessionOpened(int sessionId, int result) { - LOGI("In"); return PinHolderSession::OnSessionOpened(sessionId, result); } void DeviceManagerService::OnPinHolderSessionClosed(int sessionId) { - LOGI("In"); - PinHolderSession::OnSessionClosed(sessionId); + CHECK_NULL_VOID(pinHolder_); + pinHolder_->OnSessionClosed(sessionId); } void DeviceManagerService::OnPinHolderBytesReceived(int sessionId, const void *data, unsigned int dataLen) { - LOGI("In"); PinHolderSession::OnBytesReceived(sessionId, data, dataLen); } @@ -1049,6 +1171,7 @@ bool DeviceManagerService::IsDMServiceImplReady() if (isImplsoLoaded_ && (dmServiceImpl_ != nullptr)) { return true; } + LOGI("libdevicemanagerserviceimpl start load."); void *so_handle = dlopen(LIB_IMPL_NAME, RTLD_NOW | RTLD_NODELETE | RTLD_NOLOAD); if (so_handle == nullptr) { so_handle = dlopen(LIB_IMPL_NAME, RTLD_NOW | RTLD_NODELETE); @@ -1081,14 +1204,12 @@ bool DeviceManagerService::IsDMServiceImplReady() bool DeviceManagerService::IsDMImplSoLoaded() { - LOGI("In"); std::lock_guard lock(isImplLoadLock_); return isImplsoLoaded_; } bool DeviceManagerService::IsDMServiceAdapterSoLoaded() { - LOGI("In"); std::lock_guard lock(isAdapterResidentLoadLock_); if (!isAdapterResidentSoLoaded_ || (dmServiceImplExtResident_ == nullptr)) { return false; @@ -1168,7 +1289,6 @@ int32_t DeviceManagerService::GetEncryptedUuidByNetworkId(const std::string &pkg LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("PkgName = %{public}s", pkgName.c_str()); CHECK_NULL_RETURN(softbusListener_, ERR_DM_POINT_NULL); int32_t ret = softbusListener_->GetUuidByNetworkId(networkId.c_str(), uuid); if (ret != DM_OK) { @@ -1177,9 +1297,9 @@ int32_t DeviceManagerService::GetEncryptedUuidByNetworkId(const std::string &pkg } std::string appId = Crypto::Sha256(AppManager::GetInstance().GetAppId()); - LOGI("appId = %{public}s, uuid = %{public}s.", GetAnonyString(appId).c_str(), GetAnonyString(uuid).c_str()); uuid = Crypto::Sha256(appId + "_" + uuid); - LOGI("encryptedUuid = %{public}s.", GetAnonyString(uuid).c_str()); + LOGI("appId = %{public}s, uuid = %{public}s, encryptedUuid = %{public}s.", GetAnonyString(appId).c_str(), + GetAnonyString(uuid).c_str(), GetAnonyString(uuid).c_str()); return DM_OK; } @@ -1232,7 +1352,6 @@ int32_t DeviceManagerService::GetNetworkTypeByNetworkId(const std::string &pkgNa LOGE("The caller: %{public}s does not have permission to call GetNetworkTypeByNetworkId.", pkgName.c_str()); return ERR_DM_NO_PERMISSION; } - LOGI("Begin for pkgName = %{public}s", pkgName.c_str()); if (pkgName.empty() || netWorkId.empty()) { LOGE("Invalid parameter, pkgName: %{public}s, netWorkId: %{public}s", pkgName.c_str(), GetAnonyString(netWorkId).c_str()); @@ -1257,7 +1376,6 @@ int32_t DeviceManagerService::ImportAuthCode(const std::string &pkgName, const s LOGE("The caller: %{public}s is not in white list.", processName.c_str()); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("DeviceManagerService::ImportAuthCode begin."); if (authCode.empty() || pkgName.empty()) { LOGE("Invalid parameter, authCode: %{public}s.", GetAnonyString(authCode).c_str()); return ERR_DM_INPUT_PARA_INVALID; @@ -1288,7 +1406,6 @@ int32_t DeviceManagerService::ExportAuthCode(std::string &authCode) LOGE("ExportAuthCode failed, instance not init or init failed."); return ERR_DM_NOT_INIT; } - LOGI("DeviceManagerService::ExportAuthCode begin."); return dmServiceImpl_->ExportAuthCode(authCode); } @@ -1308,7 +1425,6 @@ void DeviceManagerService::UnloadDMServiceImplSo() bool DeviceManagerService::IsDMServiceAdapterResidentLoad() { - LOGI("Start."); if (listener_ == nullptr) { listener_ = std::make_shared(); } @@ -1370,7 +1486,6 @@ int32_t DeviceManagerService::StartDiscovering(const std::string &pkgName, LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } - LOGI("Start for pkgName = %{public}s", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -1390,7 +1505,6 @@ int32_t DeviceManagerService::StopDiscovering(const std::string &pkgName, LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } - LOGI("Start for pkgName = %{public}s", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -1413,7 +1527,6 @@ int32_t DeviceManagerService::EnableDiscoveryListener(const std::string &pkgName LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } - LOGI("Start for pkgName = %{public}s", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -1430,7 +1543,6 @@ int32_t DeviceManagerService::DisableDiscoveryListener(const std::string &pkgNam LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } - LOGI("Start for pkgName = %{public}s", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -1446,7 +1558,6 @@ int32_t DeviceManagerService::StartAdvertising(const std::string &pkgName, LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } - LOGI("Start for pkgName = %{public}s", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -1462,7 +1573,6 @@ int32_t DeviceManagerService::StopAdvertising(const std::string &pkgName, LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } - LOGI("Start for pkgName = %{public}s", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; @@ -1546,7 +1656,20 @@ int32_t DeviceManagerService::UnbindTarget(const std::string &pkgName, const Pee LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } - return dmServiceImplExtResident_->UnbindTargetExt(pkgName, targetId, unbindParam); + std::string realDeviceId = targetId.deviceId; +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + std::string udidHashTemp = ""; + if (GetUdidHashByAnoyDeviceId(realDeviceId, udidHashTemp) == DM_OK) { + realDeviceId = udidHashTemp; + } +#endif + std::map unbindParamWithUdid(unbindParam); + CHECK_NULL_RETURN(softbusListener_, ERR_DM_POINT_NULL); + std::string udid = ""; + if (softbusListener_->GetUdidFromDp(realDeviceId, udid) == DM_OK) { + unbindParamWithUdid.insert(std::pair(UN_BIND_PARAM_UDID_KEY, udid)); + } + return dmServiceImplExtResident_->UnbindTargetExt(pkgName, targetId, unbindParamWithUdid); } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) @@ -1589,6 +1712,10 @@ void DeviceManagerService::InitServiceInfos( int32_t DeviceManagerService::RegisterLocalServiceInfo(const DMLocalServiceInfo &serviceInfo) { + if (!PermissionManager::GetInstance().CheckPermission()) { + LOGE("The caller does not have permission to call RegisterLocalServiceInfo."); + return ERR_DM_NO_PERMISSION; + } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) DistributedDeviceProfile::LocalServiceInfo dpLocalServiceInfo; bool success = InitDPLocalServiceInfo(serviceInfo, dpLocalServiceInfo); @@ -1605,6 +1732,11 @@ int32_t DeviceManagerService::RegisterLocalServiceInfo(const DMLocalServiceInfo int32_t DeviceManagerService::UnRegisterLocalServiceInfo(const std::string &bundleName, int32_t pinExchangeType) { + if (!PermissionManager::GetInstance().CheckPermission()) { + LOGE("The caller: %{public}s does not have permission to call UnRegisterLocalServiceInfo.", + bundleName.c_str()); + return ERR_DM_NO_PERMISSION; + } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) return DeviceProfileConnector::GetInstance().DeleteLocalServiceInfo(bundleName, pinExchangeType); #else @@ -1616,6 +1748,10 @@ int32_t DeviceManagerService::UnRegisterLocalServiceInfo(const std::string &bund int32_t DeviceManagerService::UpdateLocalServiceInfo(const DMLocalServiceInfo &serviceInfo) { + if (!PermissionManager::GetInstance().CheckPermission()) { + LOGE("The caller does not have permission to call UpdateLocalServiceInfo."); + return ERR_DM_NO_PERMISSION; + } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) DistributedDeviceProfile::LocalServiceInfo dpLocalServiceInfo; bool success = InitDPLocalServiceInfo(serviceInfo, dpLocalServiceInfo); @@ -1633,6 +1769,11 @@ int32_t DeviceManagerService::UpdateLocalServiceInfo(const DMLocalServiceInfo &s int32_t DeviceManagerService::GetLocalServiceInfoByBundleNameAndPinExchangeType(const std::string &bundleName, int32_t pinExchangeType, DMLocalServiceInfo &serviceInfo) { + if (!PermissionManager::GetInstance().CheckPermission()) { + LOGE("The caller: %{public}s does not have permission to call GetLocalServiceInfo.", + bundleName.c_str()); + return ERR_DM_NO_PERMISSION; + } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) DistributedDeviceProfile::LocalServiceInfo dpLocalServiceInfo; int32_t ret = DeviceProfileConnector::GetInstance().GetLocalServiceInfoByBundleNameAndPinExchangeType(bundleName, @@ -1689,7 +1830,6 @@ int32_t DeviceManagerService::CreatePinHolder(const std::string &pkgName, const LOGE("The caller: %{public}s is not in white list.", processName.c_str()); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("DeviceManagerService::CreatePinHolder begin."); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName: %{public}s.", pkgName.c_str()); return ERR_DM_INPUT_PARA_INVALID; @@ -1714,7 +1854,6 @@ int32_t DeviceManagerService::DestroyPinHolder(const std::string &pkgName, const LOGE("The caller: %{public}s is not in white list.", processName.c_str()); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("Begin."); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName: %{public}s.", pkgName.c_str()); return ERR_DM_INPUT_PARA_INVALID; @@ -1729,13 +1868,11 @@ int32_t DeviceManagerService::DpAclAdd(const std::string &udid) LOGE("The caller does not have permission to call DpAclAdd."); return ERR_DM_NO_PERMISSION; } - LOGI("Start."); if (!IsDMServiceImplReady()) { LOGE("DpAclAdd failed, instance not init or init failed."); return ERR_DM_NOT_INIT; } dmServiceImpl_->DpAclAdd(udid); - LOGI("DeviceManagerService::DpAclAdd completed"); return DM_OK; } @@ -1782,35 +1919,23 @@ int32_t DeviceManagerService::IsSameAccount(const std::string &networkId) bool DeviceManagerService::CheckAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) { - if (!PermissionManager::GetInstance().CheckPermission()) { - LOGE("The caller: %{public}s does not have permission to call CheckAccessControl.", caller.pkgName.c_str()); - return false; - } - if (!IsDMServiceImplReady()) { - LOGE("CheckAccessControl failed, instance not init or init failed."); - return false; - } std::string srcUdid = ""; - SoftbusListener::GetUdidByNetworkId(caller.networkId.c_str(), srcUdid); std::string sinkUdid = ""; - SoftbusListener::GetUdidByNetworkId(callee.networkId.c_str(), sinkUdid); - return dmServiceImpl_->CheckAccessControl(caller, srcUdid, callee, sinkUdid); + if (!GetAccessUdidByNetworkId(caller.networkId.c_str(), srcUdid, callee.networkId.c_str(), sinkUdid)) { + LOGE("GetAccessUdidByNetworkId failed."); + return false; + } + return dmServiceImpl_->CheckAccessControl(caller, srcUdid, callee, sinkUdid); } bool DeviceManagerService::CheckIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) { - if (!PermissionManager::GetInstance().CheckPermission()) { - LOGE("The caller: %{public}s does not have permission to call CheckIsSameAccount.", caller.pkgName.c_str()); - return false; - } - if (!IsDMServiceImplReady()) { - LOGE("CheckIsSameAccount failed, instance not init or init failed."); - return false; - } std::string srcUdid = ""; - SoftbusListener::GetUdidByNetworkId(caller.networkId.c_str(), srcUdid); std::string sinkUdid = ""; - SoftbusListener::GetUdidByNetworkId(callee.networkId.c_str(), sinkUdid); + if (!GetAccessUdidByNetworkId(caller.networkId.c_str(), srcUdid, callee.networkId.c_str(), sinkUdid)) { + LOGE("GetAccessUdidByNetworkId failed."); + return false; + } return dmServiceImpl_->CheckIsSameAccount(caller, srcUdid, callee, sinkUdid); } @@ -1856,6 +1981,20 @@ void DeviceManagerService::SubscribeAccountCommonEvent() return; } +void DeviceManagerService::SendShareTypeUnBindBroadCast(const char *credId, const int32_t localUserId, + const std::vector &peerUdids) +{ + LOGI("Start."); + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::SHARE_UNBIND; + msg.userId = static_cast(localUserId); + msg.credId = credId; + msg.peerUdids = peerUdids; + std::string broadCastMsg = ReleationShipSyncMgr::GetInstance().SyncTrustRelationShip(msg); + CHECK_NULL_VOID(softbusListener_); + softbusListener_->SendAclChangedBroadcast(broadCastMsg); +} + void DeviceManagerService::SubscribeScreenLockEvent() { LOGI("Start"); @@ -1865,19 +2004,27 @@ void DeviceManagerService::SubscribeScreenLockEvent() ScreenEventCallback callback = [=](const auto &arg1) { this->ScreenCommonEventCallback(arg1); }; std::vector screenEventVec; screenEventVec.emplace_back(CommonEventSupport::COMMON_EVENT_SCREEN_LOCKED); + screenEventVec.emplace_back(CommonEventSupport::COMMON_EVENT_SCREEN_UNLOCKED); if (screenCommonEventManager_->SubscribeScreenCommonEvent(screenEventVec, callback)) { LOGI("Success"); } return; } -void DeviceManagerService::AccountCommonEventCallback(const std::string commonEventType, int32_t currentUserId, - int32_t beforeUserId) +DM_EXPORT void DeviceManagerService::AccountCommonEventCallback( + const std::string commonEventType, int32_t currentUserId, int32_t beforeUserId) { - LOGI("CommonEventType: %{public}s, currentUserId: %{public}d, beforeUserId: %{public}d", commonEventType.c_str(), - currentUserId, beforeUserId); if (commonEventType == CommonEventSupport::COMMON_EVENT_USER_SWITCHED) { - HandleUserSwitchedEvent(currentUserId, beforeUserId); + DeviceNameManager::GetInstance().InitDeviceNameWhenUserSwitch(currentUserId, beforeUserId); + MultipleUserConnector::SetAccountInfo(currentUserId, MultipleUserConnector::GetCurrentDMAccountInfo()); + if (beforeUserId != -1 && currentUserId != -1 && IsDMServiceAdapterResidentLoad()) { + dmServiceImplExtResident_->AccountUserSwitched( + currentUserId, MultipleUserConnector::GetOhosAccountId()); + } + DMCommTool::GetInstance()->StartCommonEvent(commonEventType, + [this, commonEventType] () { + DeviceManagerService::HandleAccountCommonEvent(commonEventType); + }); } else if (commonEventType == CommonEventSupport::COMMON_EVENT_HWID_LOGIN) { DeviceNameManager::GetInstance().InitDeviceNameWhenLogin(); MultipleUserConnector::SetAccountInfo(currentUserId, MultipleUserConnector::GetCurrentDMAccountInfo()); @@ -1899,25 +2046,96 @@ void DeviceManagerService::AccountCommonEventCallback(const std::string commonEv } else if (commonEventType == CommonEventSupport::COMMON_EVENT_USER_INFO_UPDATED) { DeviceNameManager::GetInstance().InitDeviceNameWhenNickChange(); } else if (commonEventType == CommonEventSupport::COMMON_EVENT_USER_STOPPED && IsPC()) { - HandleUserStopEvent(beforeUserId); + DMCommTool::GetInstance()->StartCommonEvent(commonEventType, + [this, commonEventType] () { + DeviceManagerService::HandleAccountCommonEvent(commonEventType); + }); } else if (commonEventType == CommonEventSupport::COMMON_EVENT_USER_UNLOCKED) { DeviceNameManager::GetInstance().AccountSysReady(beforeUserId); - if (IsPC()) { - HandleUserSwitched(); - if (IsDMServiceAdapterResidentLoad()) { - dmServiceImplExtResident_->AccountUserSwitched(currentUserId, - MultipleUserConnector::GetOhosAccountId()); - } - } + DMCommTool::GetInstance()->StartCommonEvent(commonEventType, + [this, commonEventType] () { + DeviceManagerService::HandleAccountCommonEvent(commonEventType); + }); } else { LOGE("Invalied account common event."); } return; } +bool DeviceManagerService::IsUserStatusChanged(std::vector foregroundUserVec, + std::vector backgroundUserVec) +{ + LOGI("foregroundUserVec: %{public}s, backgroundUserVec: %{public}s", + GetIntegerList(foregroundUserVec).c_str(), GetIntegerList(backgroundUserVec).c_str()); + std::lock_guard lock(userVecLock_); + std::sort(foregroundUserVec.begin(), foregroundUserVec.end()); + std::sort(backgroundUserVec.begin(), backgroundUserVec.end()); + std::sort(foregroundUserVec_.begin(), foregroundUserVec_.end()); + std::sort(backgroundUserVec_.begin(), backgroundUserVec_.end()); + if (foregroundUserVec == foregroundUserVec_ && backgroundUserVec == backgroundUserVec_) { + LOGI("User status has not changed."); + return true; + } + LOGD("User status has changed"); + foregroundUserVec_.clear(); + backgroundUserVec_.clear(); + foregroundUserVec_ = foregroundUserVec; + backgroundUserVec_ = backgroundUserVec; + return false; +} + +void DeviceManagerService::HandleAccountCommonEvent(const std::string commonEventType) +{ + LOGI("commonEventType: %{public}s.", commonEventType.c_str()); + std::vector foregroundUserVec; + int32_t retFront = MultipleUserConnector::GetForegroundUserIds(foregroundUserVec); + std::vector backgroundUserVec; + int32_t retBack = MultipleUserConnector::GetBackgroundUserIds(backgroundUserVec); + MultipleUserConnector::ClearLockedUser(foregroundUserVec, backgroundUserVec); + if (retFront != DM_OK || retBack != DM_OK) { + LOGE("retFront: %{public}d, retBack: %{public}d, frontuserids: %{public}s, backuserids: %{public}s", + retFront, retBack, GetIntegerList(foregroundUserVec).c_str(), GetIntegerList(backgroundUserVec).c_str()); + return; + } + if (IsUserStatusChanged(foregroundUserVec, backgroundUserVec)) { + LOGI("User status has not changed."); + return; + } + char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localUdidTemp); + CHECK_NULL_VOID(discoveryMgr_); + if (!discoveryMgr_->IsCommonDependencyReady() || discoveryMgr_->GetCommonDependencyObj() == nullptr) { + LOGE("IsCommonDependencyReady failed or GetCommonDependencyObj() is nullptr."); + return; + } + if (!discoveryMgr_->GetCommonDependencyObj()->CheckAclStatusAndForegroundNotMatch(localUdid, foregroundUserVec, + backgroundUserVec)) { + LOGI("no unreasonable data."); + return; + } + std::map curUserDeviceMap = + discoveryMgr_->GetCommonDependencyObj()->GetDeviceIdAndBindLevel(foregroundUserVec, localUdid); + std::map preUserDeviceMap = + discoveryMgr_->GetCommonDependencyObj()->GetDeviceIdAndBindLevel(backgroundUserVec, localUdid); + std::vector peerUdids; + for (const auto &item : curUserDeviceMap) { + peerUdids.push_back(item.first); + } + for (const auto &item : preUserDeviceMap) { + if (find(peerUdids.begin(), peerUdids.end(), item.first) == peerUdids.end()) { + peerUdids.push_back(item.first); + } + } + if (peerUdids.empty()) { + return; + } + NotifyRemoteAccountCommonEvent(commonEventType, localUdid, peerUdids, foregroundUserVec, backgroundUserVec); +} + void DeviceManagerService::HandleUserSwitched() { - LOGI("onStart, HandleUserSwitched."); + LOGI("start."); std::vector foregroundUserVec; int32_t retFront = MultipleUserConnector::GetForegroundUserIds(foregroundUserVec); std::vector backgroundUserVec; @@ -1960,17 +2178,17 @@ void DeviceManagerService::HandleUserSwitched() } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) -void DeviceManagerService::NotifyRemoteLocalUserSwitch(const std::string &localUdid, - const std::vector &peerUdids, const std::vector &foregroundUserIds, - const std::vector &backgroundUserIds) +void DeviceManagerService::NotifyRemoteAccountCommonEvent(const std::string commonEventType, + const std::string &localUdid, const std::vector &peerUdids, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) { - LOGI("onstart UserSwitch, foregroundUserIds: %{public}s, backgroundUserIds: %{public}s", + LOGI("foregroundUserIds: %{public}s, backgroundUserIds: %{public}s", GetIntegerList(foregroundUserIds).c_str(), GetIntegerList(backgroundUserIds).c_str()); if (peerUdids.empty()) { return; } if (softbusListener_ == nullptr) { - UpdateAclAndDeleteGroup(localUdid, peerUdids, foregroundUserIds, backgroundUserIds); + UpdateAcl(localUdid, peerUdids, foregroundUserIds, backgroundUserIds); LOGE("softbusListener_ is null"); return; } @@ -1985,24 +2203,142 @@ void DeviceManagerService::NotifyRemoteLocalUserSwitch(const std::string &localU continue; } int32_t networkType = 0; - int32_t ret = softbusListener_->GetNetworkTypeByNetworkId(netWorkId.c_str(), networkType); - if (ret != DM_OK || networkType <= 0) { + if (softbusListener_->GetNetworkTypeByNetworkId(netWorkId.c_str(), networkType) != DM_OK || networkType <= 0) { LOGI("get networkType failed: %{public}s", GetAnonyString(udid).c_str()); bleUdids.push_back(udid); continue; } - if ((static_cast(networkType) & USERID_SYNC_DISCOVERY_TYPE_BLE_MASK) != 0x0) { + uint32_t addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BLE; + if ((static_cast(networkType) & addrTypeMask) != 0x0) { bleUdids.push_back(udid); } else { wifiDevices.insert(std::pair(udid, netWorkId)); } } if (!bleUdids.empty()) { - UpdateAclAndDeleteGroup(localUdid, peerUdids, foregroundUserIds, backgroundUserIds); - SendUserIdsBroadCast(bleUdids, foregroundUserIds, backgroundUserIds, true); + UpdateAcl(localUdid, peerUdids, foregroundUserIds, backgroundUserIds); + if (commonEventType == CommonEventSupport::COMMON_EVENT_USER_UNLOCKED || + commonEventType == CommonEventSupport::COMMON_EVENT_USER_SWITCHED) { + SendCommonEventBroadCast(bleUdids, foregroundUserIds, backgroundUserIds, true); + } else if (commonEventType == CommonEventSupport::COMMON_EVENT_USER_STOPPED) { + SendCommonEventBroadCast(bleUdids, foregroundUserIds, backgroundUserIds, false); + } else { + LOGE("commonEventType not match"); + return; + } } if (!wifiDevices.empty()) { - NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, foregroundUserIds, backgroundUserIds); + NotifyRemoteAccountCommonEventByWifi(localUdid, wifiDevices, foregroundUserIds, backgroundUserIds); + } +} + +void DeviceManagerService::NotifyRemoteAccountCommonEventByWifi(const std::string &localUdid, + const std::map &wifiDevices, const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds) +{ + for (const auto &it : wifiDevices) { + int32_t result = SendAccountCommonEventByWifi(it.second, foregroundUserIds, backgroundUserIds); + if (result != DM_OK) { + LOGE("by wifi failed: %{public}s", GetAnonyString(it.first).c_str()); + std::vector updateUdids; + updateUdids.push_back(it.first); + UpdateAcl(localUdid, updateUdids, foregroundUserIds, backgroundUserIds); + continue; + } + if (timer_ == nullptr) { + timer_ = std::make_shared(); + } + std::string udid = it.first; + timer_->StartTimer(std::string(ACCOUNT_COMMON_EVENT_BY_WIFI_TIMEOUT_TASK) + Crypto::Sha256(udid), + USER_SWITCH_BY_WIFI_TIMEOUT_S, + [this, localUdid, foregroundUserIds, backgroundUserIds, udid] (std::string name) { + DeviceManagerService::HandleCommonEventTimeout(localUdid, foregroundUserIds, backgroundUserIds, udid); + }); + } +} + +int32_t DeviceManagerService::SendAccountCommonEventByWifi(const std::string &networkId, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) +{ + LOGI("start"); + std::vector foregroundUserIdsUInt; + for (auto const &u : foregroundUserIds) { + foregroundUserIdsUInt.push_back(static_cast(u)); + } + std::vector backgroundUserIdsUInt; + for (auto const &u : backgroundUserIds) { + backgroundUserIdsUInt.push_back(static_cast(u)); + } + return DMCommTool::GetInstance()->SendUserIds(networkId, foregroundUserIdsUInt, backgroundUserIdsUInt); +} + +void DeviceManagerService::HandleCommonEventTimeout(const std::string &localUdid, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, + const std::string &udid) +{ + LOGI("start udid: %{public}s", GetAnonyString(udid).c_str()); + std::vector updateUdids; + updateUdids.push_back(udid); + UpdateAcl(localUdid, updateUdids, foregroundUserIds, backgroundUserIds); +} + +void DeviceManagerService::UpdateAcl(const std::string &localUdid, + const std::vector &peerUdids, const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds) +{ + CHECK_NULL_VOID(discoveryMgr_); + if (!discoveryMgr_->IsCommonDependencyReady() || discoveryMgr_->GetCommonDependencyObj() == nullptr) { + LOGE("IsCommonDependencyReady failed or GetCommonDependencyObj() is nullptr."); + return; + } + discoveryMgr_->GetCommonDependencyObj()->HandleAccountCommonEvent(localUdid, peerUdids, foregroundUserIds, + backgroundUserIds); +} + +void DeviceManagerService::NotifyRemoteLocalUserSwitch(const std::string &localUdid, + const std::vector &peerUdids, const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds) +{ + LOGI("onstart UserSwitch, foregroundUserIds: %{public}s, backgroundUserIds: %{public}s", + GetIntegerList(foregroundUserIds).c_str(), GetIntegerList(backgroundUserIds).c_str()); + if (peerUdids.empty()) { + return; + } + if (softbusListener_ == nullptr) { + UpdateAclAndDeleteGroup(localUdid, peerUdids, foregroundUserIds, backgroundUserIds); + LOGE("softbusListener_ is null"); + return; + } + std::vector bleUdids; + std::map wifiDevices; + for (const auto &udid : peerUdids) { + std::string netWorkId = ""; + SoftbusCache::GetInstance().GetNetworkIdFromCache(udid, netWorkId); + if (netWorkId.empty()) { + LOGI("netWorkId is empty: %{public}s", GetAnonyString(udid).c_str()); + bleUdids.push_back(udid); + continue; + } + int32_t networkType = 0; + int32_t ret = softbusListener_->GetNetworkTypeByNetworkId(netWorkId.c_str(), networkType); + if (ret != DM_OK || networkType <= 0) { + LOGI("get networkType failed: %{public}s", GetAnonyString(udid).c_str()); + bleUdids.push_back(udid); + continue; + } + uint32_t addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BLE; + if ((static_cast(networkType) & addrTypeMask) != 0x0) { + bleUdids.push_back(udid); + } else { + wifiDevices.insert(std::pair(udid, netWorkId)); + } + } + if (!bleUdids.empty()) { + UpdateAclAndDeleteGroup(localUdid, peerUdids, foregroundUserIds, backgroundUserIds); + SendUserIdsBroadCast(bleUdids, foregroundUserIds, backgroundUserIds, true); + } + if (!wifiDevices.empty()) { + NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, foregroundUserIds, backgroundUserIds); } } @@ -2052,9 +2388,6 @@ void DeviceManagerService::UpdateAclAndDeleteGroup(const std::string &localUdid, } discoveryMgr_->GetCommonDependencyObj()->HandleUserSwitched(localUdid, deviceVec, foregroundUserIds, backgroundUserIds); - //delete group - CHECK_NULL_VOID(hichainListener_); - hichainListener_->DeleteAllGroup(localUdid, backgroundUserIds); } #endif @@ -2064,7 +2397,9 @@ void DeviceManagerService::HandleAccountLogout(int32_t userId, const std::string LOGI("UserId: %{public}d, accountId: %{public}s, accountName: %{public}s", userId, GetAnonyString(accountId).c_str(), GetAnonyString(accountName).c_str()); if (IsDMServiceAdapterResidentLoad()) { - dmServiceImplExtResident_->AccountIdLogout(userId, accountId); + dmServiceImplExtResident_->ClearCacheWhenLogout(userId, accountId); + } else { + LOGW("ClearCacheWhenLogout fail, adapter instance not init or init failed."); } if (!IsDMServiceImplReady()) { LOGE("Init impl failed."); @@ -2080,12 +2415,16 @@ void DeviceManagerService::HandleAccountLogout(int32_t userId, const std::string peerUdids.emplace_back(item.first); } if (!peerUdids.empty()) { + //logout notify cast+ + if (IsDMServiceAdapterResidentLoad()) { + dmServiceImplExtResident_->AccountIdLogout(userId, accountId, peerUdids); + } char accountIdHash[DM_MAX_DEVICE_ID_LEN] = {0}; if (Crypto::GetAccountIdHash(accountId, reinterpret_cast(accountIdHash)) != DM_OK) { LOGE("GetAccountHash failed."); return; } - SendAccountLogoutBroadCast(peerUdids, std::string(accountIdHash), accountName, userId); + NotifyRemoteLocalLogout(peerUdids, std::string(accountIdHash), accountName, userId); } for (const auto &item : deviceMap) { dmServiceImpl_->HandleIdentAccountLogout(localUdid, userId, item.first, item.second); @@ -2144,8 +2483,8 @@ void DeviceManagerService::HandleUserRemoved(int32_t removedUserId) if (!peerUdids.empty()) { // Send UserId Removed broadcast SendUserRemovedBroadCast(peerUdids, removedUserId); + dmServiceImpl_->HandleUserRemoved(peerUdids, removedUserId); } - dmServiceImpl_->HandleUserRemoved(removedUserId); } void DeviceManagerService::SendUserRemovedBroadCast(const std::vector &peerUdids, int32_t userId) @@ -2226,7 +2565,6 @@ void DeviceManagerService::HandleUserIdsBroadCast(const std::vector std::vector foregroundUserIdInfos; std::vector backgroundUserIdInfos; GetFrontAndBackUserIdInfos(remoteUserIdInfos, foregroundUserIdInfos, backgroundUserIdInfos); - LOGI("process foreground and background userids"); // Notify received remote foreground userids to dsoftbus std::vector foregroundUserIds; for (const auto &u : foregroundUserIdInfos) { @@ -2263,8 +2601,111 @@ void DeviceManagerService::ProcessSyncUserIds(const std::vector &foreg } } +void DeviceManagerService::ProcessUninstApp(int32_t userId, int32_t tokenId) +{ + LOGI("DeviceManagerService::ProcessUninstApp userId: %{public}s, tokenId: %{public}s", + GetAnonyInt32(userId).c_str(), GetAnonyInt32(tokenId).c_str()); + if (IsDMServiceImplReady()) { + dmServiceImpl_->ProcessAppUninstall(userId, tokenId); + } +} + +void DeviceManagerService::ProcessUnBindApp(int32_t userId, int32_t tokenId, const std::string &extra, + const std::string &udid) +{ + LOGI("DeviceManagerService::ProcessUnBindApp userId: %{public}s, tokenId: %{public}s, udid: %{public}s", + GetAnonyInt32(userId).c_str(), GetAnonyInt32(tokenId).c_str(), GetAnonyString(udid).c_str()); + if (IsDMServiceImplReady()) { + dmServiceImpl_->ProcessUnBindApp(userId, tokenId, extra, udid); + } +} + +void DeviceManagerService::SendCommonEventBroadCast(const std::vector &peerUdids, + const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, bool isNeedResponse) +{ + LOGI("peerUdids: %{public}s, foregroundUserIds: %{public}s, backgroundUserIds: %{public}s, isNeedRsp: %{public}s", + GetAnonyStringList(peerUdids).c_str(), GetIntegerList(foregroundUserIds).c_str(), + GetIntegerList(backgroundUserIds).c_str(), isNeedResponse ? "true" : "false"); + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::SYNC_USERID; + msg.peerUdids = peerUdids; + msg.syncUserIdFlag = isNeedResponse; + msg.isNewEvent = true; + for (const auto &userId : foregroundUserIds) { + msg.userIdInfos.push_back({ true, static_cast(userId) }); + } + for (auto const &userId : backgroundUserIds) { + msg.userIdInfos.push_back({ false, static_cast(userId) }); + } + std::string broadCastMsg = ReleationShipSyncMgr::GetInstance().SyncTrustRelationShip(msg); + CHECK_NULL_VOID(softbusListener_); + softbusListener_->SendAclChangedBroadcast(broadCastMsg); +} + +void DeviceManagerService::HandleCommonEventBroadCast(const std::vector &remoteUserIdInfos, + const std::string &remoteUdid, bool isNeedResponse) +{ + LOGI("rmtUdid: %{public}s, rmtUserIds: %{public}s, isNeedResponse: %{public}s,", + GetAnonyString(remoteUdid).c_str(), GetUserIdInfoList(remoteUserIdInfos).c_str(), + isNeedResponse ? "true" : "false"); + if (isNeedResponse) { + std::vector foregroundUserVec; + int32_t retFront = MultipleUserConnector::GetForegroundUserIds(foregroundUserVec); + std::vector backgroundUserVec; + int32_t retBack = MultipleUserConnector::GetBackgroundUserIds(backgroundUserVec); + MultipleUserConnector::ClearLockedUser(foregroundUserVec, backgroundUserVec); + if (retFront != DM_OK || retBack!= DM_OK) { + LOGE("retFront: %{public}d, retBack: %{public}d, frontuserids: %{public}s, backuserids: %{public}s", + retFront, retBack, GetIntegerList(foregroundUserVec).c_str(), + GetIntegerList(backgroundUserVec).c_str()); + } else { + LOGE("Send back local frontuserids: %{public}s, backuserids: %{public}s", + GetIntegerList(foregroundUserVec).c_str(), GetIntegerList(backgroundUserVec).c_str()); + std::vector remoteUdids = { remoteUdid }; + SendCommonEventBroadCast(remoteUdids, foregroundUserVec, backgroundUserVec, false); + } + } + + std::vector foregroundUserIdInfos; + std::vector backgroundUserIdInfos; + GetFrontAndBackUserIdInfos(remoteUserIdInfos, foregroundUserIdInfos, backgroundUserIdInfos); + // Notify received remote foreground userids to dsoftbus + std::vector foregroundUserIds; + for (const auto &u : foregroundUserIdInfos) { + foregroundUserIds.push_back(static_cast(u.userId)); + } + std::vector backgroundUserIds; + for (const auto &u : backgroundUserIdInfos) { + backgroundUserIds.push_back(static_cast(u.userId)); + } + if (IsDMServiceImplReady()) { + dmServiceImpl_->HandleCommonEventBroadCast(foregroundUserIds, backgroundUserIds, remoteUdid); + } +} + +void DeviceManagerService::ProcessCommonUserStatusEvent(const std::vector &foregroundUserIds, + const std::vector &backgroundUserIds, const std::string &remoteUdid) +{ + LOGI("foregroundUserIds: %{public}s, backgroundUserIds: %{public}s, remoteUdid: %{public}s", + GetIntegerList(foregroundUserIds).c_str(), GetIntegerList(backgroundUserIds).c_str(), + GetAnonyString(remoteUdid).c_str()); + + if (timer_ != nullptr) { + timer_->DeleteTimer(std::string(ACCOUNT_COMMON_EVENT_BY_WIFI_TIMEOUT_TASK) + Crypto::Sha256(remoteUdid)); + } + if (IsDMServiceImplReady()) { + dmServiceImpl_->HandleCommonEventBroadCast(foregroundUserIds, backgroundUserIds, remoteUdid); + } +} + void DeviceManagerService::ScreenCommonEventCallback(std::string commonEventType) { + if (IsDMServiceAdapterResidentLoad()) { + bool isLock = commonEventType == EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_LOCKED; + dmServiceImplExtResident_->HandleScreenLockEvent(isLock); + } else { + LOGE("ScreenCommonEventCallback failed, dmServiceImplExtResident not init or init failed."); + } if (!IsDMImplSoLoaded()) { LOGE("ScreenCommonEventCallback failed, instance not init or init failed."); return; @@ -2318,7 +2759,6 @@ int32_t DeviceManagerService::SetDnPolicy(const std::string &pkgName, std::map &p uint64_t tokenId, int32_t bindLevel) { LOGI("TokenId %{public}" PRId64", bindLevel %{public}d, userId %{public}d.", tokenId, bindLevel, userId); - if (static_cast(bindLevel) == DEVICE) { + if (static_cast(bindLevel) == USER) { SendDeviceUnBindBroadCast(peerUdids, userId); return; } @@ -2418,7 +2860,7 @@ void DeviceManagerService::SendUnBindBroadCast(const std::vector &p void DeviceManagerService::SendUnBindBroadCast(const std::vector &peerUdids, int32_t userId, uint64_t tokenId, int32_t bindLevel, uint64_t peerTokenId) { - if (static_cast(bindLevel) == DEVICE) { + if (static_cast(bindLevel) == USER) { SendDeviceUnBindBroadCast(peerUdids, userId); return; } @@ -2443,31 +2885,81 @@ void DeviceManagerService::SendDeviceUnBindBroadCast(const std::vectorSendAclChangedBroadcast(broadCastMsg); } +int32_t DeviceManagerService::CalculateBroadCastDelayTime() +{ + int64_t timeDiff = 0; + int32_t delayTime = 0; + int64_t currentTime = + std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(); + { + std::lock_guard lock(broadCastLock_); + if (SendLastBroadCastTime_ == 0) { + SendLastBroadCastTime_ = currentTime; + } + timeDiff = currentTime - SendLastBroadCastTime_; + delayTime = SEND_DELAY_MAX_TIME - timeDiff + lastDelayTime_; + if (delayTime < SEND_DELAY_MIN_TIME || delayTime == SEND_DELAY_MAX_TIME) { + delayTime = SEND_DELAY_MIN_TIME; + } + SendLastBroadCastTime_ = currentTime; + lastDelayTime_ = delayTime; + } + return delayTime; +} + void DeviceManagerService::SendAppUnBindBroadCast(const std::vector &peerUdids, int32_t userId, uint64_t tokenId) { - RelationShipChangeMsg msg; - msg.type = RelationShipChangeType::APP_UNBIND; - msg.userId = static_cast(userId); - msg.peerUdids = peerUdids; - msg.tokenId = tokenId; - std::string broadCastMsg = ReleationShipSyncMgr::GetInstance().SyncTrustRelationShip(msg); - CHECK_NULL_VOID(softbusListener_); - softbusListener_->SendAclChangedBroadcast(broadCastMsg); + int32_t delayTime = CalculateBroadCastDelayTime(); + std::function task = [=]() { + LOGI("SendAppUnBindBroadCast Start."); + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::APP_UNBIND; + msg.userId = static_cast(userId); + msg.peerUdids = peerUdids; + msg.tokenId = tokenId; + std::string broadCastMsg = ReleationShipSyncMgr::GetInstance().SyncTrustRelationShip(msg); + CHECK_NULL_VOID(softbusListener_); + softbusListener_->SendAclChangedBroadcast(broadCastMsg); + }; + ffrt::submit(task, ffrt::task_attr().delay(delayTime * DELAY_TIME_SEC_CONVERSION)); } void DeviceManagerService::SendAppUnBindBroadCast(const std::vector &peerUdids, int32_t userId, uint64_t tokenId, uint64_t peerTokenId) { - RelationShipChangeMsg msg; - msg.type = RelationShipChangeType::APP_UNBIND; - msg.userId = static_cast(userId); - msg.peerUdids = peerUdids; - msg.tokenId = tokenId; - msg.peerTokenId = peerTokenId; - std::string broadCastMsg = ReleationShipSyncMgr::GetInstance().SyncTrustRelationShip(msg); - CHECK_NULL_VOID(softbusListener_); - softbusListener_->SendAclChangedBroadcast(broadCastMsg); + int32_t delayTime = CalculateBroadCastDelayTime(); + std::function task = [=]() { + LOGI("SendAppUnBindBroadCast Start."); + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::APP_UNBIND; + msg.userId = static_cast(userId); + msg.peerUdids = peerUdids; + msg.tokenId = tokenId; + msg.peerTokenId = peerTokenId; + std::string broadCastMsg = ReleationShipSyncMgr::GetInstance().SyncTrustRelationShip(msg); + CHECK_NULL_VOID(softbusListener_); + softbusListener_->SendAclChangedBroadcast(broadCastMsg); + }; + ffrt::submit(task, ffrt::task_attr().delay(delayTime * DELAY_TIME_SEC_CONVERSION)); +} + +void DeviceManagerService::SendAppUnInstallBroadCast(const std::vector &peerUdids, int32_t userId, + uint64_t tokenId) +{ + int32_t delayTime = CalculateBroadCastDelayTime(); + std::function task = [=]() { + LOGI("SendAppUnInstallBroadCast Start."); + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::APP_UNINSTALL; + msg.userId = static_cast(userId); + msg.peerUdids = peerUdids; + msg.tokenId = tokenId; + std::string broadCastMsg = ReleationShipSyncMgr::GetInstance().SyncTrustRelationShip(msg); + CHECK_NULL_VOID(softbusListener_); + softbusListener_->SendAclChangedBroadcast(broadCastMsg); + }; + ffrt::submit(task, ffrt::task_attr().delay(delayTime * DELAY_TIME_SEC_CONVERSION)); } void DeviceManagerService::SendServiceUnBindBroadCast(const std::vector &peerUdids, int32_t userId, @@ -2483,19 +2975,53 @@ void DeviceManagerService::SendServiceUnBindBroadCast(const std::vectorSendAclChangedBroadcast(broadCastMsg); } +void DeviceManagerService::HandleCredentialDeleted(const char *credId, const char *credInfo) +{ + LOGI("start."); + if (credId == nullptr || credInfo == nullptr) { + LOGE("HandleCredentialDeleted credId or credInfo is nullptr."); + return; + } + char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localUdidTemp); + if (!IsDMServiceImplReady()) { + LOGE("HandleCredentialDeleted failed, instance not init or init failed."); + return; + } + std::string remoteUdid = ""; + dmServiceImpl_->HandleCredentialDeleted(credId, credInfo, localUdid, remoteUdid); + if (remoteUdid.empty()) { + LOGE("HandleCredentialDeleted failed, remoteUdid is empty."); + return; + } + std::vector peerUdids; + peerUdids.emplace_back(remoteUdid); + SendShareTypeUnBindBroadCast(credId, MultipleUserConnector::GetCurrentAccountUserID(), peerUdids); + return; +} + void DeviceManagerService::HandleDeviceTrustedChange(const std::string &msg) { - if (msg.empty()) { - LOGE("Msg is empty."); + if (!IsMsgEmptyAndDMServiceImplReady(msg)) { return; } - RelationShipChangeMsg relationShipMsg = - ReleationShipSyncMgr::GetInstance().ParseTrustRelationShipChange(msg); + RelationShipChangeMsg relationShipMsg = ReleationShipSyncMgr::GetInstance().ParseTrustRelationShipChange(msg); LOGI("Receive trust change msg: %{public}s", relationShipMsg.ToString().c_str()); - if (!IsDMServiceImplReady()) { - LOGE("Imp instance not init or init failed."); + if (!ReleationShipSyncMgr::GetInstance().IsNewBroadCastId(relationShipMsg)) { + LOGI("is not new broadcast"); + return; + } + bool ret = ParseRelationShipChangeType(relationShipMsg); + if (!ret) { + LOGI("ParseRelationShipChangeType failed"); return; } + return; +} + +bool DeviceManagerService::ParseRelationShipChangeType(const RelationShipChangeMsg &relationShipMsg) +{ switch (relationShipMsg.type) { case RelationShipChangeType::ACCOUNT_LOGOUT: dmServiceImpl_->HandleAccountLogoutEvent(relationShipMsg.userId, relationShipMsg.accountId, @@ -2514,9 +3040,18 @@ void DeviceManagerService::HandleDeviceTrustedChange(const std::string &msg) static_cast(relationShipMsg.tokenId)); } break; + case RelationShipChangeType::SERVICE_UNBIND: + dmServiceImpl_->HandleServiceUnBindEvent(relationShipMsg.userId, relationShipMsg.peerUdid, + static_cast(relationShipMsg.tokenId)); + break; case RelationShipChangeType::SYNC_USERID: - HandleUserIdsBroadCast(relationShipMsg.userIdInfos, - relationShipMsg.peerUdid, relationShipMsg.syncUserIdFlag); + if (relationShipMsg.isNewEvent) { + HandleCommonEventBroadCast(relationShipMsg.userIdInfos, + relationShipMsg.peerUdid, relationShipMsg.syncUserIdFlag); + } else { + HandleUserIdsBroadCast(relationShipMsg.userIdInfos, + relationShipMsg.peerUdid, relationShipMsg.syncUserIdFlag); + } break; case RelationShipChangeType::DEL_USER: dmServiceImpl_->HandleRemoteUserRemoved(relationShipMsg.userId, relationShipMsg.peerUdid); @@ -2524,9 +3059,44 @@ void DeviceManagerService::HandleDeviceTrustedChange(const std::string &msg) case RelationShipChangeType::STOP_USER: HandleUserStopBroadCast(relationShipMsg.userId, relationShipMsg.peerUdid); break; + case RelationShipChangeType::SHARE_UNBIND: + HandleShareUnbindBroadCast(relationShipMsg.userId, relationShipMsg.credId); + break; + case RelationShipChangeType::APP_UNINSTALL: + ProcessUninstApp(relationShipMsg.userId, static_cast(relationShipMsg.tokenId)); + break; default: LOGI("Dm have not this event type."); - break; + return false; + } + return true; +} + +bool DeviceManagerService::IsMsgEmptyAndDMServiceImplReady(const std::string &msg) +{ + if (msg.empty()) { + LOGE("Msg is empty."); + return false; + } + if (!IsDMServiceImplReady()) { + LOGE("Imp instance not init or init failed."); + return false; + } + return true; +} + +void DeviceManagerService::HandleShareUnbindBroadCast(const int32_t userId, const std::string &credId) +{ + LOGI("start."); + if (credId == "") { + LOGE("HandleShareUnbindBroadCast credId is null."); + return; + } + char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localUdidTemp); + if (IsDMServiceImplReady()) { + dmServiceImpl_->HandleShareUnbindBroadCast(credId, userId, localUdid); } return; } @@ -2570,7 +3140,6 @@ void DeviceManagerService::ProcessCheckSumByWifi(std::string networkId, std::vec return; } // use connection to exchange foreground/background userid - LOGI("Try open softbus session to exchange foreground/background userid"); std::vector foregroundUserIdsUInt; for (auto const &u : foregroundUserIds) { foregroundUserIdsUInt.push_back(static_cast(u)); @@ -2634,11 +3203,11 @@ void DeviceManagerService::HandleUserIdCheckSumChange(const std::string &msg) LOGI("Can not get background userids, ret: %{public}d, background userid num: %{public}d", ret, static_cast(backgroundUserIds.size())); } - - if ((discoveryType & USERID_CHECKSUM_DISCOVERY_TYPE_WIFI_MASK) != 0x0) { - ProcessCheckSumByWifi(remoteNetworkId, foregroundUserIds, backgroundUserIds); - } else { + uint32_t addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BLE; + if ((discoveryType & addrTypeMask) != 0x0) { ProcessCheckSumByBT(remoteNetworkId, foregroundUserIds, backgroundUserIds); + } else { + ProcessCheckSumByWifi(remoteNetworkId, foregroundUserIds, backgroundUserIds); } } #endif @@ -2701,6 +3270,8 @@ void DeviceManagerService::SubscribePackageCommonEvent() packageCommonEventManager_ = std::make_shared(); } PackageEventCallback callback = [=](const auto &arg1, const auto &arg2, const auto &arg3) { + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); + NotifyRemoteUninstallApp(userId, arg3); if (IsDMServiceImplReady()) { dmServiceImpl_->ProcessAppUnintall(arg1, arg3); } @@ -2712,7 +3283,25 @@ void DeviceManagerService::SubscribePackageCommonEvent() if (packageCommonEventManager_->SubscribePackageCommonEvent(commonEventVec, callback)) { LOGI("Success"); } -#endif +#endif +} + +int32_t DeviceManagerService::SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList) +{ + if (IsDMServiceImplReady()) { + return dmServiceImpl_->SyncLocalAclListProcess(localDevUserInfo, remoteDevUserInfo, remoteAclList); + } + return ERR_DM_FAILED; +} + +int32_t DeviceManagerService::GetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList) +{ + if (IsDMServiceImplReady()) { + return dmServiceImpl_->GetAclListHash(localDevUserInfo, remoteDevUserInfo, aclList); + } + return ERR_DM_FAILED; } void DeviceManagerService::HandleCredentialAuthStatus(const std::string &deviceList, uint16_t deviceTypeId, @@ -2845,7 +3434,8 @@ void DeviceManagerService::NotifyRemoteLocalUserSwitch(int32_t curUserId, int32_ bleUdids.push_back(udid); continue; } - if ((static_cast(networkType) & USERID_SYNC_DISCOVERY_TYPE_BLE_MASK) != 0x0) { + uint32_t addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BLE; + if ((static_cast(networkType) & addrTypeMask) != 0x0) { bleUdids.push_back(udid); } else { wifiDevices.insert(std::pair(udid, netWorkId)); @@ -2860,6 +3450,184 @@ void DeviceManagerService::NotifyRemoteLocalUserSwitch(int32_t curUserId, int32_ } } +void DeviceManagerService::NotifyRemoteUninstallApp(int32_t userId, int32_t tokenId) +{ + LOGI("DeviceManagerService::NotifyRemoteUninstallApp userId: %{public}s, tokenId: %{public}s", + GetAnonyInt32(userId).c_str(), GetAnonyInt32(tokenId).c_str()); + std::vector peerUdids; + int32_t currentUserId = MultipleUserConnector::GetCurrentAccountUserID(); + if (IsDMServiceImplReady()) { + peerUdids = dmServiceImpl_->GetDeviceIdByUserIdAndTokenId(currentUserId, tokenId); + } + if (peerUdids.empty()) { + LOGE("peerUdids is empty"); + return; + } + if (softbusListener_ == nullptr) { + LOGE("softbusListener_ is null"); + return; + } + std::vector bleUdids; + std::map wifiDevices; + for (const auto &udid : peerUdids) { + std::string netWorkId = ""; + SoftbusCache::GetInstance().GetNetworkIdFromCache(udid, netWorkId); + if (netWorkId.empty()) { + LOGE("netWorkId is empty: %{public}s", GetAnonyString(udid).c_str()); + bleUdids.push_back(udid); + continue; + } + int32_t networkType = 0; + int32_t ret = softbusListener_->GetNetworkTypeByNetworkId(netWorkId.c_str(), networkType); + if (ret != DM_OK || networkType <= 0) { + LOGE("get networkType failed: %{public}s", GetAnonyString(udid).c_str()); + bleUdids.push_back(udid); + continue; + } + uint32_t addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BLE; + if ((static_cast(networkType) & addrTypeMask) != 0x0) { + bleUdids.push_back(udid); + } else { + wifiDevices.insert(std::pair(udid, netWorkId)); + } + } + if (!bleUdids.empty()) { + SendAppUnInstallBroadCast(bleUdids, userId, tokenId); + } + if (!wifiDevices.empty()) { + NotifyRemoteUninstallAppByWifi(userId, tokenId, wifiDevices); + } +} + + +void DeviceManagerService::NotifyRemoteUninstallAppByWifi(int32_t userId, int32_t tokenId, + const std::map &wifiDevices) +{ + LOGI("DeviceManagerService::NotifyRemoteUninstallAppByWifi userId: %{public}s, tokenId: %{public}s", + GetAnonyInt32(userId).c_str(), GetAnonyInt32(tokenId).c_str()); + for (const auto &it : wifiDevices) { + int32_t result = SendUninstAppByWifi(userId, tokenId, it.second); + if (result != DM_OK) { + LOGE("by wifi failed: %{public}s", GetAnonyString(it.first).c_str()); + continue; + } + if (timer_ == nullptr) { + timer_ = std::make_shared(); + } + std::string udid = it.first; + std::string networkId = it.second; + timer_->StartTimer(std::string(APP_UNINSTALL_BY_WIFI_TIMEOUT_TASK) + Crypto::Sha256(udid), + USER_SWITCH_BY_WIFI_TIMEOUT_S, [this, networkId] (std::string name) { + DMCommTool::GetInstance()->StopSocket(networkId); + }); + } +} + +void DeviceManagerService::NotifyRemoteUnBindAppByWifi(int32_t userId, int32_t tokenId, std::string extra, + const std::map &wifiDevices) +{ + LOGI("DeviceManagerService::NotifyRemoteUnBindAppByWifi userId: %{public}s, tokenId: %{public}s, extra: %{public}s", + GetAnonyInt32(userId).c_str(), GetAnonyInt32(tokenId).c_str(), GetAnonyString(extra).c_str()); + for (const auto &it : wifiDevices) { + char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localUdidTemp, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localUdidTemp); + int32_t result = SendUnBindAppByWifi(userId, tokenId, extra, it.second, localUdid); + if (result != DM_OK) { + LOGE("by wifi failed: %{public}s", GetAnonyString(it.first).c_str()); + continue; + } + if (timer_ == nullptr) { + timer_ = std::make_shared(); + } + std::string udid = it.first; + std::string networkId = it.second; + timer_->StartTimer(std::string(APP_UNBIND_BY_WIFI_TIMEOUT_TASK) + Crypto::Sha256(udid), + USER_SWITCH_BY_WIFI_TIMEOUT_S, [this, networkId] (std::string name) { + DMCommTool::GetInstance()->StopSocket(networkId); + }); + } +} + +void DeviceManagerService::ProcessReceiveRspAppUninstall(const std::string &remoteUdid) +{ + LOGI("ProcessReceiveRspAppUninstall remoteUdid: %{public}s", GetAnonyString(remoteUdid).c_str()); + if (timer_ != nullptr && remoteUdid != "") { + timer_->DeleteTimer(std::string(APP_UNINSTALL_BY_WIFI_TIMEOUT_TASK) + Crypto::Sha256(remoteUdid)); + } +} + +void DeviceManagerService::ProcessReceiveRspAppUnbind(const std::string &remoteUdid) +{ + LOGI("ProcessReceiveRspAppUnbind remoteUdid: %{public}s", GetAnonyString(remoteUdid).c_str()); + if (timer_ != nullptr && remoteUdid != "") { + timer_->DeleteTimer(std::string(APP_UNBIND_BY_WIFI_TIMEOUT_TASK) + Crypto::Sha256(remoteUdid)); + } +} + +int32_t DeviceManagerService::SendUninstAppByWifi(int32_t userId, int32_t tokenId, const std::string &networkId) +{ + LOGE("DeviceManagerService::SendUninstAppByWifi userId: %{public}s, tokenId: %{public}s", + GetAnonyInt32(userId).c_str(), GetAnonyInt32(tokenId).c_str()); + return DMCommTool::GetInstance()->SendUninstAppObj(userId, tokenId, networkId); +} + +int32_t DeviceManagerService::SendUnBindAppByWifi(int32_t userId, int32_t tokenId, std::string extra, + const std::string &networkId, const std::string &udid) +{ + LOGE("DeviceManagerService::SendUnBindAppByWifi"); + return DMCommTool::GetInstance()->SendUnBindAppObj(userId, tokenId, extra, networkId, udid); +} + +void DeviceManagerService::GetNotifyRemoteUnBindAppWay(int32_t userId, int32_t tokenId, + std::map &wifiDevices, bool &isBleWay) +{ + std::vector peerUdids; + int32_t currentUserId = MultipleUserConnector::GetCurrentAccountUserID(); + std::map deviceMap = dmServiceImpl_->GetDeviceIdAndBindLevel(currentUserId); + for (const auto &item : deviceMap) { + peerUdids.push_back(item.first); + } + if (peerUdids.empty()) { + LOGE("peerUdids is empty"); + return; + } + if (softbusListener_ == nullptr) { + LOGE("softbusListener_ is null"); + return; + } + + std::vector bleUdids; + for (const auto &udid : peerUdids) { + std::string netWorkId = ""; + SoftbusCache::GetInstance().GetNetworkIdFromCache(udid, netWorkId); + if (netWorkId.empty()) { + LOGE("netWorkId is empty: %{public}s", GetAnonyString(udid).c_str()); + bleUdids.push_back(udid); + continue; + } + int32_t networkType = 0; + int32_t ret = softbusListener_->GetNetworkTypeByNetworkId(netWorkId.c_str(), networkType); + if (ret != DM_OK || networkType <= 0) { + LOGE("get networkType failed: %{public}s", GetAnonyString(udid).c_str()); + bleUdids.push_back(udid); + continue; + } + uint32_t addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BLE; + if ((static_cast(networkType) & addrTypeMask) != 0x0) { + bleUdids.push_back(udid); + } else { + wifiDevices.insert(std::pair(udid, netWorkId)); + } + } + + if (!bleUdids.empty()) { + isBleWay = true; + } else { + isBleWay = false; + } +} + void DeviceManagerService::NotifyRemoteLocalUserSwitchByWifi(int32_t curUserId, int32_t preUserId, const std::map &wifiDevices, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) @@ -2909,8 +3677,8 @@ void DeviceManagerService::HandleUserSwitchTimeout(int32_t curUserId, int32_t pr void DeviceManagerService::HandleUserSwitchedEvent(int32_t currentUserId, int32_t beforeUserId) { + LOGI("In"); DeviceNameManager::GetInstance().InitDeviceNameWhenUserSwitch(currentUserId, beforeUserId); - CheckRegisterInfoWithWise(currentUserId); MultipleUserConnector::SetAccountInfo(currentUserId, MultipleUserConnector::GetCurrentDMAccountInfo()); if (IsPC()) { return; @@ -2922,14 +3690,11 @@ void DeviceManagerService::HandleUserSwitchedEvent(int32_t currentUserId, int32_ if (beforeUserId != -1 && currentUserId != -1) { HandleUserSwitched(currentUserId, beforeUserId); } - if (IsDMServiceAdapterResidentLoad()) { - dmServiceImplExtResident_->AccountUserSwitched(currentUserId, MultipleUserConnector::GetOhosAccountId()); - } } void DeviceManagerService::HandleUserStopEvent(int32_t stopUserId) { - LOGI("onStart, HandleUserStopEvent %{public}s.", GetAnonyInt32(stopUserId).c_str()); + LOGI("stopUserId %{public}s.", GetAnonyInt32(stopUserId).c_str()); std::vector stopUserVec; stopUserVec.push_back(stopUserId); char localUdidTemp[DEVICE_UUID_LENGTH] = {0}; @@ -2980,7 +3745,8 @@ void DeviceManagerService::DivideNotifyMethod(const std::vector &pe bleUdids.push_back(udid); continue; } - if ((static_cast(networkType) & USERID_SYNC_DISCOVERY_TYPE_BLE_MASK) != 0x0) { + uint32_t addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BLE; + if ((static_cast(networkType) & addrTypeMask) != 0x0) { bleUdids.push_back(udid); } else { wifiDevices.insert(std::pair(udid, netWorkId)); @@ -3143,6 +3909,15 @@ int32_t DeviceManagerService::PutDeviceProfileInfoList(const std::string &pkgNam LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } + std::string processName = ""; + if (PermissionManager::GetInstance().GetCallerProcessName(processName) != DM_OK) { + LOGE("Get caller process name failed, pkgname: %{public}s.", pkgName.c_str()); + return ERR_DM_FAILED; + } + if (!PermissionManager::GetInstance().CheckProcessNameValidPutDeviceProfileInfoList(processName)) { + LOGE("The caller: %{public}s is not in white list.", processName.c_str()); + return ERR_DM_NO_PERMISSION; + } LOGI("Start for pkgName = %{public}s", pkgName.c_str()); if (!IsDMServiceAdapterResidentLoad()) { LOGE("GetDeviceProfileInfoList failed, adapter instance not init or init failed."); @@ -3190,7 +3965,7 @@ int32_t DeviceManagerService::SetLocalDeviceName(const std::string &pkgName, con } if (!PermissionManager::GetInstance().CheckProcessNameValidModifyLocalDeviceName(processName)) { LOGE("The caller: %{public}s is not in white list.", processName.c_str()); - return ERR_DM_INPUT_PARA_INVALID; + return ERR_DM_NO_PERMISSION; } LOGI("Start for pkgName = %{public}s", pkgName.c_str()); if (!IsDMServiceAdapterResidentLoad()) { @@ -3214,7 +3989,7 @@ int32_t DeviceManagerService::SetRemoteDeviceName(const std::string &pkgName, } if (!PermissionManager::GetInstance().CheckProcessNameValidModifyRemoteDeviceName(processName)) { LOGE("The caller: %{public}s is not in white list.", processName.c_str()); - return ERR_DM_INPUT_PARA_INVALID; + return ERR_DM_NO_PERMISSION; } LOGI("Start for pkgName = %{public}s", pkgName.c_str()); if (!IsDMServiceAdapterResidentLoad()) { @@ -3234,17 +4009,14 @@ std::vector DeviceManagerService::GetDeviceNamePrefixs() return dmServiceImplExtResident_->GetDeviceNamePrefixs(); } -void DeviceManagerService::CheckRegisterInfoWithWise(int32_t curUserId) +void DeviceManagerService::HandleNetworkConnected(int32_t networkStatus) { - LOGI("In curUserId:%{public}d", curUserId); - if (curUserId == -1) { - return; - } + LOGI("In"); if (!IsDMServiceAdapterResidentLoad()) { - LOGE("CheckRegisterInfoWithWise failed, adapter instance not init or init failed."); + LOGE("HandleNetworkConnected failed, adapter instance not init or init failed."); return; } - dmServiceImplExtResident_->CheckRegisterInfoWithWise(); + dmServiceImplExtResident_->HandleNetworkConnected(networkStatus); } int32_t DeviceManagerService::RestoreLocalDeviceName(const std::string &pkgName) @@ -3261,7 +4033,12 @@ int32_t DeviceManagerService::RestoreLocalDeviceName(const std::string &pkgName) } if (!PermissionManager::GetInstance().CheckProcessNameValidModifyLocalDeviceName(processName)) { LOGE("The caller: %{public}s is not in white list.", processName.c_str()); - return ERR_DM_INPUT_PARA_INVALID; + return ERR_DM_NO_PERMISSION; + } + if (IsDMServiceAdapterResidentLoad()) { + dmServiceImplExtResident_->RestoreLocalDeviceName(); + } else { + LOGW("RestoreLocalDeviceName fail, adapter instance not init or init failed."); } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) return DeviceNameManager::GetInstance().RestoreLocalDeviceName(); @@ -3339,5 +4116,161 @@ int32_t DeviceManagerService::GetDeviceNetworkIdList(const std::string &pkgName, } return DM_OK; } + +void DeviceManagerService::NotifyRemoteLocalLogout(const std::vector &peerUdids, + const std::string &accountIdHash, const std::string &accountName, int32_t userId) +{ + LOGI("Start."); + std::vector bleUdids; + std::vector wifiDevices; + for (const auto &udid : peerUdids) { + std::string netWorkId = ""; + SoftbusCache::GetInstance().GetNetworkIdFromCache(udid, netWorkId); + if (netWorkId.empty()) { + LOGI("netWorkId is empty: %{public}s", GetAnonyString(udid).c_str()); + bleUdids.push_back(udid); + continue; + } + int32_t networkType = 0; + int32_t ret = softbusListener_->GetNetworkTypeByNetworkId(netWorkId.c_str(), networkType); + if (ret != DM_OK || networkType <= 0) { + LOGI("get networkType failed: %{public}s", GetAnonyString(udid).c_str()); + bleUdids.push_back(udid); + continue; + } + uint32_t addrTypeMask = 1 << NetworkType::BIT_NETWORK_TYPE_BLE; + if ((static_cast(networkType) & addrTypeMask) != 0x0) { + bleUdids.push_back(udid); + } else { + wifiDevices.push_back(netWorkId); + } + } + if (!bleUdids.empty()) { + SendAccountLogoutBroadCast(bleUdids, accountIdHash, accountName, userId); + } +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + for (const auto &it : wifiDevices) { + int32_t ret = DMCommTool::GetInstance()->SendLogoutAccountInfo(it, accountIdHash, userId); + if (ret != DM_OK) { + LOGE("Send LogoutAccount Info error, ret = %{public}d", ret); + } + } +#endif +} + +void DeviceManagerService::ProcessSyncAccountLogout(const std::string &accountId, const std::string &peerUdid, + int32_t userId) +{ + LOGI("Start. process udid: %{public}s", GetAnonyString(peerUdid).c_str()); + if (!IsDMServiceImplReady()) { + LOGE("Imp instance not init or init failed."); + return; + } + dmServiceImpl_->HandleAccountLogoutEvent(userId, accountId, peerUdid); +} + +int32_t DeviceManagerService::OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m) +{ + if (!IsDMServiceAdapterResidentLoad()) { + LOGE("failed, adapter instance not init or init failed."); + return ERR_DM_UNSUPPORTED_METHOD; + } + return dmServiceImplExtResident_->OpenAuthSessionWithPara(deviceId, actionId, isEnable160m); +} + +int32_t DeviceManagerService::UnRegisterPinHolderCallback(const std::string &pkgName) +{ + if (!PermissionManager::GetInstance().CheckPermission()) { + LOGE("The caller: %{public}s does not have permission to call UnRegisterPinHolderCallback.", pkgName.c_str()); + return ERR_DM_NO_PERMISSION; + } + std::string processName = ""; + if (PermissionManager::GetInstance().GetCallerProcessName(processName) != DM_OK) { + LOGE("Get caller process name failed, pkgname: %{public}s.", pkgName.c_str()); + return ERR_DM_FAILED; + } + if (!PermissionManager::GetInstance().CheckProcessNameValidOnPinHolder(processName)) { + LOGE("The caller: %{public}s is not in white list.", processName.c_str()); + return ERR_DM_INPUT_PARA_INVALID; + } + LOGI("begin."); + if (pkgName.empty()) { + LOGE("Invalid parameter, pkgName: %{public}s.", pkgName.c_str()); + return ERR_DM_INPUT_PARA_INVALID; + } + CHECK_NULL_RETURN(pinHolder_, ERR_DM_POINT_NULL); + return pinHolder_->UnRegisterPinHolderCallback(pkgName); +} + +int32_t DeviceManagerService::GetLocalDeviceName(std::string &deviceName) +{ +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + return DeviceNameManager::GetInstance().GetLocalDisplayDeviceName(0, deviceName); +#endif + (void) deviceName; + return DM_OK; +} + +bool DeviceManagerService::GetAccessUdidByNetworkId(const std::string &srcNetWorkId, std::string &srcUdid, + const std::string &sinkNetWorkId, std::string &sinkUdid) +{ + LOGI("start srcNetWorkId %{public}s, sinkNetWorkId %{public}s.", GetAnonyString(srcNetWorkId).c_str(), + GetAnonyString(sinkNetWorkId).c_str()); + if (!PermissionManager::GetInstance().CheckPermission()) { + LOGE("The caller not have permission to call GetAccessUdidByNetworkId."); + return false; + } + if (!IsDMServiceImplReady()) { + LOGE("GetAccessUdidByNetworkId failed, instance not init or init failed."); + return false; + } + SoftbusListener::GetUdidByNetworkId(srcNetWorkId.c_str(), srcUdid); + SoftbusListener::GetUdidByNetworkId(sinkNetWorkId.c_str(), sinkUdid); + return true; +} + +bool DeviceManagerService::CheckSrcAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + std::string srcUdid = ""; + std::string sinkUdid = ""; + if (!GetAccessUdidByNetworkId(caller.networkId.c_str(), srcUdid, callee.networkId.c_str(), sinkUdid)) { + LOGE("The caller %{public}s GetAccessUdidByNetworkId failed.", caller.pkgName.c_str()); + return false; + } + return dmServiceImpl_->CheckSrcAccessControl(caller, srcUdid, callee, sinkUdid); +} + +bool DeviceManagerService::CheckSinkAccessControl(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + std::string srcUdid = ""; + std::string sinkUdid = ""; + if (!GetAccessUdidByNetworkId(caller.networkId.c_str(), srcUdid, callee.networkId.c_str(), sinkUdid)) { + LOGE("The caller %{public}s GetAccessUdidByNetworkId failed.", caller.pkgName.c_str()); + return false; + } + return dmServiceImpl_->CheckSinkAccessControl(caller, srcUdid, callee, sinkUdid); +} + +bool DeviceManagerService::CheckSrcIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + std::string srcUdid = ""; + std::string sinkUdid = ""; + if (!GetAccessUdidByNetworkId(caller.networkId.c_str(), srcUdid, callee.networkId.c_str(), sinkUdid)) { + LOGE("The caller %{public}s GetAccessUdidByNetworkId failed.", caller.pkgName.c_str()); + return false; + } + return dmServiceImpl_->CheckSrcIsSameAccount(caller, srcUdid, callee, sinkUdid); +} + +bool DeviceManagerService::CheckSinkIsSameAccount(const DmAccessCaller &caller, const DmAccessCallee &callee) +{ + std::string srcUdid = ""; + std::string sinkUdid = ""; + if (!GetAccessUdidByNetworkId(caller.networkId.c_str(), srcUdid, callee.networkId.c_str(), sinkUdid)) { + LOGE("The caller %{public}s GetAccessUdidByNetworkId failed.", caller.pkgName.c_str()); + return false; + } + return dmServiceImpl_->CheckSinkIsSameAccount(caller, srcUdid, callee, sinkUdid); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/src/device_manager_service_listener.cpp b/services/service/src/device_manager_service_listener.cpp index b090406df3066cde52b8cbf623c44ad868ce4876..d1d0a84b8377d0256468ec5d844b975814030128 100644 --- a/services/service/src/device_manager_service_listener.cpp +++ b/services/service/src/device_manager_service_listener.cpp @@ -45,6 +45,7 @@ #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) #include "datetime_ex.h" #include "device_name_manager.h" +#include "device_manager_service.h" #include "kv_adapter_manager.h" #include "multiple_user_connector.h" #endif @@ -190,7 +191,6 @@ int32_t DeviceManagerServiceListener::FillUdidAndUuidToDeviceInfo(const std::str void DeviceManagerServiceListener::ProcessDeviceStateChange(const ProcessInfo &processInfo, const DmDeviceState &state, const DmDeviceInfo &info, const DmDeviceBasicInfo &deviceBasicInfo) { - LOGI("DeviceManagerServiceListener::ProcessDeviceStateChange, state = %{public}d", state); std::vector processInfoVec = GetNotifyProcessInfoByUserId(processInfo.userId, DmCommonNotifyEvent::REG_DEVICE_STATE); std::vector hpProcessInfoVec; @@ -230,11 +230,6 @@ void DeviceManagerServiceListener::ProcessAppStateChange(const ProcessInfo &proc ProcessInfo bindProcessInfo = DealBindProcessInfo(processInfo); processInfoVec.push_back(bindProcessInfo); std::vector allProcessInfos = ipcServerListener_.GetAllProcessInfo(); - for (auto item : allProcessInfos) { - if (item.pkgName.find(PICKER_PROXY_SPLIT + processInfo.pkgName) != std::string::npos) { - processInfoVec.push_back(item); - } - } switch (static_cast(state)) { case static_cast(DmDeviceState::DEVICE_STATE_ONLINE): ProcessAppOnline(processInfoVec, processInfo, state, info, deviceBasicInfo); @@ -254,7 +249,6 @@ void DeviceManagerServiceListener::ProcessAppStateChange(const ProcessInfo &proc void DeviceManagerServiceListener::OnDeviceStateChange(const ProcessInfo &processInfo, const DmDeviceState &state, const DmDeviceInfo &info) { - LOGI("OnDeviceStateChange, state = %{public}d", state); DmDeviceBasicInfo deviceBasicInfo; ConvertDeviceInfoToDeviceBasicInfo(processInfo.pkgName, info, deviceBasicInfo); if (processInfo.pkgName == std::string(DM_PKG_NAME)) { @@ -289,7 +283,7 @@ void DeviceManagerServiceListener::OnDeviceFound(const ProcessInfo &processInfo, void DeviceManagerServiceListener::OnDiscoveryFailed(const ProcessInfo &processInfo, uint16_t subscribeId, int32_t failedReason) { - LOGI("DeviceManagerServiceListener::OnDiscoveryFailed"); + LOGI("OnDiscoveryFailed"); std::shared_ptr pReq = std::make_shared(); std::shared_ptr pRsp = std::make_shared(); @@ -302,7 +296,7 @@ void DeviceManagerServiceListener::OnDiscoveryFailed(const ProcessInfo &processI void DeviceManagerServiceListener::OnDiscoverySuccess(const ProcessInfo &processInfo, int32_t subscribeId) { - LOGI("DeviceManagerServiceListener::OnDiscoverySuccess"); + LOGI("OnDiscoverySuccess"); std::shared_ptr pReq = std::make_shared(); std::shared_ptr pRsp = std::make_shared(); @@ -315,7 +309,7 @@ void DeviceManagerServiceListener::OnDiscoverySuccess(const ProcessInfo &process void DeviceManagerServiceListener::OnPublishResult(const std::string &pkgName, int32_t publishId, int32_t publishResult) { - LOGI("DeviceManagerServiceListener::OnPublishResult : %{public}d", publishResult); + LOGI("OnPublishResult : %{public}d", publishResult); std::shared_ptr pReq = std::make_shared(); std::shared_ptr pRsp = std::make_shared(); @@ -425,7 +419,7 @@ void DeviceManagerServiceListener::OnUnbindResult(const ProcessInfo &processInfo void DeviceManagerServiceListener::OnPinHolderCreate(const ProcessInfo &processInfo, const std::string &deviceId, DmPinType pinType, const std::string &payload) { - LOGI("DeviceManagerServiceListener::OnPinHolderCreate : %{public}s", processInfo.pkgName.c_str()); + LOGI("OnPinHolderCreate : %{public}s", processInfo.pkgName.c_str()); std::shared_ptr pReq = std::make_shared(); std::shared_ptr pRsp = std::make_shared(); @@ -440,7 +434,7 @@ void DeviceManagerServiceListener::OnPinHolderCreate(const ProcessInfo &processI void DeviceManagerServiceListener::OnPinHolderDestroy(const ProcessInfo &processInfo, DmPinType pinType, const std::string &payload) { - LOGI("DeviceManagerServiceListener::OnPinHolderDestroy : %{public}s", processInfo.pkgName.c_str()); + LOGI("OnPinHolderDestroy : %{public}s", processInfo.pkgName.c_str()); std::shared_ptr pReq = std::make_shared(); std::shared_ptr pRsp = std::make_shared(); @@ -453,7 +447,7 @@ void DeviceManagerServiceListener::OnPinHolderDestroy(const ProcessInfo &process void DeviceManagerServiceListener::OnCreateResult(const ProcessInfo &processInfo, int32_t result) { - LOGI("DeviceManagerServiceListener::OnCreateResult : %{public}d", result); + LOGI("OnCreateResult : %{public}d", result); std::shared_ptr pReq = std::make_shared(); std::shared_ptr pRsp = std::make_shared(); @@ -465,7 +459,7 @@ void DeviceManagerServiceListener::OnCreateResult(const ProcessInfo &processInfo void DeviceManagerServiceListener::OnDestroyResult(const ProcessInfo &processInfo, int32_t result) { - LOGI("DeviceManagerServiceListener::OnDestroyResult : %{public}d", result); + LOGI("OnDestroyResult : %{public}d", result); std::shared_ptr pReq = std::make_shared(); std::shared_ptr pRsp = std::make_shared(); @@ -493,7 +487,6 @@ void DeviceManagerServiceListener::OnPinHolderEvent(const ProcessInfo &processIn #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) int32_t DeviceManagerServiceListener::ConvertUdidHashToAnoyAndSave(const std::string &pkgName, DmDeviceInfo &deviceInfo) { - LOGD("pkgName %{public}s.", pkgName.c_str()); std::string appId = ""; if (AppManager::GetInstance().GetAppIdByPkgName(pkgName, appId) != DM_OK) { LOGD("GetAppIdByPkgName failed"); @@ -519,7 +512,6 @@ int32_t DeviceManagerServiceListener::ConvertUdidHashToAnoyAndSave(const std::st int32_t DeviceManagerServiceListener::ConvertUdidHashToAnoyDeviceId(const std::string &pkgName, const std::string &udidHash, std::string &anoyDeviceId) { - LOGI("pkgName %{public}s, udidHash %{public}s.", pkgName.c_str(), GetAnonyString(udidHash).c_str()); std::string appId = ""; if (AppManager::GetInstance().GetAppIdByPkgName(pkgName, appId) != DM_OK) { LOGD("GetAppIdByPkgName failed"); @@ -658,6 +650,7 @@ void DeviceManagerServiceListener::OnAppUnintall(const std::string &pkgName) void DeviceManagerServiceListener::OnSinkBindResult(const ProcessInfo &processInfo, const PeerTargetId &targetId, int32_t result, int32_t status, std::string content) { + LOGI("pkgName %{public}s, userId %{public}d.", processInfo.pkgName.c_str(), processInfo.userId); std::shared_ptr pReq = std::make_shared(); std::shared_ptr pRsp = std::make_shared(); if (status < STATUS_DM_AUTH_FINISH && status > STATUS_DM_AUTH_DEFAULT) { @@ -954,6 +947,19 @@ void DeviceManagerServiceListener::OnGetDeviceProfileInfoListResult(const Proces std::shared_ptr pRsp = std::make_shared(); pReq->SetPkgName(processInfo.pkgName); pReq->SetDeviceProfileInfoList(deviceProfileInfos); +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + std::string userDefinedDeviceName = DeviceNameManager::GetInstance().GetUserDefinedDeviceName(); + if (code == DM_OK && !userDefinedDeviceName.empty()) { + std::vector temVec = deviceProfileInfos; + for (auto &item : temVec) { + if (item.isLocalDevice) { + item.deviceName = userDefinedDeviceName; + break; + } + } + pReq->SetDeviceProfileInfoList(temVec); + } +#endif pReq->SetResult(code); pReq->SetProcessInfo(processInfo); ipcServerListener_.SendRequest(GET_DEVICE_PROFILE_INFO_LIST_RESULT, pReq, pRsp); @@ -985,6 +991,8 @@ void DeviceManagerServiceListener::OnSetLocalDeviceNameResult(const ProcessInfo if (code == DM_OK) { DeviceNameManager::GetInstance().ModifyUserDefinedName(deviceName); } +#else + (void) deviceName; #endif ipcServerListener_.SendRequest(SET_LOCAL_DEVICE_NAME_RESULT, pReq, pRsp); } @@ -999,7 +1007,27 @@ void DeviceManagerServiceListener::OnSetRemoteDeviceNameResult(const ProcessInfo pReq->SetDeviceId(deviceId); pReq->SetResult(code); pReq->SetProcessInfo(processInfo); + (void) deviceName; ipcServerListener_.SendRequest(SET_REMOTE_DEVICE_NAME_RESULT, pReq, pRsp); } + +std::string DeviceManagerServiceListener::GetLocalDisplayDeviceNameForPrivacy() +{ +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + return DeviceNameManager::GetInstance().GetLocalDisplayDeviceNameForPrivacy(); +#else + return ""; +#endif +} + +int32_t DeviceManagerServiceListener::OpenAuthSessionWithPara(const std::string &deviceId, + int32_t actionId, bool isEnable160m) +{ +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) + return DeviceManagerService::GetInstance().OpenAuthSessionWithPara(deviceId, actionId, isEnable160m); +#else + return DM_OK; +#endif +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/src/devicenamemgr/account_boot_listener.cpp b/services/service/src/devicenamemgr/account_boot_listener.cpp deleted file mode 100644 index 1149c397524c87e564e9ddeac0499bdc4fd3d324..0000000000000000000000000000000000000000 --- a/services/service/src/devicenamemgr/account_boot_listener.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "account_boot_listener.h" -#include "common_event_support.h" -#include "parameter.h" - -#include "dm_log.h" -#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) -#include "ffrt.h" -#endif - -namespace OHOS { -namespace DistributedHardware { -namespace { - const char * const BOOTEVENT_ACCOUNT_READY = "bootevent.account.ready"; -#if (defined(__LITEOS_M__) || defined(LITE_DEVICE)) - const char * const ACCOUNT_BOOT_EVENT = "account_boot_event"; -#endif -} - -std::mutex AccountBootListener::depSaStatelock_; - -static void AccountBootCb(const char *key, const char *value, void *context) -{ - if (key == nullptr || value == nullptr || context == nullptr) { - LOGE("key or value or context is null, param is error!"); - return; - } - if (strcmp(key, BOOTEVENT_ACCOUNT_READY) != 0 || strcmp(value, "true") != 0) { - return; - } - AccountBootListener *accountBootListener = static_cast(context); - - if (accountBootListener == nullptr) { - LOGE("accountBootListener is null"); - return; - } - LOGI("Trigger"); -#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) - ffrt::submit([=]() { accountBootListener->DoAccountBootProc(); }); -#else - std::thread dealThread([=]() { - accountBootListener->DoAccountBootProc(); - }); - int32_t ret = pthread_setname_np(dealThread.native_handle(), ACCOUNT_BOOT_EVENT); - if (ret != DM_OK) { - LOGE("dealThread setname failed."); - } - dealThread.detach(); -#endif -} - -AccountBootListener::AccountBootListener() : isRegAccountBootCb_(false), - localDeviceMgr_(std::make_shared()), isDmSaReady_(false), isDataShareReady_(false), - dataShareCommonEventManager_(std::make_shared()) -{ - LOGI("Ctor AccountBootListener"); -} - -AccountBootListener::~AccountBootListener() -{ - LOGI("Dtor AccountBootListener"); -} - -void AccountBootListener::RegisterAccountBootCb() -{ - if (isRegAccountBootCb_) { - return; - } - LOGI("start"); - int32_t ret = WatchParameter(BOOTEVENT_ACCOUNT_READY, AccountBootCb, this); - if (ret != 0) { - LOGE("watch account boot event fail"); - } - isRegAccountBootCb_ = true; -} - -void AccountBootListener::DoAccountBootProc() -{ - LOGI("start"); - if (localDeviceMgr_ == nullptr) { - LOGE("localDeviceMgr_ is null"); - return; - } - localDeviceMgr_->RegisterDeviceNameChangeCb(); - localDeviceMgr_->RegisterDisplayNameChangeCb(); - localDeviceMgr_->QueryLocalDisplayName(); - localDeviceMgr_->QueryLocalDeviceName(); -} - -void AccountBootListener::SetSaTriggerFlag(SaTriggerFlag triggerFlag) -{ - LOGI("start"); - std::lock_guard lock(depSaStatelock_); - switch (triggerFlag) { - case SaTriggerFlag::DM_SA_READY: - isDmSaReady_ = true; - LOGI("DM SA ready!"); - break; - case SaTriggerFlag::DATA_SHARE_SA_REDDY: - LOGI("DATA SHARE SA ready!"); - this->InitDataShareEvent(); - break; - default: - break; - } - LOGI("isDmSaReady_: %{public}d, isDataShareReady_: %{public}d", - std::atomic_load(&isDmSaReady_), std::atomic_load(&isDataShareReady_)); - if (isDmSaReady_ && isDataShareReady_) { - LOGI("dm and data_share is ready!"); - this->RegisterAccountBootCb(); - } -} - -void AccountBootListener::InitDataShareEvent() -{ - LOGI("Start"); - if (dataShareCommonEventManager_ == nullptr) { - dataShareCommonEventManager_ = std::make_shared(); - } - DataShareEventCallback callback = [=]() { - this->DataShareCallback(); - }; - std::vector dataShareEventVec; - dataShareEventVec.emplace_back(EventFwk::CommonEventSupport::COMMON_EVENT_DATA_SHARE_READY); - if (dataShareCommonEventManager_->SubscribeDataShareCommonEvent(dataShareEventVec, callback)) { - LOGI("Success"); - } - return; -} - -void AccountBootListener::DataShareCallback() -{ - LOGI("Start"); - std::lock_guard lock(depSaStatelock_); - isDataShareReady_ = true; - LOGI("isDmSaReady_: %{public}d, isDataShareReady_: %{public}d", - std::atomic_load(&isDmSaReady_), std::atomic_load(&isDataShareReady_)); - if (isDmSaReady_ && isDataShareReady_) { - LOGI("dm and data_share is ready!"); - this->RegisterAccountBootCb(); - } -} - -std::string AccountBootListener::GetLocalDisplayName() const -{ - if (localDeviceMgr_ == nullptr) { - LOGE("logcalDeviceMgr_ is null"); - return ""; - } - return localDeviceMgr_->GetLocalDisplayName(); -} - -std::string AccountBootListener::GetLocalDeviceName() const -{ - if (localDeviceMgr_ == nullptr) { - LOGE("logcalDeviceMgr_ is null"); - return ""; - } - return localDeviceMgr_->GetLocalDeviceName(); -} -} // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file diff --git a/services/service/src/devicenamemgr/device_name_manager.cpp b/services/service/src/devicenamemgr/device_name_manager.cpp index 8129fc2139c0e6e50b553f5f252f88c0c633d76f..537f9d81cd47da492723eca94a22d28738df7c6a 100644 --- a/services/service/src/devicenamemgr/device_name_manager.cpp +++ b/services/service/src/devicenamemgr/device_name_manager.cpp @@ -41,13 +41,16 @@ const std::string SETTINGS_GENERAL_USER_DEFINED_DEVICE_NAME = "settings.general. const std::string SETTINGS_GENERAL_DISPLAY_DEVICE_NAME_STATE = "settings.general.display_device_name_state"; const std::string SETTING_COLUMN_VALUE = "VALUE"; const std::string SETTING_COLUMN_KEYWORD = "KEYWORD"; +constexpr int32_t NUM0 = 0; constexpr int32_t NUM1 = 1; constexpr int32_t NUM2 = 2; constexpr int32_t NUM3 = 3; constexpr int32_t NUM4 = 4; +constexpr int32_t NUM6 = 6; constexpr int32_t NUM18 = 18; constexpr int32_t NUM21 = 21; constexpr int32_t NUM24 = 24; +const std::string ANOY_STRING = "***"; constexpr int32_t DEFAULT_DEVICE_NAME_MAX_LENGTH = 12; constexpr int32_t NAME_LENGTH_MIN = 18; constexpr int32_t NAME_LENGTH_MAX = 100; @@ -77,6 +80,7 @@ void DeviceNameManager::DataShareReady() if (DependsIsReady()) { int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); InitDeviceName(userId); + RegisterDeviceNameChangeMonitor(userId, DEFAULT_USER_ID); } } @@ -112,6 +116,7 @@ int32_t DeviceNameManager::InitDeviceNameWhenSoftBusReady() if (DependsIsReady()) { int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); InitDeviceName(userId); + RegisterDeviceNameChangeMonitor(userId, DEFAULT_USER_ID); } return DM_OK; } @@ -135,6 +140,7 @@ int32_t DeviceNameManager::InitDeviceNameWhenUserSwitch(int32_t curUserId, int32 LOGI("In"); if (DependsIsReady()) { InitDeviceName(curUserId); + RegisterDeviceNameChangeMonitor(curUserId, preUserId); } return DM_OK; } @@ -169,6 +175,24 @@ int32_t DeviceNameManager::InitDeviceNameWhenNickChange() return DM_OK; } +int32_t DeviceNameManager::InitDeviceNameWhenLanguageOrRegionChanged() +{ + LOGI("In"); + if (DependsIsReady()) { + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); + InitDeviceName(userId); + } + return DM_OK; +} + +std::string DeviceNameManager::GetUserDefinedDeviceName() +{ + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); + std::string userDefinedDeviceName = ""; + GetUserDefinedDeviceName(userId, userDefinedDeviceName); + return userDefinedDeviceName; +} + int32_t DeviceNameManager::InitDeviceNameWhenNameChange(int32_t userId) { LOGI("In"); @@ -253,7 +277,7 @@ void DeviceNameManager::InitDeviceName(int32_t userId) { LOGI("In userId:%{public}d", userId); if (userId == -1) { - LOGI("userId:%{public}d is invalid", userId); + LOGE("userId:%{public}d is invalid", userId); return; } std::string userDefinedDeviceName = ""; @@ -304,7 +328,7 @@ void DeviceNameManager::InitDeviceNameToSoftBus(const std::string &prefixName, c int32_t DeviceNameManager::GetLocalDisplayDeviceName(int32_t maxNamelength, std::string &displayName) { - int32_t userId = 0; + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); if (maxNamelength < 0 || (maxNamelength > 0 && maxNamelength < NAME_LENGTH_MIN) || maxNamelength > NAME_LENGTH_MAX) { LOGE("maxNamelength:%{public}d is invalid", maxNamelength); @@ -317,13 +341,42 @@ int32_t DeviceNameManager::GetLocalDisplayDeviceName(int32_t maxNamelength, std: displayName = GetLocalDisplayDeviceName("", userDefinedDeviceName, maxNamelength); return DM_OK; } - MultipleUserConnector::GetCallerUserId(userId); std::string nickName = MultipleUserConnector::GetAccountNickName(userId); std::string localMarketName = GetLocalMarketName(); displayName = GetLocalDisplayDeviceName(nickName, localMarketName, maxNamelength); return DM_OK; } +std::string DeviceNameManager::GenLocalAnoyDeviceNameWithNickAndMarketName(const std::string &nickName, + const std::string &marketName) +{ + if (nickName.empty()) { + return marketName; + } + + std::string anoyNickName = AnoyPrivacyString(nickName); + std::string nameSeparator = NAME_SEPARATOR_ZH; + if (GetSystemLanguage() != LANGUAGE_ZH_HANS || GetSystemRegion() != LOCAL_ZH_HANS_CN) { + nameSeparator = NAME_SEPARATOR_OTHER; + } + + return anoyNickName + nameSeparator + marketName; +} + +std::string DeviceNameManager::GetLocalDisplayDeviceNameForPrivacy() +{ + int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); + std::string userDefinedDeviceName = ""; + GetUserDefinedDeviceName(userId, userDefinedDeviceName); + if (!userDefinedDeviceName.empty()) { + return AnoyPrivacyString(userDefinedDeviceName); + } + + std::string nickName = MultipleUserConnector::GetAccountNickName(userId); + std::string localMarketName = GetLocalMarketName(); + return GenLocalAnoyDeviceNameWithNickAndMarketName(nickName, localMarketName); +} + std::string DeviceNameManager::GetLocalDisplayDeviceName(const std::string &prefixName, const std::string &subffixName, int32_t maxNameLength) { @@ -383,7 +436,7 @@ int32_t DeviceNameManager::ModifyUserDefinedName(const std::string &deviceName) int32_t DeviceNameManager::RestoreLocalDeviceName() { - LOGI("In"); + LOGI("DeviceNameManager In"); int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); SetUserDefinedDeviceName("", userId); SetDisplayDeviceNameState("", userId); @@ -397,12 +450,18 @@ int32_t DeviceNameManager::RestoreLocalDeviceName() int32_t DeviceNameManager::InitDisplayDeviceNameToSettingsData(const std::string &nickName, const std::string &deviceName, int32_t userId) { +#if defined(SUPPORT_WISEDEVICE) std::string newDisplayName = GetLocalDisplayDeviceName(nickName, deviceName, 0); std::string oldDisplayName = ""; GetDisplayDeviceName(userId, oldDisplayName); if (oldDisplayName != newDisplayName) { SetDisplayDeviceName(newDisplayName, userId); } +#else + (void) nickName; + (void) deviceName; + (void) userId; +#endif // SUPPORT_WISEDEVICE return DM_OK; } @@ -411,6 +470,65 @@ int32_t DeviceNameManager::GetUserDefinedDeviceName(int32_t userId, std::string return GetValue(SETTINGSDATA_SECURE, userId, SETTINGS_GENERAL_USER_DEFINED_DEVICE_NAME, deviceName); } +std::string DeviceNameManager::AnoyPrivacyString(const std::string &str) +{ + std::vector wholeCharVec = ConvertToWholeCharacter(str); + if (wholeCharVec.size() == NUM0) { + return ""; + } + if (wholeCharVec.size() == NUM1) { + return wholeCharVec[0]; + } + + std::string res; + if (wholeCharVec.size() > NUM1 && wholeCharVec.size() <= NUM6) { + uint32_t leftLen = wholeCharVec.size() / 2; + for (uint32_t i = 0; i < leftLen; i++) { + res += wholeCharVec[i]; + } + res += ANOY_STRING; + return res; + } + + for (int32_t i = 0; i < NUM3; i++) { + res += wholeCharVec[i]; + } + res += ANOY_STRING; + for (size_t j = wholeCharVec.size() - NUM3; j < wholeCharVec.size(); j++) { + res += wholeCharVec[j]; + } + return res; +} + +std::vector DeviceNameManager::ConvertToWholeCharacter(const std::string &str) +{ + std::vector wholeCharacterVec; + int32_t length = static_cast(str.size()); + for (int32_t i = 0; i < length;) { + unsigned char c = static_cast(str[i]); + int numBytes = NUM1; + if ((c & 0x80) == 0) { + numBytes = NUM1; + } else if ((c & 0xE0) == 0xC0) { + numBytes = NUM2; + } else if ((c & 0xF0) == 0xE0) { + numBytes = NUM3; + } else if ((c & 0xF8) == 0xF0) { + numBytes = NUM4; + } else { + LOGE("Invalid characters"); + return {}; + } + if (i + numBytes > length) { + break; + } + std::string substr(str.begin() + i, str.begin() + i + numBytes); + wholeCharacterVec.emplace_back(substr); + i += numBytes; + } + return wholeCharacterVec; +} + std::string DeviceNameManager::SubstrByBytes(const std::string &str, int32_t maxNumBytes) { int32_t length = static_cast(str.size()); @@ -479,23 +597,22 @@ std::string DeviceNameManager::GetSystemRegion() if (status > 0) { return param; } - LOGE("Failed to get system local"); + LOGE("Failed to get system region"); return ""; } std::string DeviceNameManager::GetLocalMarketName() { std::lock_guard lock(localMarketNameMtx_); - if (!localMarketName_.empty()) { - return localMarketName_; - } - const char *marketName = GetMarketName(); - if (marketName == nullptr) { - LOGE("get marketName fail!"); - return ""; + if (localMarketName_.empty()) { + const char *marketName = GetMarketName(); + if (marketName == nullptr) { + LOGE("get marketName fail!"); + return ""; + } + localMarketName_ = marketName; + free((char *)marketName); } - localMarketName_ = marketName; - free((char *)marketName); std::vector prefixs = DeviceManagerService::GetInstance().GetDeviceNamePrefixs(); for (const auto &item : prefixs) { localMarketName_ = TrimStr(ReplaceStr(localMarketName_, item, "")); @@ -506,7 +623,7 @@ std::string DeviceNameManager::GetLocalMarketName() int32_t DeviceNameManager::SetUserDefinedDeviceName(const std::string &deviceName, int32_t userId) { - LOGI("SetUserDefinedDeviceName:%{public}s, userId:%{publid}d", GetAnonyString(deviceName).c_str(), userId); + LOGI("SetUserDefinedDeviceName:%{public}s, userId:%{public}d", GetAnonyString(deviceName).c_str(), userId); return SetValue(SETTINGSDATA_SECURE, userId, SETTINGS_GENERAL_USER_DEFINED_DEVICE_NAME, deviceName); } @@ -517,17 +634,17 @@ int32_t DeviceNameManager::GetDisplayDeviceName(int32_t userId, std::string &dev int32_t DeviceNameManager::SetDisplayDeviceNameState(const std::string &state, int32_t userId) { - LOGI("SetDisplayDeviceNameState:%{public}s, userId:%{publid}d", state.c_str(), userId); + LOGI("SetDisplayDeviceNameState:%{public}s, userId:%{public}d", state.c_str(), userId); return SetValue(SETTINGSDATA_SECURE, userId, SETTINGS_GENERAL_DISPLAY_DEVICE_NAME_STATE, state); } int32_t DeviceNameManager::SetDisplayDeviceName(const std::string &deviceName, int32_t userId) { if (deviceName.empty()) { - LOGE("SetDisplayDeviceName deviceName is empty, userId:%{publid}d", userId); + LOGE("SetDisplayDeviceName deviceName is empty, userId:%{public}d", userId); return ERR_DM_NAME_EMPTY; } - LOGI("SetDisplayDeviceName:%{public}s, userId:%{publid}d", GetAnonyString(deviceName).c_str(), userId); + LOGI("SetDisplayDeviceName:%{public}s, userId:%{public}d", GetAnonyString(deviceName).c_str(), userId); return SetValue(SETTINGSDATA_SECURE, userId, SETTINGS_GENERAL_DISPLAY_DEVICE_NAME, deviceName); } diff --git a/services/service/src/devicenamemgr/local_device_name_mgr.cpp b/services/service/src/devicenamemgr/local_device_name_mgr.cpp deleted file mode 100644 index 4c9e616ba4894eba46ca80207851dd3ecad4d883..0000000000000000000000000000000000000000 --- a/services/service/src/devicenamemgr/local_device_name_mgr.cpp +++ /dev/null @@ -1,293 +0,0 @@ -/* - * Copyright (c) 2024-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "local_device_name_mgr.h" - -#include "datashare_result_set.h" -#include "ohos_account_kits.h" -#include "os_account_manager.h" -#include "iservice_registry.h" -#include "system_ability_definition.h" -#include "uri.h" - -#include "device_manager_service.h" -#include "dm_error_type.h" -#include "dm_log.h" -#include "settings_data_event_monitor.h" - -namespace OHOS { -namespace DistributedHardware { -namespace { - const std::string SETTINGS_DATA_BASE_URI = - "datashare:///com.ohos.settingsdata/entry/settingsdata/SETTINGSDATA?Proxy=true"; - const std::string SETTINGS_DATA_SECURE_URI = - "datashare:///com.ohos.settingsdata/entry/settingsdata/USER_SETTINGSDATA_SECURE_"; - constexpr const char *SETTINGS_DATA_EXT_URI = "datashare:///com.ohos.settingsdata.DataAbility"; - constexpr const char *SETTINGS_DATA_FIELD_KEYWORD = "KEYWORD"; - constexpr const char *SETTINGS_DATA_FIELD_VALUE = "VALUE"; - constexpr const char *PREDICATES_STRING = "settings.general.device_name"; - constexpr const char *USER_DEFINED_STRING = "settings.general.user_defined_device_name"; - constexpr const char *DISPLAY_DEVICE_NAME_STRING = "settings.general.display_device_name"; -} - -std::mutex LocalDeviceNameMgr::devNameMtx_; - -LocalDeviceNameMgr::LocalDeviceNameMgr() : localDeviceName_(""), localDisplayName_("") -{ - LOGI("Ctor LocalDeviceNameMgr"); -} - -LocalDeviceNameMgr::~LocalDeviceNameMgr() -{ - std::lock_guard lock(devNameMtx_); - localDeviceName_ = ""; - localDisplayName_ = ""; - LOGI("Dtor LocalDeviceNameMgr"); -} - -std::shared_ptr LocalDeviceNameMgr::GetDataShareHelper() -{ - sptr saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (saManager == nullptr) { - LOGE("saManager NULL"); - return nullptr; - } - - sptr remoteObject = saManager->GetSystemAbility(DISTRIBUTED_HARDWARE_DEVICEMANAGER_SA_ID); - if (remoteObject == nullptr) { - LOGE("remoteObject NULL"); - return nullptr; - } - return DataShare::DataShareHelper::Creator(remoteObject, SETTINGS_DATA_BASE_URI, SETTINGS_DATA_EXT_URI); -} - -int32_t LocalDeviceNameMgr::GetDeviceNameFromDataShareHelper( - std::shared_ptr dataShareHelper, std::shared_ptr uri, - const char *key, std::string &deviceName) -{ - if (dataShareHelper == nullptr || uri == nullptr || key == nullptr) { - LOGE("dataShareHelper or uri or key is null, param is error!"); - return ERR_DM_FAILED; - } - int32_t numRows = 0; - std::string val; - std::vector columns; - columns.emplace_back(SETTINGS_DATA_FIELD_VALUE); - DataShare::DataSharePredicates predicates; - predicates.EqualTo(SETTINGS_DATA_FIELD_KEYWORD, key); - - auto resultSet = dataShareHelper->Query(*uri, predicates, columns); - if (resultSet == nullptr) { - LOGE("query fail."); - return ERR_DM_FAILED; - } - resultSet->GetRowCount(numRows); - if (numRows <= 0) { - LOGE("row zero."); - resultSet->Close(); - return ERR_DM_FAILED; - } - - int columnIndex; - resultSet->GoToFirstRow(); - resultSet->GetColumnIndex(SETTINGS_DATA_FIELD_VALUE, columnIndex); - if (resultSet->GetString(columnIndex, val) != DM_OK) { - LOGE("GetString val fail"); - resultSet->Close(); - return ERR_DM_FAILED; - } - deviceName = val; - LOGI("deviceName=%{public}s.", deviceName.c_str()); - resultSet->Close(); - return DM_OK; -} - -int32_t LocalDeviceNameMgr::GetDefaultDeviceName(std::shared_ptr dataShareHelper, - std::string &deviceName) -{ - if (dataShareHelper == nullptr) { - LOGE("dataShareHelper is null, param is error!"); - return ERR_DM_FAILED; - } - std::shared_ptr uri = std::make_shared(SETTINGS_DATA_BASE_URI + "&key=" + PREDICATES_STRING); - LOGI("get default deviceName"); - return GetDeviceNameFromDataShareHelper(dataShareHelper, uri, PREDICATES_STRING, deviceName); -} - -int32_t LocalDeviceNameMgr::GetUserDefinedDeviceName(std::shared_ptr dataShareHelper, - std::string &deviceName) -{ - if (dataShareHelper == nullptr) { - LOGE("dataShareHelper is null, param is error!"); - return ERR_DM_FAILED; - } - int32_t osAccountId = GetActiveOsAccountIds(); - if (osAccountId == ERR_DM_FAILED) { - LOGE("osAccountId acquire fail!"); - return ERR_DM_FAILED; - } - std::string accountIdStr = std::to_string(osAccountId); - std::shared_ptr uri = std::make_shared(SETTINGS_DATA_SECURE_URI + accountIdStr + "?Proxy=true&key=" + - USER_DEFINED_STRING); - LOGI("get user defined deviceName, accountId=%{public}s", accountIdStr.c_str()); - return GetDeviceNameFromDataShareHelper(dataShareHelper, uri, USER_DEFINED_STRING, deviceName); -} - -int32_t LocalDeviceNameMgr::GetDisplayDeviceName(std::shared_ptr dataShareHelper, - std::string &deviceName) -{ - if (dataShareHelper == nullptr) { - LOGE("dataShareHelper is null, param is error!"); - return ERR_DM_FAILED; - } - int32_t osAccountId = GetActiveOsAccountIds(); - if (osAccountId == ERR_DM_FAILED) { - LOGE("osAccountId acquire fail!"); - return ERR_DM_FAILED; - } - std::string accountIdStr = std::to_string(osAccountId); - std::shared_ptr uri = std::make_shared(SETTINGS_DATA_SECURE_URI + accountIdStr + "?Proxy=true&key=" + - DISPLAY_DEVICE_NAME_STRING); - LOGI("get user defined deviceName, accountId=%{public}s", accountIdStr.c_str()); - return GetDeviceNameFromDataShareHelper(dataShareHelper, uri, DISPLAY_DEVICE_NAME_STRING, deviceName); -} - -int32_t LocalDeviceNameMgr::GetActiveOsAccountIds() -{ - std::vector accountId; - int32_t ret = OHOS::AccountSA::OsAccountManager::QueryActiveOsAccountIds(accountId); - if (ret != DM_OK || accountId.empty()) { - LOGE("QueryActiveOsAccountIds failed"); - return ERR_DM_FAILED; - } - LOGI("account id=%{public}d", accountId[0]); - return accountId[0]; -} - -int32_t LocalDeviceNameMgr::QueryLocalDeviceName() -{ - auto dataShareHelper = GetDataShareHelper(); - if (dataShareHelper == nullptr) { - LOGE("dataShareHelper is null"); - return ERR_DM_FAILED; - } - std::string localDeviceName = ""; - int32_t ret = GetUserDefinedDeviceName(dataShareHelper, localDeviceName); - if (ret == DM_OK && !localDeviceName.empty()) { - std::lock_guard lock(devNameMtx_); - localDeviceName_ = localDeviceName; - dataShareHelper->Release(); - LOGI("get user defined deviceName=%{public}s", localDeviceName.c_str()); - - return DM_OK; - } - ret = GetDefaultDeviceName(dataShareHelper, localDeviceName); - if (ret != DM_OK || localDeviceName.empty()) { - LOGE("get default deviceName failed"); - return ERR_DM_FAILED; - } - std::lock_guard lock(devNameMtx_); - localDeviceName_ = localDeviceName; - dataShareHelper->Release(); - LOGI("get default deviceName=%{public}s", localDeviceName.c_str()); - - return DM_OK; -} - -void LocalDeviceNameMgr::RegisterDeviceNameChangeCb() -{ - auto dataShareHelper = GetDataShareHelper(); - if (dataShareHelper == nullptr) { - LOGE("dataShareHelper is null"); - return; - } - - auto uri = std::make_shared(SETTINGS_DATA_BASE_URI + "&key=" + PREDICATES_STRING); - sptr settingDataObserver = - sptr(new SettingsDataEventMonitor(shared_from_this(), - SettingsDataMonitorType::USER_DEFINED_DEVICE_NAME_MONITOR)); - dataShareHelper->RegisterObserver(*uri, settingDataObserver); - - int32_t osAccountId = GetActiveOsAccountIds(); - if (osAccountId == ERR_DM_FAILED) { - LOGE("Get OsAccountId error"); - return; - } - std::string accountIdStr = std::to_string(osAccountId); - uri = std::make_shared(SETTINGS_DATA_SECURE_URI + accountIdStr + - "?Proxy=true&key=" + USER_DEFINED_STRING); - - dataShareHelper->RegisterObserver(*uri, settingDataObserver); - dataShareHelper->Release(); - LOGI("register device name change cb success"); -} - -int32_t LocalDeviceNameMgr::QueryLocalDisplayName() -{ - auto dataShareHelper = GetDataShareHelper(); - if (dataShareHelper == nullptr) { - LOGE("dataShareHelper is null"); - return ERR_DM_FAILED; - } - std::string localDisplayName = ""; - int32_t ret = GetDisplayDeviceName(dataShareHelper, localDisplayName); - if (ret != DM_OK || localDisplayName.empty()) { - LOGE("get display device name failed"); - return ERR_DM_FAILED; - } - std::lock_guard lock(devNameMtx_); - localDisplayName_ = localDisplayName; - dataShareHelper->Release(); - LOGI("get display deviceName=%{public}s", localDisplayName.c_str()); - return DM_OK; -} - -void LocalDeviceNameMgr::RegisterDisplayNameChangeCb() -{ - auto dataShareHelper = GetDataShareHelper(); - if (dataShareHelper == nullptr) { - LOGE("dataShareHelper is null"); - return; - } - - int32_t osAccountId = GetActiveOsAccountIds(); - if (osAccountId == ERR_DM_FAILED) { - LOGE("Get OsAccountId error"); - return; - } - std::string accountIdStr = std::to_string(osAccountId); - auto uri = std::make_shared(SETTINGS_DATA_SECURE_URI + accountIdStr + - "?Proxy=true&key=" + DISPLAY_DEVICE_NAME_STRING); - sptr settingDataObserver = - sptr(new SettingsDataEventMonitor(shared_from_this(), - SettingsDataMonitorType::DISPLAY_DEVICE_NAME_MONITOR)); - dataShareHelper->RegisterObserver(*uri, settingDataObserver); - dataShareHelper->Release(); - LOGI("register display device name change cb success"); -} - -std::string LocalDeviceNameMgr::GetLocalDisplayName() const -{ - std::lock_guard lock(devNameMtx_); - return localDisplayName_; -} - -std::string LocalDeviceNameMgr::GetLocalDeviceName() const -{ - std::lock_guard lock(devNameMtx_); - return localDeviceName_; -} -} // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file diff --git a/services/service/src/discovery/discovery_manager.cpp b/services/service/src/discovery/discovery_manager.cpp index 19193d0bda9879676d22914bbbb6b737432b2ea8..87db35c87dca8f82e0c7917f46a19e81ebae38e3 100644 --- a/services/service/src/discovery/discovery_manager.cpp +++ b/services/service/src/discovery/discovery_manager.cpp @@ -59,11 +59,11 @@ DiscoveryManager::~DiscoveryManager() int32_t DiscoveryManager::EnableDiscoveryListener(const std::string &pkgName, const std::map &discoverParam, const std::map &filterOptions) { - LOGI("DiscoveryManager::EnableDiscoveryListener begin for pkgName = %{public}s.", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } + LOGI("begin for pkgName = %{public}s.", pkgName.c_str()); std::string pkgNameTemp = AddMultiUserIdentify(pkgName); DmSubscribeInfo dmSubInfo; dmSubInfo.subscribeId = DM_INVALID_FLAG_ID; @@ -78,21 +78,22 @@ int32_t DiscoveryManager::EnableDiscoveryListener(const std::string &pkgName, UpdateInfoFreq(discoverParam, dmSubInfo); if (discoverParam.find(PARAM_KEY_META_TYPE) != discoverParam.end()) { std::string metaType = discoverParam.find(PARAM_KEY_META_TYPE)->second; - LOGI("EnableDiscoveryListener, input MetaType = %{public}s in discoverParam map.", metaType.c_str()); + LOGI("input MetaType = %{public}s.", metaType.c_str()); } if (discoverParam.find(PARAM_KEY_SUBSCRIBE_ID) != discoverParam.end() && IsNumberString((discoverParam.find(PARAM_KEY_SUBSCRIBE_ID)->second))) { - uint16_t externalSubId = std::atoi((discoverParam.find(PARAM_KEY_SUBSCRIBE_ID)->second).c_str()); + uint16_t externalSubId = + static_cast(std::atoi((discoverParam.find(PARAM_KEY_SUBSCRIBE_ID)->second).c_str())); dmSubInfo.subscribeId = GenInnerSubId(pkgNameTemp, externalSubId); } if (discoverParam.find(PARAM_KEY_DISC_CAPABILITY) != discoverParam.end()) { std::string capability = discoverParam.find(PARAM_KEY_DISC_CAPABILITY)->second; if (strcpy_s(dmSubInfo.capability, DM_MAX_DEVICE_CAPABILITY_LEN, capability.c_str()) != EOK) { - LOGI("EnableDiscoveryListener failed, capability copy err."); + LOGE("failed, capability copy err."); return ERR_DM_ENABLE_DISCOVERY_LISTENER_FAILED; } } - LOGI("EnableDiscoveryListener capability = %{public}s,", std::string(dmSubInfo.capability).c_str()); + LOGI("capability = %{public}s,", std::string(dmSubInfo.capability).c_str()); { std::lock_guard capLock(capabilityMapLocks_); capabilityMap_[pkgNameTemp] = std::string(dmSubInfo.capability); @@ -100,7 +101,7 @@ int32_t DiscoveryManager::EnableDiscoveryListener(const std::string &pkgName, UpdateInfoMedium(discoverParam, dmSubInfo); int32_t ret = softbusListener_->RefreshSoftbusLNN(DM_PKG_NAME, dmSubInfo, LNN_DISC_CAPABILITY); if (ret != DM_OK) { - LOGE("EnableDiscoveryListener failed, softbus refresh lnn ret: %{public}d.", ret); + LOGE("failed, softbus refresh lnn ret: %{public}d.", ret); return ret; } softbusListener_->RegisterSoftbusLnnOpsCbk(pkgNameTemp, shared_from_this()); @@ -110,11 +111,11 @@ int32_t DiscoveryManager::EnableDiscoveryListener(const std::string &pkgName, int32_t DiscoveryManager::DisableDiscoveryListener(const std::string &pkgName, const std::map &extraParam) { - LOGI("DiscoveryManager::DisableDiscoveryListener begin for pkgName = %{public}s.", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } + LOGI("begin for pkgName = %{public}s.", pkgName.c_str()); std::string pkgNameTemp = RemoveMultiUserIdentify(pkgName); if (extraParam.find(PARAM_KEY_META_TYPE) != extraParam.end()) { LOGI("DisableDiscoveryListener, input MetaType = %{public}s", @@ -123,7 +124,8 @@ int32_t DiscoveryManager::DisableDiscoveryListener(const std::string &pkgName, uint16_t innerSubId = DM_INVALID_FLAG_ID; if (extraParam.find(PARAM_KEY_SUBSCRIBE_ID) != extraParam.end() && IsNumberString(extraParam.find(PARAM_KEY_SUBSCRIBE_ID)->second)) { - uint16_t externalSubId = std::atoi((extraParam.find(PARAM_KEY_SUBSCRIBE_ID)->second).c_str()); + uint16_t externalSubId = + static_cast(std::atoi((extraParam.find(PARAM_KEY_SUBSCRIBE_ID)->second).c_str())); innerSubId = GetAndRemoveInnerSubId(pkgNameTemp, externalSubId); } { @@ -143,11 +145,11 @@ int32_t DiscoveryManager::DisableDiscoveryListener(const std::string &pkgName, int32_t DiscoveryManager::StartDiscovering(const std::string &pkgName, const std::map &discoverParam, const std::map &filterOptions) { - LOGI("DiscoveryManager::StartDiscovering begin for pkgName = %{public}s.", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } + LOGI("begin for pkgName = %{public}s.", pkgName.c_str()); std::string pkgNameTemp = AddMultiUserIdentify(pkgName); DmSubscribeInfo dmSubInfo; ConfigDiscParam(discoverParam, &dmSubInfo); @@ -183,7 +185,6 @@ int32_t DiscoveryManager::StartDiscovering(const std::string &pkgName, void DiscoveryManager::ConfigDiscParam(const std::map &discoverParam, DmSubscribeInfo *dmSubInfo) { - LOGI("DiscoveryManager::ConfigDiscParam"); if (dmSubInfo == nullptr) { LOGE("ConfigDiscParam failed, dmSubInfo is nullptr."); return; @@ -218,7 +219,7 @@ int32_t DiscoveryManager::StartDiscovering4MineLibary(const std::string &pkgName LOGE("capability copy err."); return ERR_DM_START_DISCOVERING_FAILED; } - LOGI("StartDiscovering for mine meta node process, pkgName = %{public}s, capability = %{public}s", + LOGI("mine meta node process, pkgName = %{public}s, capability = %{public}s", pkgName.c_str(), std::string(dmSubInfo.capability).c_str()); { std::lock_guard capLock(capabilityMapLocks_); @@ -246,7 +247,7 @@ int32_t DiscoveryManager::StartDiscoveringNoMetaType(const std::string &pkgName, LOGE("capability copy err."); return ERR_DM_START_DISCOVERING_FAILED; } - LOGI("StartDiscovering for standard meta node process, pkgName = %{public}s, capability = %{public}s", + LOGI("standard meta node process, pkgName = %{public}s, capability = %{public}s", pkgName.c_str(), std::string(dmSubInfo.capability).c_str()); { @@ -267,33 +268,29 @@ int32_t DiscoveryManager::StartDiscoveringNoMetaType(const std::string &pkgName, int32_t DiscoveryManager::StartDiscovering4MetaType(const std::string &pkgName, DmSubscribeInfo &dmSubInfo, const std::map ¶m) { - LOGI("StartDiscovering for meta node process, input metaType = %{public}s, pkgName = %{public}s", + LOGI("meta node process, input metaType = %{public}s, pkgName = %{public}s", (param.find(PARAM_KEY_META_TYPE)->second).c_str(), pkgName.c_str()); MetaNodeType metaType = (MetaNodeType)(std::atoi((param.find(PARAM_KEY_META_TYPE)->second).c_str())); switch (metaType) { case MetaNodeType::PROXY_SHARE: - LOGI("StartDiscovering4MetaType for share meta node process."); if (strcpy_s(dmSubInfo.capability, DM_MAX_DEVICE_CAPABILITY_LEN, DM_CAPABILITY_SHARE) != EOK) { LOGE("capability copy error."); return ERR_DM_FAILED; } break; case MetaNodeType::PROXY_WEAR: - LOGI("StartDiscovering4MetaType for wear meta node process."); if (strcpy_s(dmSubInfo.capability, DM_MAX_DEVICE_CAPABILITY_LEN, DM_CAPABILITY_WEAR) != EOK) { LOGE("capability copy error."); return ERR_DM_FAILED; } break; case MetaNodeType::PROXY_CASTPLUS: - LOGI("StartDiscovering4MetaType for cast_plus meta node process."); if (strcpy_s(dmSubInfo.capability, DM_MAX_DEVICE_CAPABILITY_LEN, DM_CAPABILITY_CASTPLUS) != EOK) { LOGE("capability copy error."); return ERR_DM_FAILED; } break; default: - LOGE("StartDiscovering4MetaType failed, unsupport meta type : %{public}d.", metaType); return ERR_DM_UNSUPPORTED_METHOD; } @@ -301,7 +298,7 @@ int32_t DiscoveryManager::StartDiscovering4MetaType(const std::string &pkgName, if (param.find(PARAM_KEY_CUSTOM_DATA) != param.end()) { customData = param.find(PARAM_KEY_CUSTOM_DATA)->second; } - LOGI("StartDiscovering4MetaType capability = %{public}s,", std::string(dmSubInfo.capability).c_str()); + LOGI("capability = %{public}s,", std::string(dmSubInfo.capability).c_str()); { std::lock_guard capLock(capabilityMapLocks_); capabilityMap_[pkgName] =std::string(dmSubInfo.capability); @@ -316,23 +313,23 @@ int32_t DiscoveryManager::StartDiscovering4MetaType(const std::string &pkgName, int32_t DiscoveryManager::StopDiscovering(const std::string &pkgName, uint16_t subscribeId) { - LOGI("DiscoveryManager::StopDiscovering begin for pkgName = %{public}s.", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } + LOGI("begin for pkgName = %{public}s.", pkgName.c_str()); std::string pkgNameTemp = RemoveMultiUserIdentify(pkgName); return StopDiscoveringByInnerSubId(pkgNameTemp, subscribeId); } int32_t DiscoveryManager::StopDiscoveringByInnerSubId(const std::string &pkgName, uint16_t subscribeId) { - LOGI("DiscoveryManager::StopDiscovering begin for pkgName = %{public}s.", pkgName.c_str()); if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } - uint16_t innerSubId = GetAndRemoveInnerSubId(pkgName, subscribeId); + LOGI("begin for pkgName = %{public}s.", pkgName.c_str()); + uint16_t innerSubId = static_cast(GetAndRemoveInnerSubId(pkgName, subscribeId)); if (innerSubId == DM_INVALID_FLAG_ID) { LOGE("Invalid parameter, cannot find subscribeId in cache map."); return ERR_DM_INPUT_PARA_INVALID; @@ -457,7 +454,7 @@ bool DiscoveryManager::CompareCapability(uint32_t capabilityType, const std::str void DiscoveryManager::OnDiscoveringResult(const std::string &pkgName, int32_t subscribeId, int32_t result) { - LOGI("DiscoveryManager::OnDiscoveringResult, subscribeId = %{public}d, result = %{public}d.", subscribeId, result); + LOGI("subscribeId = %{public}d, result = %{public}d.", subscribeId, result); int32_t userId = -1; std::string callerPkgName = ""; GetPkgNameAndUserId(pkgName, callerPkgName, userId); @@ -544,7 +541,7 @@ int32_t DiscoveryManager::HandleDiscoveryQueue(const std::string &pkgName, uint1 void DiscoveryManager::HandleDiscoveryTimeout(const std::string &pkgName) { - LOGI("DiscoveryManager::HandleDiscoveryTimeout, pkgName: %{public}s.", pkgName.c_str()); + LOGI("pkgName: %{public}s.", pkgName.c_str()); uint16_t subscribeId = 0; { std::lock_guard autoLock(locks_); @@ -641,13 +638,12 @@ bool DiscoveryManager::IsCommonDependencyReady() } dpConnector_ = func(); isSoLoaded_ = true; - LOGI("IsCommonDependencyReady success."); return true; } bool DiscoveryManager::CloseCommonDependencyObj() { - LOGI("DiscoveryManager::CloseCommonDependencyObj start."); + LOGI("start."); std::lock_guard lock(comDependencyLoadLock); if (!isSoLoaded_ && (dpConnector_ == nullptr) && (dpConnectorHandle_ == nullptr)) { return true; @@ -661,7 +657,6 @@ bool DiscoveryManager::CloseCommonDependencyObj() isSoLoaded_ = false; dpConnector_ = nullptr; dpConnectorHandle_ = nullptr; - LOGI("close libdevicemanagerdependency so success."); return true; } #endif @@ -679,7 +674,7 @@ void DiscoveryManager::ClearDiscoveryCache(const ProcessInfo &processInfo) uint16_t innerSubId = DM_INVALID_FLAG_ID; { std::lock_guard autoLock(subIdMapLocks_); - innerSubId = pkgName2SubIdMap_[pkgNameTemp][it]; + innerSubId = static_cast(pkgName2SubIdMap_[pkgNameTemp][it]); randSubIdSet_.erase(innerSubId); pkgName2SubIdMap_.erase(pkgNameTemp); } diff --git a/services/service/src/hichain/hichain_listener.cpp b/services/service/src/hichain/hichain_listener.cpp index 52870f4babf35fd04f1621193407c1f3b088ce13..1779410c6d9a709ab748459cc7ceb087e551ff10 100644 --- a/services/service/src/hichain/hichain_listener.cpp +++ b/services/service/src/hichain/hichain_listener.cpp @@ -16,6 +16,7 @@ #include "hichain_listener.h" #include "device_manager_service.h" +#include "dm_constants.h" #include "dm_random.h" #include "multiple_user_connector.h" @@ -25,6 +26,7 @@ namespace DistributedHardware { namespace { constexpr uint32_t MAX_DATA_LEN = 65536; constexpr uint32_t DM_IDENTICAL_ACCOUNT = 1; + constexpr uint32_t ACCOUNT_SHARED = 3; constexpr const char* DM_PKG_NAME_EXT = "com.huawei.devicemanager"; } @@ -32,6 +34,10 @@ static DataChangeListener dataChangeListener_ = { .onDeviceUnBound = HichainListener::OnHichainDeviceUnBound, }; +static CredChangeListener credChangeListener_ = { + .onCredDelete = HichainListener::OnCredentialDeleted, +}; + void FromJson(const JsonItemObject &jsonObject, GroupInformation &groupInfo) { if (jsonObject.Contains(FIELD_GROUP_TYPE) && jsonObject.At(FIELD_GROUP_TYPE).IsNumberInteger()) { @@ -81,10 +87,15 @@ HichainListener::HichainListener() LOGI("HichainListener constructor start."); InitDeviceAuthService(); deviceGroupManager_ = GetGmInstance(); + credManager_ = GetCredMgrInstance(); if (deviceGroupManager_ == nullptr) { LOGE("[HICHAIN]failed to init group manager."); return; } + if (credManager_ == nullptr) { + LOGE("[HICHAIN]failed to init cred manager."); + return; + } LOGI("HichainListener::constructor success."); } @@ -96,7 +107,7 @@ HichainListener::~HichainListener() void HichainListener::RegisterDataChangeCb() { - LOGI("HichainListener::RegisterDataChangeCb start"); + LOGI("start"); if (deviceGroupManager_ == nullptr) { LOGE("deviceGroupManager_ is null!"); return; @@ -106,12 +117,27 @@ void HichainListener::RegisterDataChangeCb() LOGE("[HICHAIN]regDataChangeListener failed with ret: %{public}d.", ret); return; } - LOGI("RegisterDataChangeCb success!"); + LOGI("success!"); +} + +void HichainListener::RegisterCredentialCb() +{ + LOGI("start"); + if (credManager_ == nullptr) { + LOGE("credManager_ is null!"); + return; + } + int32_t ret = credManager_->registerChangeListener(DM_PKG_NAME, &credChangeListener_); + if (ret != DM_OK) { + LOGE("[HICHAIN]registerChangeListener failed with ret: %{public}d.", ret); + return; + } + LOGI("success!"); } void HichainListener::OnHichainDeviceUnBound(const char *peerUdid, const char *groupInfo) { - LOGI("HichainListener::onDeviceUnBound start"); + LOGI("start"); if (peerUdid == nullptr || groupInfo == nullptr) { LOGE("peerUdid or groupInfo is null!"); return; @@ -140,9 +166,39 @@ void HichainListener::OnHichainDeviceUnBound(const char *peerUdid, const char *g } } +void HichainListener::OnCredentialDeleted(const char *credId, const char *credInfo) +{ + if (credId == nullptr || credInfo == nullptr) { + LOGE("credId or credInfo is null!"); + return; + } + if (strlen(credId) > MAX_DATA_LEN || strlen(credInfo) > MAX_DATA_LEN) { + LOGE("credId or credInfo is invalid"); + return; + } + LOGI("start, credId: %{public}s.", GetAnonyString(credId).c_str()); + JsonObject jsonObject; + jsonObject.Parse(std::string(credInfo)); + if (jsonObject.IsDiscarded()) { + LOGE("credInfo prase error."); + return; + } + uint32_t credType = 0; + std::string credTypeTag = "credType"; + if (IsInt32(jsonObject, credTypeTag)) { + credType = static_cast(jsonObject[credTypeTag].Get()); + } + if (credType != ACCOUNT_SHARED) { + LOGE("credType %{public}d is invalid.", credType); + return; + } + DeviceManagerService::GetInstance().HandleCredentialDeleted(credId, credInfo); + return; +} + void HichainListener::DeleteAllGroup(const std::string &localUdid, const std::vector &backgroundUserIds) { - LOGI("OnStart HichainListener::DeleteAllGroup"); + LOGI("start"); for (auto &userId : backgroundUserIds) { std::vector groupList; GetRelatedGroups(userId, localUdid, groupList); @@ -182,11 +238,11 @@ int32_t HichainListener::GetRelatedGroupsExt(int32_t userId, const std::string & int32_t HichainListener::GetRelatedGroupsCommon(int32_t userId, const std::string &deviceId, const char* pkgName, std::vector &groupList) { - LOGI("Start to get related groups."); if (userId < 0) { LOGE("user id failed"); return ERR_DM_FAILED; } + LOGI("Start."); uint32_t groupNum = 0; char *returnGroups = nullptr; int32_t ret = diff --git a/services/service/src/ipc/standard/ipc_cmd_parser.cpp b/services/service/src/ipc/standard/ipc_cmd_parser.cpp index 51af6f0ee6451e360800a5ddf0033fcb58c5e272..58517d1567c15030abaa37ca975a1aa5333b1c8b 100644 --- a/services/service/src/ipc/standard/ipc_cmd_parser.cpp +++ b/services/service/src/ipc/standard/ipc_cmd_parser.cpp @@ -45,12 +45,94 @@ #include "ipc_server_client_proxy.h" #include "ipc_server_stub.h" #include "multiple_user_connector.h" +#include "app_manager.h" #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) #include "multiple_user_connector.h" #endif namespace OHOS { namespace DistributedHardware { const unsigned int XCOLLIE_TIMEOUT_S = 5; +constexpr const char* SCENEBOARD_PROCESS = "com.ohos.sceneboard"; +void DecodeDmAccessCaller(MessageParcel &parcel, DmAccessCaller &caller) +{ + caller.accountId = parcel.ReadString(); + caller.pkgName = parcel.ReadString(); + caller.networkId = parcel.ReadString(); + caller.userId = parcel.ReadInt32(); + caller.tokenId = parcel.ReadUint64(); + caller.extra = parcel.ReadString(); +} + +void DecodeDmAccessCallee(MessageParcel &parcel, DmAccessCallee &callee) +{ + callee.accountId = parcel.ReadString(); + callee.networkId = parcel.ReadString(); + callee.peerId = parcel.ReadString(); + callee.pkgName = parcel.ReadString(); + callee.userId = parcel.ReadInt32(); + callee.extra = parcel.ReadString(); + callee.tokenId = parcel.ReadUint64(); +} + +int32_t OnIpcCmd(const DMIpcCmdInterfaceCode &ipcCode, MessageParcel &data, MessageParcel &reply) +{ + LOGI("start ipcCode %{public}d.", static_cast(ipcCode)); + DmAccessCaller caller; + DmAccessCallee callee; + DecodeDmAccessCaller(data, caller); + DecodeDmAccessCallee(data, callee); + bool result = false; + switch (ipcCode) { + case CHECK_ACCESS_CONTROL: + result = DeviceManagerService::GetInstance().CheckAccessControl(caller, callee); + break; + case CHECK_SAME_ACCOUNT: + result = DeviceManagerService::GetInstance().CheckIsSameAccount(caller, callee); + break; + case CHECK_SRC_ACCESS_CONTROL: + result = DeviceManagerService::GetInstance().CheckSrcAccessControl(caller, callee); + break; + case CHECK_SINK_ACCESS_CONTROL: + result = DeviceManagerService::GetInstance().CheckSinkAccessControl(caller, callee); + break; + case CHECK_SRC_SAME_ACCOUNT: + result = DeviceManagerService::GetInstance().CheckSrcIsSameAccount(caller, callee); + break; + case CHECK_SINK_SAME_ACCOUNT: + result = DeviceManagerService::GetInstance().CheckSinkIsSameAccount(caller, callee); + break; + default: + LOGE("invalid ipccode"); + break; + } + if (!reply.WriteBool(result)) { + LOGE("write result failed."); + return ERR_DM_IPC_WRITE_FAILED; + } + return DM_OK; +} + +int32_t SetXcollieTimer() +{ + std::string processName = ""; + AppManager::GetInstance().GetCallerProcessName(processName); + if (processName != SCENEBOARD_PROCESS) { + return DM_OK; + } + return OHOS::HiviewDFX::XCollie::GetInstance().SetTimer("RegisterDeviceManagerListener", XCOLLIE_TIMEOUT_S, + nullptr, nullptr, OHOS::HiviewDFX::XCOLLIE_FLAG_LOG | OHOS::HiviewDFX::XCOLLIE_FLAG_RECOVERY); +} + +void CancelXcollieTimer(int32_t id) +{ + std::string processName = ""; + AppManager::GetInstance().GetCallerProcessName(processName); + if (processName != SCENEBOARD_PROCESS) { + return; + } + OHOS::HiviewDFX::XCollie::GetInstance().CancelTimer(id); +} + bool EncodeDmDeviceInfo(const DmDeviceInfo &devInfo, MessageParcel &parcel) { bool bRet = true; @@ -102,25 +184,6 @@ void DecodePeerTargetId(MessageParcel &parcel, PeerTargetId &targetId) targetId.wifiPort = parcel.ReadUint16(); } -void DecodeDmAccessCaller(MessageParcel &parcel, DmAccessCaller &caller) -{ - caller.accountId = parcel.ReadString(); - caller.pkgName = parcel.ReadString(); - caller.networkId = parcel.ReadString(); - caller.userId = parcel.ReadInt32(); - caller.tokenId = parcel.ReadUint64(); - caller.extra = parcel.ReadString(); -} - -void DecodeDmAccessCallee(MessageParcel &parcel, DmAccessCallee &callee) -{ - callee.accountId = parcel.ReadString(); - callee.networkId = parcel.ReadString(); - callee.peerId = parcel.ReadString(); - callee.userId = parcel.ReadInt32(); - callee.extra = parcel.ReadString(); -} - ON_IPC_SET_REQUEST(SERVER_DEVICE_STATE_NOTIFY, std::shared_ptr pBaseReq, MessageParcel &data) { CHECK_NULL_RETURN(pBaseReq, ERR_DM_FAILED); @@ -393,19 +456,18 @@ ON_IPC_CMD(GET_ALL_TRUST_DEVICE_LIST, MessageParcel &data, MessageParcel &reply) ON_IPC_CMD(REGISTER_DEVICE_MANAGER_LISTENER, MessageParcel &data, MessageParcel &reply) { - int32_t id = OHOS::HiviewDFX::XCollie::GetInstance().SetTimer("RegisterDeviceManagerListener", XCOLLIE_TIMEOUT_S, - nullptr, nullptr, OHOS::HiviewDFX::XCOLLIE_FLAG_LOG | OHOS::HiviewDFX::XCOLLIE_FLAG_RECOVERY); + int32_t timerId = SetXcollieTimer(); std::string pkgName = data.ReadString(); sptr listener = data.ReadRemoteObject(); if (listener == nullptr) { LOGE("read remote object failed."); - OHOS::HiviewDFX::XCollie::GetInstance().CancelTimer(id); + CancelXcollieTimer(timerId); return ERR_DM_POINT_NULL; } sptr callback(new IpcServerClientProxy(listener)); if (callback == nullptr) { LOGE("create ipc server client proxy failed."); - OHOS::HiviewDFX::XCollie::GetInstance().CancelTimer(id); + CancelXcollieTimer(timerId); return ERR_DM_POINT_NULL; } ProcessInfo processInfo; @@ -415,10 +477,10 @@ ON_IPC_CMD(REGISTER_DEVICE_MANAGER_LISTENER, MessageParcel &data, MessageParcel int32_t result = IpcServerStub::GetInstance().RegisterDeviceManagerListener(processInfo, callback); if (!reply.WriteInt32(result)) { LOGE("write result failed"); - OHOS::HiviewDFX::XCollie::GetInstance().CancelTimer(id); + CancelXcollieTimer(timerId); return ERR_DM_IPC_WRITE_FAILED; } - OHOS::HiviewDFX::XCollie::GetInstance().CancelTimer(id); + CancelXcollieTimer(timerId); return DM_OK; } @@ -1367,33 +1429,14 @@ ON_IPC_CMD(CHECK_API_PERMISSION, MessageParcel &data, MessageParcel &reply) ON_IPC_CMD(CHECK_ACCESS_CONTROL, MessageParcel &data, MessageParcel &reply) { - DmAccessCaller caller; - DmAccessCallee callee; - DecodeDmAccessCaller(data, caller); - DecodeDmAccessCallee(data, callee); - int32_t result = DeviceManagerService::GetInstance().CheckAccessControl(caller, callee); - if (!reply.WriteInt32(result)) { - LOGE("write result failed."); - return ERR_DM_IPC_WRITE_FAILED; - } - return DM_OK; + return OnIpcCmd(CHECK_ACCESS_CONTROL, data, reply); } ON_IPC_CMD(CHECK_SAME_ACCOUNT, MessageParcel &data, MessageParcel &reply) { - DmAccessCaller caller; - DmAccessCallee callee; - DecodeDmAccessCaller(data, caller); - DecodeDmAccessCallee(data, callee); - int32_t result = DeviceManagerService::GetInstance().CheckIsSameAccount(caller, callee); - if (!reply.WriteInt32(result)) { - LOGE("write result failed."); - return ERR_DM_IPC_WRITE_FAILED; - } - return DM_OK; + return OnIpcCmd(CHECK_SAME_ACCOUNT, data, reply); } - ON_IPC_CMD(SHIFT_LNN_GEAR, MessageParcel &data, MessageParcel &reply) { std::string pkgName = data.ReadString(); @@ -1775,7 +1818,7 @@ ON_IPC_CMD(UPDATE_LOCALSERVICE_INFO, MessageParcel &data, MessageParcel &reply) ON_IPC_CMD(GET_SERVICEINFO_BYBUNDLENAME_PINEXCHANGETYPE, MessageParcel &data, MessageParcel &reply) { std::string bundleName = data.ReadString(); - int64_t pinExchangeType = data.ReadInt32(); + int32_t pinExchangeType = data.ReadInt32(); DMLocalServiceInfo serviceInfo; int32_t result = DeviceManagerService::GetInstance().GetLocalServiceInfoByBundleNameAndPinExchangeType( bundleName, pinExchangeType, serviceInfo); @@ -1858,8 +1901,8 @@ ON_IPC_SET_REQUEST(SET_REMOTE_DEVICE_NAME_RESULT, std::shared_ptr pBaseR return ERR_DM_IPC_WRITE_FAILED; } std::string deviceId = pReq->GetDeviceId(); - if (!data.WriteString(pkgName)) { - LOGE("write pkgName failed"); + if (!data.WriteString(deviceId)) { + LOGE("write deviceId failed"); return ERR_DM_IPC_WRITE_FAILED; } int32_t result = pReq->GetResult(); @@ -1908,5 +1951,51 @@ ON_IPC_CMD(GET_DEVICE_NETWORK_ID_LIST, MessageParcel &data, MessageParcel &reply } return DM_OK; } + +ON_IPC_CMD(UNREGISTER_PIN_HOLDER_CALLBACK, MessageParcel &data, MessageParcel &reply) +{ + std::string pkgName = data.ReadString(); + int32_t result = DeviceManagerService::GetInstance().UnRegisterPinHolderCallback(pkgName); + if (!reply.WriteInt32(result)) { + LOGE("write result failed"); + return ERR_DM_IPC_WRITE_FAILED; + } + return DM_OK; +} + +ON_IPC_CMD(GET_LOCAL_DEVICE_NAME, MessageParcel &data, MessageParcel &reply) +{ + std::string deviceName = ""; + int32_t result = DeviceManagerService::GetInstance().GetLocalDeviceName(deviceName); + if (!reply.WriteInt32(result)) { + LOGE("write result failed"); + return ERR_DM_IPC_WRITE_FAILED; + } + if (!reply.WriteString(deviceName)) { + LOGE("write displayName failed"); + return ERR_DM_IPC_WRITE_FAILED; + } + return DM_OK; +} + +ON_IPC_CMD(CHECK_SRC_ACCESS_CONTROL, MessageParcel &data, MessageParcel &reply) +{ + return OnIpcCmd(CHECK_SRC_ACCESS_CONTROL, data, reply); +} + +ON_IPC_CMD(CHECK_SINK_ACCESS_CONTROL, MessageParcel &data, MessageParcel &reply) +{ + return OnIpcCmd(CHECK_SINK_ACCESS_CONTROL, data, reply); +} + +ON_IPC_CMD(CHECK_SRC_SAME_ACCOUNT, MessageParcel &data, MessageParcel &reply) +{ + return OnIpcCmd(CHECK_SRC_SAME_ACCOUNT, data, reply); +} + +ON_IPC_CMD(CHECK_SINK_SAME_ACCOUNT, MessageParcel &data, MessageParcel &reply) +{ + return OnIpcCmd(CHECK_SINK_SAME_ACCOUNT, data, reply); +} } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/service/src/ipc/standard/ipc_server_listener.cpp b/services/service/src/ipc/standard/ipc_server_listener.cpp index c6852a5e5fcec1b49a18ad5ed8e6362f6283988a..b40ee0a405d49b3ee8a084a2eb4ea28a5e810c6e 100644 --- a/services/service/src/ipc/standard/ipc_server_listener.cpp +++ b/services/service/src/ipc/standard/ipc_server_listener.cpp @@ -38,7 +38,7 @@ int32_t IpcServerListener::SendRequest(int32_t cmdCode, std::shared_ptr } sptr listener = IpcServerStub::GetInstance().GetDmListener(processInfo); if (listener == nullptr) { - LOGI("cannot get listener for package:%{public}s.", processInfo.pkgName.c_str()); + LOGE("cannot get listener for package:%{public}s.", processInfo.pkgName.c_str()); return ERR_DM_POINT_NULL; } return listener->SendCmd(cmdCode, req, rsp); diff --git a/services/service/src/ipc/standard/ipc_server_stub.cpp b/services/service/src/ipc/standard/ipc_server_stub.cpp index d185bf7745543e836ac28708702b608c515bc3bf..c85383af7292f05e11704bbdbc510063dd097d6b 100644 --- a/services/service/src/ipc/standard/ipc_server_stub.cpp +++ b/services/service/src/ipc/standard/ipc_server_stub.cpp @@ -14,6 +14,9 @@ */ #include "ipc_server_stub.h" + +#include + #include "ipc_cmd_register.h" #include "ipc_skeleton.h" #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) @@ -24,6 +27,7 @@ #include "mem_mgr_proxy.h" #endif // SUPPORT_MEMMGR #include "system_ability_definition.h" +#include "datetime_ex.h" #include "device_manager_service.h" #include "device_manager_service_notify.h" #include "device_name_manager.h" @@ -56,6 +60,7 @@ IpcServerStub::IpcServerStub() : SystemAbility(DISTRIBUTED_HARDWARE_DEVICEMANAGE void IpcServerStub::OnStart() { + startBeginTime_ = GetTickCount(); LOGI("IpcServerStub::OnStart start"); if (state_ == ServiceRunningState::STATE_RUNNING) { LOGI("IpcServerStub has already started."); @@ -93,17 +98,19 @@ void IpcServerStub::ReclaimMemmgrFileMemForDM() std::string path = JoinPath("/proc/", std::to_string(memmgrPid), "reclaim"); std::string contentStr = "1"; LOGI("Start echo 1 to pid : %{public}d, path: %{public}s", memmgrPid, path.c_str()); - int32_t fd = open(path.c_str(), O_WRONLY); - if (fd == -1) { + FILE *file = fopen(path.c_str(), "w"); + if (file == NULL) { LOGE("ReclaimMemmgrFileMemForDM open file failed."); return; } - if (write(fd, contentStr.c_str(), strlen(contentStr.c_str())) < 0) { - LOGE("ReclaimMemmgrFileMemForDM write file failed."); - close(fd); - return; + size_t strLength = contentStr.length(); + size_t ret = fwrite(contentStr.c_str(), 1, strLength, file); + if (ret != strLength) { + LOGE("fwrite failed"); + } + if (fclose(file) != DM_OK) { + LOGE("fclose failed"); } - close(fd); } LOGI("ReclaimMemmgrFileMemForDM success."); } @@ -209,6 +216,7 @@ bool IpcServerStub::Init() DeviceManagerService::GetInstance().InitDMServiceListener(); if (!registerToService_) { bool ret = Publish(this); + LOGI("Publish, cost %{public}" PRId64 " ms", GetTickCount() - startBeginTime_); if (!ret) { LOGE("IpcServerStub::Init Publish failed!"); return false; @@ -276,13 +284,15 @@ ServiceRunningState IpcServerStub::QueryServiceState() const int32_t IpcServerStub::RegisterDeviceManagerListener(const ProcessInfo &processInfo, sptr listener) { - LOGI("RegisterDeviceManagerListener start"); if (processInfo.pkgName.empty() || listener == nullptr) { LOGE("RegisterDeviceManagerListener error: input parameter invalid."); return ERR_DM_POINT_NULL; } - - LOGI("Register device manager listener for package name: %{public}s", processInfo.pkgName.c_str()); + LOGI("pkgName: %{public}s", processInfo.pkgName.c_str()); +#ifdef SUPPORT_MEMMGR + int pid = getpid(); + Memory::MemMgrClient::GetInstance().SetCritical(pid, true, DISTRIBUTED_HARDWARE_DEVICEMANAGER_SA_ID); +#endif // SUPPORT_MEMMGR std::lock_guard autoLock(listenerLock_); auto iter = dmListener_.find(processInfo); if (iter != dmListener_.end()) { @@ -304,16 +314,14 @@ int32_t IpcServerStub::RegisterDeviceManagerListener(const ProcessInfo &processI if (!listener->AsObject()->AddDeathRecipient(appRecipient)) { LOGE("AddDeathRecipient Failed"); } - LOGI("Checking the number of listeners."); if (dmListener_.size() > MAX_CALLBACK_NUM || appRecipient_.size() > MAX_CALLBACK_NUM) { LOGE("dmListener_ or appRecipient_ size exceed the limit!"); return ERR_DM_FAILED; } dmListener_[processInfo] = listener; appRecipient_[processInfo] = appRecipient; - LOGI("Add system sa."); AddSystemSA(processInfo.pkgName); - LOGI("Register listener complete."); + LOGI("complete."); return DM_OK; } @@ -323,7 +331,7 @@ int32_t IpcServerStub::UnRegisterDeviceManagerListener(const ProcessInfo &proces LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("IpcServerStub::UnRegisterDeviceManagerListener In, pkgName: %{public}s", processInfo.pkgName.c_str()); + LOGI("In, pkgName: %{public}s", processInfo.pkgName.c_str()); std::lock_guard autoLock(listenerLock_); auto listenerIter = dmListener_.find(processInfo); if (listenerIter == dmListener_.end()) { @@ -341,6 +349,12 @@ int32_t IpcServerStub::UnRegisterDeviceManagerListener(const ProcessInfo &proces listener->AsObject()->RemoveDeathRecipient(appRecipient); appRecipient_.erase(processInfo); dmListener_.erase(processInfo); +#ifdef SUPPORT_MEMMGR + if (dmListener_.size() == 0) { + int pid = getpid(); + Memory::MemMgrClient::GetInstance().SetCritical(pid, false, DISTRIBUTED_HARDWARE_DEVICEMANAGER_SA_ID); + } +#endif // SUPPORT_MEMMGR RemoveSystemSA(processInfo.pkgName); DeviceManagerService::GetInstance().RemoveNotifyRecord(processInfo); return DM_OK; @@ -385,7 +399,7 @@ const ProcessInfo IpcServerStub::GetDmListenerPkgName(const wptr int32_t IpcServerStub::Dump(int32_t fd, const std::vector& args) { - LOGI("DistributedHardwareService Dump."); + LOGI("start."); std::vector argsStr {}; for (auto item : args) { argsStr.emplace_back(Str16ToStr8(item)); diff --git a/services/service/src/permission/lite/permission_manager.cpp b/services/service/src/permission/lite/permission_manager.cpp index ee07ba6631716cccbfc8367d13f8ee02862afe37..a86742e99b71a134ce1accf3246d895ae3ea3670 100644 --- a/services/service/src/permission/lite/permission_manager.cpp +++ b/services/service/src/permission/lite/permission_manager.cpp @@ -94,5 +94,11 @@ bool PermissionManager::CheckProcessNameValidOnGetDeviceInfo(const std::string & (void)processName; return true; } + +bool PermissionManager::CheckProcessNameValidPutDeviceProfileInfoList(const std::string &processName) +{ + (void)processName; + return true; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/src/permission/standard/permission_manager.cpp b/services/service/src/permission/standard/permission_manager.cpp index b30e5453985fedd86366de8842b3795526484e1c..c88b33ba8c8561a4487f3165281a5679e2e0a3ac 100644 --- a/services/service/src/permission/standard/permission_manager.cpp +++ b/services/service/src/permission/standard/permission_manager.cpp @@ -47,7 +47,7 @@ constexpr const static char* g_pinHolderWhiteList[PIN_HOLDER_WHITE_LIST_NUM] = { "CollaborationFwk", }; -constexpr int32_t SYSTEM_SA_WHITE_LIST_NUM = 8; +constexpr int32_t SYSTEM_SA_WHITE_LIST_NUM = 10; constexpr const static char* SYSTEM_SA_WHITE_LIST[SYSTEM_SA_WHITE_LIST_NUM] = { "Samgr_Networking", "ohos.distributeddata.service", @@ -57,6 +57,8 @@ constexpr const static char* SYSTEM_SA_WHITE_LIST[SYSTEM_SA_WHITE_LIST_NUM] = { "ohos.dhardware", "ohos.security.distributed_access_token", "ohos.storage.distributedfile.daemon", + "audio_manager_service", + "hmos.collaborationfwk.deviceDetect", }; constexpr uint32_t SETDNPOLICY_WHITE_LIST_NUM = 4; @@ -67,19 +69,27 @@ constexpr const static char* g_setDnPolicyWhiteList[SETDNPOLICY_WHITE_LIST_NUM] "com.ohos.distributedjstest", }; -constexpr uint32_t GETDEVICEINFO_WHITE_LIST_NUM = 2; +constexpr uint32_t GETDEVICEINFO_WHITE_LIST_NUM = 3; constexpr const static char* g_getDeviceInfoWhiteList[GETDEVICEINFO_WHITE_LIST_NUM] = { "gameservice_server", "com.huawei.hmos.slassistant", + "token_sync_service", }; -constexpr int32_t MODIFY_LOCAL_DEVICE_NAME_WHITE_LIST_NUM = 1; +constexpr int32_t MODIFY_LOCAL_DEVICE_NAME_WHITE_LIST_NUM = 2; constexpr const static char* g_modifyLocalDeviceNameWhiteList[MODIFY_LOCAL_DEVICE_NAME_WHITE_LIST_NUM] = { "com.huawei.hmos.settings", + "com.huawei.hmos.tvcooperation", }; constexpr int32_t MODIFY_REMOTE_DEVICE_NAME_WHITE_LIST_NUM = 1; constexpr const static char* g_modifyRemoteDeviceNameWhiteList[MODIFY_REMOTE_DEVICE_NAME_WHITE_LIST_NUM] = { "com.ohos.settings", }; + +constexpr int32_t PUT_DEVICE_PROFILE_INFO_LIST_WHITE_LIST_NUM = 2; +constexpr const static char* g_putDeviceProfileInfoListWhiteList[PUT_DEVICE_PROFILE_INFO_LIST_WHITE_LIST_NUM] = { + "com.huawei.hmos.ailifesvc", + "com.huawei.hmos.tvcooperation", +}; } bool PermissionManager::CheckPermission(void) @@ -143,7 +153,7 @@ int32_t PermissionManager::GetCallerProcessName(std::string &processName) LOGE("GetCallerProcessName GetCallingTokenID error."); return ERR_DM_FAILED; } - LOGI("GetCallerProcessName::tokenCaller ID == %{public}s", GetAnonyInt32(tokenCaller).c_str()); + LOGI("tokenCaller ID == %{public}s", GetAnonyInt32(tokenCaller).c_str()); ATokenTypeEnum tokenTypeFlag = AccessTokenKit::GetTokenTypeFlag(tokenCaller); if (tokenTypeFlag == ATokenTypeEnum::TOKEN_HAP) { HapTokenInfo tokenInfo; @@ -175,12 +185,10 @@ int32_t PermissionManager::GetCallerProcessName(std::string &processName) bool PermissionManager::CheckProcessNameValidOnAuthCode(const std::string &processName) { - LOGI("Enter PermissionManager::CheckProcessNameValidOnAuthCode"); if (processName.empty()) { LOGE("ProcessName is empty"); return false; } - uint16_t index = 0; for (; index < AUTH_CODE_WHITE_LIST_NUM; ++index) { std::string tmp(g_authCodeWhiteList[index]); @@ -188,14 +196,11 @@ bool PermissionManager::CheckProcessNameValidOnAuthCode(const std::string &proce return true; } } - - LOGE("CheckProcessNameValidOnAuthCode process name: %{public}s invalid.", processName.c_str()); return false; } bool PermissionManager::CheckProcessNameValidOnPinHolder(const std::string &processName) { - LOGI("Enter PermissionManager::CheckProcessNameValidOnPinHolder"); if (processName.empty()) { LOGE("ProcessName is empty"); return false; @@ -208,8 +213,6 @@ bool PermissionManager::CheckProcessNameValidOnPinHolder(const std::string &proc return true; } } - - LOGE("CheckProcessNameValidOnPinHolder process name: %{public}s invalid.", processName.c_str()); return false; } @@ -236,13 +239,11 @@ std::unordered_set PermissionManager::GetWhiteListSystemSA() bool PermissionManager::CheckSystemSA(const std::string &pkgName) { - LOGI("Get calling tokenID."); AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); if (tokenCaller == 0) { LOGE("CheckMonitorPermission GetCallingTokenID error."); return false; } - LOGI("Get token type flag."); ATokenTypeEnum tokenTypeFlag = AccessTokenKit::GetTokenTypeFlag(tokenCaller); if (tokenTypeFlag == ATokenTypeEnum::TOKEN_NATIVE) { return true; @@ -263,8 +264,6 @@ bool PermissionManager::CheckProcessNameValidOnSetDnPolicy(const std::string &pr return true; } } - - LOGE("Process name: %{public}s invalid.", processName.c_str()); return false; } @@ -281,8 +280,6 @@ bool PermissionManager::CheckProcessNameValidOnGetDeviceInfo(const std::string & return true; } } - - LOGE("Process name: %{public}s invalid.", processName.c_str()); return false; } @@ -299,8 +296,6 @@ bool PermissionManager::CheckProcessNameValidModifyLocalDeviceName(const std::st return true; } } - - LOGE("Process name: %{public}s invalid.", processName.c_str()); return false; } @@ -317,8 +312,22 @@ bool PermissionManager::CheckProcessNameValidModifyRemoteDeviceName(const std::s return true; } } + return false; +} - LOGE("Process name: %{public}s invalid.", processName.c_str()); +bool PermissionManager::CheckProcessNameValidPutDeviceProfileInfoList(const std::string &processName) +{ + if (processName.empty()) { + LOGE("ProcessName is empty"); + return false; + } + uint16_t index = 0; + for (; index < PUT_DEVICE_PROFILE_INFO_LIST_WHITE_LIST_NUM; ++index) { + std::string tmp(g_putDeviceProfileInfoListWhiteList[index]); + if (processName == tmp) { + return true; + } + } return false; } } // namespace DistributedHardware diff --git a/services/service/src/pinholder/pin_holder.cpp b/services/service/src/pinholder/pin_holder.cpp index ca6822a4d30d1e790bab8cbb9138bdf8599902c8..240a435faeebf3323b77560e2d1ff7189f822f0f 100644 --- a/services/service/src/pinholder/pin_holder.cpp +++ b/services/service/src/pinholder/pin_holder.cpp @@ -70,10 +70,6 @@ PinHolder::PinHolder(std::shared_ptr listener): l PinHolder::~PinHolder() { - if (session_ != nullptr) { - session_->UnRegisterSessionCallback(); - session_ = nullptr; - } if (timer_ != nullptr) { timer_->DeleteAll(); timer_ = nullptr; @@ -96,6 +92,17 @@ int32_t PinHolder::RegisterPinHolderCallback(const std::string &pkgName) return DM_OK; } +int32_t PinHolder::UnRegisterPinHolderCallback(const std::string &pkgName) +{ + if (session_ == nullptr) { + LOGE("session is nullptr."); + return ERR_DM_FAILED; + } + session_->UnRegisterSessionCallback(); + LOGI("success."); + return DM_OK; +} + int32_t PinHolder::CreatePinHolder(const std::string &pkgName, const PeerTargetId &targetId, DmPinType pinType, const std::string &payload) { diff --git a/services/service/src/pinholder/pin_holder_session.cpp b/services/service/src/pinholder/pin_holder_session.cpp index 83b74db44b207226faf5aa508f8c502f986e68fb..44b8a3b8de30bb9eb9e4c1f01e25dd5fb743d681 100644 --- a/services/service/src/pinholder/pin_holder_session.cpp +++ b/services/service/src/pinholder/pin_holder_session.cpp @@ -23,6 +23,7 @@ namespace OHOS { namespace DistributedHardware { std::shared_ptr PinHolderSession::pinholderSessionCallback_ = nullptr; +std::mutex PinHolderSession::pinHolderSessionLock_; PinHolderSession::PinHolderSession() { LOGD("PinHolderSession constructor."); @@ -35,12 +36,14 @@ PinHolderSession::~PinHolderSession() int32_t PinHolderSession::RegisterSessionCallback(std::shared_ptr callback) { + std::lock_guard autoLock(pinHolderSessionLock_); pinholderSessionCallback_ = callback; return DM_OK; } int32_t PinHolderSession::UnRegisterSessionCallback() { + std::lock_guard autoLock(pinHolderSessionLock_); pinholderSessionCallback_ = nullptr; return DM_OK; } @@ -59,7 +62,7 @@ int32_t PinHolderSession::OpenSessionServer(const PeerTargetId &targetId) LOGE("[SOFTBUS]open session error, sessionId: %{public}d.", sessionId); return sessionId; } - LOGI("OpenAuthSession success. sessionId: %{public}d.", sessionId); + LOGI("success. sessionId: %{public}d.", sessionId); return sessionId; } @@ -72,24 +75,36 @@ int32_t PinHolderSession::CloseSessionServer(int32_t sessionId) int PinHolderSession::OnSessionOpened(int sessionId, int result) { - if (pinholderSessionCallback_ == nullptr) { + std::shared_ptr tempCbk; + { + std::lock_guard autoLock(pinHolderSessionLock_); + tempCbk = pinholderSessionCallback_; + } + LOGI("[SOFTBUS]OnSessionOpened sessionId: %{public}d", sessionId); + if (tempCbk == nullptr) { LOGE("OnSessionOpened error, pinholderSessionCallback_ is nullptr."); return ERR_DM_FAILED; } int32_t sessionSide = GetSessionSide(sessionId); - pinholderSessionCallback_->OnSessionOpened(sessionId, sessionSide, result); + tempCbk->OnSessionOpened(sessionId, sessionSide, result); LOGI("OnSessionOpened, success, sessionId: %{public}d.", sessionId); return DM_OK; } void PinHolderSession::OnSessionClosed(int sessionId) { + std::shared_ptr tempCbk; + { + std::lock_guard autoLock(pinHolderSessionLock_); + tempCbk = pinholderSessionCallback_; + } LOGI("[SOFTBUS]OnSessionClosed sessionId: %{public}d", sessionId); - if (pinholderSessionCallback_ == nullptr) { + if (tempCbk == nullptr) { LOGE("OnSessionClosed error, pinholderSessionCallback_ is nullptr."); return; } - pinholderSessionCallback_->OnSessionClosed(sessionId); + tempCbk->OnSessionClosed(sessionId); + LOGI("OnSessionClosed, success, sessionId: %{public}d.", sessionId); return; } @@ -100,13 +115,19 @@ void PinHolderSession::OnBytesReceived(int sessionId, const void *data, unsigned dataLen); return; } - if (pinholderSessionCallback_ == nullptr) { + std::shared_ptr tempCbk; + { + std::lock_guard autoLock(pinHolderSessionLock_); + tempCbk = pinholderSessionCallback_; + } + if (tempCbk == nullptr) { LOGE("OnBytesReceived error, pinholderSessionCallback_ is nullptr."); return; } LOGI("start, sessionId: %{public}d, dataLen: %{public}d.", sessionId, dataLen); std::string message = std::string(reinterpret_cast(data), dataLen); - pinholderSessionCallback_->OnDataReceived(sessionId, message); + tempCbk->OnDataReceived(sessionId, message); + LOGI("OnBytesReceived, success, sessionId: %{public}d.", sessionId); return; } diff --git a/services/service/src/publishcommonevent/dm_datashare_common_event.cpp b/services/service/src/publishcommonevent/dm_datashare_common_event.cpp index 48063b99bd99c247d42ee65d19a43a9347a9fe56..dd903b8345094efdd6941ab4ea3e708630805097 100644 --- a/services/service/src/publishcommonevent/dm_datashare_common_event.cpp +++ b/services/service/src/publishcommonevent/dm_datashare_common_event.cpp @@ -134,20 +134,23 @@ bool DmDataShareCommonEventManager::UnsubscribeDataShareCommonEvent() void DmDataShareEventSubscriber::OnReceiveEvent(const CommonEventData &data) { std::string receiveEvent = data.GetWant().GetAction(); + int32_t eventState = data.GetCode(); bool validEvent = false; - if (receiveEvent == EventFwk::CommonEventSupport::COMMON_EVENT_DATA_SHARE_READY) { + if (receiveEvent == EventFwk::CommonEventSupport::COMMON_EVENT_DATA_SHARE_READY || + receiveEvent == EventFwk::CommonEventSupport::COMMON_EVENT_LOCALE_CHANGED || + receiveEvent == EventFwk::CommonEventSupport::COMMON_EVENT_CONNECTIVITY_CHANGE) { validEvent = true; } - LOGI("Received datashare event: %{public}s", receiveEvent.c_str()); + LOGI("Received datashare event: %{public}s, eventState: %{public}d", receiveEvent.c_str(), eventState); if (!validEvent) { LOGE("Invalied datashare type event."); return; } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) - ffrt::submit([=]() { callback_(receiveEvent); }); + ffrt::submit([=]() { callback_(receiveEvent, eventState); }); #else - std::thread dealThread([=]() { callback_(receiveEvent); }); + std::thread dealThread([=]() { callback_(receiveEvent, eventState); }); int32_t ret = pthread_setname_np(dealThread.native_handle(), DEAL_THREAD); if (ret != DM_OK) { LOGE("dealThread setname failed."); diff --git a/services/service/src/publishcommonevent/dm_package_common_event.cpp b/services/service/src/publishcommonevent/dm_package_common_event.cpp index 8b444a3dee99d478708fda3b1bf0a4d48158971c..0aea005162a6b7613dec359655b2d8a231acbadb 100644 --- a/services/service/src/publishcommonevent/dm_package_common_event.cpp +++ b/services/service/src/publishcommonevent/dm_package_common_event.cpp @@ -138,6 +138,10 @@ void DmPackageEventSubscriber::OnReceiveEvent(const CommonEventData &data) std::string receiveEvent = data.GetWant().GetAction(); std::string appId = data.GetWant().GetStringParam(APP_ID); int32_t accessTokenId = static_cast(data.GetWant().GetIntParam(ACCESS_TOKEN_ID, 0)); + if (accessTokenId == -1 || appId == "") { + LOGE("Invalid parameters: accessTokenId = %{public}d, appId = %{public}s", accessTokenId, appId.c_str()); + return; + } LOGI("Received package event: %{public}s", receiveEvent.c_str()); if (receiveEvent != EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_FULLY_REMOVED && diff --git a/services/service/src/publishcommonevent/dm_screen_common_event.cpp b/services/service/src/publishcommonevent/dm_screen_common_event.cpp index a5219b2050664611b21b9e1f8027786473ff07b4..ce7d5ecdf729341b0f2cc989e9d9d75d4211dd28 100644 --- a/services/service/src/publishcommonevent/dm_screen_common_event.cpp +++ b/services/service/src/publishcommonevent/dm_screen_common_event.cpp @@ -136,7 +136,8 @@ void DmScreenEventSubscriber::OnReceiveEvent(const CommonEventData &data) { std::string receiveEvent = data.GetWant().GetAction(); LOGI("Received screen event: %{public}s", receiveEvent.c_str()); - if (receiveEvent != EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_LOCKED) { + if (receiveEvent != EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_LOCKED && + receiveEvent != EventFwk::CommonEventSupport::COMMON_EVENT_SCREEN_UNLOCKED) { return; } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) diff --git a/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp b/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp index 01a64b6723649cd6fa12b21627f7e295a564f09f..40d8dbf995defbdd36144e695b5831f424aa6212 100644 --- a/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp +++ b/services/service/src/relationshipsyncmgr/dm_comm_tool.cpp @@ -16,6 +16,7 @@ #include "dm_comm_tool.h" #include "device_manager_service.h" #include "dm_anonymous.h" +#include "dm_constants.h" #include "dm_error_type.h" #include "dm_transport.h" #include "dm_transport_msg.h" @@ -33,7 +34,12 @@ constexpr int32_t DM_COMM_SEND_LOCAL_USERIDS = 1; constexpr int32_t DM_COMM_RSP_LOCAL_USERIDS = 2; constexpr int32_t DM_COMM_SEND_USER_STOP = 3; constexpr int32_t DM_COMM_RSP_USER_STOP = 4; - +constexpr int32_t DM_COMM_ACCOUNT_LOGOUT = 5; +constexpr int32_t DM_COMM_SEND_LOCAL_APP_UNINSTALL = 6; +constexpr int32_t DM_COMM_SEND_LOCAL_APP_UNBIND = 7; +constexpr int32_t DM_COMM_RSP_APP_UNINSTALL = 8; +constexpr int32_t DM_COMM_RSP_APP_UNBIND = 9; +constexpr const char* EVENT_TASK = "EventTask"; const char* const USER_STOP_MSG_KEY = "stopUserId"; DMCommTool::DMCommTool() : dmTransportPtr_(nullptr) @@ -44,6 +50,7 @@ DMCommTool::DMCommTool() : dmTransportPtr_(nullptr) void DMCommTool::Init() { LOGI("Init DMCommTool"); + eventQueue_ = std::make_shared(EVENT_TASK); dmTransportPtr_ = std::make_shared(shared_from_this()); std::shared_ptr runner = AppExecFwk::EventRunner::Create(true); eventHandler_ = std::make_shared(runner, shared_from_this()); @@ -69,7 +76,7 @@ std::shared_ptr DMCommTool::GetInstance() int32_t DMCommTool::SendUserIds(const std::string rmtNetworkId, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) { - if (!IsIdLengthValid(rmtNetworkId) || foregroundUserIds.empty() || dmTransportPtr_ == nullptr) { + if (!IsIdLengthValid(rmtNetworkId) || dmTransportPtr_ == nullptr) { LOGE("param invalid, networkId: %{public}s, foreground userids size: %{public}d", GetAnonyString(rmtNetworkId).c_str(), static_cast(foregroundUserIds.size())); return ERR_DM_INPUT_PARA_INVALID; @@ -80,7 +87,7 @@ int32_t DMCommTool::SendUserIds(const std::string rmtNetworkId, return ERR_DM_FAILED; } - UserIdsMsg userIdsMsg(foregroundUserIds, backgroundUserIds); + UserIdsMsg userIdsMsg(foregroundUserIds, backgroundUserIds, true); cJSON *root = cJSON_CreateObject(); if (root == nullptr) { LOGE("Create cJSON object failed."); @@ -103,6 +110,150 @@ int32_t DMCommTool::SendUserIds(const std::string rmtNetworkId, LOGE("Send local foreground userids failed, ret: %{public}d", ret); return ERR_DM_FAILED; } + LOGI("success"); + return DM_OK; +} + +int32_t DMCommTool::SendUninstAppObj(int32_t userId, int32_t tokenId, const std::string &networkId) +{ + LOGI("SendUninstAppObj, userId: %{public}s, tokenId: %{public}s", GetAnonyInt32(userId).c_str(), + GetAnonyInt32(tokenId).c_str()); + if (!IsIdLengthValid(networkId)) { + LOGE("param invalid, networkId: %{public}s", GetAnonyString(networkId).c_str()); + return ERR_DM_INPUT_PARA_INVALID; + } + if (dmTransportPtr_ == nullptr) { + LOGE("dmTransportPtr_ is null"); + return ERR_DM_FAILED; + } + int32_t socketId = 0; + if (dmTransportPtr_->StartSocket(networkId, socketId) != DM_OK || socketId <= 0) { + LOGE("Start socket error"); + return ERR_DM_FAILED; + } + + UninstAppMsg uninstAppMsg(userId, tokenId); + cJSON *root = cJSON_CreateObject(); + if (root == nullptr) { + LOGE("Create cJSON object failed."); + return ERR_DM_FAILED; + } + ToJson(root, uninstAppMsg); + char *msg = cJSON_PrintUnformatted(root); + if (msg == nullptr) { + cJSON_Delete(root); + return ERR_DM_FAILED; + } + std::string msgStr(msg); + cJSON_Delete(root); + cJSON_free(msg); + CommMsg commMsg(DM_COMM_SEND_LOCAL_APP_UNINSTALL, msgStr); + std::string payload = GetCommMsgString(commMsg); + + int32_t ret = dmTransportPtr_->Send(networkId, payload, socketId); + if (ret != DM_OK) { + LOGE("Send local foreground userids failed, ret: %{public}d", ret); + return ERR_DM_FAILED; + } + LOGI("Send local foreground userids success"); + return DM_OK; +} + +int32_t DMCommTool::RspAppUninstall(const std::string rmtNetworkId, int32_t socketId) +{ + LOGI("RspAppUninstall Start."); + if (dmTransportPtr_ == nullptr) { + LOGE("dmTransportPtr_ is null"); + return ERR_DM_FAILED; + } + std::string msgStr(""); + CommMsg commMsg(DM_COMM_RSP_APP_UNINSTALL, msgStr); + std::string payload = GetCommMsgString(commMsg); + + if (dmTransportPtr_ == nullptr) { + LOGE("dmTransportPtr_ is null"); + return ERR_DM_FAILED; + } + int32_t ret = dmTransportPtr_->Send(rmtNetworkId, payload, socketId); + if (ret != DM_OK) { + LOGE("RspAppUninstall failed, ret: %{public}d", ret); + return ERR_DM_FAILED; + } + + LOGI("RspAppUninstall success"); + return DM_OK; +} + +int32_t DMCommTool::RspAppUnbind(const std::string rmtNetworkId, int32_t socketId) +{ + LOGI("RspAppUnbind Start."); + if (dmTransportPtr_ == nullptr) { + LOGE("dmTransportPtr_ is null"); + return ERR_DM_FAILED; + } + std::string msgStr(""); + CommMsg commMsg(DM_COMM_RSP_APP_UNBIND, msgStr); + std::string payload = GetCommMsgString(commMsg); + + if (dmTransportPtr_ == nullptr) { + LOGE("dmTransportPtr_ is null"); + return ERR_DM_FAILED; + } + int32_t ret = dmTransportPtr_->Send(rmtNetworkId, payload, socketId); + if (ret != DM_OK) { + LOGE("RspAppUnbind failed, ret: %{public}d", ret); + return ERR_DM_FAILED; + } + + LOGI("RspAppUnbind success"); + return DM_OK; +} + +int32_t DMCommTool::SendUnBindAppObj(int32_t userId, int32_t tokenId, const std::string &extra, + const std::string &networkId, const std::string &udid) +{ + LOGI("DMCommTool::SendUnBindAppObj, userId: %{public}s, tokenId: %{public}s, extra: %{public}s, udid: %{public}s", + GetAnonyInt32(userId).c_str(), GetAnonyInt32(tokenId).c_str(), GetAnonyString(extra).c_str(), + GetAnonyString(udid).c_str()); + if (!IsIdLengthValid(networkId)) { + LOGE("param invalid, networkId: %{public}s", GetAnonyString(networkId).c_str()); + return ERR_DM_INPUT_PARA_INVALID; + } + + if (dmTransportPtr_ == nullptr) { + LOGE("dmTransportPtr_ is null"); + return ERR_DM_FAILED; + } + int32_t socketId; + if (dmTransportPtr_->StartSocket(networkId, socketId) != DM_OK || socketId <= 0) { + LOGE("Start socket error"); + return ERR_DM_FAILED; + } + + UnBindAppMsg unBindAppMsg(userId, tokenId, extra, udid); + cJSON *root = cJSON_CreateObject(); + if (root == nullptr) { + LOGE("Create cJSON object failed."); + return ERR_DM_FAILED; + } + ToJson(root, unBindAppMsg); + char *msg = cJSON_PrintUnformatted(root); + if (msg == nullptr) { + cJSON_Delete(root); + return ERR_DM_FAILED; + } + std::string msgStr(msg); + cJSON_Delete(root); + cJSON_free(msg); + CommMsg commMsg(DM_COMM_SEND_LOCAL_APP_UNBIND, msgStr); + std::string payload = GetCommMsgString(commMsg); + + int32_t ret = dmTransportPtr_->Send(networkId, payload, socketId); + if (ret != DM_OK) { + LOGE("Send local foreground userids failed, ret: %{public}d", ret); + return ERR_DM_FAILED; + } + LOGI("Send local foreground userids success"); return DM_OK; } @@ -110,9 +261,9 @@ int32_t DMCommTool::SendUserIds(const std::string rmtNetworkId, void DMCommTool::RspLocalFrontOrBackUserIds(const std::string rmtNetworkId, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds, int32_t socketId) { - UserIdsMsg userIdsMsg(foregroundUserIds, backgroundUserIds); + UserIdsMsg userIdsMsg(foregroundUserIds, backgroundUserIds, true); cJSON *root = cJSON_CreateObject(); - if (root == nullptr) { + if (root == nullptr || dmTransportPtr_ == nullptr) { LOGE("Create cJSON object failed."); return; } @@ -133,7 +284,7 @@ void DMCommTool::RspLocalFrontOrBackUserIds(const std::string rmtNetworkId, LOGE("Response local foreground userids failed, ret: %{public}d", ret); return; } - LOGI("Response local foreground userids success"); + LOGI("success"); } DMCommTool::DMCommToolEventHandler::DMCommToolEventHandler(const std::shared_ptr runner, @@ -142,35 +293,40 @@ DMCommTool::DMCommToolEventHandler::DMCommToolEventHandler(const std::shared_ptr LOGI("Ctor DMCommToolEventHandler"); } -void DMCommTool::DMCommToolEventHandler::ProcessEvent( - const AppExecFwk::InnerEvent::Pointer &event) +void DMCommTool::DMCommToolEventHandler::ParseUserIdsMsg(std::shared_ptr commMsg, UserIdsMsg &userIdsMsg) { - uint32_t eventId = event->GetInnerEventId(); - std::shared_ptr commMsg = event->GetSharedObject(); - if (commMsg == nullptr) { - LOGE("ProcessEvent commMsg is null"); + CHECK_NULL_VOID(commMsg); + std::string payload = commMsg->commMsg->msg; + cJSON *root = cJSON_Parse(payload.c_str()); + if (root == NULL) { + LOGE("the msg is not json format"); return; } + FromJson(root, userIdsMsg); + cJSON_Delete(root); +} + +void DMCommTool::DMCommToolEventHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointer &event) +{ + uint32_t eventId = event->GetInnerEventId(); + std::shared_ptr commMsg = event->GetSharedObject(); + CHECK_NULL_VOID(commMsg); + UserIdsMsg userIdsMsg; + ParseUserIdsMsg(commMsg, userIdsMsg); if (dmCommToolWPtr_.expired()) { LOGE("dmCommToolWPtr_ is expired"); return; } std::shared_ptr dmCommToolPtr = dmCommToolWPtr_.lock(); - if (dmCommToolPtr == nullptr) { - LOGE("dmCommToolPtr is null"); - return; - } + HandleEvent(dmCommToolPtr, eventId, commMsg, userIdsMsg); +} + +void DMCommTool::DMCommToolEventHandler::HandleEvent(const std::shared_ptr &dmCommToolPtr, uint32_t eventId, + const std::shared_ptr &commMsg, const UserIdsMsg &userIdsMsg) +{ + CHECK_NULL_VOID(dmCommToolPtr); + HandleLocalUserIdEvent(dmCommToolPtr, eventId, commMsg, userIdsMsg); switch (eventId) { - case DM_COMM_SEND_LOCAL_USERIDS: { - // Process remote foreground userids and send back local user ids - dmCommToolPtr->ProcessReceiveUserIdsEvent(commMsg); - break; - } - case DM_COMM_RSP_LOCAL_USERIDS: { - // Process remote foreground userids and close session - dmCommToolPtr->ProcessResponseUserIdsEvent(commMsg); - break; - } case DM_COMM_SEND_USER_STOP: { dmCommToolPtr->ProcessReceiveUserStopEvent(commMsg); break; @@ -179,19 +335,134 @@ void DMCommTool::DMCommToolEventHandler::ProcessEvent( dmCommToolPtr->ProcessResponseUserStopEvent(commMsg); break; } + case DM_COMM_ACCOUNT_LOGOUT: { + dmCommToolPtr->ProcessReceiveLogoutEvent(commMsg); + break; + } + case DM_COMM_SEND_LOCAL_APP_UNINSTALL: { + dmCommToolPtr->ProcessReceiveUninstAppEvent(commMsg); + break; + } + case DM_COMM_SEND_LOCAL_APP_UNBIND: { + dmCommToolPtr->ProcessReceiveUnBindAppEvent(commMsg); + break; + } + case DM_COMM_RSP_APP_UNINSTALL: { + dmCommToolPtr->ProcessReceiveRspAppUninstallEvent(commMsg); + break; + } + case DM_COMM_RSP_APP_UNBIND: { + dmCommToolPtr->ProcessReceiveRspAppUnbindEvent(commMsg); + break; + } default: LOGE("event is undefined, id is %{public}d", eventId); break; } } +void DMCommTool::DMCommToolEventHandler::HandleLocalUserIdEvent(const std::shared_ptr &dmCommToolPtr, + uint32_t eventId, const std::shared_ptr &commMsg, const UserIdsMsg &userIdsMsg) +{ + CHECK_NULL_VOID(dmCommToolPtr); + switch (eventId) { + case DM_COMM_SEND_LOCAL_USERIDS: { + if (userIdsMsg.isNewEvent) { + dmCommToolPtr->ProcessReceiveCommonEvent(commMsg); + } else { + dmCommToolPtr->ProcessReceiveUserIdsEvent(commMsg); + } + break; + } + case DM_COMM_RSP_LOCAL_USERIDS: { + if (userIdsMsg.isNewEvent) { + dmCommToolPtr->ProcessResponseCommonEvent(commMsg); + } else { + dmCommToolPtr->ProcessResponseUserIdsEvent(commMsg); + } + break; + } + default: + break; + } +} + +void DMCommTool::ProcessReceiveCommonEvent(const std::shared_ptr commMsg) +{ + LOGI("start"); + std::string rmtUdid = ""; + SoftbusCache::GetInstance().GetUdidFromCache(commMsg->remoteNetworkId.c_str(), rmtUdid); + if (rmtUdid.empty()) { + LOGE("Can not find remote udid by networkid: %{public}s", GetAnonyString(commMsg->remoteNetworkId).c_str()); + return; + } + + std::string payload = commMsg->commMsg->msg; + cJSON *root = cJSON_Parse(payload.c_str()); + if (root == NULL) { + LOGE("the msg is not json format"); + return; + } + UserIdsMsg userIdsMsg; + FromJson(root, userIdsMsg); + cJSON_Delete(root); + uint32_t totalUserNum = static_cast(userIdsMsg.foregroundUserIds.size()) + + static_cast(userIdsMsg.backgroundUserIds.size()); + + // step1: send back local userids + std::vector foregroundUserIds; + MultipleUserConnector::GetForegroundUserIds(foregroundUserIds); + std::vector backgroundUserIds; + MultipleUserConnector::GetBackgroundUserIds(backgroundUserIds); + MultipleUserConnector::ClearLockedUser(foregroundUserIds, backgroundUserIds); + std::vector foregroundUserIdsU32; + std::vector backgroundUserIdsU32; + for (auto const &u : foregroundUserIds) { + foregroundUserIdsU32.push_back(static_cast(u)); + } + for (auto const &u : backgroundUserIds) { + backgroundUserIdsU32.push_back(static_cast(u)); + } + RspLocalFrontOrBackUserIds(commMsg->remoteNetworkId, foregroundUserIdsU32, backgroundUserIdsU32, + commMsg->socketId); + + DeviceManagerService::GetInstance().ProcessCommonUserStatusEvent(userIdsMsg.foregroundUserIds, + userIdsMsg.backgroundUserIds, rmtUdid); +} + +void DMCommTool::ProcessResponseCommonEvent(const std::shared_ptr commMsg) +{ + LOGI("start"); + // step1: close socket + this->dmTransportPtr_->StopSocket(commMsg->remoteNetworkId); + + std::string rmtUdid = ""; + SoftbusCache::GetInstance().GetUdidFromCache(commMsg->remoteNetworkId.c_str(), rmtUdid); + if (rmtUdid.empty()) { + LOGE("Can not find remote udid by networkid: %{public}s", GetAnonyString(commMsg->remoteNetworkId).c_str()); + return; + } + + std::string payload = commMsg->commMsg->msg; + cJSON *root = cJSON_Parse(payload.c_str()); + if (root == NULL) { + LOGE("the msg is not json format"); + return; + } + UserIdsMsg userIdsMsg; + FromJson(root, userIdsMsg); + cJSON_Delete(root); + DeviceManagerService::GetInstance().ProcessCommonUserStatusEvent(userIdsMsg.foregroundUserIds, + userIdsMsg.backgroundUserIds, rmtUdid); +} + void DMCommTool::ProcessReceiveUserIdsEvent(const std::shared_ptr commMsg) { - LOGI("Receive remote userids, process and rsp local userid"); + LOGI("start"); std::string rmtUdid = ""; SoftbusCache::GetInstance().GetUdidFromCache(commMsg->remoteNetworkId.c_str(), rmtUdid); if (rmtUdid.empty()) { - LOGE("Can not find remote udid by networkid: %{public}s", commMsg->remoteNetworkId.c_str()); + LOGE("Can not find remote udid by networkid: %{public}s", GetAnonyString(commMsg->remoteNetworkId).c_str()); return; } @@ -225,7 +496,7 @@ void DMCommTool::ProcessReceiveUserIdsEvent(const std::shared_ptr } RspLocalFrontOrBackUserIds(commMsg->remoteNetworkId, foregroundUserIdsU32, backgroundUserIdsU32, commMsg->socketId); - + if (userIdsMsg.foregroundUserIds.empty()) { LOGE("Parse but get none remote foreground userids"); } else { @@ -235,16 +506,125 @@ void DMCommTool::ProcessReceiveUserIdsEvent(const std::shared_ptr } } +void DMCommTool::ProcessReceiveUninstAppEvent(const std::shared_ptr commMsg) +{ + if (commMsg == nullptr || commMsg->commMsg == nullptr) { + LOGE("commMsg or commMsg->commMsg is null"); + return; + } + LOGI("DMCommTool::ProcessReceiveUninstAppEvent commMsg = %{public}s", + GetAnonyString(commMsg->commMsg->msg).c_str()); + std::string payload = commMsg->commMsg->msg; + cJSON *root = cJSON_Parse(payload.c_str()); + if (root == NULL) { + LOGE("the msg is not json format"); + return; + } + UninstAppMsg uninstAppMsg; + FromJson(root, uninstAppMsg); + cJSON_Delete(root); + RspAppUninstall(commMsg->remoteNetworkId, commMsg->socketId); + + if (uninstAppMsg.userId_ == -1 || uninstAppMsg.tokenId_ == -1) { + LOGE("param invalid, userId: %{public}d, tokenId: %{public}d", + uninstAppMsg.userId_, uninstAppMsg.tokenId_); + return; + } else { + DeviceManagerService::GetInstance().ProcessUninstApp(uninstAppMsg.userId_, + uninstAppMsg.tokenId_); + } +} + +void DMCommTool::ProcessReceiveUnBindAppEvent(const std::shared_ptr commMsg) +{ + if (commMsg == nullptr || commMsg->commMsg == nullptr) { + LOGE("commMsg or commMsg->commMsg is null"); + return; + } + LOGI("DMCommTool::ProcessReceiveUnBindAppEvent Receive remote uninstall app"); + std::string payload = commMsg->commMsg->msg; + cJSON *root = cJSON_Parse(payload.c_str()); + if (root == NULL) { + LOGE("the msg is not json format"); + return; + } + UnBindAppMsg unBindAppMsg; + FromJson(root, unBindAppMsg); + cJSON_Delete(root); + RspAppUnbind(commMsg->remoteNetworkId, commMsg->socketId); + + if (unBindAppMsg.userId_ == -1 || unBindAppMsg.tokenId_ == -1) { + LOGE("param invalid, userId: %{public}d, tokenId: %{public}d", + unBindAppMsg.userId_, unBindAppMsg.tokenId_); + return; + } else { + DeviceManagerService::GetInstance().ProcessUnBindApp(unBindAppMsg.userId_, + unBindAppMsg.tokenId_, unBindAppMsg.extra_, unBindAppMsg.udid_); + } +} + +void DMCommTool::StopSocket(const std::string &networkId) +{ + LOGI("DMCommTool::StopSocket, networkId = %{public}s", GetAnonyString(networkId).c_str()); + if (dmTransportPtr_ == nullptr) { + LOGE("dmTransportPtr_ is null"); + return; + } + dmTransportPtr_->StopSocket(networkId); +} + +void DMCommTool::ProcessReceiveRspAppUninstallEvent(const std::shared_ptr commMsg) +{ + if (commMsg == nullptr || commMsg->remoteNetworkId == "") { + LOGE("commMsg or commMsg->remoteNetworkId is null"); + return; + } + LOGI("DMCommTool::ProcessReceiveRspAppUninstallEvent Start."); + if (dmTransportPtr_ == nullptr) { + LOGE("dmTransportPtr_ is null"); + return; + } + this->dmTransportPtr_->StopSocket(commMsg->remoteNetworkId); + std::string rmtUdid = ""; + SoftbusCache::GetInstance().GetUdidFromCache(commMsg->remoteNetworkId.c_str(), rmtUdid); + if (rmtUdid.empty()) { + LOGE("Can not find remote udid by networkid."); + return; + } + DeviceManagerService::GetInstance().ProcessReceiveRspAppUninstall(rmtUdid); +} + +void DMCommTool::ProcessReceiveRspAppUnbindEvent(const std::shared_ptr commMsg) +{ + if (commMsg == nullptr || commMsg->remoteNetworkId == "") { + LOGE("commMsg or commMsg->remoteNetworkId is null"); + return; + } + if (dmTransportPtr_ == nullptr) { + LOGE("dmTransportPtr_ is null"); + return; + } + LOGI("DMCommTool::ProcessReceiveRspAppUnbindEvent Start."); + this->dmTransportPtr_->StopSocket(commMsg->remoteNetworkId); + std::string rmtUdid = ""; + SoftbusCache::GetInstance().GetUdidFromCache(commMsg->remoteNetworkId.c_str(), rmtUdid); + if (rmtUdid.empty()) { + LOGE("Can not find remote udid by networkid."); + return; + } + DeviceManagerService::GetInstance().ProcessReceiveRspAppUnbind(rmtUdid); +} + void DMCommTool::ProcessResponseUserIdsEvent(const std::shared_ptr commMsg) { - LOGI("process receive remote userids response"); + LOGI("start"); // step1: close socket this->dmTransportPtr_->StopSocket(commMsg->remoteNetworkId); std::string rmtUdid = ""; SoftbusCache::GetInstance().GetUdidFromCache(commMsg->remoteNetworkId.c_str(), rmtUdid); if (rmtUdid.empty()) { - LOGE("Can not find remote udid by networkid: %{public}s", commMsg->remoteNetworkId.c_str()); + LOGE("Can not find remote udid by networkid."); return; } @@ -418,5 +798,95 @@ void DMCommTool::ProcessResponseUserStopEvent(const std::shared_ptr(localDeviceId); DeviceManagerService::GetInstance().HandleUserStop(stopUserId, localUdid, acceptEventUdids); } + +int32_t DMCommTool::SendLogoutAccountInfo(const std::string &rmtNetworkId, + const std::string &accountId, int32_t userId) +{ + if (!IsIdLengthValid(rmtNetworkId) || accountId.empty() || dmTransportPtr_ == nullptr) { + LOGE("param invalid, networkId: %{public}s, userId: %{public}d", + GetAnonyString(rmtNetworkId).c_str(), userId); + return ERR_DM_INPUT_PARA_INVALID; + } + LOGI("Start, send networkId: %{public}s", GetAnonyString(rmtNetworkId).c_str()); + int32_t socketId = 0; + if (dmTransportPtr_->StartSocket(rmtNetworkId, socketId) != DM_OK || socketId <= 0) { + LOGE("Start socket error"); + return ERR_DM_FAILED; + } + + cJSON *root = cJSON_CreateObject(); + if (root == nullptr) { + LOGE("Create cJSON object failed."); + return ERR_DM_FAILED; + } + LogoutAccountMsg LogoutAccountMsg(accountId, userId); + ToJson(root, LogoutAccountMsg); + char *msg = cJSON_PrintUnformatted(root); + if (msg == nullptr) { + cJSON_Delete(root); + return ERR_DM_FAILED; + } + std::string msgStr(msg); + cJSON_Delete(root); + cJSON_free(msg); + CommMsg commMsg(DM_COMM_ACCOUNT_LOGOUT, msgStr); + std::string payload = GetCommMsgString(commMsg); + + int32_t ret = dmTransportPtr_->Send(rmtNetworkId, payload, socketId); + if (ret != DM_OK) { + LOGE("Send account logout failed, ret: %{public}d", ret); + return ERR_DM_FAILED; + } + LOGI("success"); + return DM_OK; +} + +void DMCommTool::ProcessReceiveLogoutEvent(const std::shared_ptr commMsg) +{ + CHECK_NULL_VOID(commMsg); + CHECK_NULL_VOID(dmTransportPtr_); + this->dmTransportPtr_->StopSocket(commMsg->remoteNetworkId); + LOGI("Receive remote logout, networkId: %{public}s", GetAnonyString(commMsg->remoteNetworkId).c_str()); + std::string rmtUdid = ""; + SoftbusCache::GetInstance().GetUdidFromCache(commMsg->remoteNetworkId.c_str(), rmtUdid); + if (rmtUdid.empty()) { + LOGE("Can not find remote udid by networkid: %{public}s", GetAnonyString(commMsg->remoteNetworkId).c_str()); + return; + } + + CHECK_NULL_VOID(commMsg->commMsg); + std::string payload = commMsg->commMsg->msg; + cJSON *root = cJSON_Parse(payload.c_str()); + if (root == NULL) { + LOGE("the msg is not json format"); + return; + } + LogoutAccountMsg logoutAccountMsg; + FromJson(root, logoutAccountMsg); + cJSON_Delete(root); + + if (logoutAccountMsg.accountId.empty() || logoutAccountMsg.userId == -1) { + LOGE("param invalid, accountId: %{public}s, userId: %{public}d", + GetAnonyString(logoutAccountMsg.accountId).c_str(), logoutAccountMsg.userId); + return; + } + DeviceManagerService::GetInstance().ProcessSyncAccountLogout(logoutAccountMsg.accountId, + rmtUdid, logoutAccountMsg.userId); + LOGI("success."); +} + +int32_t DMCommTool::StartCommonEvent(std::string commonEventType, EventCallback eventCallback) +{ + if (commonEventType.empty() || eventCallback == nullptr) { + LOGE("StartCommonEvent input value invalid"); + return ERR_DM_INPUT_PARA_INVALID; + } + CHECK_NULL_RETURN(eventQueue_, ERR_DM_POINT_NULL); + LOGI("start eventType: %{public}s", commonEventType.c_str()); + std::lock_guard locker(eventMutex_); + auto taskFunc = [eventCallback] () { eventCallback(); }; + eventQueue_->submit(taskFunc); + return DM_OK; +} } // DistributedHardware } // OHOS \ No newline at end of file diff --git a/services/service/src/relationshipsyncmgr/dm_transport.cpp b/services/service/src/relationshipsyncmgr/dm_transport.cpp index 3d102b082ed8412a26c2dbc45fc890adc8adfd9e..1bacbcc7878c257c576b19020d6aca9be24229c4 100644 --- a/services/service/src/relationshipsyncmgr/dm_transport.cpp +++ b/services/service/src/relationshipsyncmgr/dm_transport.cpp @@ -13,6 +13,8 @@ * limitations under the License. */ +#include + #include "dm_transport.h" #include "dm_anonymous.h" #include "dm_comm_tool.h" @@ -20,6 +22,7 @@ #include "dm_log.h" #include "dm_softbus_cache.h" #include "dm_transport_msg.h" +#include "softbus_error_code.h" namespace OHOS { namespace DistributedHardware { @@ -28,6 +31,7 @@ namespace { constexpr uint32_t MAX_SEND_MSG_LENGTH = 4 * 1024 * 1024; constexpr uint32_t INTERCEPT_STRING_LENGTH = 20; constexpr uint32_t MAX_ROUND_SIZE = 1000; +const int32_t USLEEP_TIME_US_200000 = 200000; // 200ms static QosTV g_qosInfo[] = { { .qos = QOS_TYPE_MIN_BW, .value = 256 * 1024}, { .qos = QOS_TYPE_MAX_LATENCY, .value = 8000 }, @@ -117,7 +121,7 @@ void DMTransport::HandleReceiveMessage(const int32_t socketId, const std::string LOGE("payload invalid"); return; } - LOGI("Receive msg: %{public}s", payload.c_str()); + LOGI("Receive msg: %{public}s", GetAnonyString(payload).c_str()); cJSON *root = cJSON_Parse(payload.c_str()); if (root == NULL) { LOGE("the msg is not json format"); @@ -373,13 +377,31 @@ void DMTransport::ClearDeviceSocketOpened(const std::string &remoteDevId, int32_ } int32_t DMTransport::StartSocket(const std::string &rmtNetworkId, int32_t &socketId) +{ + int32_t errCode = ERR_DM_FAILED; + int32_t count = 0; + const int32_t maxCount = 10; + + do { + errCode = StartSocketInner(rmtNetworkId, socketId); + if (errCode != ERR_DM_SOCKET_IN_USED) { + break; + } + count++; + usleep(USLEEP_TIME_US_200000); + } while (count < maxCount); + + return errCode; +} + +int32_t DMTransport::StartSocketInner(const std::string &rmtNetworkId, int32_t &socketId) { if (!IsIdLengthValid(rmtNetworkId)) { return ERR_DM_INPUT_PARA_INVALID; } if (IsDeviceSessionOpened(rmtNetworkId, socketId)) { LOGE("Softbus session has already opened, deviceId: %{public}s", GetAnonyString(rmtNetworkId).c_str()); - return DM_OK; + return ERR_DM_SOCKET_IN_USED; } int32_t socket = CreateClientSocket(rmtNetworkId); @@ -390,6 +412,10 @@ int32_t DMTransport::StartSocket(const std::string &rmtNetworkId, int32_t &socke int32_t ret = Bind(socket, g_qosInfo, g_qosTvParamIndex, &iSocketListener); if (ret < DM_OK) { + if (ret == SOFTBUS_TRANS_SOCKET_IN_USE) { + LOGI("Softbus trans socket in use."); + return ERR_DM_SOCKET_IN_USED; + } LOGE("OpenSession fail, rmtNetworkId: %{public}s, socket: %{public}d, ret: %{public}d", GetAnonyString(rmtNetworkId).c_str(), socket, ret); Shutdown(socket); diff --git a/services/service/src/relationshipsyncmgr/dm_transport_msg.cpp b/services/service/src/relationshipsyncmgr/dm_transport_msg.cpp index 1cbd08a5247ca40a30303963fd019874c9a632c2..1344d1168194b9d32b583d0d24f37fa028ee39f3 100644 --- a/services/service/src/relationshipsyncmgr/dm_transport_msg.cpp +++ b/services/service/src/relationshipsyncmgr/dm_transport_msg.cpp @@ -23,10 +23,16 @@ const int32_t MAX_USER_ID_NUM = 5; const int32_t MAX_BACKGROUND_USER_ID_NUM = 5; const char* const FOREGROUND_USERIDS_MSG_USERIDS_KEY = "foregroundUserIds"; const char* const BACKGROUND_USERIDS_MSG_USERIDS_KEY = "backgroundUserIds"; +const char* const IS_NEW_EVENT_KEY = "isNewEvent"; const char* const COMM_MSG_CODE_KEY = "code"; const char* const COMM_MSG_MSG_KEY = "msg"; const char* const DSOFTBUS_NOTIFY_USERIDS_UDIDKEY = "remoteUdid"; const char* const DSOFTBUS_NOTIFY_USERIDS_USERIDKEY = "foregroundUserIds"; +const char* const DSOFTBUS_NOTIFY_ACCOUNTID_KEY = "accountId"; +const char* const DSOFTBUS_NOTIFY_USERID_KEY = "userId"; +const char* const DSOFTBUS_NOTIFY_TOKENID_KEY = "tokenId"; +const char* const DSOFTBUS_NOTIFY_EXTRA_KEY = "extra"; +const char* const DSOFTBUS_NOTIFY_UDID_KEY = "udid"; } void ToJson(cJSON *jsonObject, const UserIdsMsg &userIdsMsg) { @@ -63,6 +69,7 @@ void ToJson(cJSON *jsonObject, const UserIdsMsg &userIdsMsg) } } cJSON_AddItemToObject(jsonObject, BACKGROUND_USERIDS_MSG_USERIDS_KEY, backgroundUserIdArr); + cJSON_AddBoolToObject(jsonObject, IS_NEW_EVENT_KEY, userIdsMsg.isNewEvent); } void FromJson(const cJSON *jsonObject, UserIdsMsg &userIdsMsg) @@ -102,6 +109,10 @@ void FromJson(const cJSON *jsonObject, UserIdsMsg &userIdsMsg) } } } + cJSON *isNewEventJson = cJSON_GetObjectItem(jsonObject, IS_NEW_EVENT_KEY); + if (cJSON_IsBool(isNewEventJson)) { + userIdsMsg.isNewEvent = (isNewEventJson->valueint != 0); + } } void ToJson(cJSON *jsonObject, const CommMsg &commMsg) @@ -226,5 +237,107 @@ std::string NotifyUserIds::ToString() cJSON_free(retStr); return ret; } + +void ToJson(cJSON *jsonObject, const LogoutAccountMsg &accountInfo) +{ + if (jsonObject == nullptr) { + LOGE("Json pointer is nullptr!"); + return; + } + + cJSON_AddStringToObject(jsonObject, DSOFTBUS_NOTIFY_ACCOUNTID_KEY, accountInfo.accountId.c_str()); + cJSON_AddNumberToObject(jsonObject, DSOFTBUS_NOTIFY_USERID_KEY, accountInfo.userId); +} + +void FromJson(const cJSON *jsonObject, LogoutAccountMsg &accountInfo) +{ + if (jsonObject == nullptr) { + LOGE("Json pointer is nullptr!"); + return; + } + cJSON *accountIdObj = cJSON_GetObjectItem(jsonObject, DSOFTBUS_NOTIFY_ACCOUNTID_KEY); + if (cJSON_IsString(accountIdObj)) { + accountInfo.accountId = accountIdObj->valuestring; + } + + cJSON *userIdObj = cJSON_GetObjectItem(jsonObject, DSOFTBUS_NOTIFY_USERID_KEY); + if (cJSON_IsNumber(userIdObj)) { + accountInfo.userId = userIdObj->valueint; + } +} + +void ToJson(cJSON *jsonObject, const UninstAppMsg &uninstAppMsg) +{ + if (jsonObject == nullptr) { + LOGE("Json pointer is nullptr!"); + return; + } + + cJSON_AddNumberToObject(jsonObject, DSOFTBUS_NOTIFY_USERID_KEY, uninstAppMsg.userId_); + cJSON_AddNumberToObject(jsonObject, DSOFTBUS_NOTIFY_TOKENID_KEY, uninstAppMsg.tokenId_); +} + +void FromJson(const cJSON *jsonObject, UninstAppMsg &uninstAppMsg) +{ + if (jsonObject == nullptr) { + LOGE("Json pointer is nullptr!"); + return; + } + + cJSON *userIdObj = cJSON_GetObjectItem(jsonObject, DSOFTBUS_NOTIFY_USERID_KEY); + cJSON *tokenIdObj = cJSON_GetObjectItem(jsonObject, DSOFTBUS_NOTIFY_TOKENID_KEY); + if (userIdObj == nullptr || tokenIdObj == nullptr) { + LOGE("userIdObj or tokenIdObj is nullptr"); + return; + } + if (cJSON_IsNumber(userIdObj)) { + uninstAppMsg.userId_ = userIdObj->valueint; + } + if (cJSON_IsNumber(tokenIdObj)) { + uninstAppMsg.tokenId_ = tokenIdObj->valueint; + } +} + +void ToJson(cJSON *jsonObject, const UnBindAppMsg &unBindAppMsg) +{ + if (jsonObject == nullptr) { + LOGE("Json pointer is nullptr!"); + return; + } + + cJSON_AddNumberToObject(jsonObject, DSOFTBUS_NOTIFY_USERID_KEY, unBindAppMsg.userId_); + cJSON_AddNumberToObject(jsonObject, DSOFTBUS_NOTIFY_TOKENID_KEY, unBindAppMsg.tokenId_); + cJSON_AddStringToObject(jsonObject, DSOFTBUS_NOTIFY_EXTRA_KEY, unBindAppMsg.extra_.c_str()); + cJSON_AddStringToObject(jsonObject, DSOFTBUS_NOTIFY_UDID_KEY, unBindAppMsg.udid_.c_str()); +} + +void FromJson(const cJSON *jsonObject, UnBindAppMsg &unBindAppMsg) +{ + if (jsonObject == nullptr) { + LOGE("Json pointer is nullptr!"); + return; + } + + cJSON *userIdObj = cJSON_GetObjectItem(jsonObject, DSOFTBUS_NOTIFY_USERID_KEY); + cJSON *tokenIdObj = cJSON_GetObjectItem(jsonObject, DSOFTBUS_NOTIFY_TOKENID_KEY); + cJSON *extraObj = cJSON_GetObjectItem(jsonObject, DSOFTBUS_NOTIFY_EXTRA_KEY); + cJSON *udidObj = cJSON_GetObjectItem(jsonObject, DSOFTBUS_NOTIFY_UDID_KEY); + if (userIdObj == nullptr || tokenIdObj == nullptr || extraObj == nullptr || udidObj == nullptr) { + LOGE("userIdObj or tokenIdObj or extraObj or udidObj is nullptr"); + return; + } + if (cJSON_IsNumber(userIdObj)) { + unBindAppMsg.userId_ = userIdObj->valueint; + } + if (cJSON_IsNumber(tokenIdObj)) { + unBindAppMsg.tokenId_ = tokenIdObj->valueint; + } + if (cJSON_IsString(extraObj)) { + unBindAppMsg.extra_ = extraObj->valuestring; + } + if (cJSON_IsString(udidObj)) { + unBindAppMsg.udid_ = udidObj->valuestring; + } +} } // DistributedHardware } // OHOS \ No newline at end of file diff --git a/services/service/src/relationshipsyncmgr/relationship_sync_mgr.cpp b/services/service/src/relationshipsyncmgr/relationship_sync_mgr.cpp index 962391c13c068ba88046af53acd81126816f3722..8d9923d2deed253f76c0c6fffd7abff1b6e646b8 100644 --- a/services/service/src/relationshipsyncmgr/relationship_sync_mgr.cpp +++ b/services/service/src/relationshipsyncmgr/relationship_sync_mgr.cpp @@ -14,6 +14,10 @@ */ #include "relationship_sync_mgr.h" + +#include +#include + #include "dm_anonymous.h" #include "dm_log.h" @@ -22,30 +26,33 @@ namespace DistributedHardware { DM_IMPLEMENT_SINGLE_INSTANCE(ReleationShipSyncMgr); namespace { /** - * @brief account logout payload length 8 bytes - * | 2 bytes | 6 bytes | - * | userid lower 2 bytes | account id first 6 bytes | + * @brief account logout payload length 9 bytes + * | 2 bytes | 6 bytes | 1 bytes | + * | userid lower 2 bytes | account id first 6 bytes | broadcastId | */ - const int32_t ACCOUNT_LOGOUT_PAYLOAD_LEN = 8; + const int32_t ACCOUNT_LOGOUT_PAYLOAD_LEN = 9; /** * @brief device unbind payload length 2 bytes - * | 2 bytes | - * | userid lower 2 bytes | + * | 2 bytes | 1 bytes | + * | userid lower 2 bytes | broadcastId | */ - const int32_t DEVICE_UNBIND_PAYLOAD_LEN = 2; + const int32_t DEVICE_UNBIND_PAYLOAD_LEN = 3; /** * @brief app unbind payload length 6 bytes - * | 2 bytes | 4 bytes | - * | userid lower 2 bytes | token id lower 4 bytes | + * | 2 bytes | 4 bytes | 4 bytes | 1 bytes | + * | userid lower 2 bytes | token id lower 4 bytes | peertoken id lower 4 bytes | broadcastId | */ - const int32_t APP_UNBIND_PAYLOAD_LEN = 10; + const int32_t APP_UNBIND_PAYLOAD_LEN = 11; /** * @brief delete user payload length 2 bytes - * | 2 bytes | - * | userid lower 2 bytes | + * | 2 bytes | 1 bytes | + * | userid lower 2 bytes | broadcastId | */ - const int32_t DEL_USER_PAYLOAD_LEN = 2; - const int32_t STOP_USER_PAYLOAD_LEN = 2; + const int32_t DEL_USER_PAYLOAD_LEN = 3; + const int32_t STOP_USER_PAYLOAD_LEN = 3; + const int32_t SHARE_UNBIND_PAYLOAD_LEN = 9; + const int32_t SHARE_UNBIND_BROADCAST_LEN = 8; + const int32_t APP_UNINSTALL_PAYLOAD_LEN = 7; /** * @brief the userid payload cost 2 bytes. * @@ -58,6 +65,12 @@ namespace { const int32_t USERID_BYTES = 2; const int32_t BITS_PER_BYTE = 8; const int32_t INVALIED_PAYLOAD_SIZE = 12; + const int32_t CREDID_PAYLOAD_LEN = 8; + const int32_t ACCOUNT_LOGOUT_BROADCAST_LEN = 8; + const int32_t BROADCAST_PAYLOAD_LEN = 10; + const int32_t BROADCAST_TIMEOUT_S = 5; + const int32_t CURRENT_TIME_SEC_FLAG = 10; + const int32_t GET_CURRENT_TIME_MAX_NUM = 3; const char * const MSG_TYPE = "TYPE"; const char * const MSG_VALUE = "VALUE"; @@ -67,6 +80,7 @@ namespace { // The need response mask offset, the 8th bit. const int32_t NEED_RSP_MASK_OFFSET = 7; + const int32_t IS_NEW_USER_SYNC_MASK_OFFSET = 6; /** * @brief The userid cost 2 byte, the heigher part set on the 2th byte. * The Max user id is just above 10000+, cost 15bits. We use the first bit @@ -86,12 +100,12 @@ namespace { const uint16_t FOREGROUND_USERID_LEN_MASK = 0b00000111; const uint16_t ALL_USERID_NUM_MASK = 0b00111000; const uint32_t MAX_MEM_MALLOC_SIZE = 4 * 1024; - const uint32_t MAX_USER_ID_NUM = 5; + const uint32_t MAX_USER_ID_NUM = 4; } RelationShipChangeMsg::RelationShipChangeMsg() : type(RelationShipChangeType::TYPE_MAX), userId(UINT32_MAX), accountId(""), tokenId(UINT64_MAX), peerUdids({}), peerUdid(""), accountName(""), - syncUserIdFlag(false), userIdInfos({}) + syncUserIdFlag(false), userIdInfos({}), isNewEvent(false), broadCastId(UINT8_MAX) { } @@ -116,6 +130,10 @@ bool RelationShipChangeMsg::ToBroadcastPayLoad(uint8_t *&msg, uint32_t &len) con ToAppUnbindPayLoad(msg, len); ret = true; break; + case RelationShipChangeType::SERVICE_UNBIND: + ToServiceUnbindPayLoad(msg, len); + ret = true; + break; case RelationShipChangeType::SYNC_USERID: ret = ToSyncFrontOrBackUserIdPayLoad(msg, len); break; @@ -127,6 +145,14 @@ bool RelationShipChangeMsg::ToBroadcastPayLoad(uint8_t *&msg, uint32_t &len) con ToStopUserPayLoad(msg, len); ret = true; break; + case RelationShipChangeType::SHARE_UNBIND: + ToShareUnbindPayLoad(msg, len); + ret = true; + break; + case RelationShipChangeType::APP_UNINSTALL: + ToAppUninstallPayLoad(msg, len); + ret = true; + break; default: LOGE("RelationShipChange type invalid"); break; @@ -134,6 +160,27 @@ bool RelationShipChangeMsg::ToBroadcastPayLoad(uint8_t *&msg, uint32_t &len) con return ret; } +void RelationShipChangeMsg::ToShareUnbindPayLoad(uint8_t *&msg, uint32_t &len) const +{ + if (credId.length() <= (CREDID_PAYLOAD_LEN - USERID_PAYLOAD_LEN)) { + LOGE("ToShareUnbindPayLoad credId length is invalid."); + len = 0; + return; + } + msg = new uint8_t[SHARE_UNBIND_PAYLOAD_LEN](); + for (int i = 0; i < USERID_PAYLOAD_LEN; i++) { + msg[i] |= (userId >> (i * BITS_PER_BYTE)) & 0xFF; + } + + for (int i = USERID_PAYLOAD_LEN; i < CREDID_PAYLOAD_LEN; i++) { + msg[i] = credId[i - USERID_PAYLOAD_LEN]; + } + for (int i = CREDID_PAYLOAD_LEN; i < SHARE_UNBIND_PAYLOAD_LEN; i++) { + msg[i] |= (broadCastId >> ((i - CREDID_PAYLOAD_LEN) * BITS_PER_BYTE)) & 0xFF; + } + len = SHARE_UNBIND_PAYLOAD_LEN; +} + bool RelationShipChangeMsg::FromBroadcastPayLoad(const cJSON *payloadJson, RelationShipChangeType type) { LOGI("FromBroadcastPayLoad type %{public}d.", type); @@ -152,6 +199,9 @@ bool RelationShipChangeMsg::FromBroadcastPayLoad(const cJSON *payloadJson, Relat case RelationShipChangeType::APP_UNBIND: ret = FromAppUnbindPayLoad(payloadJson); break; + case RelationShipChangeType::SERVICE_UNBIND: + ret = FromServiceUnbindPayLoad(payloadJson); + break; case RelationShipChangeType::SYNC_USERID: ret = FromSyncFrontOrBackUserIdPayLoad(payloadJson); break; @@ -161,6 +211,12 @@ bool RelationShipChangeMsg::FromBroadcastPayLoad(const cJSON *payloadJson, Relat case RelationShipChangeType::STOP_USER: ret = FromStopUserPayLoad(payloadJson); break; + case RelationShipChangeType::SHARE_UNBIND: + ret = FromShareUnbindPayLoad(payloadJson); + break; + case RelationShipChangeType::APP_UNINSTALL: + ret = FromAppUninstallPayLoad(payloadJson); + break; default: LOGE("RelationShipChange type invalid"); break; @@ -168,6 +224,45 @@ bool RelationShipChangeMsg::FromBroadcastPayLoad(const cJSON *payloadJson, Relat return ret; } +bool RelationShipChangeMsg::FromShareUnbindPayLoad(const cJSON *payloadJson) +{ + if (payloadJson == NULL) { + LOGE("Share unbind payloadJson is null."); + return false; + } + int32_t arraySize = cJSON_GetArraySize(payloadJson); + if (arraySize < SHARE_UNBIND_PAYLOAD_LEN || arraySize >= INVALIED_PAYLOAD_SIZE) { + LOGE("Payload invalied,the size is %{public}d.", arraySize); + return false; + } + userId = 0; + for (uint32_t i = 0; i < USERID_PAYLOAD_LEN; i++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, i); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + userId |= (static_cast(payloadItem->valueint)) << (i * BITS_PER_BYTE); + } + } + credId = ""; + for (uint32_t j = USERID_PAYLOAD_LEN; j < CREDID_PAYLOAD_LEN; j++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + credId += static_cast(payloadItem->valueint); + } + } + this->broadCastId = 0; + for (uint32_t j = CREDID_PAYLOAD_LEN; j < SHARE_UNBIND_PAYLOAD_LEN; j++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + this->broadCastId |= (static_cast(payloadItem->valueint)) << + ((j - CREDID_PAYLOAD_LEN) * BITS_PER_BYTE); + } + } + return true; +} + bool RelationShipChangeMsg::IsValid() const { bool ret = false; @@ -187,10 +282,14 @@ bool RelationShipChangeMsg::IsValid() const case RelationShipChangeType::STOP_USER: ret = (userId != UINT32_MAX); break; + case RelationShipChangeType::SHARE_UNBIND: + ret = (userId != UINT32_MAX); + break; case RelationShipChangeType::SERVICE_UNBIND: + ret = (userId != UINT32_MAX); + break; case RelationShipChangeType::APP_UNINSTALL: - // current NOT support - ret = false; + ret = (userId != UINT32_MAX && tokenId != UINT64_MAX); break; case RelationShipChangeType::SYNC_USERID: ret = (!userIdInfos.empty() && @@ -210,7 +309,8 @@ bool RelationShipChangeMsg::IsChangeTypeValid() { return (type == RelationShipChangeType::ACCOUNT_LOGOUT) || (type == RelationShipChangeType::DEVICE_UNBIND) || (type == RelationShipChangeType::APP_UNBIND) || (type == RelationShipChangeType::SYNC_USERID) || - (type == RelationShipChangeType::DEL_USER) || (type == RelationShipChangeType::STOP_USER); + (type == RelationShipChangeType::DEL_USER) || (type == RelationShipChangeType::STOP_USER) || + (type == RelationShipChangeType::SERVICE_UNBIND) || (type == RelationShipChangeType::APP_UNINSTALL); } bool RelationShipChangeMsg::IsChangeTypeValid(uint32_t type) @@ -220,7 +320,10 @@ bool RelationShipChangeMsg::IsChangeTypeValid(uint32_t type) (type == (uint32_t)RelationShipChangeType::APP_UNBIND) || (type == (uint32_t)RelationShipChangeType::SYNC_USERID) || (type == (uint32_t)RelationShipChangeType::DEL_USER) || - (type == (uint32_t)RelationShipChangeType::STOP_USER); + (type == (uint32_t)RelationShipChangeType::STOP_USER) || + (type == (uint32_t)RelationShipChangeType::SHARE_UNBIND) || + (type == (uint32_t)RelationShipChangeType::SERVICE_UNBIND) || + (type == (uint32_t)RelationShipChangeType::APP_UNINSTALL); } void RelationShipChangeMsg::ToAccountLogoutPayLoad(uint8_t *&msg, uint32_t &len) const @@ -230,9 +333,13 @@ void RelationShipChangeMsg::ToAccountLogoutPayLoad(uint8_t *&msg, uint32_t &len) msg[i] |= (userId >> (i * BITS_PER_BYTE)) & 0xFF; } - for (int j = USERID_PAYLOAD_LEN; j < ACCOUNT_LOGOUT_PAYLOAD_LEN; j++) { + for (int j = USERID_PAYLOAD_LEN; j < ACCOUNT_LOGOUT_BROADCAST_LEN; j++) { msg[j] = accountId[j - USERID_PAYLOAD_LEN]; } + + for (int j = ACCOUNT_LOGOUT_BROADCAST_LEN; j < ACCOUNT_LOGOUT_PAYLOAD_LEN; j++) { + msg[j] |= (broadCastId >> ((j - ACCOUNT_LOGOUT_BROADCAST_LEN) * BITS_PER_BYTE)) & 0xFF; + } len = ACCOUNT_LOGOUT_PAYLOAD_LEN; } @@ -242,6 +349,9 @@ void RelationShipChangeMsg::ToDeviceUnbindPayLoad(uint8_t *&msg, uint32_t &len) for (int i = 0; i < USERID_PAYLOAD_LEN; i++) { msg[i] |= (userId >> (i * BITS_PER_BYTE)) & 0xFF; } + for (int i = USERID_PAYLOAD_LEN; i < DEVICE_UNBIND_PAYLOAD_LEN; i++) { + msg[i] |= (broadCastId >> ((i - USERID_PAYLOAD_LEN) * BITS_PER_BYTE)) & 0xFF; + } len = DEVICE_UNBIND_PAYLOAD_LEN; } @@ -256,13 +366,39 @@ void RelationShipChangeMsg::ToAppUnbindPayLoad(uint8_t *&msg, uint32_t &len) con msg[i] |= (tokenId >> ((i - USERID_PAYLOAD_LEN) * BITS_PER_BYTE)) & 0xFF; } - for (int i = TOKENID_PAYLOAD_LEN; i < APP_UNBIND_PAYLOAD_LEN; i++) { + for (int i = TOKENID_PAYLOAD_LEN; i < BROADCAST_PAYLOAD_LEN; i++) { msg[i] |= (peerTokenId >> ((i - TOKENID_PAYLOAD_LEN) * BITS_PER_BYTE)) & 0xFF; } + for (int i = BROADCAST_PAYLOAD_LEN; i < APP_UNBIND_PAYLOAD_LEN; i++) { + msg[i] |= (broadCastId >> ((i - BROADCAST_PAYLOAD_LEN) * BITS_PER_BYTE)) & 0xFF; + } + len = APP_UNBIND_PAYLOAD_LEN; } +void RelationShipChangeMsg::ToAppUninstallPayLoad(uint8_t *&msg, uint32_t &len) const +{ + msg = new uint8_t[APP_UNINSTALL_PAYLOAD_LEN](); + for (int i = 0; i < USERID_PAYLOAD_LEN; i++) { + msg[i] |= (userId >> (i * BITS_PER_BYTE)) & 0xFF; + } + + for (int i = USERID_PAYLOAD_LEN; i < TOKENID_PAYLOAD_LEN; i++) { + msg[i] |= (tokenId >> ((i - USERID_PAYLOAD_LEN) * BITS_PER_BYTE)) & 0xFF; + } + + for (int i = TOKENID_PAYLOAD_LEN; i < APP_UNINSTALL_PAYLOAD_LEN; i++) { + msg[i] |= (broadCastId >> ((i - TOKENID_PAYLOAD_LEN) * BITS_PER_BYTE)) & 0xFF; + } + len = APP_UNINSTALL_PAYLOAD_LEN; +} + +void RelationShipChangeMsg::ToServiceUnbindPayLoad(uint8_t *&msg, uint32_t &len) const +{ + ToAppUnbindPayLoad(msg, len); +} + bool RelationShipChangeMsg::ToSyncFrontOrBackUserIdPayLoad(uint8_t *&msg, uint32_t &len) const { uint32_t userIdNum = static_cast(userIdInfos.size()); @@ -271,9 +407,9 @@ bool RelationShipChangeMsg::ToSyncFrontOrBackUserIdPayLoad(uint8_t *&msg, uint32 return false; } - len = userIdNum * USERID_BYTES + 1; + len = (userIdNum + 1) * USERID_BYTES; - if (len > MAX_MEM_MALLOC_SIZE) { + if (len > INVALIED_PAYLOAD_SIZE) { LOGE("len too long"); return false; } @@ -283,6 +419,9 @@ bool RelationShipChangeMsg::ToSyncFrontOrBackUserIdPayLoad(uint8_t *&msg, uint32 } else { msg[0] |= 0x0 << NEED_RSP_MASK_OFFSET; } + if (isNewEvent) { + msg[0] |= 0x1 << IS_NEW_USER_SYNC_MASK_OFFSET; + } msg[0] |= userIdNum; int32_t userIdIdx = 0; @@ -295,6 +434,7 @@ bool RelationShipChangeMsg::ToSyncFrontOrBackUserIdPayLoad(uint8_t *&msg, uint32 idx += USERID_BYTES; userIdIdx++; } + msg[userIdNum * USERID_BYTES + 1] |= broadCastId & 0xFF; return true; } @@ -302,18 +442,24 @@ void RelationShipChangeMsg::ToDelUserPayLoad(uint8_t *&msg, uint32_t &len) const { len = DEL_USER_PAYLOAD_LEN; msg = new uint8_t[DEL_USER_PAYLOAD_LEN](); - for (int i = 0; i < DEL_USER_PAYLOAD_LEN; i++) { + for (int i = 0; i < USERID_PAYLOAD_LEN; i++) { msg[i] |= (userId >> (i * BITS_PER_BYTE)) & 0xFF; } + for (int i = USERID_PAYLOAD_LEN; i < DEL_USER_PAYLOAD_LEN; i++) { + msg[i] |= (broadCastId >> ((i - USERID_PAYLOAD_LEN) * BITS_PER_BYTE)) & 0xFF; + } } void RelationShipChangeMsg::ToStopUserPayLoad(uint8_t *&msg, uint32_t &len) const { len = STOP_USER_PAYLOAD_LEN; msg = new uint8_t[STOP_USER_PAYLOAD_LEN](); - for (int i = 0; i < STOP_USER_PAYLOAD_LEN; i++) { + for (int i = 0; i < USERID_PAYLOAD_LEN; i++) { msg[i] |= (userId >> (i * BITS_PER_BYTE)) & 0xFF; } + for (int i = USERID_PAYLOAD_LEN; i < STOP_USER_PAYLOAD_LEN; i++) { + msg[i] |= (broadCastId >> ((i - USERID_PAYLOAD_LEN) * BITS_PER_BYTE)) & 0xFF; + } } bool RelationShipChangeMsg::FromAccountLogoutPayLoad(const cJSON *payloadJson) @@ -336,13 +482,22 @@ bool RelationShipChangeMsg::FromAccountLogoutPayLoad(const cJSON *payloadJson) } } accountId = ""; - for (uint32_t j = USERID_PAYLOAD_LEN; j < ACCOUNT_LOGOUT_PAYLOAD_LEN; j++) { + for (uint32_t j = USERID_PAYLOAD_LEN; j < ACCOUNT_LOGOUT_BROADCAST_LEN; j++) { cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); CHECK_NULL_RETURN(payloadItem, false); if (cJSON_IsNumber(payloadItem)) { accountId += static_cast(payloadItem->valueint); } } + broadCastId = 0; + for (uint32_t j = ACCOUNT_LOGOUT_BROADCAST_LEN; j < ACCOUNT_LOGOUT_PAYLOAD_LEN; j++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + broadCastId |= (static_cast(payloadItem->valueint)) << + ((j - ACCOUNT_LOGOUT_BROADCAST_LEN) * BITS_PER_BYTE); + } + } return true; } @@ -353,7 +508,7 @@ bool RelationShipChangeMsg::FromDeviceUnbindPayLoad(const cJSON *payloadJson) return false; } int32_t arraySize = cJSON_GetArraySize(payloadJson); - if (arraySize < ACCOUNT_LOGOUT_PAYLOAD_LEN || arraySize >= INVALIED_PAYLOAD_SIZE) { + if (arraySize < DEVICE_UNBIND_PAYLOAD_LEN || arraySize >= INVALIED_PAYLOAD_SIZE) { LOGE("Payload invalied,the size is %{public}d.", arraySize); return false; } @@ -365,6 +520,15 @@ bool RelationShipChangeMsg::FromDeviceUnbindPayLoad(const cJSON *payloadJson) userId |= (static_cast(payloadItem->valueint)) << (i * BITS_PER_BYTE); } } + broadCastId = 0; + for (uint32_t j = USERID_PAYLOAD_LEN; j < DEVICE_UNBIND_PAYLOAD_LEN; j++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + broadCastId |= (static_cast(payloadItem->valueint)) << + ((j - USERID_PAYLOAD_LEN) * BITS_PER_BYTE); + } + } return true; } @@ -396,7 +560,7 @@ bool RelationShipChangeMsg::FromAppUnbindPayLoad(const cJSON *payloadJson) } } peerTokenId = 0; - for (uint32_t j = TOKENID_PAYLOAD_LEN; j < APP_UNBIND_PAYLOAD_LEN; j++) { + for (uint32_t j = TOKENID_PAYLOAD_LEN; j < BROADCAST_PAYLOAD_LEN; j++) { cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); CHECK_NULL_RETURN(payloadItem, false); if (cJSON_IsNumber(payloadItem)) { @@ -404,6 +568,70 @@ bool RelationShipChangeMsg::FromAppUnbindPayLoad(const cJSON *payloadJson) ((j - TOKENID_PAYLOAD_LEN) * BITS_PER_BYTE); } } + broadCastId = 0; + for (uint32_t j = BROADCAST_PAYLOAD_LEN; j < APP_UNBIND_PAYLOAD_LEN; j++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + broadCastId |= (static_cast(payloadItem->valueint)) << + ((j - BROADCAST_PAYLOAD_LEN) * BITS_PER_BYTE); + } + } + return true; +} + +bool RelationShipChangeMsg::FromAppUninstallPayLoad(const cJSON *payloadJson) +{ + if (payloadJson == NULL) { + LOGE("App unbind payloadJson is null."); + return false; + } + int32_t arraySize = cJSON_GetArraySize(payloadJson); + if (arraySize < APP_UNINSTALL_PAYLOAD_LEN || arraySize >= INVALIED_PAYLOAD_SIZE) { + LOGE("Payload invalied,the size is %{public}d.", arraySize); + return false; + } + userId = 0; + for (uint32_t i = 0; i < USERID_PAYLOAD_LEN; i++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, i); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + userId |= (static_cast(payloadItem->valueint)) << (i * BITS_PER_BYTE); + } + } + tokenId = 0; + for (uint32_t j = USERID_PAYLOAD_LEN; j < TOKENID_PAYLOAD_LEN; j++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + tokenId |= (static_cast(payloadItem->valueint)) << ((j - USERID_PAYLOAD_LEN) * BITS_PER_BYTE); + } + } + this->broadCastId = 0; + for (uint32_t j = TOKENID_PAYLOAD_LEN; j < APP_UNINSTALL_PAYLOAD_LEN; j++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + this->broadCastId |= (static_cast(payloadItem->valueint)) << + ((j - TOKENID_PAYLOAD_LEN) * BITS_PER_BYTE); + } + } + return true; +} + +bool RelationShipChangeMsg::FromServiceUnbindPayLoad(const cJSON *payloadJson) +{ + return FromAppUnbindPayLoad(payloadJson); +} + +bool RelationShipChangeMsg::GetBroadCastId(const cJSON *payloadJson, uint32_t userIdNum) +{ + broadCastId = 0; + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, userIdNum * USERID_BYTES + 1); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + broadCastId |= static_cast(payloadItem->valueint); + } return true; } @@ -427,10 +655,11 @@ bool RelationShipChangeMsg::FromSyncFrontOrBackUserIdPayLoad(const cJSON *payloa if (cJSON_IsNumber(payloadItem)) { uint8_t val = static_cast(payloadItem->valueint); this->syncUserIdFlag = (((val >> NEED_RSP_MASK_OFFSET) & 0x1) == 0x1); + this->isNewEvent = (((val >> IS_NEW_USER_SYNC_MASK_OFFSET) & 0x1) == 0x1); userIdNum = ((static_cast(payloadItem->valueint)) & FOREGROUND_USERID_LEN_MASK); } - int32_t effectiveLen = static_cast(userIdNum * USERID_BYTES + 1); + int32_t effectiveLen = static_cast((userIdNum + 1) * USERID_BYTES); if (effectiveLen > arraySize) { LOGE("payload userIdNum invalid, userIdNum: %{public}u, arraySize: %{public}d", userIdNum, arraySize); return false; @@ -459,7 +688,7 @@ bool RelationShipChangeMsg::FromSyncFrontOrBackUserIdPayLoad(const cJSON *payloa isForegroundUser = false; } } - return true; + return GetBroadCastId(payloadJson, userIdNum); } bool RelationShipChangeMsg::FromDelUserPayLoad(const cJSON *payloadJson) @@ -482,6 +711,15 @@ bool RelationShipChangeMsg::FromDelUserPayLoad(const cJSON *payloadJson) this->userId |= (static_cast(payloadItem->valueint)) << (i * BITS_PER_BYTE); } } + this->broadCastId = 0; + for (uint32_t j = USERID_PAYLOAD_LEN; j < DEL_USER_PAYLOAD_LEN; j++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + this->broadCastId |= (static_cast(payloadItem->valueint)) << + ((j - USERID_PAYLOAD_LEN) * BITS_PER_BYTE); + } + } return true; } @@ -505,6 +743,15 @@ bool RelationShipChangeMsg::FromStopUserPayLoad(const cJSON *payloadJson) this->userId |= (static_cast(payloadItem->valueint)) << (i * BITS_PER_BYTE); } } + this->broadCastId = 0; + for (uint32_t j = USERID_PAYLOAD_LEN; j < STOP_USER_PAYLOAD_LEN; j++) { + cJSON *payloadItem = cJSON_GetArrayItem(payloadJson, j); + CHECK_NULL_RETURN(payloadItem, false); + if (cJSON_IsNumber(payloadItem)) { + this->broadCastId |= (static_cast(payloadItem->valueint)) << + ((j - USERID_PAYLOAD_LEN) * BITS_PER_BYTE); + } + } return true; } @@ -516,6 +763,10 @@ cJSON *RelationShipChangeMsg::ToPayLoadJson() const LOGE("Get broadcast payload failed"); return nullptr; } + if (payload == nullptr || len == 0) { + LOGE("payload is null or len is 0."); + return nullptr; + } cJSON *arrayObj = cJSON_CreateArray(); if (arrayObj == nullptr) { LOGE("cJSON_CreateArray failed"); @@ -567,7 +818,12 @@ std::string RelationShipChangeMsg::ToJson() const cJSON *udidStringObj = nullptr; for (uint32_t index = 0; index < peerUdids.size(); index++) { udidStringObj = cJSON_CreateString(peerUdids[index].c_str()); - if (udidStringObj == nullptr || !cJSON_AddItemToArray(udidArrayObj, udidStringObj)) { + if (udidStringObj == nullptr) { + cJSON_Delete(udidArrayObj); + cJSON_Delete(msg); + return ""; + } + if (!cJSON_AddItemToArray(udidArrayObj, udidStringObj)) { cJSON_Delete(udidStringObj); cJSON_Delete(udidArrayObj); cJSON_Delete(msg); @@ -627,8 +883,64 @@ bool RelationShipChangeMsg::FromJson(const std::string &msgJson) return true; } -std::string ReleationShipSyncMgr::SyncTrustRelationShip(const RelationShipChangeMsg &msg) +const std::string RelationShipChangeMsg::ToMapKey() const +{ + std::ostringstream ret; + std::string isNewEventStr = isNewEvent ? "true" : "false"; + ret << "_" << std::to_string(static_cast(type)); + ret << "_" << isNewEventStr; + ret << "_" << std::to_string(userId); + ret << "_" << GetAnonyString(accountId); + ret << "_" << GetAnonyString(peerUdid); + ret << "_" << std::to_string(tokenId); + ret << "_" << std::to_string(peerTokenId); + ret << "_" << GetUserIdInfoList(userIdInfos); + ret << "_" << std::to_string(syncUserIdFlag); + ret << "_" << credId; + return ret.str(); +} + +void ReleationShipSyncMgr::HandleRecvBroadCastTimeout(const std::string &key) +{ + std::lock_guard autoLock(lock_); + auto iter = recvBroadCastIdMap_.find(key); + if (iter != recvBroadCastIdMap_.end()) { + recvBroadCastIdMap_.erase(iter); + } +} + +bool ReleationShipSyncMgr::GetCurrentTimeSec(int32_t &sec) +{ + int32_t retryNum = 0; + time_t now; + struct tm ltm; + while (retryNum < GET_CURRENT_TIME_MAX_NUM) { + time(&now); + struct tm *res = localtime_r(&now, <m); + if (res == nullptr) { + retryNum++; + LOGE("get current time failed. retryNum: %{public}d", retryNum); + continue; + } + sec = ltm.tm_sec % CURRENT_TIME_SEC_FLAG; + if (sec == 0) { + sec = CURRENT_TIME_SEC_FLAG; + } + return true; + } + return false; +} + +std::string ReleationShipSyncMgr::SyncTrustRelationShip(RelationShipChangeMsg &msg) { + int32_t currentTimeSec = 0; + msg.broadCastId = 0; + if (!GetCurrentTimeSec(currentTimeSec)) { + LOGE("get current time failed, use default value"); + return msg.ToJson(); + } + msg.broadCastId = static_cast(currentTimeSec); + LOGI("send trust change msg: %{public}s", msg.ToString().c_str()); return msg.ToJson(); } @@ -641,27 +953,60 @@ RelationShipChangeMsg ReleationShipSyncMgr::ParseTrustRelationShipChange(const s return msgObj; } +bool ReleationShipSyncMgr::IsNewBroadCastId(const RelationShipChangeMsg &msg) +{ + if (msg.broadCastId == 0) { + return true; + } + std::string key = msg.ToMapKey(); + std::lock_guard autoLock(lock_); + if (timer_ == nullptr) { + timer_ = std::make_shared(); + } + auto iter = recvBroadCastIdMap_.find(key); + if (iter == recvBroadCastIdMap_.end()) { + recvBroadCastIdMap_[key] = msg.broadCastId; + timer_->StartTimer(key, BROADCAST_TIMEOUT_S, [this](std::string key) { + ReleationShipSyncMgr::HandleRecvBroadCastTimeout(key); + }); + return true; + } else if (iter != recvBroadCastIdMap_.end() && recvBroadCastIdMap_[key] != msg.broadCastId) { + timer_->DeleteTimer(key); + recvBroadCastIdMap_[key] = msg.broadCastId; + timer_->StartTimer(key, BROADCAST_TIMEOUT_S, [this](std::string key) { + ReleationShipSyncMgr::HandleRecvBroadCastTimeout(key); + }); + return true; + } else { + return false; + } + return false; +} + const std::string RelationShipChangeMsg::ToString() const { - std::string ret; - ret += "{ MsgType: " + std::to_string(static_cast(type)); - ret += ", userId: " + std::to_string(userId); - ret += ", accountId: " + GetAnonyString(accountId); - ret += ", tokenId: " + std::to_string(tokenId); - ret += ", peerUdids: " + GetAnonyStringList(peerUdids); - ret += ", peerUdid: " + GetAnonyString(peerUdid); - ret += ", accountName: " + GetAnonyString(accountName); - ret += ", syncUserIdFlag: " + std::to_string(syncUserIdFlag); - ret += ", userIds: " + GetUserIdInfoList(userIdInfos) + " }"; - return ret; + std::ostringstream ret; + std::string isNewEventStr = isNewEvent ? "true" : "false"; + ret << "{ MsgType: " << std::to_string(static_cast(type)); + ret << "{ isNewEvent: " << isNewEventStr; + ret << ", userId: " << std::to_string(userId); + ret << ", accountId: " << GetAnonyString(accountId); + ret << ", tokenId: " << std::to_string(tokenId); + ret << ", peerUdids: " << GetAnonyStringList(peerUdids); + ret << ", peerUdid: " << GetAnonyString(peerUdid); + ret << ", accountName: " << GetAnonyString(accountName); + ret << ", syncUserIdFlag: " << std::to_string(syncUserIdFlag); + ret << ", userIds: " << GetUserIdInfoList(userIdInfos); + ret << ", broadCastId: " << std::to_string(broadCastId) << " }"; + return ret.str(); } const std::string UserIdInfo::ToString() const { - std::string ret; - ret += "{ " + std::to_string(this->isForeground); - ret += ", userId: " + std::to_string(this->userId) + " }"; - return ret; + std::ostringstream ret; + ret << "{ " << std::to_string(this->isForeground); + ret << ", userId: " << std::to_string(this->userId) << " }"; + return ret.str(); } const std::string GetUserIdInfoList(const std::vector &list) diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index 5861cef0c062f08661510ada333742b6a6da41a8..f3d2faceff7780cba9d420310736399d305f0f61 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -31,6 +31,7 @@ #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) #include "dm_transport_msg.h" #include "ffrt.h" +#include "multiple_user_connector.h" #endif #include "ipc_skeleton.h" #include "parameter.h" @@ -194,6 +195,19 @@ void SoftbusListener::CredentialAuthStatusProcess(std::string deviceList, uint16 DeviceManagerService::GetInstance().HandleCredentialAuthStatus(deviceList, deviceTypeId, errcode); } +int32_t SoftbusListener::OnSyncLocalAclList(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList) +{ + return DeviceManagerService::GetInstance().SyncLocalAclListProcess(localDevUserInfo, remoteDevUserInfo, + remoteAclList); +} + +int32_t SoftbusListener::OnGetAclListHash(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string &aclList) +{ + return DeviceManagerService::GetInstance().GetAclListHash(localDevUserInfo, remoteDevUserInfo, aclList); +} + void SoftbusListener::OnCredentialAuthStatus(const char *deviceList, uint32_t deviceListLen, uint16_t deviceTypeId, int32_t errcode) { @@ -219,12 +233,11 @@ void SoftbusListener::OnCredentialAuthStatus(const char *deviceList, uint32_t de void SoftbusListener::OnDeviceScreenStatusChanged(NodeStatusType type, NodeStatus *status) { - LOGI("received device screen status change callback from softbus."); if (status == nullptr) { LOGE("[SOFTBUS]status is nullptr, type = %{public}d", static_cast(type)); return; } - LOGI("screenStatusChanged networkId: %{public}s, screenStatus: %{public}d", + LOGI("networkId: %{public}s, screenStatus: %{public}d", GetAnonyString(status->basicInfo.networkId).c_str(), static_cast(status->reserved[0])); if (type != NodeStatusType::TYPE_SCREEN_STATUS) { LOGE("type is not matching."); @@ -350,7 +363,7 @@ void SoftbusListener::UpdateDeviceName(NodeBasicInfo *info) LOGE("GetUdidByNetworkId failed, not update device name"); return; } - LOGI("UpdateDeviceName, info->deviceName: %{public}s.", GetAnonyString(info->deviceName).c_str()); + LOGI("info->deviceName: %{public}s.", GetAnonyString(info->deviceName).c_str()); DeviceProfileConnector::GetInstance().UpdateAclDeviceName(udid, info->deviceName); #endif } @@ -363,7 +376,6 @@ void SoftbusListener::OnSoftbusDeviceInfoChanged(NodeBasicInfoType type, NodeBas return; } if (type == NodeBasicInfoType::TYPE_DEVICE_NAME || type == NodeBasicInfoType::TYPE_NETWORK_INFO) { - LOGI("DeviceInfo %{public}d change.", type); DmDeviceInfo dmDeviceInfo; int32_t networkType = -1; if (type == NodeBasicInfoType::TYPE_NETWORK_INFO) { @@ -372,7 +384,7 @@ void SoftbusListener::OnSoftbusDeviceInfoChanged(NodeBasicInfoType type, NodeBas LOGE("[SOFTBUS]GetNodeKeyInfo networkType failed."); return; } - LOGI("OnSoftbusDeviceInfoChanged NetworkType %{public}d.", networkType); + LOGI("NetworkType %{public}d.", networkType); } if (type == NodeBasicInfoType::TYPE_DEVICE_NAME) { UpdateDeviceName(info); @@ -395,7 +407,7 @@ void SoftbusListener::OnSoftbusDeviceInfoChanged(NodeBasicInfoType type, NodeBas void SoftbusListener::OnLocalDevInfoChange() { - LOGI("SoftbusListener::OnLocalDevInfoChange"); + LOGI("start"); SoftbusCache::GetInstance().UpDataLocalDevInfo(); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) NodeBasicInfo nodeBasicInfo; @@ -416,7 +428,7 @@ void SoftbusListener::OnLocalDevInfoChange() void SoftbusListener::OnDeviceTrustedChange(TrustChangeType type, const char *msg, uint32_t msgLen) { - LOGI("OnDeviceTrustedChange."); + LOGI("start."); if (msg == nullptr || msgLen > MAX_SOFTBUS_MSG_LEN || strlen(msg) != msgLen) { LOGE("OnDeviceTrustedChange msg invalied."); return; @@ -514,7 +526,7 @@ void SoftbusListener::OnSoftbusDiscoveryResult(int subscribeId, RefreshResult re void SoftbusListener::OnSoftbusPublishResult(int publishId, PublishResult result) { - LOGD("OnSoftbusPublishResult, publishId: %{public}d, result: %{public}d.", publishId, result); + LOGD("publishId: %{public}d, result: %{public}d.", publishId, result); } SoftbusListener::SoftbusListener() @@ -585,7 +597,7 @@ int32_t SoftbusListener::InitSoftPublishLNN() publishInfo.freq = ExchangeFreq::LOW; publishInfo.capability = DM_CAPABILITY_OSD; publishInfo.ranging = false; - LOGI("InitSoftPublishLNN begin, publishId: %{public}d, mode: 0x%{public}x, medium: %{public}d, capability:" + LOGI("begin, publishId: %{public}d, mode: 0x%{public}x, medium: %{public}d, capability:" "%{public}s, ranging: %{public}d, freq: %{public}d.", publishInfo.publishId, publishInfo.mode, publishInfo.medium, publishInfo.capability, publishInfo.ranging, publishInfo.freq); @@ -600,7 +612,7 @@ int32_t SoftbusListener::InitSoftPublishLNN() int32_t SoftbusListener::RefreshSoftbusLNN(const char *pkgName, const DmSubscribeInfo &dmSubInfo, const std::string &customData) { - LOGI("RefreshSoftbusLNN begin, subscribeId: %{public}d.", dmSubInfo.subscribeId); + LOGI("begin, subscribeId: %{public}d.", dmSubInfo.subscribeId); SubscribeInfo subscribeInfo; if (memset_s(&subscribeInfo, sizeof(SubscribeInfo), 0, sizeof(SubscribeInfo)) != DM_OK) { LOGE("RefreshSoftbusLNN memset_s failed."); @@ -617,7 +629,7 @@ int32_t SoftbusListener::RefreshSoftbusLNN(const char *pkgName, const DmSubscrib subscribeInfo.capabilityData = const_cast(reinterpret_cast(customData.c_str())); subscribeInfo.dataLen = customData.size(); - LOGI("RefreshSoftbusLNN begin, subscribeId: %{public}d, mode: 0x%{public}x, medium: %{public}d, capability:" + LOGI("subscribeId: %{public}d, mode: 0x%{public}x, medium: %{public}d, capability:" "%{public}s, freq: %{public}d.", subscribeInfo.subscribeId, subscribeInfo.mode, subscribeInfo.medium, subscribeInfo.capability, subscribeInfo.freq); int32_t ret = ::RefreshLNN(pkgName, &subscribeInfo, &softbusRefreshCallback_); @@ -646,7 +658,7 @@ int32_t SoftbusListener::RefreshSoftbusLNN(const char *pkgName, const DmSubscrib int32_t SoftbusListener::StopRefreshSoftbusLNN(uint16_t subscribeId) { - LOGI("StopRefreshSoftbusLNN begin, subscribeId: %{public}d.", (int32_t)subscribeId); + LOGI("begin, subscribeId: %{public}d.", (int32_t)subscribeId); { std::lock_guard lock(g_lockDeviceIdSet); deviceIdSet.clear(); @@ -738,7 +750,7 @@ int32_t SoftbusListener::GetTrustedDeviceList(std::vector &deviceI { int32_t ret = SoftbusCache::GetInstance().GetDeviceInfoFromCache(deviceInfoList); size_t deviceCount = deviceInfoList.size(); - LOGI("Success from cache deviceInfoList size is %{public}zu.", deviceCount); + LOGI("size is %{public}zu.", deviceCount); return ret; } @@ -956,6 +968,11 @@ void SoftbusListener::ParseConnAddrInfo(const ConnectionAddr *addrInfo, JsonObje jsonObj[PARAM_KEY_USB_IP] = usbIp; jsonObj[PARAM_KEY_USB_PORT] = (addrInfo->info).ip.port; jsonObj[PARAM_KEY_CONN_ADDR_TYPE] = CONN_ADDR_TYPE_USB; + } else if (addrInfo->type == ConnectionAddrType::CONNECTION_ADDR_NCM) { + std::string ncmIp((addrInfo->info).ip.ip); + jsonObj[PARAM_KEY_NCM_IP] = ncmIp; + jsonObj[PARAM_KEY_NCM_PORT] = (addrInfo->info).ip.port; + jsonObj[PARAM_KEY_CONN_ADDR_TYPE] = CONN_ADDR_TYPE_NCM; } else { LOGI("Unknown connection address type: %{public}d.", addrInfo->type); } @@ -971,7 +988,7 @@ int32_t SoftbusListener::GetNetworkTypeByNetworkId(const char *networkId, int32_ return ret; } networkType = tempNetworkType; - LOGI("GetNetworkTypeByNetworkId networkType %{public}d.", tempNetworkType); + LOGI("networkType %{public}d.", tempNetworkType); return DM_OK; } @@ -1080,7 +1097,6 @@ bool SoftbusListener::IsDmRadarHelperReady() bool SoftbusListener::CloseDmRadarHelperObj(std::string name) { (void)name; - LOGI("SoftbusListener::CloseDmRadarHelperObj start."); std::lock_guard lock(g_radarLoadLock); if (!isRadarSoLoad_ && (dmRadarHelper_ == nullptr) && (radarHandle_ == nullptr)) { return true; @@ -1094,7 +1110,7 @@ bool SoftbusListener::CloseDmRadarHelperObj(std::string name) isRadarSoLoad_ = false; dmRadarHelper_ = nullptr; radarHandle_ = nullptr; - LOGI("close libdevicemanagerradar so success."); + LOGI("success."); return true; } @@ -1153,7 +1169,8 @@ int32_t SoftbusListener::GetIPAddrTypeFromCache(const std::string &deviceId, con continue; } if (addrInfo->type == ConnectionAddrType::CONNECTION_ADDR_ETH || - addrInfo->type == ConnectionAddrType::CONNECTION_ADDR_WLAN) { + addrInfo->type == ConnectionAddrType::CONNECTION_ADDR_WLAN || + addrInfo->type == ConnectionAddrType::CONNECTION_ADDR_NCM) { std::string cacheIp((addrInfo->info).ip.ip); if (cacheIp == ip) { addrType = addrInfo->type; @@ -1176,7 +1193,7 @@ std::string SoftbusListener::GetHostPkgName() void SoftbusListener::SendAclChangedBroadcast(const std::string &msg) { - LOGI("SendAclChangedBroadcast"); + LOGI("start"); if (SyncTrustedRelationShip(DM_PKG_NAME, msg.c_str(), msg.length()) != DM_OK) { LOGE("SyncTrustedRelationShip failed."); } @@ -1197,7 +1214,7 @@ int32_t SoftbusListener::GetDeviceScreenStatus(const char *networkId, int32_t &s return ret; } screenStatus = devScreenStatus; - LOGI("GetDeviceScreenStatus screenStatus: %{public}d.", devScreenStatus); + LOGI("screenStatus: %{public}d.", devScreenStatus); return DM_OK; } @@ -1207,7 +1224,6 @@ int32_t SoftbusListener::SetForegroundUserIdsToDSoftBus(const std::string &remot #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) NotifyUserIds notifyUserIds(remoteUdid, userIds); std::string msg = notifyUserIds.ToString(); - LOGI("Notify remote userid to dsoftbus, msg: %{public}s", GetAnonyString(msg).c_str()); return DM_OK; #else (void)remoteUdid; @@ -1218,7 +1234,7 @@ int32_t SoftbusListener::SetForegroundUserIdsToDSoftBus(const std::string &remot void SoftbusListener::DeleteCacheDeviceInfo() { - LOGI("DeleteCacheDeviceInfo start."); + LOGI("start."); std::vector onlineDevInfoVec; SoftbusCache::GetInstance().GetDeviceInfoFromCache(onlineDevInfoVec); if (onlineDevInfoVec.empty()) { @@ -1234,7 +1250,7 @@ void SoftbusListener::DeleteCacheDeviceInfo() int32_t SoftbusListener::SetLocalDisplayName(const std::string &displayName) { - LOGI("SoftbusListener Start SetLocalDisplayName!"); + LOGI("start"); uint32_t len = static_cast(displayName.size()); int32_t ret = ::SetDisplayName(DM_PKG_NAME, displayName.c_str(), len); if (ret != DM_OK) { @@ -1294,6 +1310,10 @@ int32_t SoftbusListener::GetAllTrustedDeviceList(const std::string &pkgName, con { #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) (void)extra; + int32_t currentUserId = MultipleUserConnector::GetCurrentAccountUserID(); + char localDeviceId[DEVICE_UUID_LENGTH] = {0}; + GetDevUdid(localDeviceId, DEVICE_UUID_LENGTH); + std::string localUdid = std::string(localDeviceId); std::vector allProfile = DeviceProfileConnector::GetInstance().GetAllAccessControlProfile(); for (DistributedDeviceProfile::AccessControlProfile profile : allProfile) { @@ -1301,14 +1321,16 @@ int32_t SoftbusListener::GetAllTrustedDeviceList(const std::string &pkgName, con continue; } DistributedDeviceProfile::Accesser acer = profile.GetAccesser(); - if (pkgName == acer.GetAccesserBundleName()) { + if (pkgName == acer.GetAccesserBundleName() && currentUserId == acer.GetAccesserUserId() && + localUdid == acer.GetAccesserDeviceId()) { DmDeviceInfo deviceinfo; ConvertAclToDeviceInfo(profile, deviceinfo); deviceList.push_back(deviceinfo); continue; } DistributedDeviceProfile::Accessee acee = profile.GetAccessee(); - if (pkgName == acee.GetAccesseeBundleName()) { + if (pkgName == acee.GetAccesseeBundleName() && currentUserId == acee.GetAccesseeUserId() && + localUdid == acee.GetAccesseeDeviceId()) { DmDeviceInfo deviceinfo; ConvertAclToDeviceInfo(profile, deviceinfo); deviceList.push_back(deviceinfo); @@ -1349,7 +1371,7 @@ int32_t SoftbusListener::GetAttrFromExtraData(DmDeviceInfo &dmDevInfo, int32_t & return DM_OK; } cJSON *customData = cJSON_GetObjectItem(extraDataJsonObj, PARAM_KEY_CUSTOM_DATA); - if (customData == NULL) { + if (customData == NULL || customData->valuestring == NULL) { cJSON_Delete(extraDataJsonObj); return DM_OK; } diff --git a/services/service/src/softbus/softbus_publish.cpp b/services/service/src/softbus/softbus_publish.cpp index 94a605c1424d5e3ecc1614a5e4c0d1614cfb893b..c6ccd4425f086fa19e4777531c28140fb8756c1c 100644 --- a/services/service/src/softbus/softbus_publish.cpp +++ b/services/service/src/softbus/softbus_publish.cpp @@ -40,7 +40,7 @@ std::mutex g_publishMutex; void PublishCommonEventCallback(int32_t bluetoothState, int32_t wifiState, int32_t screenState) { - LOGI("PublishCommonEventCallback start, bleState: %{public}d, wifiState: %{public}d, screenState: %{public}d", + LOGI("start, bleState: %{public}d, wifiState: %{public}d, screenState: %{public}d", bluetoothState, wifiState, screenState); std::lock_guard saLock(g_publishMutex); DmDeviceInfo info; @@ -49,7 +49,6 @@ void PublishCommonEventCallback(int32_t bluetoothState, int32_t wifiState, int32 LOGE("deviceType: %{public}d is watch, not publish", static_cast(info.deviceTypeId)); return; } - LOGI("deviceType: %{public}d", static_cast(info.deviceTypeId)); SoftbusPublish softbusPublish; if (screenState == DM_SCREEN_OFF) { int32_t ret = softbusPublish.StopPublishSoftbusLNN(DISTRIBUTED_HARDWARE_DEVICEMANAGER_SA_ID); @@ -101,7 +100,7 @@ SoftbusPublish::~SoftbusPublish() void SoftbusPublish::OnSoftbusPublishResult(int publishId, PublishResult result) { - LOGD("OnSoftbusPublishResult, publishId: %{public}d, result: %{public}d.", publishId, result); + LOGD("publishId: %{public}d, result: %{public}d.", publishId, result); } int32_t SoftbusPublish::PublishSoftbusLNN() @@ -114,10 +113,7 @@ int32_t SoftbusPublish::PublishSoftbusLNN() publishInfo.capability = DM_CAPABILITY_OSD; publishInfo.ranging = false; - LOGI("Begin, publishId: %{public}d, mode: 0x%{public}x, medium: %{public}d, capability:" - "%{public}s, ranging: %{public}d, freq: %{public}d.", publishInfo.publishId, publishInfo.mode, - publishInfo.medium, publishInfo.capability, publishInfo.ranging, publishInfo.freq); - + LOGI("Begin"); int32_t ret = PublishLNN(DM_PKG_NAME, &publishInfo, &softbusPublishCallback_); if (ret != DM_OK) { LOGE("[SOFTBUS]PublishLNN failed, ret: %{public}d.", ret); diff --git a/services/softbuscache/BUILD.gn b/services/softbuscache/BUILD.gn index b9dffcf3c54c9c562ba5e5b4946d7917c3f13d6a..49a243c36afd9896067c0f8e8a4bcd6b9336462e 100644 --- a/services/softbuscache/BUILD.gn +++ b/services/softbuscache/BUILD.gn @@ -25,7 +25,7 @@ if (defined(ohos_lite)) { "${common_path}/include", "${innerkits_path}/native_cpp/include", "${utils_path}/include/crypto", - "//third_party/cJSON", + "${json_path}/include", ] sources = [ @@ -42,6 +42,7 @@ if (defined(ohos_lite)) { deps = [ "${dsoftbussdk_path}:softbus_client", "${hilog_path}:hilog_shared", + "${json_path}:devicemanagerjson", "${third_path}:libsec_shared", "${utils_path}:devicemanagerutils", ] @@ -85,6 +86,7 @@ if (defined(ohos_lite)) { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", "${utils_path}:devicemanagerutils", ] diff --git a/services/softbuscache/src/dm_softbus_cache.cpp b/services/softbuscache/src/dm_softbus_cache.cpp index 02f9dc378c3ec896e74593771acef4355c2a35dd..1c285bcd9809900088dd90e1a656cecc48255d3a 100644 --- a/services/softbuscache/src/dm_softbus_cache.cpp +++ b/services/softbuscache/src/dm_softbus_cache.cpp @@ -29,7 +29,7 @@ DmDeviceInfo localDeviceInfo_; std::mutex localDevInfoMutex_; void SoftbusCache::SaveLocalDeviceInfo() { - LOGI("SoftbusCache::SaveLocalDeviceInfo"); + LOGI("start"); std::lock_guard mutexLock(localDevInfoMutex_); if (g_online) { return; @@ -41,8 +41,7 @@ void SoftbusCache::SaveLocalDeviceInfo() return; } ConvertNodeBasicInfoToDmDevice(nodeBasicInfo, localDeviceInfo_); - LOGI("SoftbusCache::SaveLocalDeviceInfo networkid %{public}s.", - GetAnonyString(std::string(localDeviceInfo_.networkId)).c_str()); + LOGI("networkid %{public}s.", GetAnonyString(std::string(localDeviceInfo_.networkId)).c_str()); SaveDeviceInfo(localDeviceInfo_); SaveDeviceSecurityLevel(localDeviceInfo_.networkId); g_online = true; @@ -51,8 +50,7 @@ void SoftbusCache::SaveLocalDeviceInfo() void SoftbusCache::DeleteLocalDeviceInfo() { - LOGI("SoftbusCache::DeleteLocalDeviceInfo networkid %{public}s.", - GetAnonyString(std::string(localDeviceInfo_.networkId)).c_str()); + LOGI("networkid %{public}s.", GetAnonyString(std::string(localDeviceInfo_.networkId)).c_str()); std::lock_guard mutexLock(localDevInfoMutex_); g_online = false; g_getLocalDevInfo = false; @@ -63,7 +61,7 @@ int32_t SoftbusCache::GetLocalDeviceInfo(DmDeviceInfo &nodeInfo) std::lock_guard mutexLock(localDevInfoMutex_); if (g_getLocalDevInfo) { nodeInfo = localDeviceInfo_; - LOGD("SoftbusCache::GetLocalDeviceInfo from dm cache."); + LOGD("dm cache success."); return DM_OK; } NodeBasicInfo nodeBasicInfo; @@ -77,13 +75,13 @@ int32_t SoftbusCache::GetLocalDeviceInfo(DmDeviceInfo &nodeInfo) SaveDeviceInfo(localDeviceInfo_); SaveDeviceSecurityLevel(localDeviceInfo_.networkId); g_getLocalDevInfo = true; - LOGI("SoftbusCache::GetLocalDeviceInfo from softbus."); + LOGI("from softbus success."); return DM_OK; } void SoftbusCache::UpDataLocalDevInfo() { - LOGI("SoftbusCache::UpDataLocalDevInfo"); + LOGI("start"); NodeBasicInfo nodeBasicInfo; int32_t ret = GetLocalNodeDeviceInfo(DM_PKG_NAME, &nodeBasicInfo); if (ret != DM_OK) { @@ -121,7 +119,7 @@ int32_t SoftbusCache::GetUuidByNetworkId(const char *networkId, std::string &uui void SoftbusCache::SaveDeviceInfo(DmDeviceInfo deviceInfo) { - LOGI("SoftbusCache::SaveDeviceInfo"); + LOGI("start"); std::string udid = ""; std::string uuid = ""; if (deviceInfo.networkId[0] == '\0') { @@ -146,18 +144,17 @@ void SoftbusCache::SaveDeviceInfo(DmDeviceInfo deviceInfo) } std::lock_guard mutexLock(deviceInfosMutex_); deviceInfo_[udid] = std::pair(uuid, deviceInfo); - LOGI("SaveDeviceInfo success udid %{public}s, networkId %{public}s", + LOGI("success udid %{public}s, networkId %{public}s", GetAnonyString(udid).c_str(), GetAnonyString(std::string(deviceInfo.networkId)).c_str()); } void SoftbusCache::DeleteDeviceInfo(const DmDeviceInfo &nodeInfo) { - LOGI("SoftbusCache::DeleteDeviceInfo networkId %{public}s", - GetAnonyString(std::string(nodeInfo.networkId)).c_str()); + LOGI("networkId %{public}s", GetAnonyString(std::string(nodeInfo.networkId)).c_str()); std::lock_guard mutexLock(deviceInfosMutex_); for (const auto &item : deviceInfo_) { if (std::string(item.second.second.networkId) == std::string(nodeInfo.networkId)) { - LOGI("DeleteDeviceInfo success udid %{public}s", GetAnonyString(item.first).c_str()); + LOGI("success udid %{public}s", GetAnonyString(item.first).c_str()); deviceInfo_.erase(item.first); break; } @@ -172,7 +169,7 @@ void SoftbusCache::DeleteDeviceInfo() void SoftbusCache::ChangeDeviceInfo(const DmDeviceInfo deviceInfo) { - LOGI("SoftbusCache::ChangeDeviceInfo"); + LOGI("start"); std::string udid = ""; GetUdidByNetworkId(deviceInfo.networkId, udid); std::lock_guard mutexLock(deviceInfosMutex_); @@ -192,7 +189,7 @@ void SoftbusCache::ChangeDeviceInfo(const DmDeviceInfo deviceInfo) GetUuidByNetworkId(deviceInfo.networkId, uuid); deviceInfo_[udid].first = uuid; } - LOGI("ChangeDeviceInfo sucess udid %{public}s, networkId %{public}s.", + LOGI("sucess udid %{public}s, networkId %{public}s.", GetAnonyString(udid).c_str(), GetAnonyString(std::string(deviceInfo.networkId)).c_str()); } @@ -210,7 +207,7 @@ int32_t SoftbusCache::GetDeviceInfoFromCache(std::vector &deviceIn void SoftbusCache::UpdateDeviceInfoCache() { - LOGI("SoftbusCache::UpdateDeviceInfoCache"); + LOGI("start"); int32_t deviceCount = 0; NodeBasicInfo *nodeInfo = nullptr; int32_t ret = GetAllNodeDeviceInfo(DM_PKG_NAME, &nodeInfo, &deviceCount); @@ -226,7 +223,7 @@ void SoftbusCache::UpdateDeviceInfoCache() SaveDeviceInfo(deviceInfo); } FreeNodeInfo(nodeInfo); - LOGI("UpdateDeviceInfoCache success, deviceCount: %{public}d.", deviceCount); + LOGI("success, deviceCount: %{public}d.", deviceCount); return; } @@ -299,7 +296,7 @@ int32_t SoftbusCache::ConvertNodeBasicInfoToDmDevice(const NodeBasicInfo &nodeIn void SoftbusCache::SaveDeviceSecurityLevel(const char *networkId) { - LOGI("SoftbusCache::SaveDeviceSecurityLevel networkId %{public}s.", GetAnonyString(std::string(networkId)).c_str()); + LOGI("networkId %{public}s.", GetAnonyString(std::string(networkId)).c_str()); std::lock_guard mutexLock(deviceSecurityLevelMutex_); if (deviceSecurityLevel_.find(std::string(networkId)) != deviceSecurityLevel_.end()) { return; @@ -315,8 +312,7 @@ void SoftbusCache::SaveDeviceSecurityLevel(const char *networkId) void SoftbusCache::DeleteDeviceSecurityLevel(const char *networkId) { - LOGI("SoftbusCache::DeleteDeviceSecurityLevel networkId %{public}s.", - GetAnonyString(std::string(networkId)).c_str()); + LOGI("networkId %{public}s.", GetAnonyString(std::string(networkId)).c_str()); std::lock_guard mutexLock(deviceSecurityLevelMutex_); if (deviceSecurityLevel_.find(std::string(networkId)) != deviceSecurityLevel_.end()) { deviceSecurityLevel_.erase(std::string(networkId)); @@ -364,7 +360,7 @@ int32_t SoftbusCache::GetDevInfoByNetworkId(const std::string &networkId, DmDevi for (const auto &item : deviceInfo_) { if (std::string(item.second.second.networkId) == networkId) { nodeInfo = item.second.second; - LOGI("GetDevInfoByNetworkId success networkId %{public}s, udid %{public}s.", + LOGI("success networkId %{public}s, udid %{public}s.", GetAnonyString(networkId).c_str(), GetAnonyString(item.first).c_str()); return DM_OK; } @@ -403,23 +399,22 @@ int32_t SoftbusCache::GetDevInfoFromBus(const std::string &networkId, DmDeviceIn int32_t SoftbusCache::GetUdidByUdidHash(const std::string &udidHash, std::string &udid) { - LOGI("udidHash %{public}s.", GetAnonyString(udidHash).c_str()); { std::lock_guard mutexLock(deviceInfosMutex_); for (const auto &item : deviceInfo_) { if (std::string(item.second.second.deviceId) == udidHash) { udid = item.first; - LOGI("GetUdidByUdidHash success udid %{public}s.", GetAnonyString(udid).c_str()); + LOGI("success udid %{public}s.", GetAnonyString(udid).c_str()); return DM_OK; } } } + LOGI("failed udidHash %{public}s.", GetAnonyString(udidHash).c_str()); return ERR_DM_FAILED; } int32_t SoftbusCache::GetUuidByUdid(const std::string &udid, std::string &uuid) { - LOGI("udid %{public}s.", GetAnonyString(udid).c_str()); { std::lock_guard mutexLock(deviceInfosMutex_); if (deviceInfo_.find(udid) != deviceInfo_.end()) { @@ -428,45 +423,47 @@ int32_t SoftbusCache::GetUuidByUdid(const std::string &udid, std::string &uuid) return DM_OK; } } + LOGI("failed udid %{public}s.", GetAnonyString(udid).c_str()); return ERR_DM_FAILED; } int32_t SoftbusCache::GetNetworkIdFromCache(const std::string &udid, std::string &networkId) { - LOGI("udid %{public}s.", GetAnonyString(udid).c_str()); { std::lock_guard mutexLock(deviceInfosMutex_); if (deviceInfo_.find(udid) != deviceInfo_.end()) { networkId = deviceInfo_[udid].second.networkId; - LOGI("GetNetworkIdFromCache success networkId %{public}s, udid %{public}s.", + LOGI("success networkId %{public}s, udid %{public}s.", GetAnonyString(networkId).c_str(), GetAnonyString(udid).c_str()); return DM_OK; } } + LOGI("failed udid %{public}s.", GetAnonyString(udid).c_str()); return ERR_DM_FAILED; } int32_t SoftbusCache::GetDeviceNameFromCache(const std::string &udid, std::string &deviceName) { - LOGI("udid %{public}s.", GetAnonyString(udid).c_str()); { std::lock_guard mutexLock(deviceInfosMutex_); if (deviceInfo_.find(udid) != deviceInfo_.end()) { deviceName = deviceInfo_[udid].second.deviceName; - LOGI("GetDeviceNameFromCache success deviceName: %{public}s, udid: %{public}s.", + LOGI("success deviceName: %{public}s, udid: %{public}s.", deviceName.c_str(), GetAnonyString(udid).c_str()); return DM_OK; } } + LOGI("failed udid %{public}s.", GetAnonyString(udid).c_str()); return ERR_DM_FAILED; } bool SoftbusCache::CheckIsOnline(const std::string &deviceId) { - LOGI("deviceId %{public}s.", GetAnonyString(deviceId).c_str()); { std::lock_guard mutexLock(deviceInfosMutex_); for (const auto &item : deviceInfo_) { + LOGI("deviceId %{public}s, cache deviceId %{public}s.", GetAnonyString(deviceId).c_str(), + GetAnonyString(std::string(item.second.second.deviceId)).c_str()); if (std::string(item.second.second.deviceId) == deviceId) { LOGI("CheckIsOnline is true."); return true; diff --git a/test/BUILD.gn b/test/BUILD.gn index b5cd94a6b1a55884dab6b954419baa1411221c57..c856a29d07410f6762367b2c15713fd527d77ca9 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -19,6 +19,7 @@ group("test") { deps += [ "benchmarktest:benchmarktest", "commonfuzztest:fuzztest", + "interfacesfuzztest:fuzztest", "servicesfuzztest:fuzztest", "softbusfuzztest:fuzztest", "unittest:unittest", diff --git a/test/benchmarktest/device_manager_fa_test/BUILD.gn b/test/benchmarktest/device_manager_fa_test/BUILD.gn index 39b5a3ef28403e1d75aa1db0997ccfac66eb352f..ee21f117202c280d14162b6d13e9b06aa7adf7e1 100644 --- a/test/benchmarktest/device_manager_fa_test/BUILD.gn +++ b/test/benchmarktest/device_manager_fa_test/BUILD.gn @@ -38,10 +38,12 @@ ohos_benchmarktest("DeviceManagerFaTest") { "access_token:libnativetoken", "access_token:libtoken_setproc", "bounds_checking_function:libsec_shared", + "cJSON:cjson_static", "dsoftbus:softbus_client", "ipc:ipc_single", "napi:ace_napi", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/benchmarktest/device_manager_test/BUILD.gn b/test/benchmarktest/device_manager_test/BUILD.gn index d6d35d51284325b7dedabcd20fc9631d0267d1fd..8de2eb535d467d4a31fef977a62ead75c13211f2 100644 --- a/test/benchmarktest/device_manager_test/BUILD.gn +++ b/test/benchmarktest/device_manager_test/BUILD.gn @@ -35,7 +35,9 @@ ohos_benchmarktest("DeviceManagerTest") { "access_token:libtoken_setproc", "benchmark:benchmark", "bounds_checking_function:libsec_shared", + "cJSON:cjson_static", "dsoftbus:softbus_client", + "selinux_adapter:librestorecon", ] } diff --git a/test/commonfuzztest/BUILD.gn b/test/commonfuzztest/BUILD.gn index 4430b898c558325dd8cf715f3cac09ba6f42408f..c88c67ba243daa0e32af9e3f00ab22ec24c2da27 100644 --- a/test/commonfuzztest/BUILD.gn +++ b/test/commonfuzztest/BUILD.gn @@ -19,12 +19,14 @@ group("fuzztest") { "authenticatedeviceservice_fuzzer:fuzztest", "authenticatedeviceserviceimpl_fuzzer:fuzztest", "dmauthmanager_fuzzer:fuzztest", + "dmauthmanagerv2_fuzzer:fuzztest", "dmcommoneventmanager_fuzzer:fuzztest", "dmcredentialimpl_fuzzer:fuzztest", "generateencrypteduuid_fuzzer:fuzztest", "getdeviceinfo_fuzzer:fuzztest", "hichainconnector_fuzzer:fuzztest", "ondatareceived_fuzzer:fuzztest", + "ondatareceivedv2_fuzzer:fuzztest", "onerror_fuzzer:fuzztest", "onfinish_fuzzer:fuzztest", "onrequest_fuzzer:fuzztest", diff --git a/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn index 80b79330e3d0e423dcee18564545dadf29a3a2f3..11daa7b6b34c829ef7fc318abc6e538c381be7b7 100644 --- a/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn @@ -33,7 +33,9 @@ ohos_fuzztest("AuthenticateDeviceFuzzTest") { "${innerkits_path}/native_cpp/include/ipc", "${innerkits_path}/native_cpp/include/notify", "${utils_path}/include", + "${utils_path}/include/crypto", "${utils_path}/include/ipc/standard", + "${utils_path}/include/kvadapter", "${servicesimpl_path}/include", "${servicesimpl_path}/include/dependency/timer", "${servicesimpl_path}/include/discovery", @@ -59,7 +61,10 @@ ohos_fuzztest("AuthenticateDeviceFuzzTest") { ] sources = [ "authenticate_device_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${utils_path}:devicemanagerutils", + ] defines = [ "HI_LOG_ENABLE", @@ -71,12 +76,14 @@ ohos_fuzztest("AuthenticateDeviceFuzzTest") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "cJSON:cjson_static", "c_utils:utils", "device_auth:deviceauth_sdk", "ipc:ipc_single", "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "selinux_adapter:librestorecon", ] } diff --git a/test/commonfuzztest/authenticatedevice_fuzzer/authenticate_device_fuzzer.cpp b/test/commonfuzztest/authenticatedevice_fuzzer/authenticate_device_fuzzer.cpp index 5d6502099313c48630e769f95afa081e46905cd1..a0b1e8738cf53e4627cc68c76c8be27d6e67ac7a 100644 --- a/test/commonfuzztest/authenticatedevice_fuzzer/authenticate_device_fuzzer.cpp +++ b/test/commonfuzztest/authenticatedevice_fuzzer/authenticate_device_fuzzer.cpp @@ -21,6 +21,7 @@ #include "device_manager.h" #include "device_manager_callback.h" #include "device_manager_impl.h" +#include "dm_crypto.h" #include "accesstoken_kit.h" #include "authenticate_device_fuzzer.h" #include "nativetoken_kit.h" @@ -258,7 +259,7 @@ void AuthenticateDeviceThirdFuzzTest(const uint8_t* data, size_t size) return; } AddPermission(); - std::string str(reinterpret_cast(data), size); + std::string str = Crypto::Sha256(data, size); DeviceManagerImpl::GetInstance().ipcClientProxy_ = std::make_shared(std::make_shared()); diff --git a/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn index f5c1dfaadf4ca183481a6be6d936d78bb7ec81cb..cab2d2cd65eebdef01255ee0801d34016abb3351 100644 --- a/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn @@ -57,8 +57,8 @@ ohos_fuzztest("AuthenticateDeviceServiceFuzzTest") { sources = [ "authenticate_device_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", - "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", ] defines = [ @@ -79,8 +79,10 @@ ohos_fuzztest("AuthenticateDeviceServiceFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", + "selinux_adapter:librestorecon", ] } diff --git a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn index 40a9d26e6ce6e98d984b511cd1d10c63a751496a..91a31da58defc09e577b9606d58cc7b7d0bc0567 100644 --- a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn @@ -45,6 +45,15 @@ ohos_fuzztest("AuthenticateDeviceServiceImplFuzzTest") { "${servicesimpl_path}/include/config", ] + sanitize = { + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = true + integer_overflow = true + ubsan = true + } + cflags = [ "-g", "-O0", @@ -58,8 +67,8 @@ ohos_fuzztest("AuthenticateDeviceServiceImplFuzzTest") { deps = [ "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", - "${devicemanager_path}/services/service:devicemanagerservice", - "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", ] defines = [ @@ -80,8 +89,10 @@ ohos_fuzztest("AuthenticateDeviceServiceImplFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", + "selinux_adapter:librestorecon", ] } 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 c53e1d1575af3dedcc22db8a3e69f4d906c4db8c..ec982a51dc216f0eace45e33f1a25e1b57cf497a 100644 --- a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/authenticate_device_service_impl_fuzzer.cpp +++ b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/authenticate_device_service_impl_fuzzer.cpp @@ -47,6 +47,7 @@ int32_t g_eventId = 1; int32_t g_action = 1; int32_t g_authType = -1; uint16_t g_subscribeId = 123; +int32_t USLEEP_TIME_US_5000000 = 5000000; std::string g_reqJsonStr = R"( { @@ -153,6 +154,7 @@ void AuthenticateDeviceServiceImplFuzzTest(const uint8_t* data, size_t size) deviceManagerServiceImpl->BindTarget(str, peerTargetId, bindParam); deviceManagerServiceImpl->UnRegisterCredentialCallback(str); deviceManagerServiceImpl->UnRegisterUiStateCallback(str); + usleep(USLEEP_TIME_US_5000000); deviceManagerServiceImpl->Release(); } } diff --git a/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn b/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn index a1a8a13d838d7b766e157d4cb29a9f171e91d6f0..1d394b8ad08031b12cdae65d7a128a8067ab2620 100644 --- a/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn @@ -46,9 +46,9 @@ ohos_fuzztest("DmAuthManagerFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -58,6 +58,7 @@ ohos_fuzztest("DmAuthManagerFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", ] diff --git a/test/commonfuzztest/dmauthmanager_fuzzer/dm_auth_manager_fuzzer.cpp b/test/commonfuzztest/dmauthmanager_fuzzer/dm_auth_manager_fuzzer.cpp index 2e0da79a6ed094286e2bf2978cfb691378b20813..053f739b42d242982e690c910b6a7f0c3c959635 100644 --- a/test/commonfuzztest/dmauthmanager_fuzzer/dm_auth_manager_fuzzer.cpp +++ b/test/commonfuzztest/dmauthmanager_fuzzer/dm_auth_manager_fuzzer.cpp @@ -39,13 +39,14 @@ int32_t g_sessionSide = 0; int32_t g_result = 1; int32_t g_authType = 1; int32_t g_status = 1; -int32_t g_pinCode = 1; +std::string g_pinCode = "111111"; int32_t g_action = 1; int32_t g_userId = 1; int32_t g_pageId = 1; int32_t g_reason = 1; int32_t g_state = 1; int64_t g_requestId = 1; +int64_t g_localSessionId = 1; std::map g_bindParam; @@ -80,7 +81,7 @@ void DmAuthManagerFuzzTest(const uint8_t* data, size_t size) g_authManager->OnSessionOpened(g_sessionId, g_sessionSide, g_result); g_authManager->AuthenticateDevice(str, g_authType, str, str); g_authManager->ImportAuthCode(str, str); - g_authManager->BindTarget(str, g_targetId, g_bindParam); + g_authManager->BindTarget(str, g_targetId, g_bindParam, g_sessionId, g_localSessionId); g_authManager->ShowConfigDialog(); g_authManager->ShowAuthInfoDialog(); g_authManager->ShowStartAuthDialog(); diff --git a/test/commonfuzztest/dmauthmanagerv2_fuzzer/BUILD.gn b/test/commonfuzztest/dmauthmanagerv2_fuzzer/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..fb2de39cab0aa6a70aefea49cc690e3e5d00b8f4 --- /dev/null +++ b/test/commonfuzztest/dmauthmanagerv2_fuzzer/BUILD.gn @@ -0,0 +1,80 @@ +# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("DmAuthManagerV2FuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/commonfuzztest/dmauthmanagerv2_fuzzer" + + include_dirs = [ + "${innerkits_path}/native_cpp/include", + "${servicesimpl_path}/include/ability", + "${servicesimpl_path}/include/adapter", + "${servicesimpl_path}/include/authentication_v2", + "${servicesimpl_path}/include/dependency/hichain", + "${servicesimpl_path}/include/dependency/softbus", + "${servicesimpl_path}/include/dependency/timer", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Werror", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "dm_auth_manager_fuzzer.cpp" ] + + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${services_path}:devicemanagerservice", + "${servicesimpl_path}:devicemanagerserviceimpl", + "${utils_path}:devicemanagerutils", + ] + + external_deps = [ + "cJSON:cjson", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "hilog:libhilog", + "init:libbegetutil", + "ipc:ipc_single", + "safwk:system_ability_fwk", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"DmAuthManagerV2FuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":DmAuthManagerV2FuzzTest" ] +} +############################################################################### diff --git a/test/commonfuzztest/dmauthmanagerv2_fuzzer/corpus/init b/test/commonfuzztest/dmauthmanagerv2_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..d9719cafab50ed61d354cfa865b56390a0df320f --- /dev/null +++ b/test/commonfuzztest/dmauthmanagerv2_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ \ No newline at end of file diff --git a/test/commonfuzztest/dmauthmanagerv2_fuzzer/dm_auth_manager_fuzzer.cpp b/test/commonfuzztest/dmauthmanagerv2_fuzzer/dm_auth_manager_fuzzer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..018ed36976c6e991705bdcd72676cc909fda175b --- /dev/null +++ b/test/commonfuzztest/dmauthmanagerv2_fuzzer/dm_auth_manager_fuzzer.cpp @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2025-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include "device_manager_service_listener.h" +#include "auth_manager.h" +#include "dm_auth_manager_fuzzer.h" + +namespace OHOS { +namespace DistributedHardware { + +int32_t g_sessionId = 1; +int32_t g_sessionSide = 0; +int32_t g_result = 1; +int32_t g_authType = 1; +int32_t g_status = 1; +int32_t g_pinCode = 1; +int32_t g_action = 1; +int32_t g_userId = 1; +int32_t g_pageId = 1; +int32_t g_reason = 1; +int32_t g_state = 1; +int64_t g_requestId = 1; +int64_t g_operationCode = 1; +int64_t g_localSessionId = 1; + +std::map g_bindParam; + +PeerTargetId g_targetId = { + .deviceId = "deviceId", + .brMac = "brMac", + .bleMac = "bleMac", + .wifiIp = "wifiIp", +}; + +// AuthSrcManager fuzz +void DmAuthSrcManagerFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr listener = std::make_shared(); + std::shared_ptr hiChainAuthConnector = std::make_shared(); + std::shared_ptr hiChainConnector = std::make_shared(); + FuzzedDataProvider fdp(data, size); + std::string str(reinterpret_cast(data), size); + int32_t bindLevel = fdp.ConsumeIntegral(); + std::shared_ptr authManager = std::make_shared(softbusConnector, hiChainConnector, + listener, hiChainAuthConnector); + + authManager->OnUserOperation(g_action, str); + authManager->BindTarget(str, g_targetId, g_bindParam, g_sessionId, g_localSessionId); + authManager->StopAuthenticateDevice(str); + authManager->ImportAuthCode(str, str); + authManager->RegisterUiStateCallback(str); + authManager->UnRegisterUiStateCallback(str); + authManager->UnAuthenticateDevice(str, str, bindLevel); + authManager->UnBindDevice(str, str, bindLevel, str); + authManager->HandleDeviceNotTrust(str); + authManager->DeleteGroup(str, str); + authManager->AuthDeviceTransmit(g_requestId, data, size); + authManager->AuthDeviceSessionKey(g_requestId, data, size); + authManager->AuthDeviceRequest(g_requestId, g_operationCode, str.c_str()); + authManager->OnDataReceived(g_sessionId, str); + authManager->OnAuthDeviceDataReceived(g_sessionId, str); +} + +// AuthSinkManager fuzz +void DmAuthSinkManagerFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr listener = std::make_shared(); + std::shared_ptr hiChainAuthConnector = std::make_shared(); + std::shared_ptr hiChainConnector = std::make_shared(); + FuzzedDataProvider fdp(data, size); + std::string str(reinterpret_cast(data), size); + int32_t bindLevel = fdp.ConsumeIntegral(); + std::shared_ptr authManager = std::make_shared(softbusConnector, hiChainConnector, + listener, hiChainAuthConnector); + + authManager->OnUserOperation(g_action, str); + authManager->BindTarget(str, g_targetId, g_bindParam, g_sessionId, g_localSessionId); + authManager->StopAuthenticateDevice(str); + authManager->ImportAuthCode(str, str); + authManager->RegisterUiStateCallback(str); + authManager->UnRegisterUiStateCallback(str); + authManager->UnAuthenticateDevice(str, str, bindLevel); + authManager->UnBindDevice(str, str, bindLevel, str); + authManager->HandleDeviceNotTrust(str); + authManager->DeleteGroup(str, str); + authManager->AuthDeviceTransmit(g_requestId, data, size); + authManager->AuthDeviceSessionKey(g_requestId, data, size); + authManager->AuthDeviceRequest(g_requestId, g_operationCode, str.c_str()); + authManager->OnDataReceived(g_sessionId, str); + authManager->OnAuthDeviceDataReceived(g_sessionId, str); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::DmAuthSrcManagerFuzzTest(data, size); + OHOS::DistributedHardware::DmAuthSinkManagerFuzzTest(data, size); + return 0; +} \ No newline at end of file diff --git a/test/commonfuzztest/dmauthmanagerv2_fuzzer/dm_auth_manager_fuzzer.h b/test/commonfuzztest/dmauthmanagerv2_fuzzer/dm_auth_manager_fuzzer.h new file mode 100644 index 0000000000000000000000000000000000000000..35643d1c413a5faa1d10d0d6c7812892ccdc835f --- /dev/null +++ b/test/commonfuzztest/dmauthmanagerv2_fuzzer/dm_auth_manager_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DM_AUTH_MANAGER_FUZZER_H +#define DM_AUTH_MANAGER_FUZZER_H + +#define FUZZ_PROJECT_NAME "dmauthmanagerv2_fuzzer" + +#endif // DM_AUTH_MANAGER_FUZZER_H \ No newline at end of file diff --git a/test/commonfuzztest/dmauthmanagerv2_fuzzer/project.xml b/test/commonfuzztest/dmauthmanagerv2_fuzzer/project.xml new file mode 100644 index 0000000000000000000000000000000000000000..bac4974e9068af3c045fbb5c3a588aa79e47faaf --- /dev/null +++ b/test/commonfuzztest/dmauthmanagerv2_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + \ No newline at end of file diff --git a/test/commonfuzztest/dmcommoneventmanager_fuzzer/BUILD.gn b/test/commonfuzztest/dmcommoneventmanager_fuzzer/BUILD.gn index 4c82241146a29c9fda960c1007bfc5d8fa9635b7..ef93862a07314fb0eb75b142e3460f18144b8d79 100644 --- a/test/commonfuzztest/dmcommoneventmanager_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmcommoneventmanager_fuzzer/BUILD.gn @@ -62,7 +62,6 @@ ohos_fuzztest("DmCommonEventManagerFuzzTest") { "ability_base:want", "ability_runtime:ability_manager", "c_utils:utils", - "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "dsoftbus:softbus_client", "hilog:libhilog", diff --git a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn index 7014d7121b68bbf8197a7525965bdf4544bdac78..b6d56f31ee781fe79c44bd71183a715df969b8cc 100644 --- a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn +++ b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("GenerateEncryptedUuidFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn index 0b101fc0cbab37f080c6ff9fb46551ea8e4634db..c8cbead482d1639466f483420938ff4c07f44c54 100644 --- a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn +++ b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("GetDeviceInfoFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn b/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn index 60906c4b8230023e00c5c4f782670b44140a4243..17b0edcfd79d4e42fc33e0baa18f5549968ba89e 100644 --- a/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn +++ b/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn @@ -46,9 +46,10 @@ ohos_fuzztest("HichainConnectorFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${json_path}:devicemanagerjson", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -58,6 +59,7 @@ ohos_fuzztest("HichainConnectorFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", ] diff --git a/test/commonfuzztest/hichainconnector_fuzzer/hichain_connector_fuzzer.cpp b/test/commonfuzztest/hichainconnector_fuzzer/hichain_connector_fuzzer.cpp index be997d5e2ab5747fc8f28242ab8d8fe623e8861a..4e8f148016301f3633103deaeeb7e2483a0e9075 100644 --- a/test/commonfuzztest/hichainconnector_fuzzer/hichain_connector_fuzzer.cpp +++ b/test/commonfuzztest/hichainconnector_fuzzer/hichain_connector_fuzzer.cpp @@ -53,7 +53,7 @@ public: (void)deviceId; return ""; } - int32_t GetPinCode(int32_t &code) override + int32_t GetPinCode(std::string &code) override { (void)code; return DM_OK; @@ -343,10 +343,11 @@ void HiChainConnectorSixthFuzzTest(const uint8_t* data, size_t size) std::string credentialInfo = SafetyDump(jsonObjCre); hichainConnector->ParseRemoteCredentialExt(credentialInfo, params, groupOwner); int32_t groupType = *(reinterpret_cast(data)); - JsonObject jsonDeviceList(JsonCreateType::JSON_CREATE_TYPE_ARRAY); + JsonObject jsonDeviceList; int32_t osAccountUserId = 0; std::string userId = "user_002"; - jsonDeviceList[FIELD_DEVICE_LIST] = "deviceList"; + std::vector fieldDeviceList = {"deviceList"}; + jsonDeviceList[FIELD_DEVICE_LIST] = fieldDeviceList; hichainConnector->ParseRemoteCredential(groupType, userId, jsonDeviceList, params, osAccountUserId); } diff --git a/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn b/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn index 3d042f19a0ddd59ae7d5db7b70b55566bd702645..dd80157794d06d5c381710448d812a825de7e44f 100644 --- a/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn +++ b/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn @@ -45,9 +45,9 @@ ohos_fuzztest("OnDataReceivedFuzzTest") { sources = [ "on_data_received_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -57,6 +57,7 @@ ohos_fuzztest("OnDataReceivedFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", ] diff --git a/test/commonfuzztest/ondatareceivedv2_fuzzer/BUILD.gn b/test/commonfuzztest/ondatareceivedv2_fuzzer/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..b81e1b47298dfc17c2d5288fd1d947d192304f19 --- /dev/null +++ b/test/commonfuzztest/ondatareceivedv2_fuzzer/BUILD.gn @@ -0,0 +1,79 @@ +# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("OnDataReceivedV2FuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/commonfuzztest/ondatareceivedv2_fuzzer" + + include_dirs = [ + "${innerkits_path}/native_cpp/include", + "${servicesimpl_path}/include/ability", + "${servicesimpl_path}/include/adapter", + "${servicesimpl_path}/include/authentication", + "${servicesimpl_path}/include/dependency/hichain", + "${servicesimpl_path}/include/dependency/softbus", + "${servicesimpl_path}/include/dependency/timer", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Werror", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "on_data_received_fuzzer.cpp" ] + + deps = [ + "${services_path}:devicemanagerservice", + "${servicesimpl_path}:devicemanagerserviceimpl", + "${utils_path}:devicemanagerutils", + ] + + external_deps = [ + "cJSON:cjson", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "hilog:libhilog", + "init:libbegetutil", + "ipc:ipc_single", + "safwk:system_ability_fwk", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"OnDataReceivedV2FuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":OnDataReceivedV2FuzzTest" ] +} +############################################################################### diff --git a/test/commonfuzztest/ondatareceivedv2_fuzzer/corpus/init b/test/commonfuzztest/ondatareceivedv2_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..d9719cafab50ed61d354cfa865b56390a0df320f --- /dev/null +++ b/test/commonfuzztest/ondatareceivedv2_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ \ No newline at end of file diff --git a/test/commonfuzztest/ondatareceivedv2_fuzzer/on_data_received_fuzzer.cpp b/test/commonfuzztest/ondatareceivedv2_fuzzer/on_data_received_fuzzer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..6ad3053b333ac3c5e57ddf8a4b47535a7a16970c --- /dev/null +++ b/test/commonfuzztest/ondatareceivedv2_fuzzer/on_data_received_fuzzer.cpp @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include "auth_manager.h" +#include "device_manager_service_listener.h" +#include "on_data_received_fuzzer.h" + +namespace OHOS { +namespace DistributedHardware { +// AuthSrcManager fuzz +void OnDataReceivedSrcFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + + std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr listener = std::make_shared(); + std::shared_ptr hiChainAuthConnector = std::make_shared(); + std::shared_ptr hiChainConnector = std::make_shared(); + std::shared_ptr authManager = std::make_shared(softbusConnector, hiChainConnector, + listener, hiChainAuthConnector); + FuzzedDataProvider fdp(data, size); + int32_t sessionId = fdp.ConsumeIntegral(); + std::string message(reinterpret_cast(data), size); + authManager->OnDataReceived(sessionId, message); + authManager->OnSessionClosed(sessionId); +} + +// AuthSinkManager fuzz +void OnDataReceivedSinkFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + + std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr listener = std::make_shared(); + std::shared_ptr hiChainAuthConnector = std::make_shared(); + std::shared_ptr hiChainConnector = std::make_shared(); + std::shared_ptr authManager = std::make_shared(softbusConnector, hiChainConnector, + listener, hiChainAuthConnector); + FuzzedDataProvider fdp(data, size); + int32_t sessionId = fdp.ConsumeIntegral(); + std::string message(reinterpret_cast(data), size); + authManager->OnDataReceived(sessionId, message); + authManager->OnSessionClosed(sessionId); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::OnDataReceivedSrcFuzzTest(data, size); + OHOS::DistributedHardware::OnDataReceivedSinkFuzzTest(data, size); + return 0; +} \ No newline at end of file diff --git a/test/commonfuzztest/ondatareceivedv2_fuzzer/on_data_received_fuzzer.h b/test/commonfuzztest/ondatareceivedv2_fuzzer/on_data_received_fuzzer.h new file mode 100644 index 0000000000000000000000000000000000000000..e59b91fdae845288037debbdd6947feafed4a93e --- /dev/null +++ b/test/commonfuzztest/ondatareceivedv2_fuzzer/on_data_received_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ON_DATA_RECEIVED_FUZZER_H +#define ON_DATA_RECEIVED_FUZZER_H + +#define FUZZ_PROJECT_NAME "ondatareceivedv2_fuzzer" + +#endif // ON_DATA_RECEIVED_FUZZER_H \ No newline at end of file diff --git a/test/commonfuzztest/ondatareceivedv2_fuzzer/project.xml b/test/commonfuzztest/ondatareceivedv2_fuzzer/project.xml new file mode 100644 index 0000000000000000000000000000000000000000..bac4974e9068af3c045fbb5c3a588aa79e47faaf --- /dev/null +++ b/test/commonfuzztest/ondatareceivedv2_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + \ No newline at end of file diff --git a/test/commonfuzztest/onerror_fuzzer/BUILD.gn b/test/commonfuzztest/onerror_fuzzer/BUILD.gn index c4eb296a42a67893bd433221f63b7b2128fbfd3d..9d9d2801dca8be36635b71501fe25472f0f6f4bb 100644 --- a/test/commonfuzztest/onerror_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onerror_fuzzer/BUILD.gn @@ -44,9 +44,9 @@ ohos_fuzztest("OnErrorFuzzTest") { sources = [ "on_error_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -56,6 +56,7 @@ ohos_fuzztest("OnErrorFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", ] diff --git a/test/commonfuzztest/onerror_fuzzer/on_error_fuzzer.cpp b/test/commonfuzztest/onerror_fuzzer/on_error_fuzzer.cpp index fdf2075d31c4e197c4641785a9fba73827a0afe7..781698e0de92c003b2c23e84aec694e0c6a9faeb 100644 --- a/test/commonfuzztest/onerror_fuzzer/on_error_fuzzer.cpp +++ b/test/commonfuzztest/onerror_fuzzer/on_error_fuzzer.cpp @@ -47,7 +47,7 @@ public: (void)deviceId; return ""; } - int32_t GetPinCode(int32_t &code) override + int32_t GetPinCode(std::string &code) override { (void)code; return DM_OK; diff --git a/test/commonfuzztest/onfinish_fuzzer/BUILD.gn b/test/commonfuzztest/onfinish_fuzzer/BUILD.gn index 032d9750e78a8a5b3141e41bca31ae4d2a1a3107..3881335e7ec7603209f9d3df225a0bfac04a99fc 100644 --- a/test/commonfuzztest/onfinish_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onfinish_fuzzer/BUILD.gn @@ -44,9 +44,9 @@ ohos_fuzztest("OnFinishFuzzTest") { sources = [ "on_finish_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -56,6 +56,7 @@ ohos_fuzztest("OnFinishFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", ] diff --git a/test/commonfuzztest/onfinish_fuzzer/on_finish_fuzzer.cpp b/test/commonfuzztest/onfinish_fuzzer/on_finish_fuzzer.cpp index 7c75b19b496663b06934e612dec76f81995d0f59..19b2b0ae56bdf8a939b5ce242bc55e1eb883e634 100644 --- a/test/commonfuzztest/onfinish_fuzzer/on_finish_fuzzer.cpp +++ b/test/commonfuzztest/onfinish_fuzzer/on_finish_fuzzer.cpp @@ -47,7 +47,7 @@ public: (void)deviceId; return ""; } - int32_t GetPinCode(int32_t &code) override + int32_t GetPinCode(std::string &code) override { (void)code; return DM_OK; diff --git a/test/commonfuzztest/onrequest_fuzzer/BUILD.gn b/test/commonfuzztest/onrequest_fuzzer/BUILD.gn index f2ced8875dc20f92228f5a93bbc00c6fb8fabead..34a301d7aee7e05919d7e95f7b072e3580581445 100644 --- a/test/commonfuzztest/onrequest_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onrequest_fuzzer/BUILD.gn @@ -45,9 +45,9 @@ ohos_fuzztest("OnRequestFuzzTest") { sources = [ "on_request_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -57,6 +57,7 @@ ohos_fuzztest("OnRequestFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", ] diff --git a/test/commonfuzztest/onrequest_fuzzer/on_request_fuzzer.cpp b/test/commonfuzztest/onrequest_fuzzer/on_request_fuzzer.cpp index e4c91f69d751390fe4e4231f95bf90364e2cee9d..baaeb16e36f66b8302f4f2f25b3682a919e2dbcc 100644 --- a/test/commonfuzztest/onrequest_fuzzer/on_request_fuzzer.cpp +++ b/test/commonfuzztest/onrequest_fuzzer/on_request_fuzzer.cpp @@ -46,7 +46,7 @@ public: (void)deviceId; return ""; } - int32_t GetPinCode(int32_t &code) override + int32_t GetPinCode(std::string &code) override { (void)code; return DM_OK; diff --git a/test/commonfuzztest/pinauth_fuzzer/BUILD.gn b/test/commonfuzztest/pinauth_fuzzer/BUILD.gn index bc73c6c77ad2a5174f3033424bbdf499b99b9a05..f8ad7083e43ef54d023c3130781729ff1d6b5590 100644 --- a/test/commonfuzztest/pinauth_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinauth_fuzzer/BUILD.gn @@ -65,9 +65,9 @@ ohos_fuzztest("PinAuthFuzzTest") { deps = [ "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] defines = [ @@ -79,12 +79,12 @@ ohos_fuzztest("PinAuthFuzzTest") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", - "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "ffrt:libffrt", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_single", diff --git a/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn b/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn index fcdc9c372804e1d52b1c4e638c5b52689f482492..c24e87558f6367d5ebbbef8f4e7c2186e85bf5c1 100644 --- a/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn @@ -66,9 +66,9 @@ ohos_fuzztest("PinAuthUiFuzzTest") { deps = [ "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] defines = [ @@ -80,12 +80,12 @@ ohos_fuzztest("PinAuthUiFuzzTest") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", - "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "ffrt:libffrt", "hilog:libhilog", "init:libbegetutil", "resource_management:resmgr_napi_core", diff --git a/test/commonfuzztest/pinholder_fuzzer/BUILD.gn b/test/commonfuzztest/pinholder_fuzzer/BUILD.gn index 4ccc7a86ea03797cd959a0fd31828c8eab91b6e1..c673b1edcd1b2c3452c73ea9dcc7cade5a785a17 100644 --- a/test/commonfuzztest/pinholder_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinholder_fuzzer/BUILD.gn @@ -66,9 +66,9 @@ ohos_fuzztest("PinHolderFuzzTest") { deps = [ "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] defines = [ @@ -80,12 +80,12 @@ ohos_fuzztest("PinHolderFuzzTest") { external_deps = [ "ability_base:want", "ability_runtime:ability_manager", - "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "ffrt:libffrt", "hilog:libhilog", "init:libbegetutil", "resource_management:resmgr_napi_core", diff --git a/test/commonunittest/UTTest_discovery_manager.cpp b/test/commonunittest/UTTest_discovery_manager.cpp index 6568eace64228c7448eb97b3740629293688d340..d73b1f55fb93909aa00cc31101a5d5a8d038d6ae 100644 --- a/test/commonunittest/UTTest_discovery_manager.cpp +++ b/test/commonunittest/UTTest_discovery_manager.cpp @@ -295,27 +295,6 @@ HWTEST_F(DiscoveryManagerTest, OnDiscoveringResult_003, testing::ext::TestSize.L EXPECT_NE(manager->discoveryContextMap_.empty(), true); } -HWTEST_F(DiscoveryManagerTest, OnDiscoveringResult_004, testing::ext::TestSize.Level0) -{ - std::string pkgName = "pkgName"; - int32_t subscribeId = 1; - int32_t result = 1; - manager->pkgNameSet_.insert(pkgName); - DiscoveryContext context; - manager->discoveryContextMap_.emplace(pkgName, context); - manager->listener_ = std::make_shared(); - manager->OnDiscoveringResult(pkgName, subscribeId, result); - EXPECT_EQ(manager->discoveryContextMap_.empty(), true); -} - -HWTEST_F(DiscoveryManagerTest, StartDiscoveryTimer_001, testing::ext::TestSize.Level0) -{ - manager->timer_ = nullptr; - std::string pkgName = "timeTest"; - manager->StartDiscoveryTimer(pkgName); - EXPECT_EQ(manager->discoveryContextMap_.empty(), true); -} - HWTEST_F(DiscoveryManagerTest, HandleDiscoveryQueue_001, testing::ext::TestSize.Level0) { std::string pkgName = "pkgName"; @@ -365,19 +344,6 @@ HWTEST_F(DiscoveryManagerTest, GetDeviceAclParam_001, testing::ext::TestSize.Lev EXPECT_EQ(ret, DM_OK); } -HWTEST_F(DiscoveryManagerTest, GetCommonDependencyObj_001, testing::ext::TestSize.Level0) -{ - auto ret = manager->GetCommonDependencyObj(); - EXPECT_NE(ret, nullptr); -} - -HWTEST_F(DiscoveryManagerTest, IsCommonDependencyReady_001, testing::ext::TestSize.Level0) -{ - manager->isSoLoaded_ = false; - bool ret = manager->IsCommonDependencyReady(); - EXPECT_EQ(ret, true); -} - HWTEST_F(DiscoveryManagerTest, CloseCommonDependencyObj_001, testing::ext::TestSize.Level0) { manager->isSoLoaded_ = false; diff --git a/test/commonunittest/UTTest_dm_anonymous.cpp b/test/commonunittest/UTTest_dm_anonymous.cpp index 167c25a6f778c04afcb45268d8ab6aeac90f6d76..8be86ff7e8a3499ccd201bd7653c06722422c93a 100644 --- a/test/commonunittest/UTTest_dm_anonymous.cpp +++ b/test/commonunittest/UTTest_dm_anonymous.cpp @@ -296,6 +296,42 @@ HWTEST_F(DmAnonymousTest, IsInt64_002, testing::ext::TestSize.Level1) EXPECT_EQ(ret, false); } +/** + * @tc.name: IsUint64_001 + * @tc.desc: Return true + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmAnonymousTest, IsUint64_001, testing::ext::TestSize.Level1) +{ + std::string str = R"( + { + "REQUESTID" : 789 + } + )"; + JsonObject jsonObj(str); + bool ret = IsUint64(jsonObj, TAG_REQUEST_ID); + EXPECT_EQ(ret, true); +} + +/** + * @tc.name: IsUint64_002 + * @tc.desc: Return false + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DmAnonymousTest, IsUint64_002, testing::ext::TestSize.Level1) +{ + std::string str = R"( + { + "REQUESTID" : "requestidTest" + } + )"; + JsonObject jsonObj(str); + bool ret = IsUint64(jsonObj, TAG_REQUEST_ID); + EXPECT_EQ(ret, false); +} + /** * @tc.name: IsArray_001 * @tc.desc: Return true diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index 06a5ba958a7b03f60edd09bb48141147e1aa60c0..aff6cb61d2a9874d5b00bdec5957ade828a03fa0 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -39,10 +39,9 @@ using namespace testing; using namespace testing::ext; namespace OHOS { namespace DistributedHardware { -const int32_t CLONE_AUTHENTICATE_TIMEOUT = 10; namespace { - constexpr int32_t PINCODE = 100001; + const std::string PINCODE = "100001"; constexpr int32_t MIN_PIN_CODE_VALUE = 10; constexpr int32_t MAX_PIN_CODE_VALUE = 9999999; constexpr int32_t INVALID_AUTHBOX_TYPE = 100; @@ -82,7 +81,12 @@ void DmAuthManagerTest::SetUp() std::shared_ptr(authManager_)); authManager_->timer_ = std::make_shared(); } -void DmAuthManagerTest::TearDown() {} + +void DmAuthManagerTest::TearDown() +{ + Mock::VerifyAndClearExpectations(softbusSessionMock_.get()); +} + void DmAuthManagerTest::SetUpTestCase() { softbusSessionMock_ = std::make_shared(); @@ -100,6 +104,7 @@ void DmAuthManagerTest::SetUpTestCase() cryptoMgrMock_ = std::make_shared(); DmCryptoMgr::dmCryptoMgr = cryptoMgrMock_; } + void DmAuthManagerTest::TearDownTestCase() { DmSoftbusSession::dmSoftbusSession = nullptr; @@ -119,8 +124,8 @@ void DmAuthManagerTest::TearDownTestCase() } namespace { -const int32_t MIN_PIN_CODE = 100000; -const int32_t MAX_PIN_CODE = 999999; +const std::string MIN_PIN_CODE = "100000"; +const std::string MAX_PIN_CODE = "999999"; HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_001, testing::ext::TestSize.Level1) { @@ -203,7 +208,7 @@ HWTEST_F(DmAuthManagerTest, StartAuthProcess_001, testing::ext::TestSize.Level1) int32_t action = 0; g_reportAuthConfirmBoxReturnBoolValue = false; authManager_->remoteVersion_ = "4.1.5.2"; - authManager_->authResponseContext_->bindLevel = DEVICE; + authManager_->authResponseContext_->bindLevel = USER; int32_t ret = authManager_->StartAuthProcess(action); ASSERT_EQ(ret, DM_OK); } @@ -278,7 +283,7 @@ HWTEST_F(DmAuthManagerTest, AddMember_001, testing::ext::TestSize.Level1) authManager_->authResponseContext_->code = 123; authManager_->authResponseContext_->requestId = 234; authManager_->authResponseContext_->deviceId = "234"; - int32_t pinCode = 444444; + std::string pinCode = "444444"; authManager_->hiChainConnector_->RegisterHiChainCallback(authManager_); authManager_->SetAuthResponseState(authResponseState); int32_t ret = authManager_->AddMember(pinCode); @@ -287,7 +292,7 @@ HWTEST_F(DmAuthManagerTest, AddMember_001, testing::ext::TestSize.Level1) HWTEST_F(DmAuthManagerTest, AddMember_002, testing::ext::TestSize.Level1) { - int32_t pinCode = 33333; + std::string pinCode = "33333"; authManager_->authResponseContext_ = nullptr; int32_t ret = authManager_->AddMember(pinCode); ASSERT_EQ(ret, ERR_DM_FAILED); @@ -340,10 +345,10 @@ HWTEST_F(DmAuthManagerTest, SetAuthResponseState_002, testing::ext::TestSize.Lev HWTEST_F(DmAuthManagerTest, GetPinCode_001, testing::ext::TestSize.Level1) { - authManager_->authResponseContext_->code = 123456; - int32_t code = 0; + authManager_->authResponseContext_->code = "123456"; + std::string code = "0"; authManager_->GetPinCode(code); - ASSERT_EQ(code, 123456); + ASSERT_EQ(code, "123456"); } HWTEST_F(DmAuthManagerTest, GetPinCode_002, testing::ext::TestSize.Level1) @@ -352,9 +357,9 @@ HWTEST_F(DmAuthManagerTest, GetPinCode_002, testing::ext::TestSize.Level1) authManager_->ShowConfigDialog(); authManager_->ShowAuthInfoDialog(); authManager_->ShowStartAuthDialog(); - int32_t code = 0; + std::string code = "0"; int32_t ret = authManager_->GetPinCode(code); - ASSERT_NE(code, ERR_DM_TIME_OUT); + ASSERT_NE(ret, ERR_DM_TIME_OUT); } HWTEST_F(DmAuthManagerTest, SetPageId_001, testing::ext::TestSize.Level1) @@ -456,7 +461,7 @@ HWTEST_F(DmAuthManagerTest, GeneratePincode_001, testing::ext::TestSize.Level1) authManager_->timer_ = nullptr; authManager_->OnSessionOpened(openedSessionId, sessionSide, result); authManager_->OnSessionClosed(closedSessionId); - int32_t ret = authManager_->GeneratePincode(); + std::string ret = authManager_->GeneratePincode(); ASSERT_LE(ret, MAX_PIN_CODE); ASSERT_GE(ret, MIN_PIN_CODE); } @@ -472,7 +477,7 @@ HWTEST_F(DmAuthManagerTest, GeneratePincode_002, testing::ext::TestSize.Level1) authManager_->timer_ = std::make_shared(); authManager_->OnSessionOpened(openedSessionId, sessionSide, result); authManager_->OnSessionClosed(closedSessionId); - int32_t ret = authManager_->GeneratePincode(); + std::string ret = authManager_->GeneratePincode(); ASSERT_LE(ret, MAX_PIN_CODE); ASSERT_GE(ret, MIN_PIN_CODE); } @@ -488,7 +493,7 @@ HWTEST_F(DmAuthManagerTest, GeneratePincode_003, testing::ext::TestSize.Level1) authManager_->timer_ = nullptr; authManager_->OnSessionOpened(openedSessionId, sessionSide, result); authManager_->OnSessionClosed(closedSessionId); - int32_t ret = authManager_->GeneratePincode(); + std::string ret = authManager_->GeneratePincode(); ASSERT_LE(ret, MAX_PIN_CODE); ASSERT_GE(ret, MIN_PIN_CODE); } @@ -504,7 +509,7 @@ HWTEST_F(DmAuthManagerTest, GeneratePincode_004, testing::ext::TestSize.Level1) authManager_->timer_ = std::make_shared(); authManager_->OnSessionOpened(openedSessionId, sessionSide, result); authManager_->OnSessionClosed(closedSessionId); - int32_t ret = authManager_->GeneratePincode(); + std::string ret = authManager_->GeneratePincode(); ASSERT_LE(ret, MAX_PIN_CODE); ASSERT_GE(ret, MIN_PIN_CODE); } @@ -564,7 +569,7 @@ HWTEST_F(DmAuthManagerTest, UnAuthenticateDevice_001, testing::ext::TestSize.Lev { std::string pkgName; std::string udid = "UnAuthenticateDevice_001"; - int32_t bindLevel = DEVICE; + int32_t bindLevel = USER; int32_t ret = authManager_->UnAuthenticateDevice(pkgName, udid, bindLevel); EXPECT_NE(ret, DM_OK); @@ -594,7 +599,7 @@ HWTEST_F(DmAuthManagerTest, UnBindDevice_002, testing::ext::TestSize.Level1) { std::string pkgName; std::string udid = "UnBindDevice_002"; - int32_t bindLevel = DEVICE; + int32_t bindLevel = USER; std::string extra = "extraTest"; int32_t ret = authManager_->UnBindDevice(pkgName, udid, bindLevel, extra); EXPECT_NE(ret, DM_OK); @@ -778,9 +783,9 @@ HWTEST_F(DmAuthManagerTest, ImportCredential001, testing::ext::TestSize.Level1) { std::string deviceId = "deviceId"; std::string publicKey = "publicKey"; - EXPECT_CALL(*hiChainAuthConnectorMock_, ImportCredential(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*hiChainAuthConnectorMock_, ImportCredential(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = authManager_->ImportCredential(deviceId, publicKey); - ASSERT_EQ(ret, ERR_DM_FAILED); + ASSERT_NE(ret, ERR_DM_FAILED); } HWTEST_F(DmAuthManagerTest, ResponseCredential001, testing::ext::TestSize.Level1) @@ -789,13 +794,13 @@ HWTEST_F(DmAuthManagerTest, ResponseCredential001, testing::ext::TestSize.Level1 ASSERT_EQ(authManager_->isAuthDevice_, false); authManager_->authResponseContext_->publicKey = "publicKey"; - EXPECT_CALL(*hiChainAuthConnectorMock_, ImportCredential(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*hiChainAuthConnectorMock_, ImportCredential(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); authManager_->ResponseCredential(); ASSERT_EQ(authManager_->isAuthDevice_, false); authManager_->authMessageProcessor_ = std::make_shared(authManager_); authManager_->authMessageProcessor_->authResponseContext_ = std::make_shared(); - EXPECT_CALL(*hiChainAuthConnectorMock_, ImportCredential(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*hiChainAuthConnectorMock_, ImportCredential(_, _, _, _)).WillOnce(Return(DM_OK)); authManager_->ResponseCredential(); ASSERT_EQ(authManager_->isAuthDevice_, false); } @@ -817,6 +822,7 @@ HWTEST_F(DmAuthManagerTest, AuthDeviceTransmit002, testing::ext::TestSize.Level1 authManager_->authResponseState_ = nullptr; uint8_t *data = nullptr; uint32_t dataLen = 0; + EXPECT_CALL(*softbusSessionMock_, SendData(_, _)).WillOnce(Return(ERR_DM_FAILED)); bool ret = authManager_->AuthDeviceTransmit(requestId, data, dataLen); ASSERT_EQ(ret, false); } @@ -828,6 +834,7 @@ HWTEST_F(DmAuthManagerTest, AuthDeviceTransmit003, testing::ext::TestSize.Level1 authManager_->authRequestState_ = nullptr; uint8_t *data = nullptr; uint32_t dataLen = 0; + EXPECT_CALL(*softbusSessionMock_, SendData(_, _)).WillOnce(Return(ERR_DM_FAILED)); bool ret = authManager_->AuthDeviceTransmit(requestId, data, dataLen); ASSERT_EQ(ret, false); } @@ -837,6 +844,7 @@ HWTEST_F(DmAuthManagerTest, AuthDeviceTransmit004, testing::ext::TestSize.Level1 int64_t requestId = 0; uint8_t *data = nullptr; uint32_t dataLen = 0; + EXPECT_CALL(*softbusSessionMock_, SendData(_, _)).WillOnce(Return(ERR_DM_FAILED)); bool ret = authManager_->AuthDeviceTransmit(requestId, data, dataLen); ASSERT_EQ(ret, false); } @@ -995,7 +1003,7 @@ HWTEST_F(DmAuthManagerTest, AuthDeviceError004, testing::ext::TestSize.Level1) int64_t requestId = 0; int32_t errorCode = ERR_DM_FAILED; authManager_->AuthDeviceError(requestId, errorCode); - ASSERT_EQ(authManager_->authResponseContext_->state, AuthState::AUTH_REQUEST_JOIN); + ASSERT_EQ(authManager_->authResponseContext_->state, DmAuthStatus::STATUS_DM_AUTH_DEFAULT); } HWTEST_F(DmAuthManagerTest, AuthDeviceError005, testing::ext::TestSize.Level1) @@ -1038,13 +1046,6 @@ HWTEST_F(DmAuthManagerTest, AuthDeviceSessionKey001, testing::ext::TestSize.Leve authManager_->GetSessionKeyIdSync(requestId); } -HWTEST_F(DmAuthManagerTest, GetRemoteDeviceId001, testing::ext::TestSize.Level1) -{ - std::string deviceId; - authManager_->GetRemoteDeviceId(deviceId); - ASSERT_EQ(authManager_->isAuthDevice_, false); -} - HWTEST_F(DmAuthManagerTest, CompatiblePutAcl001, testing::ext::TestSize.Level1) { authManager_->authRequestState_ = std::make_shared(); @@ -1439,7 +1440,7 @@ HWTEST_F(DmAuthManagerTest, AuthenticateDevice_004, testing::ext::TestSize.Level deviceId = "sdcwafefawe"; extra = jsonObject.Dump(); ret = authManager_->AuthenticateDevice(pkgName, authType, deviceId, extra); - ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + ASSERT_EQ(ret, ERR_DM_AUTH_BUSINESS_BUSY); } HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_001, testing::ext::TestSize.Level1) @@ -1479,61 +1480,16 @@ HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_001, testing::ext::TestSize.L authManager_->NegotiateRespMsg(DM_VERSION_4_1_5_1); authManager_->NegotiateRespMsg(DM_VERSION_5_0_2); EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); authManager_->GetPeerUdidHash(sessionId, peerUdidHash); EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(ERR_DM_FAILED)); authManager_->GetPeerUdidHash(sessionId, peerUdidHash); ret = authManager_->StopAuthenticateDevice(pkgName); ASSERT_EQ(ret, DM_OK); } -HWTEST_F(DmAuthManagerTest, GetBindLevel_001, testing::ext::TestSize.Level1) -{ - int32_t bindLevel = INVALIED_TYPE; - std::string udid; - authManager_->HandleDeviceNotTrust(udid); - udid = "988989"; - authManager_->HandleDeviceNotTrust(udid); - int32_t sessionId = 32166; - authManager_->ProcIncompatible(sessionId); - - EXPECT_CALL(*appManagerMock_, IsSystemSA()).WillOnce(Return(true)); - int32_t ret = authManager_->GetBindLevel(bindLevel); - ASSERT_EQ(ret, DEVICE); - - EXPECT_CALL(*appManagerMock_, IsSystemSA()).WillOnce(Return(false)); - ret = authManager_->GetBindLevel(bindLevel); - ASSERT_EQ(ret, APP); - - authManager_->authResponseContext_->authType == AUTH_TYPE_IMPORT_AUTH_CODE; - authManager_->authResponseContext_->importAuthCode = "importAuthCode"; - authManager_->importAuthCode_ = "importAuthCode"; - authManager_->ProcessAuthRequest(sessionId); - - authManager_->authResponseContext_->authType == AUTH_TYPE_NFC; - authManager_->authResponseContext_->isOnline = false; - authManager_->authResponseContext_->reply = 0; - authManager_->authResponseContext_->isIdenticalAccount = false; - authManager_->authResponseContext_->isAuthCodeReady = true; - authManager_->ProcessAuthRequest(sessionId); - - authManager_->authResponseContext_->reply = ERR_DM_UNSUPPORTED_AUTH_TYPE; - authManager_->authResponseContext_->authType = AUTH_TYPE_IMPORT_AUTH_CODE; - authManager_->authResponseContext_->isAuthCodeReady == false; - authManager_->ProcessAuthRequest(sessionId); - - bindLevel = SERVICE; - EXPECT_CALL(*appManagerMock_, IsSystemSA()).WillOnce(Return(false)); - ret = authManager_->GetBindLevel(bindLevel); - ASSERT_EQ(ret, SERVICE); - - EXPECT_CALL(*appManagerMock_, IsSystemSA()).WillOnce(Return(true)); - ret = authManager_->GetBindLevel(bindLevel); - ASSERT_EQ(ret, SERVICE); -} - HWTEST_F(DmAuthManagerTest, IsAuthFinish_001, testing::ext::TestSize.Level1) { authManager_->authResponseContext_->reply = ERR_DM_UNSUPPORTED_AUTH_TYPE; @@ -1566,7 +1522,7 @@ HWTEST_F(DmAuthManagerTest, IsAuthFinish_001, testing::ext::TestSize.Level1) authManager_->authResponseContext_->isOnline = true; authManager_->authResponseContext_->authed = true; authManager_->authResponseContext_->importAuthCode = ""; - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).WillOnce(Return(DM_OK)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); authManager_->ProcessAuthRequestExt(sessionId); authManager_->authResponseContext_->reply = ERR_DM_AUTH_BUSINESS_BUSY; authManager_->authResponseContext_->isOnline = false; @@ -1696,10 +1652,11 @@ HWTEST_F(DmAuthManagerTest, GetBinderInfo_001, testing::ext::TestSize.Level1) EXPECT_CALL(*appManagerMock_, GetNativeTokenIdByName(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*appManagerMock_, GetHapTokenIdByName(_, _, _, _)).WillOnce(Return(DM_OK)); + authManager_->authResponseContext_->bindLevel = APP; ret = authManager_->GetBinderInfo(); ASSERT_EQ(ret, DM_OK); - authManager_->authResponseContext_->bindLevel = DEVICE; + authManager_->authResponseContext_->bindLevel = USER; authManager_->SetProcessInfo(); authManager_->authResponseContext_->bindLevel = SERVICE; @@ -1832,14 +1789,14 @@ HWTEST_F(DmAuthManagerTest, RequestCredentialDone_003, testing::ext::TestSize.Le ASSERT_EQ(authManager_->isAuthDevice_, false); authManager_->authResponseContext_->publicKey = "publicKey"; - EXPECT_CALL(*hiChainAuthConnectorMock_, ImportCredential(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*hiChainAuthConnectorMock_, ImportCredential(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); authManager_->RequestCredentialDone(); ASSERT_EQ(authManager_->isAuthDevice_, false); } HWTEST_F(DmAuthManagerTest, AuthDevice_003, testing::ext::TestSize.Level1) { - int32_t pinCode = 123456; + std::string pinCode = "123456"; authManager_->isAuthDevice_ = false; authManager_->authResponseContext_->authType = 5; EXPECT_CALL(*hiChainAuthConnectorMock_, AuthDevice(_, _, _, _)).WillOnce(Return(DM_OK)); @@ -1962,7 +1919,7 @@ HWTEST_F(DmAuthManagerTest, RegisterAuthenticationType_001, testing::ext::TestSi { int32_t authenticationType = 1; int32_t ret = authManager_->RegisterAuthenticationType(authenticationType); - ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + ASSERT_EQ(ret, DM_OK); authenticationType = 0; ret = authManager_->RegisterAuthenticationType(authenticationType); @@ -2043,7 +2000,7 @@ HWTEST_F(DmAuthManagerTest, CheckNeedShowAuthInfoDialog_001, testing::ext::TestS int32_t errorCode = ERR_DM_HICHAIN_PROOFMISMATCH; authManager_->pincodeDialogEverShown_ = false; authManager_->authResponseContext_->authType = AUTH_TYPE_NFC; - authManager_->serviceInfoProfile_.SetPinCode(std::to_string(PINCODE)); + authManager_->serviceInfoProfile_.SetPinCode(PINCODE); authManager_->serviceInfoProfile_.SetPinExchangeType( static_cast(DMLocalServiceInfoPinExchangeType::FROMDP)); bool ret = authManager_->CheckNeedShowAuthInfoDialog(errorCode); @@ -2061,7 +2018,7 @@ HWTEST_F(DmAuthManagerTest, CheckNeedShowAuthInfoDialog_001, testing::ext::TestS localServiceInfo.SetAuthType(static_cast(DMLocalServiceInfoAuthType::TRUST_ONETIME)); localServiceInfo.SetAuthBoxType(static_cast(DMLocalServiceInfoAuthBoxType::STATE3)); localServiceInfo.SetPinExchangeType(static_cast(DMLocalServiceInfoPinExchangeType::FROMDP)); - localServiceInfo.SetPinCode(std::to_string(PINCODE)); + localServiceInfo.SetPinCode(PINCODE); EXPECT_CALL(*deviceProfileConnectorMock_, GetLocalServiceInfoByBundleNameAndPinExchangeType(_, _, _)) .WillOnce(DoAll(SetArgReferee<2>(localServiceInfo), Return(DM_OK))); authManager_->GetLocalServiceInfoInDp(); @@ -2073,8 +2030,8 @@ HWTEST_F(DmAuthManagerTest, CheckNeedShowAuthInfoDialog_001, testing::ext::TestS authManager_->authResponseContext_->requestId = 1; authManager_->authMessageProcessor_ = std::make_shared(authManager_); EXPECT_CALL(*cryptoMgrMock_, SaveSessionKey(_, _)).WillOnce(Return(DM_OK)); - EXPECT_CALL(*deviceProfileConnectorMock_, PutSessionKey(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*deviceProfileConnectorMock_, PutSessionKey(_, _, _)) + .WillOnce(DoAll(SetArgReferee<2>(1), Return(DM_OK))); authManager_->AuthDeviceSessionKey(requestId, sessionKey, sessionKeyLen); authManager_->GetSessionKeyIdSync(requestId); } @@ -2089,7 +2046,7 @@ HWTEST_F(DmAuthManagerTest, IsPinCodeValid_001, testing::ext::TestSize.Level1) static_cast(DMLocalServiceInfoAuthBoxType::SKIP_CONFIRM)); authManager_->authResponseContext_->authType = AUTH_TYPE_NFC; - authManager_->serviceInfoProfile_.SetPinCode(std::to_string(PINCODE)); + authManager_->serviceInfoProfile_.SetPinCode(PINCODE); authManager_->serviceInfoProfile_.SetPinExchangeType( static_cast(DMLocalServiceInfoPinExchangeType::FROMDP)); authManager_->ShowConfigDialog(); @@ -2151,7 +2108,7 @@ HWTEST_F(DmAuthManagerTest, IsLocalServiceInfoValid_001, testing::ext::TestSize. profile.SetPinCode(""); ASSERT_TRUE(authManager_->IsLocalServiceInfoValid(profile)); - profile.SetPinCode(std::to_string(PINCODE)); + profile.SetPinCode(PINCODE); ASSERT_TRUE(authManager_->IsLocalServiceInfoValid(profile)); } @@ -2250,7 +2207,7 @@ HWTEST_F(DmAuthManagerTest, CheckAuthParamVaildExtra_002, testing::ext::TestSize EXPECT_CALL(*appManagerMock_, IsSystemSA()).WillOnce(Return(false)); ret = authManager_->CheckAuthParamVaildExtra(strExtra, deviceId); - ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + ASSERT_EQ(ret, DM_OK); std::string pkgName = "pkgName_pickerProxy_Info"; int32_t authType = 1; diff --git a/test/commonunittest/UTTest_dm_auth_manager_second.cpp b/test/commonunittest/UTTest_dm_auth_manager_second.cpp index 23269a6cff127add9bded45ba9cf8ff45cd80a8d..93497bc7f7c7546f449f8c60105d9519d68971be 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_second.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_second.cpp @@ -800,7 +800,7 @@ HWTEST_F(DmAuthManagerTest, ShowStartAuthDialog_004, testing::ext::TestSize.Leve authManager_->importPkgName_ = "hostPkgName"; authManager_->authResponseContext_->hostPkgName = "hostPkgName"; authManager_->remoteVersion_ = "4.1.5.2"; - authManager_->authResponseContext_->bindLevel = DEVICE; + authManager_->authResponseContext_->bindLevel = USER; authManager_->authResponseContext_->targetDeviceName = "ShowStartAuthDialog_004"; authManager_->ShowStartAuthDialog(); EXPECT_NE(authManager_->authResponseContext_->targetDeviceName, DmDialogManager::GetInstance().targetDeviceName_); @@ -822,7 +822,7 @@ HWTEST_F(DmAuthManagerTest, ShowStartAuthDialog_004, testing::ext::TestSize.Leve HWTEST_F(DmAuthManagerTest, ProcessPincode_001, testing::ext::TestSize.Level1) { - int32_t pinCode = 123456; + std::string pinCode = "123456"; authManager_->authResponseContext_ = nullptr; int32_t ret = authManager_->ProcessPincode(pinCode); ASSERT_EQ(ret, ERR_DM_FAILED); @@ -830,7 +830,7 @@ HWTEST_F(DmAuthManagerTest, ProcessPincode_001, testing::ext::TestSize.Level1) HWTEST_F(DmAuthManagerTest, ProcessPincode_002, testing::ext::TestSize.Level1) { - int32_t pinCode = 123456; + std::string pinCode = "123456"; authManager_->authResponseContext_->dmVersion = "dmVersion"; authManager_->authResponseContext_->bindLevel = 1; authManager_->isAuthDevice_ = true; @@ -840,14 +840,14 @@ HWTEST_F(DmAuthManagerTest, ProcessPincode_002, testing::ext::TestSize.Level1) HWTEST_F(DmAuthManagerTest, ProcessPincode_003, testing::ext::TestSize.Level1) { - int32_t pinCode = -1; + std::string pinCode = ""; authManager_->authResponseContext_->authType = AUTH_TYPE_IMPORT_AUTH_CODE; authManager_->authUiStateMgr_ = nullptr; authManager_->importAuthCode_ = "123456"; authManager_->importPkgName_ = "hostPkgName"; authManager_->authResponseContext_->hostPkgName = "hostPkgName"; authManager_->remoteVersion_ = "4.1.5.2"; - authManager_->authResponseContext_->bindLevel = DEVICE; + authManager_->authResponseContext_->bindLevel = USER; authManager_->authResponseContext_->targetDeviceName = "ShowStartAuthDialog_004"; EXPECT_CALL(*hiChainAuthConnectorMock_, AuthDevice(_, _, _, _)).WillOnce(Return(DM_OK)); int32_t ret = authManager_->ProcessPincode(pinCode); @@ -870,7 +870,7 @@ HWTEST_F(DmAuthManagerTest, ProcessPincode_003, testing::ext::TestSize.Level1) HWTEST_F(DmAuthManagerTest, AuthDevice_001, testing::ext::TestSize.Level1) { - int32_t pinCode = 123456; + std::string pinCode = "123456"; authManager_->isAuthDevice_ = true; int32_t ret = authManager_->AuthDevice(pinCode); ASSERT_EQ(ret, ERR_DM_FAILED); @@ -878,7 +878,7 @@ HWTEST_F(DmAuthManagerTest, AuthDevice_001, testing::ext::TestSize.Level1) HWTEST_F(DmAuthManagerTest, AuthDevice_002, testing::ext::TestSize.Level1) { - int32_t pinCode = 123456; + std::string pinCode = "123456"; authManager_->isAuthDevice_ = false; authManager_->authResponseContext_->authType = 5; EXPECT_CALL(*hiChainAuthConnectorMock_, AuthDevice(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); @@ -915,7 +915,9 @@ HWTEST_F(DmAuthManagerTest, BindTarget_001, testing::ext::TestSize.Level1) std::string pkgName; PeerTargetId targetId; std::map bindParam; - int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam); + int sessionId = 1; + int64_t logicalSessionId = 888; + int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam, sessionId, logicalSessionId); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -924,7 +926,9 @@ HWTEST_F(DmAuthManagerTest, BindTarget_002, testing::ext::TestSize.Level1) std::string pkgName = "pkgName"; PeerTargetId targetId; std::map bindParam; - int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam); + int sessionId = 1; + int64_t logicalSessionId = 888; + int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam, sessionId, logicalSessionId); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -936,7 +940,9 @@ HWTEST_F(DmAuthManagerTest, BindTarget_004, testing::ext::TestSize.Level1) std::map bindParam; bindParam.insert(std::pair("AUTH_TYPE", "1")); bindParam.insert(std::pair("CONN_ADDR_TYPE", "3")); - int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam); + int sessionId = 1; + int64_t logicalSessionId = 888; + int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam, sessionId, logicalSessionId); ASSERT_EQ(ret, ERR_DM_AUTH_BUSINESS_BUSY); } @@ -948,7 +954,9 @@ HWTEST_F(DmAuthManagerTest, BindTarget_005, testing::ext::TestSize.Level1) std::map bindParam; bindParam.insert(std::pair("AUTH_TYPE", "2")); bindParam.insert(std::pair("CONN_ADDR_TYPE", "3")); - int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam); + int sessionId = 1; + int64_t logicalSessionId = 888; + int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam, sessionId, logicalSessionId); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1078,7 +1086,7 @@ HWTEST_F(DmAuthManagerTest, DeleteAuthCode_001, testing::ext::TestSize.Level1) HWTEST_F(DmAuthManagerTest, GetAuthCode_001, testing::ext::TestSize.Level1) { std::string pkgName; - int32_t pinCode = 1; + std::string pinCode = "1"; authManager_->importAuthCode_ = ""; authManager_->importPkgName_ = "importPkgName_"; int32_t ret = authManager_->GetAuthCode(pkgName, pinCode); @@ -1088,7 +1096,7 @@ HWTEST_F(DmAuthManagerTest, GetAuthCode_001, testing::ext::TestSize.Level1) HWTEST_F(DmAuthManagerTest, GetAuthCode_002, testing::ext::TestSize.Level1) { std::string pkgName; - int32_t pinCode = 1; + std::string pinCode = "1"; authManager_->importAuthCode_ = "importAuthCode_"; authManager_->importPkgName_ = ""; int32_t ret = authManager_->GetAuthCode(pkgName, pinCode); @@ -1098,7 +1106,7 @@ HWTEST_F(DmAuthManagerTest, GetAuthCode_002, testing::ext::TestSize.Level1) HWTEST_F(DmAuthManagerTest, GetAuthCode_003, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; - int32_t pinCode = 1; + std::string pinCode = "1"; authManager_->importAuthCode_ = "importAuthCode_"; authManager_->importPkgName_ = "importPkgName_"; int32_t ret = authManager_->GetAuthCode(pkgName, pinCode); @@ -1108,7 +1116,7 @@ HWTEST_F(DmAuthManagerTest, GetAuthCode_003, testing::ext::TestSize.Level1) HWTEST_F(DmAuthManagerTest, GetAuthCode_004, testing::ext::TestSize.Level1) { std::string pkgName = "ohos_test"; - int32_t pinCode = 1; + std::string pinCode = "1"; authManager_->importAuthCode_ = "123456"; authManager_->importPkgName_ = "ohos_test"; int32_t ret = authManager_->GetAuthCode(pkgName, pinCode); @@ -1147,7 +1155,7 @@ HWTEST_F(DmAuthManagerTest, CheckAuthParamVaild_002, testing::ext::TestSize.Leve std::string pkgName = "ohos_test"; std::string deviceId = "512156"; int32_t ret = authManager_->CheckAuthParamVaild(pkgName, authType, deviceId, extra); - ASSERT_EQ(ret, ERR_DM_AUTH_FAILED); + ASSERT_EQ(ret, ERR_DM_UNSUPPORTED_AUTH_TYPE); } HWTEST_F(DmAuthManagerTest, CheckAuthParamVaild_003, testing::ext::TestSize.Level1) @@ -1577,7 +1585,7 @@ HWTEST_F(DmAuthManagerTest, IsIdenticalAccount_201, testing::ext::TestSize.Level authManager_->authResponseContext_->isOnline = true; EXPECT_CALL(*softbusConnectorMock_, CheckIsOnline(_)).WillOnce(Return(true)); - EXPECT_CALL(*hiChainAuthConnectorMock_, QueryCredential(_, _)).WillOnce(Return(true)); + EXPECT_CALL(*hiChainAuthConnectorMock_, QueryCredential(_, _, _)).WillOnce(Return(true)); authManager_->GetAuthRequestContext(); JsonObject jsonPeerGroupIdObj; @@ -1644,7 +1652,8 @@ HWTEST_F(DmAuthManagerTest, CheckTrustState_003, testing::ext::TestSize.Level1) authManager_->ProcessAuthRequest(sessionId); authManager_->authResponseContext_->haveCredential = true; - EXPECT_CALL(*hiChainAuthConnectorMock_, QueryCredential(_, _)).Times(::testing::AtLeast(2)).WillOnce(Return(true)); + EXPECT_CALL(*hiChainAuthConnectorMock_, + QueryCredential(_, _, _)).Times(::testing::AtLeast(2)).WillOnce(Return(true)); authManager_->GetAuthRequestContext(); authManager_->authResponseContext_->isOnline = true; @@ -1735,7 +1744,9 @@ HWTEST_F(DmAuthManagerTest, BindTarget_006, testing::ext::TestSize.Level1) std::map bindParam; bindParam.insert(std::pair("AUTH_TYPE", "2")); bindParam.insert(std::pair("CONN_ADDR_TYPE", "3")); - int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam); + int sessionId = 1; + int64_t logicalSessionId = 888; + int32_t ret = authManager_->BindTarget(pkgName, targetId, bindParam, sessionId, logicalSessionId); ASSERT_EQ(ret, ERR_DM_UNSUPPORTED_AUTH_TYPE); } } // namespace diff --git a/test/commonunittest/UTTest_dm_auth_manager_third.cpp b/test/commonunittest/UTTest_dm_auth_manager_third.cpp index 2e644498ea9fe8583db27059cfa233ea24065fa8..559b079e28f67f0c61163efcc6fe874afdd784aa 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_third.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_third.cpp @@ -344,7 +344,7 @@ HWTEST_F(DmAuthManagerTest, DeleteAccessControlList004, testing::ext::TestSize.L std::string pkgName = "pkgName"; std::string localDeviceId = "localDeviceId"; std::string remoteDeviceId = "remoteDeviceId"; - int32_t bindLevel = DEVICE; + int32_t bindLevel = USER; std::string extra = ""; auto ret = DeviceProfileConnector::GetInstance().DeleteAccessControlList(pkgName, localDeviceId, remoteDeviceId, bindLevel, extra); diff --git a/test/commonunittest/UTTest_dm_device_state_manager_two.cpp b/test/commonunittest/UTTest_dm_device_state_manager_two.cpp index 7ae3721e648186148e7454777c9563ea3cef719b..0755e6a4b5a4f00a8c1ee113fcf418499ac209be 100644 --- a/test/commonunittest/UTTest_dm_device_state_manager_two.cpp +++ b/test/commonunittest/UTTest_dm_device_state_manager_two.cpp @@ -43,12 +43,14 @@ void DmDeviceStateManagerTestTwo::TearDown() void DmDeviceStateManagerTestTwo::SetUpTestCase() { DmSoftbusConnector::dmSoftbusConnector = softbusConnectorMock_; + DmCrypto::dmCrypto = cryptoMock_; } void DmDeviceStateManagerTestTwo::TearDownTestCase() { DmSoftbusConnector::dmSoftbusConnector = nullptr; softbusConnectorMock_ = nullptr; + DmCrypto::dmCrypto = nullptr; } namespace { std::shared_ptr hiChainConnector_ = std::make_shared(); @@ -115,6 +117,7 @@ HWTEST_F(DmDeviceStateManagerTestTwo, OnDeviceOffline_002, testing::ext::TestSiz dmDeviceStateManager->stateDeviceInfos_["123"] = info; dmDeviceStateManager->OnDeviceOffline(deviceId); EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); + dmDeviceStateManager->stateDeviceInfos_.clear(); } HWTEST_F(DmDeviceStateManagerTestTwo, HandleDeviceStatusChange_001, testing::ext::TestSize.Level0) @@ -157,17 +160,24 @@ HWTEST_F(DmDeviceStateManagerTestTwo, OnDeviceOnline_001, testing::ext::TestSize dmDeviceStateManager->OnDeviceOnline("123", 0); EXPECT_CALL(*softbusConnectorMock_, GetDeviceInfoByDeviceId("123")).WillOnce(Return(info)); EXPECT_CALL(*softbusConnectorMock_, GetProcessInfo()).WillOnce(Return(processInfoVec)); + dmDeviceStateManager->stateDeviceInfos_["123"] = info; dmDeviceStateManager->OnDeviceOnline("123", 0); EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); + dmDeviceStateManager->stateDeviceInfos_.clear(); } HWTEST_F(DmDeviceStateManagerTestTwo, OnDbReady_001, testing::ext::TestSize.Level0) { - std::string pkgName = "123"; - std::string deviceId = "123"; - DmDeviceInfo info; - strcpy_s(info.deviceId, DM_MAX_DEVICE_ID_LEN, "123"); + std::string pkgName; + std::string deviceId; + dmDeviceStateManager->OnDbReady(pkgName, deviceId); + + pkgName = "123"; + dmDeviceStateManager->OnDbReady(pkgName, deviceId); + + deviceId = "123"; dmDeviceStateManager->OnDbReady(pkgName, deviceId); + DmDeviceInfo deviceInfo = { .deviceId = "123", .deviceName = "asda", @@ -183,7 +193,46 @@ HWTEST_F(DmDeviceStateManagerTestTwo, OnDbReady_001, testing::ext::TestSize.Leve EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); } -HWTEST_F(DmDeviceStateManagerTestTwo, RegisterOffLineTimer_001, testing::ext::TestSize.Level0) +HWTEST_F(DmDeviceStateManagerTestTwo, RegisterOffLineTimer_002, testing::ext::TestSize.Level0) +{ + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; + StateTimerInfo stateTimerInfo = { + .isStart = true, + }; + dmDeviceStateManager->stateTimerInfoMap_["123"] = stateTimerInfo; + EXPECT_CALL(*softbusConnectorMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).WillOnce(Return(ERR_DM_FAILED)); + dmDeviceStateManager->RegisterOffLineTimer(info); + EXPECT_EQ(dmDeviceStateManager->stateTimerInfoMap_["123"].isStart, true); + dmDeviceStateManager->stateTimerInfoMap_.clear(); +} + +HWTEST_F(DmDeviceStateManagerTestTwo, RegisterOffLineTimer_003, testing::ext::TestSize.Level0) +{ + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + }; + StateTimerInfo stateTimerInfo = { + .isStart = true, + }; + dmDeviceStateManager->stateTimerInfoMap_["123"] = stateTimerInfo; + EXPECT_CALL(*softbusConnectorMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).WillOnce(DoAll(WithArgs<1>(Invoke([](unsigned char* udidHash) { + memcpy_s(udidHash, DM_MAX_DEVICE_ID_LEN, "123", 3); + })), Return(DM_OK))); + dmDeviceStateManager->timer_ = std::make_shared(); + dmDeviceStateManager->RegisterOffLineTimer(info); + EXPECT_EQ(dmDeviceStateManager->stateTimerInfoMap_["123"].isStart, false); + dmDeviceStateManager->stateTimerInfoMap_.clear(); +} + +HWTEST_F(DmDeviceStateManagerTestTwo, RegisterOffLineTimer_004, testing::ext::TestSize.Level0) { DmDeviceInfo info = { .deviceId = "123", @@ -192,8 +241,16 @@ HWTEST_F(DmDeviceStateManagerTestTwo, RegisterOffLineTimer_001, testing::ext::Te }; StateTimerInfo stateTimerInfo; dmDeviceStateManager->stateTimerInfoMap_["123"] = stateTimerInfo; + dmDeviceStateManager->udidhash2udidMap_["123"] = "test"; EXPECT_CALL(*softbusConnectorMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).WillOnce(DoAll(WithArgs<1>(Invoke([](unsigned char* udidHash) { + memcpy_s(udidHash, DM_MAX_DEVICE_ID_LEN, "123", 3); + })), Return(DM_OK))); + dmDeviceStateManager->timer_ = std::make_shared(); dmDeviceStateManager->RegisterOffLineTimer(info); + EXPECT_NE(dmDeviceStateManager->udidhash2udidMap_["123"], "test"); + dmDeviceStateManager->stateTimerInfoMap_.clear(); + dmDeviceStateManager->udidhash2udidMap_.clear(); } HWTEST_F(DmDeviceStateManagerTestTwo, StartOffLineTimer_001, testing::ext::TestSize.Level0) @@ -204,13 +261,37 @@ HWTEST_F(DmDeviceStateManagerTestTwo, StartOffLineTimer_001, testing::ext::TestS EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); } +HWTEST_F(DmDeviceStateManagerTestTwo, StartOffLineTimer_002, testing::ext::TestSize.Level0) +{ + DmDeviceInfo info = { + .deviceId = "123", + .deviceName = "asda", + .deviceTypeId = 1, + .networkId = "aabbcc", + }; + StateTimerInfo stateTimerInfo = { + .timerName = "123", + .networkId = "aabbcc", + .isStart = false, + }; + dmDeviceStateManager->stateTimerInfoMap_["123"] = stateTimerInfo; + dmDeviceStateManager->StartOffLineTimer(info); + EXPECT_EQ(dmDeviceStateManager->stateTimerInfoMap_["123"].isStart, true); + dmDeviceStateManager->stateTimerInfoMap_.clear(); + dmDeviceStateManager->udidhash2udidMap_.clear(); +} + HWTEST_F(DmDeviceStateManagerTestTwo, DeleteOffLineTimer_001, testing::ext::TestSize.Level0) { + StateTimerInfo stateTimerInfo; + dmDeviceStateManager->stateTimerInfoMap_["123"] = stateTimerInfo; dmDeviceStateManager->timer_ = nullptr; dmDeviceStateManager->DeleteOffLineTimer("123"); + EXPECT_NE(dmDeviceStateManager->stateTimerInfoMap_.size(), 0); dmDeviceStateManager->timer_ = std::make_shared(); dmDeviceStateManager->DeleteOffLineTimer(""); - EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); + EXPECT_NE(dmDeviceStateManager->stateTimerInfoMap_.size(), 0); + dmDeviceStateManager->stateTimerInfoMap_.clear(); } HWTEST_F(DmDeviceStateManagerTestTwo, DeleteOffLineTimer_002, testing::ext::TestSize.Level0) @@ -224,8 +305,10 @@ HWTEST_F(DmDeviceStateManagerTestTwo, DeleteOffLineTimer_002, testing::ext::Test StateTimerInfo stateTimerInfo; dmDeviceStateManager->stateTimerInfoMap_["123"] = stateTimerInfo; dmDeviceStateManager->DeleteOffLineTimer("deviceInfo"); + EXPECT_NE(dmDeviceStateManager->stateTimerInfoMap_.size(), 0); dmDeviceStateManager->DeleteOffLineTimer("123"); - EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); + EXPECT_EQ(dmDeviceStateManager->stateTimerInfoMap_.size(), 0); + dmDeviceStateManager->stateTimerInfoMap_.clear(); } HWTEST_F(DmDeviceStateManagerTestTwo, DeleteOffLineTimer_003, testing::ext::TestSize.Level0) @@ -238,25 +321,15 @@ HWTEST_F(DmDeviceStateManagerTestTwo, DeleteOffLineTimer_003, testing::ext::Test }; StateTimerInfo stateTimerInfo; dmDeviceStateManager->stateTimerInfoMap_["123"] = stateTimerInfo; + dmDeviceStateManager->udidhash2udidMap_["deviceInfo"] = "test"; dmDeviceStateManager->DeleteOffLineTimer("123"); - dmDeviceStateManager->udidhash2udidMap_["123"] = "test"; - dmDeviceStateManager->DeleteOffLineTimer("123"); - EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); -} + EXPECT_NE(dmDeviceStateManager->udidhash2udidMap_.size(), 0); -HWTEST_F(DmDeviceStateManagerTestTwo, DeleteOffLineTimer_004, testing::ext::TestSize.Level0) -{ - dmDeviceStateManager->timer_ = std::make_shared(); - DmDeviceInfo info = { - .deviceId = "123", - .deviceName = "asda", - .deviceTypeId = 1, - }; - StateTimerInfo stateTimerInfo; - dmDeviceStateManager->stateTimerInfoMap_["123"] = stateTimerInfo; dmDeviceStateManager->udidhash2udidMap_["123"] = "test"; dmDeviceStateManager->DeleteOffLineTimer("123"); EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); + dmDeviceStateManager->stateTimerInfoMap_.clear(); + dmDeviceStateManager->udidhash2udidMap_.clear(); } HWTEST_F(DmDeviceStateManagerTestTwo, DeleteTimeOutGroup_001, testing::ext::TestSize.Level0) diff --git a/test/commonunittest/UTTest_dm_device_state_manager_two.h b/test/commonunittest/UTTest_dm_device_state_manager_two.h index b6d26fe45ce993dab37489b6cb99db458024bd2b..2d81dbd1d7943aa0f775522aed2a9c5fc0dddde8 100644 --- a/test/commonunittest/UTTest_dm_device_state_manager_two.h +++ b/test/commonunittest/UTTest_dm_device_state_manager_two.h @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef OHOS_UTTEST_DM_DEVICE_STATE_MANAGER_H -#define OHOS_UTTEST_DM_DEVICE_STATE_MANAGER_H +#ifndef OHOS_UTTEST_DM_DEVICE_STATE_MANAGER_TWO_H +#define OHOS_UTTEST_DM_DEVICE_STATE_MANAGER_TWO_H #include #include @@ -22,6 +22,7 @@ #include "softbus_connector_mock.h" #include "device_manager_service_listener.h" #include "softbus_session_callback.h" +#include "dm_crypto_mock.h" namespace OHOS { namespace DistributedHardware { @@ -33,6 +34,8 @@ public: void TearDown() override; static inline std::shared_ptr softbusConnectorMock_ = std::make_shared(); + static inline std::shared_ptr cryptoMock_ = + std::make_shared(); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp b/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp index 52821ab12be7bb930257816bd2861c5e8fa66347..5400124c7787019e620ca5d467c4a4f7b08dda66 100644 --- a/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp +++ b/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp @@ -686,7 +686,7 @@ HWTEST_F(DeviceProfileConnectorTest, HandleDmAuthForm_002, testing::ext::TestSiz { DistributedDeviceProfile::AccessControlProfile profiles; profiles.SetBindType(DM_POINT_TO_POINT); - profiles.SetBindLevel(DEVICE); + profiles.SetBindLevel(USER); DmDiscoveryInfo discoveryInfo; int32_t ret = DeviceProfileConnector::GetInstance().HandleDmAuthForm(profiles, discoveryInfo); EXPECT_EQ(ret, PEER_TO_PEER); @@ -724,10 +724,10 @@ HWTEST_F(DeviceProfileConnectorTest, HandleDmAuthForm_005, testing::ext::TestSiz { DistributedDeviceProfile::AccessControlProfile profiles; profiles.SetBindType(DM_ACROSS_ACCOUNT); - profiles.SetBindLevel(DEVICE); + profiles.SetBindLevel(USER); DmDiscoveryInfo discoveryInfo; int32_t ret = DeviceProfileConnector::GetInstance().HandleDmAuthForm(profiles, discoveryInfo); - EXPECT_EQ(ret, ACROSS_ACCOUNT); + EXPECT_EQ(ret, PEER_TO_PEER); } HWTEST_F(DeviceProfileConnectorTest, HandleDmAuthForm_006, testing::ext::TestSize.Level1) @@ -741,7 +741,7 @@ HWTEST_F(DeviceProfileConnectorTest, HandleDmAuthForm_006, testing::ext::TestSiz discoveryInfo.pkgname = "pkgName"; discoveryInfo.localDeviceId = "localDeviceId"; int32_t ret = DeviceProfileConnector::GetInstance().HandleDmAuthForm(profiles, discoveryInfo); - EXPECT_EQ(ret, ACROSS_ACCOUNT); + EXPECT_EQ(ret, PEER_TO_PEER); } HWTEST_F(DeviceProfileConnectorTest, HandleDmAuthForm_007, testing::ext::TestSize.Level1) @@ -755,7 +755,7 @@ HWTEST_F(DeviceProfileConnectorTest, HandleDmAuthForm_007, testing::ext::TestSiz discoveryInfo.pkgname = "pkgName"; discoveryInfo.localDeviceId = "localDeviceId"; int32_t ret = DeviceProfileConnector::GetInstance().HandleDmAuthForm(profiles, discoveryInfo); - EXPECT_EQ(ret, ACROSS_ACCOUNT); + EXPECT_EQ(ret, PEER_TO_PEER); } HWTEST_F(DeviceProfileConnectorTest, HandleDmAuthForm_008, testing::ext::TestSize.Level1) @@ -807,7 +807,7 @@ HWTEST_F(DeviceProfileConnectorTest, GetBindTypeByPkgName_002, testing::ext::Tes std::string requestDeviceId; std::string trustUdid = "123456"; auto ret = DeviceProfileConnector::GetInstance().GetBindTypeByPkgName(pkgName, requestDeviceId, trustUdid); - EXPECT_EQ(ret.empty(), true); + EXPECT_NE(ret.empty(), DM_OK); requestDeviceId = "remoteDeviceId"; trustUdid = "localDeviceId"; @@ -944,7 +944,11 @@ HWTEST_F(DeviceProfileConnectorTest, PutAccessControlList_001, testing::ext::Tes DmAccessee dmAccessee; int32_t userId = 123456; std::string localDeviceId = "deviceId"; - DeviceProfileConnector::GetInstance().DeleteAclForUserRemoved(localDeviceId, userId); + std::vector peerUdids; + std::multimap peerUserIdMap; + DmOfflineParam offlineParam; + DeviceProfileConnector::GetInstance().DeleteAclForUserRemoved(localDeviceId, userId, peerUdids, peerUserIdMap, + offlineParam); int32_t ret = DeviceProfileConnector::GetInstance().PutAccessControlList(aclInfo, dmAccesser, dmAccessee); EXPECT_EQ(ret, DM_OK); } @@ -989,7 +993,7 @@ HWTEST_F(DeviceProfileConnectorTest, ProcessBindType_003, testing::ext::TestSize { DistributedDeviceProfile::AccessControlProfile profiles; profiles.SetBindType(DM_POINT_TO_POINT); - profiles.SetBindLevel(DEVICE); + profiles.SetBindLevel(USER); std::string targetDeviceId = "targetDeviceId"; std::string localDeviceId = "localDeviceId"; uint32_t index = 0; @@ -1005,7 +1009,7 @@ HWTEST_F(DeviceProfileConnectorTest, ProcessBindType_004, testing::ext::TestSize { DistributedDeviceProfile::AccessControlProfile profiles; profiles.SetBindType(DM_ACROSS_ACCOUNT); - profiles.SetBindLevel(DEVICE); + profiles.SetBindLevel(USER); std::string targetDeviceId = "targetDeviceId"; std::string localDeviceId = "localDeviceId"; uint32_t index = 0; @@ -1017,14 +1021,6 @@ HWTEST_F(DeviceProfileConnectorTest, ProcessBindType_004, testing::ext::TestSize EXPECT_EQ(bindTypeIndex, vector({0})); } -HWTEST_F(DeviceProfileConnectorTest, CheckIdenticalAccount_001, testing::ext::TestSize.Level1) -{ - int32_t userId = 0; - std::string accountId; - bool ret = DeviceProfileConnector::GetInstance().CheckIdenticalAccount(userId, accountId); - EXPECT_EQ(ret, true); -} - HWTEST_F(DeviceProfileConnectorTest, CheckSrcDevIdInAclForDevBind_001, testing::ext::TestSize.Level1) { std::string pkgName; @@ -1084,7 +1080,8 @@ HWTEST_F(DeviceProfileConnectorTest, CheckDevIdInAclForDevBind_001, testing::ext HWTEST_F(DeviceProfileConnectorTest, DeleteTimeOutAcl_001, testing::ext::TestSize.Level1) { std::string deviceId; - uint32_t ret = DeviceProfileConnector::GetInstance().DeleteTimeOutAcl(deviceId); + DmOfflineParam offlineParam; + uint32_t ret = DeviceProfileConnector::GetInstance().DeleteTimeOutAcl(deviceId, offlineParam); EXPECT_EQ(ret, 0); } @@ -1119,12 +1116,16 @@ HWTEST_F(DeviceProfileConnectorTest, GetAuthForm_001, testing::ext::TestSize.Lev profile.SetBindType(DM_IDENTICAL_ACCOUNT); ret = DeviceProfileConnector::GetInstance().GetAuthForm(profile, trustDev, reqDev); EXPECT_EQ(ret, IDENTICAL_ACCOUNT_TYPE); + profile.SetBindType(DM_SHARE); + profile.SetBindLevel(USER); + ret = DeviceProfileConnector::GetInstance().GetAuthForm(profile, trustDev, reqDev); + EXPECT_EQ(ret, SHARE_TYPE); profile.SetBindType(DM_POINT_TO_POINT); - profile.SetBindLevel(DEVICE); + profile.SetBindLevel(USER); ret = DeviceProfileConnector::GetInstance().GetAuthForm(profile, trustDev, reqDev); EXPECT_EQ(ret, DEVICE_PEER_TO_PEER_TYPE); profile.SetBindType(DM_ACROSS_ACCOUNT); - profile.SetBindLevel(DEVICE); + profile.SetBindLevel(USER); ret = DeviceProfileConnector::GetInstance().GetAuthForm(profile, trustDev, reqDev); EXPECT_EQ(ret, DEVICE_ACROSS_ACCOUNT_TYPE); profile.SetBindLevel(APP); @@ -1157,33 +1158,33 @@ HWTEST_F(DeviceProfileConnectorTest, GetBindLevel_001, testing::ext::TestSize.Le HWTEST_F(DeviceProfileConnectorTest, UpdateBindType_001, testing::ext::TestSize.Level1) { std::string udid = "deviceId"; - int32_t bindType = DEVICE; + int32_t bindType = USER; std::map deviceMap; deviceMap[udid] = APP; DeviceProfileConnector::GetInstance().UpdateBindType(udid, bindType, deviceMap); - EXPECT_EQ(deviceMap[udid], DEVICE); + EXPECT_EQ(deviceMap[udid], USER); } HWTEST_F(DeviceProfileConnectorTest, UpdateBindType_002, testing::ext::TestSize.Level1) { std::string udid = "deviceId"; - int32_t bindType = DEVICE; + int32_t bindType = USER; std::map deviceMap; DeviceProfileConnector::GetInstance().UpdateBindType(udid, bindType, deviceMap); - EXPECT_EQ(deviceMap[udid], DEVICE); + EXPECT_EQ(deviceMap[udid], USER); } HWTEST_F(DeviceProfileConnectorTest, HandleAccountLogoutEvent_001, testing::ext::TestSize.Level1) { int32_t remoteUserId = 0; - int32_t bindType = DM_INVALIED_BINDTYPE; + int32_t bindType = DM_INVALIED_TYPE; std::string remoteAccountHash = "remoteAccountHash"; std::string remoteUdid = "1"; std::string localUdid = "localDeviceId"; bindType = DeviceProfileConnector::GetInstance().HandleAccountLogoutEvent(remoteUserId, remoteAccountHash, remoteUdid, localUdid); - EXPECT_EQ(bindType, DM_INVALIED_BINDTYPE); + EXPECT_EQ(bindType, DM_INVALIED_TYPE); } HWTEST_F(DeviceProfileConnectorTest, HandleDevUnBindEvent_001, testing::ext::TestSize.Level1) @@ -1191,10 +1192,10 @@ HWTEST_F(DeviceProfileConnectorTest, HandleDevUnBindEvent_001, testing::ext::Tes int32_t remoteUserId = 0; std::string remoteUdid = "remoteDeviceId"; std::string localUdid = "localDeviceId"; - int32_t bindType = DM_INVALIED_BINDTYPE; - - bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid); - EXPECT_EQ(bindType, DM_INVALIED_BINDTYPE); + DmOfflineParam offlineParam; + int32_t bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid, + offlineParam); + EXPECT_EQ(bindType, DM_INVALIED_TYPE); } HWTEST_F(DeviceProfileConnectorTest, HandleAppUnBindEvent_001, testing::ext::TestSize.Level1) @@ -1204,15 +1205,15 @@ HWTEST_F(DeviceProfileConnectorTest, HandleAppUnBindEvent_001, testing::ext::Tes std::string remoteUdid = "remoteDeviceId"; std::string localUdid = "localDeviceId"; std::string pkgName = ""; - ProcessInfo res; + DmOfflineParam res; res = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, localUdid); - EXPECT_EQ(pkgName, res.pkgName); + EXPECT_EQ(0, res.processVec.size()); int32_t peerTokenId = 1; res = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, localUdid, peerTokenId); - EXPECT_EQ(pkgName, res.pkgName); + EXPECT_EQ(0, res.processVec.size()); } HWTEST_F(DeviceProfileConnectorTest, SingleUserProcess_001, testing::ext::TestSize.Level1) @@ -1228,7 +1229,7 @@ HWTEST_F(DeviceProfileConnectorTest, SingleUserProcess_001, testing::ext::TestSi ret = DeviceProfileConnector::GetInstance().SingleUserProcess(profile, caller, callee); EXPECT_EQ(ret, true); profile.SetBindType(DM_POINT_TO_POINT); - profile.SetBindLevel(DEVICE); + profile.SetBindLevel(USER); ret = DeviceProfileConnector::GetInstance().SingleUserProcess(profile, caller, callee); EXPECT_EQ(ret, true); profile.SetBindLevel(APP); @@ -1238,7 +1239,7 @@ HWTEST_F(DeviceProfileConnectorTest, SingleUserProcess_001, testing::ext::TestSi ret = DeviceProfileConnector::GetInstance().SingleUserProcess(profile, caller, callee); EXPECT_EQ(ret, true); profile.SetBindType(DM_ACROSS_ACCOUNT); - profile.SetBindLevel(DEVICE); + profile.SetBindLevel(USER); ret = DeviceProfileConnector::GetInstance().SingleUserProcess(profile, caller, callee); EXPECT_EQ(ret, true); profile.SetBindLevel(APP); @@ -1254,7 +1255,7 @@ HWTEST_F(DeviceProfileConnectorTest, SingleUserProcess_001, testing::ext::TestSi HWTEST_F(DeviceProfileConnectorTest, GetAccessControlProfileByUserId_001, testing::ext::TestSize.Level1) { - int32_t userId = DEVICE; + int32_t userId = USER; std::vector profiles; profiles = DeviceProfileConnector::GetInstance().GetAccessControlProfileByUserId(userId); EXPECT_GE(profiles.size(), 0); @@ -1289,7 +1290,7 @@ HWTEST_F(DeviceProfileConnectorTest, DeleteAppBindLevel_003, testing::ext::TestS GetAccessControlProfiles(profiles); DeviceProfileConnector::GetInstance().DeleteAppBindLevel(offlineParam, pkgName, profiles, localUdid, remoteUdid, extra); - EXPECT_EQ(offlineParam.bindType, APP); + EXPECT_NE(offlineParam.bindType, APP); } HWTEST_F(DeviceProfileConnectorTest, DeleteDeviceBindLevel_001, testing::ext::TestSize.Level1) @@ -1300,12 +1301,12 @@ HWTEST_F(DeviceProfileConnectorTest, DeleteDeviceBindLevel_001, testing::ext::Te std::string remoteUdid="localDeviceId"; GetAccessControlProfiles(profiles); DeviceProfileConnector::GetInstance().DeleteDeviceBindLevel(offlineParam, profiles, localUdid, remoteUdid); - EXPECT_EQ(offlineParam.bindType, DEVICE); + EXPECT_EQ(offlineParam.bindType, USER); localUdid = "localDeviceId"; remoteUdid="remoteDeviceId"; DeviceProfileConnector::GetInstance().DeleteDeviceBindLevel(offlineParam, profiles, localUdid, remoteUdid); - EXPECT_EQ(offlineParam.bindType, DEVICE); + EXPECT_EQ(offlineParam.bindType, USER); } HWTEST_F(DeviceProfileConnectorTest, DeleteServiceBindLevel_001, testing::ext::TestSize.Level1) @@ -1339,7 +1340,8 @@ HWTEST_F(DeviceProfileConnectorTest, CheckSrcDevIdInAclForDevBind_004, testing:: HWTEST_F(DeviceProfileConnectorTest, DeleteTimeOutAcl_002, testing::ext::TestSize.Level1) { std::string deviceId = "remoteDeviceId"; - uint32_t ret = DeviceProfileConnector::GetInstance().DeleteTimeOutAcl(deviceId); + DmOfflineParam offlineParam; + uint32_t ret = DeviceProfileConnector::GetInstance().DeleteTimeOutAcl(deviceId, offlineParam); EXPECT_EQ(ret, 0); } @@ -1363,13 +1365,13 @@ HWTEST_F(DeviceProfileConnectorTest, CheckAccessControl_001, testing::ext::TestS std::string srcUdid; DmAccessCallee callee; std::string sinkUdid; - int32_t ret = DeviceProfileConnector::GetInstance().CheckAccessControl(caller, srcUdid, callee, sinkUdid); - EXPECT_EQ(ret, ERR_DM_FAILED); + bool ret = DeviceProfileConnector::GetInstance().CheckAccessControl(caller, srcUdid, callee, sinkUdid); + EXPECT_EQ(ret, false); srcUdid = "123456"; sinkUdid = "123456"; ret = DeviceProfileConnector::GetInstance().CheckAccessControl(caller, srcUdid, callee, sinkUdid); - EXPECT_NE(ret, DM_OK); + EXPECT_NE(ret, true); } HWTEST_F(DeviceProfileConnectorTest, CheckIsSameAccount_001, testing::ext::TestSize.Level1) @@ -1378,19 +1380,19 @@ HWTEST_F(DeviceProfileConnectorTest, CheckIsSameAccount_001, testing::ext::TestS std::string srcUdid; DmAccessCallee callee; std::string sinkUdid; - int32_t ret = DeviceProfileConnector::GetInstance().CheckIsSameAccount(caller, srcUdid, callee, sinkUdid); - EXPECT_EQ(ret, ERR_DM_FAILED); + bool ret = DeviceProfileConnector::GetInstance().CheckIsSameAccount(caller, srcUdid, callee, sinkUdid); + EXPECT_EQ(ret, false); srcUdid = "123456"; sinkUdid = "123456"; ret = DeviceProfileConnector::GetInstance().CheckIsSameAccount(caller, srcUdid, callee, sinkUdid); - EXPECT_NE(ret, DM_OK); + EXPECT_NE(ret, true); } HWTEST_F(DeviceProfileConnectorTest, HandleAccountLogoutEvent_002, testing::ext::TestSize.Level1) { int32_t remoteUserId = 0; - int32_t bindType = DM_INVALIED_BINDTYPE; + int32_t bindType = DM_INVALIED_TYPE; std::string remoteAccountHash = "remoteAccountHash"; std::string remoteUdid = "123456"; std::string localUdid = "localDeviceId"; @@ -1417,22 +1419,26 @@ HWTEST_F(DeviceProfileConnectorTest, HandleDevUnBindEvent_002, testing::ext::Tes int32_t remoteUserId = 0; std::string remoteUdid; std::string localUdid = "localDeviceId"; - int32_t bindType = DM_INVALIED_BINDTYPE; - bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid); - EXPECT_EQ(bindType, DM_INVALIED_BINDTYPE); + DmOfflineParam offlineParam; + int32_t bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid, + offlineParam); + EXPECT_EQ(bindType, DM_INVALIED_TYPE); remoteUdid = "123456"; - bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid); - EXPECT_EQ(bindType, DM_INVALIED_BINDTYPE); + bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid, + offlineParam); + EXPECT_EQ(bindType, DM_INVALIED_TYPE); remoteUdid = "localDeviceId"; remoteUserId = 1234; - bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid); - EXPECT_EQ(bindType, DM_IDENTICAL_ACCOUNT); + bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid, + offlineParam); + EXPECT_NE(bindType, DM_IDENTICAL_ACCOUNT); remoteUserId = 456; - bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid); - EXPECT_EQ(bindType, 3); + bindType = DeviceProfileConnector::GetInstance().HandleDevUnBindEvent(remoteUserId, remoteUdid, localUdid, + offlineParam); + EXPECT_EQ(bindType, DM_INVALIED_TYPE); } HWTEST_F(DeviceProfileConnectorTest, GetAllAccessControlProfile_001, testing::ext::TestSize.Level1) @@ -1458,37 +1464,42 @@ HWTEST_F(DeviceProfileConnectorTest, DeleteAclForAccountLogOut_001, testing::ext int32_t localUserId = 444; std::string peerUdid = "deviceId"; int32_t peerUserId = 555; + DmOfflineParam offlineParam; bool ret = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, - peerUdid, peerUserId); + peerUdid, peerUserId, offlineParam); EXPECT_FALSE(ret); localUdid = "deviceId"; localUserId = 123456; peerUdid = "deviceId"; peerUserId = 456; - ret = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId); + ret = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId, + offlineParam); EXPECT_FALSE(ret); localUdid = "deviceId"; localUserId = 123456; peerUdid = "deviceId"; peerUserId = 123456; - ret = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId); - EXPECT_TRUE(ret); + ret = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId, + offlineParam); + EXPECT_FALSE(ret); localUdid = "localDeviceId"; localUserId = 123456; peerUdid = "remoteDeviceId"; peerUserId = 123456; - ret = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId); + ret = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId, + offlineParam); EXPECT_FALSE(ret); localUdid = "remoteDeviceId"; localUserId = 1234; peerUdid = "localDeviceId"; peerUserId = 1234; - ret = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId); - EXPECT_TRUE(ret); + ret = DeviceProfileConnector::GetInstance().DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId, + offlineParam); + EXPECT_FALSE(ret); } HWTEST_F(DeviceProfileConnectorTest, GetProcessInfoFromAclByUserId_005, testing::ext::TestSize.Level1) @@ -1618,8 +1629,9 @@ HWTEST_F(DeviceProfileConnectorTest, GetUserIdAndBindLevel_001, testing::ext::Te remoteFrontUserIds.push_back(userId); std::vector remoteBackUserIds; remoteBackUserIds.push_back(userId); + DmOfflineParam offlineParam; DeviceProfileConnector::GetInstance().UpdateACL(localUdid, localUserIds, remoteUdid, remoteFrontUserIds, - remoteBackUserIds); + remoteBackUserIds, offlineParam); localUdid = "remoteDeviceId"; remoteUdid = "localDeviceId"; @@ -1689,27 +1701,37 @@ HWTEST_F(DeviceProfileConnectorTest, GetAppTrustDeviceList_004, testing::ext::Te EXPECT_EQ(ret.empty(), false); deviceId = "remoteDeviceId"; - EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()).WillOnce(Return(1234)); + EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) + .Times(::testing::AtLeast(1)) + .WillOnce(Return(1234)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); EXPECT_EQ(ret.empty(), false); deviceId = "remoteDeviceId"; - EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()).WillOnce(Return(1234)); + EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) + .Times(::testing::AtLeast(1)) + .WillOnce(Return(1234)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); EXPECT_EQ(ret.empty(), false); deviceId = "remoteDeviceId"; - EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()).WillOnce(Return(1234)); + EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) + .Times(::testing::AtLeast(1)) + .WillOnce(Return(1234)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); EXPECT_EQ(ret.empty(), false); deviceId = "remoteDeviceId"; - EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()).WillOnce(Return(12345)); + EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) + .Times(::testing::AtLeast(1)) + .WillOnce(Return(12345)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); EXPECT_EQ(ret.empty(), false); deviceId = "remoteDeviceId"; - EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()).WillOnce(Return(12345)); + EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) + .Times(::testing::AtLeast(1)) + .WillOnce(Return(12345)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); EXPECT_EQ(ret.empty(), false); @@ -1795,13 +1817,14 @@ HWTEST_F(DeviceProfileConnectorTest, CheckSrcDevIdInAclForDevBind_005, testing:: std::vector remoteFrontUserIds; std::vector remoteBackUserIds; AddAccessControlProfileFirst(profiles); + DmOfflineParam offlineParam; DeviceProfileConnector::GetInstance().DeleteSigTrustACL(profiles, remoteUdid, - remoteFrontUserIds, remoteBackUserIds); + remoteFrontUserIds, remoteBackUserIds, offlineParam); remoteUdid = "localDeviceId"; AddAccessControlProfileSeven(profiles); DeviceProfileConnector::GetInstance().DeleteSigTrustACL(profiles, remoteUdid, - remoteFrontUserIds, remoteBackUserIds); + remoteFrontUserIds, remoteBackUserIds, offlineParam); AddAccessControlProfileEight(profiles); std::string localUdid = "localDeviceId"; @@ -1824,19 +1847,19 @@ HWTEST_F(DeviceProfileConnectorTest, CheckAccessControl_002, testing::ext::TestS DmAccessCallee callee; callee.userId = userId; std::string sinkUdid = "deviceId"; - int32_t ret = DeviceProfileConnector::GetInstance().CheckAccessControl(caller, srcUdid, callee, sinkUdid); - EXPECT_EQ(ret, DM_OK); + bool ret = DeviceProfileConnector::GetInstance().CheckAccessControl(caller, srcUdid, callee, sinkUdid); + EXPECT_EQ(ret, true); srcUdid = "remoteDeviceId"; sinkUdid = "localDeviceId"; caller.userId = 456; callee.userId = 456; ret = DeviceProfileConnector::GetInstance().CheckAccessControl(caller, srcUdid, callee, sinkUdid); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, true); callee.userId = 0; ret = DeviceProfileConnector::GetInstance().CheckAccessControl(caller, srcUdid, callee, sinkUdid); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, true); } HWTEST_F(DeviceProfileConnectorTest, CheckIsSameAccount_002, testing::ext::TestSize.Level1) @@ -1848,12 +1871,12 @@ HWTEST_F(DeviceProfileConnectorTest, CheckIsSameAccount_002, testing::ext::TestS DmAccessCallee callee; callee.userId = userId; std::string sinkUdid = "remoteDeviceId"; - int32_t ret = DeviceProfileConnector::GetInstance().CheckIsSameAccount(caller, srcUdid, callee, sinkUdid); - EXPECT_EQ(ret, DM_OK); + bool ret = DeviceProfileConnector::GetInstance().CheckIsSameAccount(caller, srcUdid, callee, sinkUdid); + EXPECT_EQ(ret, true); callee.userId = 0; ret = DeviceProfileConnector::GetInstance().CheckAccessControl(caller, srcUdid, callee, sinkUdid); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, true); } HWTEST_F(DeviceProfileConnectorTest, HandleAppUnBindEvent_002, testing::ext::TestSize.Level1) @@ -1863,23 +1886,23 @@ HWTEST_F(DeviceProfileConnectorTest, HandleAppUnBindEvent_002, testing::ext::Tes std::string remoteUdid = "localDeviceId"; std::string localUdid = "remoteDeviceId"; std::string pkgName = ""; - ProcessInfo res; + DmOfflineParam res; res = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, localUdid); - EXPECT_EQ("bundleName", res.pkgName); + EXPECT_NE(1, res.processVec.size()); int32_t peerTokenId = 1001; res = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, localUdid, peerTokenId); - EXPECT_EQ("bundleName", res.pkgName); + EXPECT_NE(3, res.processVec.size()); tokenId = 1002; peerTokenId = tokenId; res = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, localUdid); - EXPECT_EQ("bundleName", res.pkgName); + EXPECT_NE(3, res.processVec.size()); res = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, localUdid, peerTokenId); - EXPECT_EQ("bundleName", res.pkgName); + EXPECT_NE(3, res.processVec.size()); } HWTEST_F(DeviceProfileConnectorTest, HandleAppUnBindEvent_003, testing::ext::TestSize.Level1) @@ -1890,10 +1913,10 @@ HWTEST_F(DeviceProfileConnectorTest, HandleAppUnBindEvent_003, testing::ext::Tes std::string localUdid = "localDeviceId"; std::string pkgName = ""; int32_t peerTokenId = 1001; - ProcessInfo res; + DmOfflineParam res; res = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, localUdid, peerTokenId); - EXPECT_EQ(pkgName, res.pkgName); + EXPECT_EQ(0, res.processVec.size()); } HWTEST_F(DeviceProfileConnectorTest, HandleAppUnBindEvent_004, testing::ext::TestSize.Level1) @@ -1904,10 +1927,10 @@ HWTEST_F(DeviceProfileConnectorTest, HandleAppUnBindEvent_004, testing::ext::Tes std::string localUdid = "localDeviceId"; std::string pkgName = ""; int32_t peerTokenId = 1001; - ProcessInfo res; + DmOfflineParam res; res = DeviceProfileConnector::GetInstance().HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, localUdid, peerTokenId); - EXPECT_EQ("bundleName", res.pkgName); + EXPECT_NE(2, res.processVec.size()); } HWTEST_F(DeviceProfileConnectorTest, GetTokenIdByNameAndDeviceId_002, testing::ext::TestSize.Level1) @@ -1982,7 +2005,7 @@ HWTEST_F(DeviceProfileConnectorTest, CheckBindType_004, testing::ext::TestSize.L EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()).WillOnce(Return(1234)); ret = DeviceProfileConnector::GetInstance().CheckBindType(peerUdid, localUdid); - EXPECT_EQ(ret, 5); + EXPECT_EQ(ret, 6); } HWTEST_F(DeviceProfileConnectorTest, GetTokenIdByNameAndDeviceId_001, testing::ext::TestSize.Level1) @@ -1990,11 +2013,11 @@ HWTEST_F(DeviceProfileConnectorTest, GetTokenIdByNameAndDeviceId_001, testing::e std::string pkgName = "bundleName"; std::string requestDeviceId = "remoteDeviceId"; uint64_t ret = DeviceProfileConnector::GetInstance().GetTokenIdByNameAndDeviceId(pkgName, requestDeviceId); - EXPECT_NE(ret, 0); + EXPECT_EQ(ret, 0); requestDeviceId = "localDeviceId"; ret = DeviceProfileConnector::GetInstance().GetTokenIdByNameAndDeviceId(pkgName, requestDeviceId); - EXPECT_NE(ret, 0); + EXPECT_EQ(ret, 0); } HWTEST_F(DeviceProfileConnectorTest, GetParamBindTypeVec_001, testing::ext::TestSize.Level1) @@ -2016,30 +2039,30 @@ HWTEST_F(DeviceProfileConnectorTest, GetParamBindTypeVec_001, testing::ext::Test profiles.SetAccesser(accesser); profiles.SetAccessee(accessee); DeviceProfileConnector::GetInstance().GetParamBindTypeVec(profiles, requestDeviceId, bindTypeVec, trustUdid); - EXPECT_FALSE(bindTypeVec.empty()); + EXPECT_TRUE(bindTypeVec.size() == 1); bindTypeVec.clear(); profiles.SetBindLevel(3); DeviceProfileConnector::GetInstance().GetParamBindTypeVec(profiles, requestDeviceId, bindTypeVec, trustUdid); - EXPECT_FALSE(bindTypeVec.empty()); + EXPECT_TRUE(bindTypeVec.size() == 1); bindTypeVec.clear(); profiles.SetBindType(DM_ACROSS_ACCOUNT); DeviceProfileConnector::GetInstance().GetParamBindTypeVec(profiles, requestDeviceId, bindTypeVec, trustUdid); - EXPECT_FALSE(bindTypeVec.empty()); + EXPECT_TRUE(bindTypeVec.size() == 1); bindTypeVec.clear(); profiles.SetBindLevel(1); DeviceProfileConnector::GetInstance().GetParamBindTypeVec(profiles, requestDeviceId, bindTypeVec, trustUdid); - EXPECT_FALSE(bindTypeVec.empty()); + EXPECT_TRUE(bindTypeVec.size() == 1); bindTypeVec.clear(); profiles.SetBindType(DM_IDENTICAL_ACCOUNT); DeviceProfileConnector::GetInstance().GetParamBindTypeVec(profiles, requestDeviceId, bindTypeVec, trustUdid); - EXPECT_FALSE(bindTypeVec.empty()); + EXPECT_TRUE(bindTypeVec.size() == 1); bindTypeVec.clear(); - profiles.SetBindType(DM_INVALIED_BINDTYPE); + profiles.SetBindType(DM_INVALIED_TYPE); DeviceProfileConnector::GetInstance().GetParamBindTypeVec(profiles, requestDeviceId, bindTypeVec, trustUdid); EXPECT_TRUE(bindTypeVec.empty()); } @@ -2122,13 +2145,14 @@ HWTEST_F(DeviceProfileConnectorTest, DeleteAclForRemoteUserRemoved_001, testing: std::string peerUdid = "deviceId"; int32_t peerUserId = 123456; std::vector userIds; - DeviceProfileConnector::GetInstance().DeleteAclForRemoteUserRemoved(peerUdid, peerUserId, userIds); - EXPECT_FALSE(userIds.empty()); + DmOfflineParam offlineParam; + DeviceProfileConnector::GetInstance().DeleteAclForRemoteUserRemoved(peerUdid, peerUserId, userIds, offlineParam); + EXPECT_TRUE(userIds.empty()); peerUdid = "remoteDeviceId"; peerUserId = 1234; - DeviceProfileConnector::GetInstance().DeleteAclForRemoteUserRemoved(peerUdid, peerUserId, userIds); - EXPECT_FALSE(userIds.empty()); + DeviceProfileConnector::GetInstance().DeleteAclForRemoteUserRemoved(peerUdid, peerUserId, userIds, offlineParam); + EXPECT_TRUE(userIds.empty()); } HWTEST_F(DeviceProfileConnectorTest, DeleteAccessControlList_001, testing::ext::TestSize.Level1) @@ -2173,32 +2197,6 @@ HWTEST_F(DeviceProfileConnectorTest, DeleteAccessControlList_001, testing::ext:: EXPECT_EQ(offlineParam.bindType, INVALIED_TYPE); } -HWTEST_F(DeviceProfileConnectorTest, DeleteAppBindLevel_002, testing::ext::TestSize.Level1) -{ - DmOfflineParam offlineParam; - std::string pkgName = "bundleName1"; - std::vector profiles; - std::string localUdid = "remoteDeviceId"; - std::string remoteUdid = "localDeviceId"; - std::string extra; - AddAccessControlProfileSix(profiles); - DeviceProfileConnector::GetInstance().DeleteAppBindLevel(offlineParam, pkgName, profiles, localUdid, remoteUdid, - extra); - EXPECT_EQ(offlineParam.leftAclNumber, 0); - - AddAccessControlProfile001(profiles); - extra = "bundleName2"; - DeviceProfileConnector::GetInstance().DeleteAppBindLevel(offlineParam, pkgName, profiles, localUdid, remoteUdid, - extra); - EXPECT_EQ(offlineParam.bindType, APP); - - AddAccessControlProfile002(profiles); - extra = "bundleName2"; - DeviceProfileConnector::GetInstance().DeleteAppBindLevel(offlineParam, pkgName, profiles, localUdid, remoteUdid, - extra); - EXPECT_EQ(offlineParam.bindType, APP); -} - HWTEST_F(DeviceProfileConnectorTest, GetBindLevel_002, testing::ext::TestSize.Level1) { std::string pkgName = "bundleName"; @@ -2215,7 +2213,7 @@ HWTEST_F(DeviceProfileConnectorTest, GetBindLevel_002, testing::ext::TestSize.Le udid = "deviceId"; EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()).WillOnce(Return(123456)); bindLevel = DeviceProfileConnector::GetInstance().GetBindLevel(pkgName, localUdid, udid, tokenId); - EXPECT_EQ(bindLevel, DEVICE); + EXPECT_EQ(bindLevel, USER); int32_t bindType = 256; std::string peerUdid = "123456"; diff --git a/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp b/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp index 523d6d2599ad98286b5942f3aad2027a3cf33648..de578f338e99e8f3d42adedfd77727140c9b0f6e 100644 --- a/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp +++ b/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp @@ -20,6 +20,7 @@ #include #include "dp_inited_callback_stub.h" #include "dm_error_type.h" +#include "dm_crypto.h" using namespace testing; using namespace testing::ext; @@ -121,7 +122,7 @@ HWTEST_F(DeviceProfileConnectorSecondTest, GetAccessControlProfile_201, testing: HWTEST_F(DeviceProfileConnectorSecondTest, GetAccessControlProfileByUserId_201, testing::ext::TestSize.Level1) { - int32_t userId = DEVICE; + int32_t userId = USER; std::vector profiles; EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAccessControlProfile(_, _)).WillOnce(Return(ERR_DM_FAILED)); profiles = DeviceProfileConnector::GetInstance().GetAccessControlProfileByUserId(userId); @@ -149,9 +150,9 @@ HWTEST_F(DeviceProfileConnectorSecondTest, CheckAuthForm_201, testing::ext::Test profiles.SetBindLevel(SERVICE); ret = DeviceProfileConnector::GetInstance().CheckAuthForm(form, profiles, discoveryInfo); - EXPECT_EQ(ret, DmAuthForm::INVALID_TYPE); + EXPECT_EQ(ret, DmAuthForm::ACROSS_ACCOUNT); - profiles.SetBindLevel(DEVICE); + profiles.SetBindLevel(USER); ret = DeviceProfileConnector::GetInstance().CheckAuthForm(form, profiles, discoveryInfo); EXPECT_EQ(ret, DmAuthForm::ACROSS_ACCOUNT); } @@ -166,13 +167,11 @@ HWTEST_F(DeviceProfileConnectorSecondTest, PutAccessControlList_201, testing::ex EXPECT_EQ(ret, ERR_DM_FAILED); } -HWTEST_F(DeviceProfileConnectorSecondTest, CheckIdenticalAccount_201, testing::ext::TestSize.Level1) +HWTEST_F(DeviceProfileConnectorSecondTest, DeleteSigTrustACL_201, testing::ext::TestSize.Level1) { int32_t userId = 0; std::string accountId; EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAccessControlProfile(_, _)).WillOnce(Return(ERR_DM_FAILED)); - bool ret = DeviceProfileConnector::GetInstance().CheckIdenticalAccount(userId, accountId); - EXPECT_FALSE(ret); userId = 1; int32_t bindType = 1; @@ -190,17 +189,20 @@ HWTEST_F(DeviceProfileConnectorSecondTest, CheckIdenticalAccount_201, testing::e profile.SetBindType(bindType); profile.SetAccesser(accesser); profile.SetAccessee(accessee); - + int userIds = 12356; std::string remoteUdid = "deviceId"; std::vector remoteFrontUserIds; remoteFrontUserIds.push_back(userIds); std::vector remoteBackUserIds; remoteBackUserIds.push_back(userIds); - DeviceProfileConnector::GetInstance().DeleteSigTrustACL(profile, remoteUdid, remoteFrontUserIds, remoteBackUserIds); + DmOfflineParam offlineParam; + DeviceProfileConnector::GetInstance().DeleteSigTrustACL(profile, remoteUdid, remoteFrontUserIds, remoteBackUserIds, + offlineParam); remoteUdid = "deviceIdEe"; - DeviceProfileConnector::GetInstance().DeleteSigTrustACL(profile, remoteUdid, remoteFrontUserIds, remoteBackUserIds); + DeviceProfileConnector::GetInstance().DeleteSigTrustACL(profile, remoteUdid, remoteFrontUserIds, remoteBackUserIds, + offlineParam); int32_t userIdee = 0; accessee.SetAccesseeUserId(userIdee); @@ -239,8 +241,9 @@ HWTEST_F(DeviceProfileConnectorSecondTest, DeleteAclForAccountLogOut_001, testin int32_t localUserId = 1; std::string peerUdid = "peer_device_id"; int32_t peerUserId = 2; + DmOfflineParam offlineParam; EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)).WillOnce(Return(DM_OK)); - int32_t result = connector.DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId); + int32_t result = connector.DeleteAclForAccountLogOut(localUdid, localUserId, peerUdid, peerUserId, offlineParam); EXPECT_EQ(result, false); } @@ -265,7 +268,7 @@ HWTEST_F(DeviceProfileConnectorSecondTest, CheckIsSameAccount_001, testing::ext: DmAccessCallee callee; std::string sinkUdid = "non_identical_udid"; EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)).WillOnce(Return(DM_OK)); - EXPECT_EQ(connector.CheckIsSameAccount(caller, srcUdid, callee, sinkUdid), ERR_DM_FAILED); + EXPECT_EQ(connector.CheckIsSameAccount(caller, srcUdid, callee, sinkUdid), false); } HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceIdAndBindLevel_001, testing::ext::TestSize.Level1) @@ -296,7 +299,7 @@ HWTEST_F(DeviceProfileConnectorSecondTest, GetAclProfileByUserId_002, testing::e std::string remoteUdid = "nonExistentDevice"; EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)).WillOnce(Return(DM_OK)); auto result = connector.GetAclProfileByUserId(localUdid, userId, remoteUdid); - + EXPECT_TRUE(result.empty()); } @@ -507,7 +510,8 @@ HWTEST_F(DeviceProfileConnectorSecondTest, PutSessionKey_201, testing::ext::Test { std::vector sessionKeyArray; int32_t sessionKeyId = 1; - int32_t ret = DeviceProfileConnector::GetInstance().PutSessionKey(sessionKeyArray, sessionKeyId); + int32_t userId = 100; + int32_t ret = DeviceProfileConnector::GetInstance().PutSessionKey(userId, sessionKeyArray, sessionKeyId); EXPECT_EQ(ret, ERR_DM_FAILED); sessionKeyArray.push_back('1'); @@ -516,11 +520,11 @@ HWTEST_F(DeviceProfileConnectorSecondTest, PutSessionKey_201, testing::ext::Test sessionKeyArray.push_back('4'); sessionKeyArray.push_back('5'); EXPECT_CALL(*distributedDeviceProfileClientMock_, PutSessionKey(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); - ret = DeviceProfileConnector::GetInstance().PutSessionKey(sessionKeyArray, sessionKeyId); + ret = DeviceProfileConnector::GetInstance().PutSessionKey(userId, sessionKeyArray, sessionKeyId); EXPECT_EQ(ret, ERR_DM_FAILED); EXPECT_CALL(*distributedDeviceProfileClientMock_, PutSessionKey(_, _, _)).WillOnce(Return(DM_OK)); - ret = DeviceProfileConnector::GetInstance().PutSessionKey(sessionKeyArray, sessionKeyId); + ret = DeviceProfileConnector::GetInstance().PutSessionKey(userId, sessionKeyArray, sessionKeyId); EXPECT_EQ(ret, DM_OK); } @@ -579,5 +583,1136 @@ HWTEST_F(DeviceProfileConnectorSecondTest, GetLocalServiceInfoByBundleNameAndPin pinExchangeType, localServiceInfo); EXPECT_EQ(ret, ERR_DM_FAILED); } + +HWTEST_F(DeviceProfileConnectorSecondTest, HandleDmAuthForm_009, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profiles; + profiles.SetBindType(DM_SHARE); + profiles.SetBindLevel(USER); + DmDiscoveryInfo discoveryInfo; + int32_t ret = DeviceProfileConnector::GetInstance().HandleDmAuthForm(profiles, discoveryInfo); + EXPECT_EQ(ret, SHARE); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, HandleDmAuthForm_010, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profiles; + profiles.SetBindType(DM_SHARE); + profiles.SetBindLevel(APP); + profiles.accesser_.SetAccesserBundleName("ohos_test"); + profiles.accesser_.SetAccesserDeviceId("localDeviceId"); + DmDiscoveryInfo discoveryInfo; + discoveryInfo.pkgname = "ohos_test"; + discoveryInfo.localDeviceId = "localDeviceId"; + int32_t ret = DeviceProfileConnector::GetInstance().HandleDmAuthForm(profiles, discoveryInfo); + EXPECT_EQ(ret, SHARE); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, HandleDmAuthForm_011, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profiles; + profiles.SetBindType(DM_SHARE); + profiles.SetBindLevel(APP); + profiles.accessee_.SetAccesseeBundleName("pkgName"); + profiles.accessee_.SetAccesseeDeviceId("localDeviceId"); + DmDiscoveryInfo discoveryInfo; + discoveryInfo.pkgname = "pkgName"; + discoveryInfo.localDeviceId = "localDeviceId"; + int32_t ret = DeviceProfileConnector::GetInstance().HandleDmAuthForm(profiles, discoveryInfo); + EXPECT_EQ(ret, SHARE); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, CheckSinkShareType_001, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profile; + int32_t userId = 123456; + std::string deviceId = "deviceId"; + std::string trustDeviceId = "trustDeviceId"; + int32_t bindType = DmAuthForm::SHARE; + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeUserId(userId); + accessee.SetAccesseeDeviceId(deviceId); + profile.SetAccessee(accessee); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(trustDeviceId); + profile.SetAccesser(accesser); + + bool ret = DeviceProfileConnector::GetInstance().CheckSinkShareType( + profile, userId, deviceId, trustDeviceId, bindType); + EXPECT_TRUE(ret); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, CheckSinkShareType_002, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profile; + int32_t userId = 123456; + std::string deviceId = "deviceId"; + std::string trustDeviceId = "trustDeviceId"; + int32_t bindType = DmAuthForm::SHARE; + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeUserId(0); + accessee.SetAccesseeDeviceId(deviceId); + profile.SetAccessee(accessee); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(trustDeviceId); + profile.SetAccesser(accesser); + + bool ret = DeviceProfileConnector::GetInstance().CheckSinkShareType( + profile, userId, deviceId, trustDeviceId, bindType); + EXPECT_FALSE(ret); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, CheckSinkShareType_003, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profile; + int32_t userId = 123456; + std::string deviceId = "deviceId"; + std::string trustDeviceId = "trustDeviceId"; + int32_t bindType = DmAuthForm::SHARE; + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeUserId(-1); + accessee.SetAccesseeDeviceId(deviceId); + profile.SetAccessee(accessee); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(trustDeviceId); + profile.SetAccesser(accesser); + bool ret = DeviceProfileConnector::GetInstance().CheckSinkShareType( + profile, userId, deviceId, trustDeviceId, bindType); + EXPECT_FALSE(ret); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, CheckSinkShareType_004, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profile; + int32_t userId = 123456; + std::string deviceId = "deviceId"; + std::string trustDeviceId = "trustDeviceId"; + int32_t bindType = DmAuthForm::ACROSS_ACCOUNT; + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeUserId(userId); + accessee.SetAccesseeDeviceId("wrongDeviceId"); + profile.SetAccessee(accessee); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(trustDeviceId); + profile.SetAccesser(accesser); + + bool ret = DeviceProfileConnector::GetInstance().CheckSinkShareType( + profile, userId, deviceId, trustDeviceId, bindType); + EXPECT_FALSE(ret); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, CheckSinkShareType_005, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profile; + int32_t userId = 123456; + std::string deviceId = "deviceId"; + std::string trustDeviceId = "trustDeviceId"; + int32_t bindType = DmAuthForm::ACROSS_ACCOUNT; + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeUserId(userId); + accessee.SetAccesseeDeviceId(deviceId); + profile.SetAccessee(accessee); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId("wrongTrustDeviceId"); + profile.SetAccesser(accesser); + + bool ret = DeviceProfileConnector::GetInstance().CheckSinkShareType( + profile, userId, deviceId, trustDeviceId, bindType); + EXPECT_FALSE(ret); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, CheckSinkShareType_006, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profile; + int32_t userId = 123456; + std::string deviceId = "deviceId"; + std::string trustDeviceId = "trustDeviceId"; + int32_t bindType = DmAuthForm::PEER_TO_PEER; // Wrong bind type + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeUserId(userId); + accessee.SetAccesseeDeviceId(deviceId); + profile.SetAccessee(accessee); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(trustDeviceId); + profile.SetAccesser(accesser); + + bool ret = DeviceProfileConnector::GetInstance().CheckSinkShareType( + profile, userId, deviceId, trustDeviceId, bindType); + EXPECT_FALSE(ret); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, CheckSinkShareType_007, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profile; + int32_t userId = 123456; + std::string deviceId = "deviceId"; + std::string trustDeviceId = "trustDeviceId"; + int32_t bindType = DmAuthForm::ACROSS_ACCOUNT; + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeUserId(999999); // Different user ID + accessee.SetAccesseeDeviceId(deviceId); + profile.SetAccessee(accessee); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(trustDeviceId); + profile.SetAccesser(accesser); + bool ret = DeviceProfileConnector::GetInstance().CheckSinkShareType( + profile, userId, deviceId, trustDeviceId, bindType); + EXPECT_FALSE(ret); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, CheckSinkShareType_008, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile profile; + int32_t userId = 123456; + std::string deviceId = "deviceId"; + std::string trustDeviceId = "trustDeviceId"; + int32_t bindType = DmAuthForm::ACROSS_ACCOUNT; + + // Empty profile (no accessee/accesser set) + bool ret = DeviceProfileConnector::GetInstance().CheckSinkShareType( + profile, userId, deviceId, trustDeviceId, bindType); + EXPECT_FALSE(ret); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAuthFormMap_001, testing::ext::TestSize.Level1) +{ + // Test case 1: Empty input - should return empty map + std::string pkgName = "testPkg";; + std::string deviceId = "deviceId1"; + int32_t userId = 123456; + std::vector profilesFilter; + + auto ret = DeviceProfileConnector::GetInstance().GetAuthFormMap(pkgName, deviceId, profilesFilter, userId); + EXPECT_EQ(ret.size(), 0); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAuthFormMap_002, testing::ext::TestSize.Level1) +{ + // Test case 2: Profile with trustDeviceId matching input deviceId - should be skipped + std::string pkgName = "testPkg"; + std::string deviceId = "deviceId1"; + int32_t userId = 123456; + + std::vector profilesFilter; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetTrustDeviceId(deviceId); // Matching deviceId + profile.SetStatus(ACTIVE); + profilesFilter.push_back(profile); + + auto ret = DeviceProfileConnector::GetInstance().GetAuthFormMap(pkgName, deviceId, profilesFilter, userId); + EXPECT_EQ(ret.size(), 0); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAuthFormMap_003, testing::ext::TestSize.Level1) +{ + // Test case 3: Profile with INACTIVE status - should be skipped + std::string pkgName = "testPkg"; + std::string deviceId = "deviceId1"; + std::string trustDeviceId = "trustDeviceId1"; + int32_t userId = 123456; + + std::vector profilesFilter; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetTrustDeviceId(trustDeviceId); + profile.SetStatus(INACTIVE); + profilesFilter.push_back(profile); + + auto ret = DeviceProfileConnector::GetInstance().GetAuthFormMap(pkgName, deviceId, profilesFilter, userId); + EXPECT_EQ(ret.size(), 0); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAuthFormMap_004, testing::ext::TestSize.Level1) +{ + // Test case 4: Profile with INVALID_TYPE auth form - should be skipped + std::string pkgName = "testPkg"; + std::string deviceId = "deviceId1"; + std::string trustDeviceId = "trustDeviceId1"; + int32_t userId = 123456; + + std::vector profilesFilter; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetTrustDeviceId(trustDeviceId); + profile.SetStatus(ACTIVE); + profile.SetBindType(DmAuthForm::INVALID_TYPE); + profilesFilter.push_back(profile); + + auto ret = DeviceProfileConnector::GetInstance().GetAuthFormMap(pkgName, deviceId, profilesFilter, userId); + EXPECT_EQ(ret.size(), 0); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAuthFormMap_005, testing::ext::TestSize.Level1) +{ + // Test case 5: Single valid profile with IDENTICAL_ACCOUNT type + std::string pkgName = "testPkg"; + std::string deviceId = "deviceId1"; + std::string trustDeviceId = "trustDeviceId1"; + int32_t userId = 123456; + + std::vector profilesFilter; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetTrustDeviceId(trustDeviceId); + profile.SetStatus(ACTIVE); + profile.SetBindType(DmAuthForm::IDENTICAL_ACCOUNT); + profilesFilter.push_back(profile); + + auto ret = DeviceProfileConnector::GetInstance().GetAuthFormMap(pkgName, deviceId, profilesFilter, userId); + EXPECT_EQ(ret.size(), 1); + EXPECT_EQ(ret[trustDeviceId], DmAuthForm::IDENTICAL_ACCOUNT); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAuthFormMap_006, testing::ext::TestSize.Level1) +{ + // Test case 6: CheckSinkShareType returns true - should skip adding to map + std::string pkgName = "testPkg"; + std::string deviceId = "deviceId1"; + std::string trustDeviceId = "trustDeviceId1"; + int32_t userId = 123456; + + std::vector profilesFilter; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetTrustDeviceId(trustDeviceId); + profile.SetStatus(ACTIVE); + // Set up accessee/accesser to make CheckSinkShareType return true + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeUserId(userId); + accessee.SetAccesseeDeviceId(deviceId); + profile.SetAccessee(accessee); + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(trustDeviceId); + profile.SetAccesser(accesser); + profile.SetBindType(DmAuthForm::ACROSS_ACCOUNT); + + profilesFilter.push_back(profile); + + auto ret = DeviceProfileConnector::GetInstance().GetAuthFormMap(pkgName, deviceId, profilesFilter, userId); + EXPECT_EQ(ret.size(), 0); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAuthFormMap_007, testing::ext::TestSize.Level1) +{ + // Test case 7: Multiple profiles with different auth forms - should keep highest priority + std::string pkgName = "testPkg"; + std::string deviceId = "deviceId1"; + std::string trustDeviceId = "trustDeviceId1"; + int32_t userId = 123456; + + std::vector profilesFilter; + // First profile - PEER_TO_PEER + DistributedDeviceProfile::AccessControlProfile profile1; + profile1.SetTrustDeviceId(trustDeviceId); + profile1.SetStatus(ACTIVE); + profile1.SetBindType(DmAuthForm::PEER_TO_PEER); + profilesFilter.push_back(profile1); + + // Second profile - ACROSS_ACCOUNT (should override PEER_TO_PEER) + DistributedDeviceProfile::AccessControlProfile profile2; + profile2.SetTrustDeviceId(trustDeviceId); + profile2.SetStatus(ACTIVE); + profile2.SetBindType(DmAuthForm::ACROSS_ACCOUNT); + profilesFilter.push_back(profile2); + + // Third profile - IDENTICAL_ACCOUNT (should override everything) + DistributedDeviceProfile::AccessControlProfile profile3; + profile3.SetTrustDeviceId(trustDeviceId); + profile3.SetStatus(ACTIVE); + profile3.SetBindType(DmAuthForm::IDENTICAL_ACCOUNT); + profilesFilter.push_back(profile3); + + auto ret = DeviceProfileConnector::GetInstance().GetAuthFormMap(pkgName, deviceId, profilesFilter, userId); + EXPECT_EQ(ret.size(), 1); + EXPECT_EQ(ret[trustDeviceId], DmAuthForm::IDENTICAL_ACCOUNT); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetVersionByExtra_001, testing::ext::TestSize.Level1) +{ + std::string extraInfo = ""; + std::string dmVersion; + + int32_t ret = DeviceProfileConnector::GetInstance().GetVersionByExtra(extraInfo, dmVersion); + EXPECT_EQ(ret, ERR_DM_FAILED); +} +HWTEST_F(DeviceProfileConnectorSecondTest, GetVersionByExtra_002, testing::ext::TestSize.Level1) +{ + std::string extraInfo = "invalid_json"; + std::string dmVersion; + + int32_t ret = DeviceProfileConnector::GetInstance().GetVersionByExtra(extraInfo, dmVersion); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetVersionByExtra_003, testing::ext::TestSize.Level1) +{ + std::string extraInfo = R"({"key": "value"})"; + std::string dmVersion; + + int32_t ret = DeviceProfileConnector::GetInstance().GetVersionByExtra(extraInfo, dmVersion); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetVersionByExtra_004, testing::ext::TestSize.Level1) +{ + std::string extraInfo = R"({"dmVersion": "5.1.0"})"; + std::string dmVersion; + + int32_t ret = DeviceProfileConnector::GetInstance().GetVersionByExtra(extraInfo, dmVersion); + EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(dmVersion, "5.1.0"); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAllVerionAclMap_001, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + std::map> aclMap; + std::string dmVersion = ""; + + EXPECT_NO_THROW(DeviceProfileConnector::GetInstance().GetAllVerionAclMap(acl, aclMap, dmVersion)); + EXPECT_EQ(aclMap.size(), 1); + EXPECT_TRUE(aclMap.find(DM_VERSION_5_1_0) != aclMap.end()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAllVerionAclMap_002, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + std::map> aclMap; + std::string dmVersion = DM_VERSION_5_1_0; + + EXPECT_NO_THROW(DeviceProfileConnector::GetInstance().GetAllVerionAclMap(acl, aclMap, dmVersion)); + EXPECT_EQ(aclMap.size(), 1); + EXPECT_TRUE(aclMap.find(dmVersion) != aclMap.end()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAllVerionAclMap_003, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + std::map> aclMap; + std::string dmVersion = "invalid_version"; + + EXPECT_NO_THROW(DeviceProfileConnector::GetInstance().GetAllVerionAclMap(acl, aclMap, dmVersion)); + EXPECT_EQ(aclMap.size(), 0); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAllVerionAclMap_004, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + acl.SetAccessControlId(12345); + acl.SetAccesserId(1); + acl.SetAccesseeId(2); + acl.SetTrustDeviceId("trustDeviceId"); + acl.SetBindType(256); + acl.SetAuthenticationType(2); + acl.SetDeviceIdType(1); + acl.SetStatus(1); + acl.SetBindLevel(1); + + std::map> aclMap; + std::string dmVersion = DM_VERSION_5_1_0; + + EXPECT_NO_THROW(DeviceProfileConnector::GetInstance().GetAllVerionAclMap(acl, aclMap, dmVersion)); + EXPECT_EQ(aclMap.size(), 1); + EXPECT_TRUE(aclMap.find(dmVersion) != aclMap.end()); + EXPECT_FALSE(aclMap[dmVersion].empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GenerateAclHash_001, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + acl.SetAccessControlId(12345); + acl.SetAccesserId(1); + acl.SetAccesseeId(2); + acl.SetTrustDeviceId("trustDeviceId"); + acl.SetBindType(256); + acl.SetAuthenticationType(2); + acl.SetDeviceIdType(1); + acl.SetStatus(1); + acl.SetBindLevel(1); + + std::map> aclMap; + std::string dmVersion = DM_VERSION_5_1_0; + + EXPECT_NO_THROW(DeviceProfileConnector::GetInstance().GenerateAclHash(acl, aclMap, dmVersion)); + EXPECT_EQ(aclMap.size(), 1); + EXPECT_TRUE(aclMap.find(dmVersion) != aclMap.end()); + EXPECT_FALSE(aclMap[dmVersion].empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GenerateAclHash_002, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + acl.SetAccessControlId(12345); + acl.SetAccesserId(1); + acl.SetAccesseeId(2); + acl.SetTrustDeviceId("trustDeviceId"); + acl.SetBindType(256); + acl.SetAuthenticationType(2); + acl.SetDeviceIdType(1); + acl.SetStatus(1); + acl.SetBindLevel(1); + + std::map> aclMap; + std::string dmVersion = "invalid_version"; + + EXPECT_NO_THROW(DeviceProfileConnector::GetInstance().GenerateAclHash(acl, aclMap, dmVersion)); + EXPECT_EQ(aclMap.size(), 0); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GenerateAclHash_003, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + acl.SetAccessControlId(12345); + acl.SetAccesserId(1); + acl.SetAccesseeId(2); + acl.SetTrustDeviceId("trustDeviceId"); + acl.SetBindType(256); + acl.SetAuthenticationType(2); + acl.SetDeviceIdType(1); + acl.SetStatus(1); + acl.SetBindLevel(1); + + std::map> aclMap; + std::string dmVersion = DM_VERSION_5_1_0;; + aclMap[dmVersion].push_back("existing_hash"); + + EXPECT_NO_THROW(DeviceProfileConnector::GetInstance().GenerateAclHash(acl, aclMap, dmVersion)); + EXPECT_EQ(aclMap.size(), 1); + EXPECT_TRUE(aclMap.find(dmVersion) != aclMap.end()); + EXPECT_EQ(aclMap[dmVersion].size(), 2); +} + + +HWTEST_F(DeviceProfileConnectorSecondTest, IsAuthNewVersion_001, testing::ext::TestSize.Level1) +{ + int32_t bindLevel = 0; + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + + std::string result = DeviceProfileConnector::GetInstance() + .IsAuthNewVersion(bindLevel, localUdid, remoteUdid, tokenId, userId); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, IsAuthNewVersion_002, testing::ext::TestSize.Level1) +{ + int32_t bindLevel = 4; + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + + std::string result = DeviceProfileConnector::GetInstance() + .IsAuthNewVersion(bindLevel, localUdid, remoteUdid, tokenId, userId); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, ChecksumAcl_001, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + acl.SetAccessControlId(12345); + acl.SetAccesserId(1); + acl.SetAccesseeId(2); + acl.SetTrustDeviceId("trustDeviceId"); + acl.SetBindType(256); + acl.SetAuthenticationType(2); + acl.SetDeviceIdType(1); + acl.SetStatus(1); + acl.SetBindLevel(1); + + std::vector acLStrList; + + bool result = DeviceProfileConnector::GetInstance().ChecksumAcl(acl, acLStrList); + EXPECT_FALSE(result); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, ChecksumAcl_002, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + acl.SetAccessControlId(12345); + acl.SetAccesserId(1); + acl.SetAccesseeId(2); + acl.SetTrustDeviceId("trustDeviceId"); + acl.SetBindType(256); + acl.SetAuthenticationType(2); + acl.SetDeviceIdType(1); + acl.SetStatus(1); + acl.SetBindLevel(1); + + std::string aclStr = DeviceProfileConnector::GetInstance().AccessToStr(acl); + std::string aclHash = Crypto::Sha256(aclStr); + + std::vector acLStrList = {aclHash}; + + bool result = DeviceProfileConnector::GetInstance().ChecksumAcl(acl, acLStrList); + EXPECT_TRUE(result); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, ChecksumAcl_003, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + acl.SetAccessControlId(12345); + acl.SetAccesserId(1); + acl.SetAccesseeId(2); + acl.SetTrustDeviceId("trustDeviceId"); + acl.SetBindType(256); + acl.SetAuthenticationType(2); + acl.SetDeviceIdType(1); + acl.SetStatus(1); + acl.SetBindLevel(1); + + std::vector acLStrList = {"invalid_hash"}; + + bool result = DeviceProfileConnector::GetInstance().ChecksumAcl(acl, acLStrList); + EXPECT_FALSE(result); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, ChecksumAcl_004, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + acl.SetAccessControlId(12345); + acl.SetAccesserId(1); + acl.SetAccesseeId(2); + acl.SetTrustDeviceId("trustDeviceId"); + acl.SetBindType(256); + acl.SetAuthenticationType(2); + acl.SetDeviceIdType(1); + acl.SetStatus(1); + acl.SetBindLevel(1); + + std::string aclStr = DeviceProfileConnector::GetInstance().AccessToStr(acl); + std::string aclHash = Crypto::Sha256(aclStr); + + std::vector acLStrList = {"invalid_hash1", aclHash, "invalid_hash2"}; + + bool result = DeviceProfileConnector::GetInstance().ChecksumAcl(acl, acLStrList); + EXPECT_TRUE(result); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, ChecksumAcl_005, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + + std::vector acLStrList = {"some_hash"}; + + bool result = DeviceProfileConnector::GetInstance().ChecksumAcl(acl, acLStrList); + EXPECT_FALSE(result); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, AccessToStr_001, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId("accesserDeviceId"); + accesser.SetAccesserUserId(1001); + accesser.SetAccesserAccountId("accesserAccountId"); + accesser.SetAccesserTokenId(2001); + accesser.SetAccesserBundleName("accesserBundleName"); + accesser.SetAccesserHapSignature("accesserHapSignature"); + accesser.SetAccesserBindLevel(1); + accesser.SetAccesserCredentialIdStr("accesserCredentialIdStr"); + accesser.SetAccesserStatus(1); + accesser.SetAccesserSKTimeStamp(1234567890); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId("accesseeDeviceId"); + accessee.SetAccesseeUserId(1002); + accessee.SetAccesseeAccountId("accesseeAccountId"); + accessee.SetAccesseeTokenId(2002); + accessee.SetAccesseeBundleName("accesseeBundleName"); + accessee.SetAccesseeHapSignature("accesseeHapSignature"); + accessee.SetAccesseeBindLevel(2); + accessee.SetAccesseeCredentialIdStr("accesseeCredentialIdStr"); + accessee.SetAccesseeStatus(2); + accessee.SetAccesseeSKTimeStamp(987654321); + + acl.SetAccesser(accesser); + acl.SetAccessee(accessee); + + std::string result = DeviceProfileConnector::GetInstance().AccessToStr(acl); + + EXPECT_FALSE(result.empty()); + EXPECT_NE(result.find("accesserDeviceId"), std::string::npos); + EXPECT_NE(result.find("accesserAccountId"), std::string::npos); + EXPECT_NE(result.find("accesseeDeviceId"), std::string::npos); + EXPECT_NE(result.find("accesseeAccountId"), std::string::npos); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, AccessToStr_002, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId("accesserDeviceId"); + accesser.SetAccesserUserId(1001); + accesser.SetAccesserAccountId("accesserAccountId"); + accesser.SetAccesserTokenId(2001); + accesser.SetAccesserBundleName("accesserBundleName"); + accesser.SetAccesserHapSignature("accesserHapSignature"); + accesser.SetAccesserBindLevel(1); + accesser.SetAccesserCredentialIdStr("accesserCredentialIdStr"); + accesser.SetAccesserStatus(1); + accesser.SetAccesserSKTimeStamp(1234567890); + + acl.SetAccesser(accesser); + + std::string result = DeviceProfileConnector::GetInstance().AccessToStr(acl); + + EXPECT_FALSE(result.empty()); + EXPECT_NE(result.find("accesserDeviceId"), std::string::npos); + EXPECT_NE(result.find("accesserAccountId"), std::string::npos); + EXPECT_EQ(result.find("accesseeDeviceId"), std::string::npos); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, AccessToStr_003, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId("accesseeDeviceId"); + accessee.SetAccesseeUserId(1002); + accessee.SetAccesseeAccountId("accesseeAccountId"); + accessee.SetAccesseeTokenId(2002); + accessee.SetAccesseeBundleName("accesseeBundleName"); + accessee.SetAccesseeHapSignature("accesseeHapSignature"); + accessee.SetAccesseeBindLevel(2); + accessee.SetAccesseeCredentialIdStr("accesseeCredentialIdStr"); + accessee.SetAccesseeStatus(2); + accessee.SetAccesseeSKTimeStamp(987654321); + + acl.SetAccessee(accessee); + + std::string result = DeviceProfileConnector::GetInstance().AccessToStr(acl); + + EXPECT_FALSE(result.empty()); + EXPECT_EQ(result.find("accesserDeviceId"), std::string::npos); + EXPECT_NE(result.find("accesseeDeviceId"), std::string::npos); + EXPECT_NE(result.find("accesseeAccountId"), std::string::npos); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, AccessToStr_004, testing::ext::TestSize.Level1) +{ + DistributedDeviceProfile::AccessControlProfile acl; + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId("accesserDeviceId"); + accesser.SetAccesserUserId(1001); + accesser.SetAccesserAccountId(""); + accesser.SetAccesserTokenId(2001); + accesser.SetAccesserBundleName(""); + accesser.SetAccesserHapSignature("accesserHapSignature"); + accesser.SetAccesserBindLevel(1); + accesser.SetAccesserCredentialIdStr(""); + accesser.SetAccesserStatus(1); + accesser.SetAccesserSKTimeStamp(1234567890); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(""); + accessee.SetAccesseeUserId(1002); + accessee.SetAccesseeAccountId("accesseeAccountId"); + accessee.SetAccesseeTokenId(2002); + accessee.SetAccesseeBundleName("accesseeBundleName"); + accessee.SetAccesseeHapSignature(""); + accessee.SetAccesseeBindLevel(2); + accessee.SetAccesseeCredentialIdStr("accesseeCredentialIdStr"); + accessee.SetAccesseeStatus(2); + accessee.SetAccesseeSKTimeStamp(987654321); + + acl.SetAccesser(accesser); + acl.SetAccessee(accessee); + std::string result = DeviceProfileConnector::GetInstance().AccessToStr(acl); + + EXPECT_FALSE(result.empty()); + EXPECT_NE(result.find("accesserDeviceId"), std::string::npos); + EXPECT_EQ(result.find("accesserAccountId"), std::string::npos); + EXPECT_NE(result.find("accesseeAccountId"), std::string::npos); + EXPECT_EQ(result.find("accesseeDeviceId"), std::string::npos); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAppServiceAuthVersionInfo_001, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + std::vector profiles; + + std::string result = DeviceProfileConnector::GetInstance().GetAppServiceAuthVersionInfo( + localUdid, remoteUdid, tokenId, userId, profiles); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAppServiceAuthVersionInfo_002, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + std::vector profiles; + + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_IDENTICAL_ACCOUNT); + profiles.push_back(profile); + + std::string result = DeviceProfileConnector::GetInstance().GetAppServiceAuthVersionInfo( + localUdid, remoteUdid, tokenId, userId, profiles); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAppServiceAuthVersionInfo_003, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + std::vector profiles; + + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindLevel(USER); + profiles.push_back(profile); + + std::string result = DeviceProfileConnector::GetInstance().GetAppServiceAuthVersionInfo( + localUdid, remoteUdid, tokenId, userId, profiles); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAppServiceAuthVersionInfo_004, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + std::vector profiles; + + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_ACROSS_ACCOUNT); + profile.SetBindLevel(APP); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserUserId(userId); + accesser.SetAccesserTokenId(tokenId); + accesser.SetAccesserDeviceId(localUdid); + accesser.SetAccesserExtraData("5.1.0"); + profile.SetAccesser(accesser); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(remoteUdid); + profile.SetAccessee(accessee); + + profiles.push_back(profile); + + std::string result = DeviceProfileConnector::GetInstance().GetAppServiceAuthVersionInfo( + localUdid, remoteUdid, tokenId, userId, profiles); + EXPECT_EQ(result, "5.1.0"); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAppServiceAuthVersionInfo_005, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + std::vector profiles; + + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_ACROSS_ACCOUNT); + profile.SetBindLevel(SERVICE); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(remoteUdid); + profile.SetAccesser(accesser); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeUserId(userId); + accessee.SetAccesseeTokenId(tokenId); + accessee.SetAccesseeDeviceId(localUdid); + accessee.SetAccesseeExtraData("5.1.0"); + profile.SetAccessee(accessee); + + profiles.push_back(profile); + + std::string result = DeviceProfileConnector::GetInstance().GetAppServiceAuthVersionInfo( + localUdid, remoteUdid, tokenId, userId, profiles); + EXPECT_EQ(result, "5.1.0"); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAppServiceAuthVersionInfo_006, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + std::vector profiles; + + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_ACROSS_ACCOUNT); + profile.SetBindLevel(APP); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserUserId(9999); + accesser.SetAccesserTokenId(tokenId); + accesser.SetAccesserDeviceId(localUdid); + accesser.SetAccesserExtraData("5.1.0"); + profile.SetAccesser(accesser); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(remoteUdid); + profile.SetAccessee(accessee); + + profiles.push_back(profile); + + std::string result = DeviceProfileConnector::GetInstance().GetAppServiceAuthVersionInfo( + localUdid, remoteUdid, tokenId, userId, profiles); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAppServiceAuthVersionInfo_007, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + std::vector profiles; + + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_ACROSS_ACCOUNT); + profile.SetBindLevel(SERVICE); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserUserId(userId); + accesser.SetAccesserTokenId(9999); + accesser.SetAccesserDeviceId(localUdid); + accesser.SetAccesserExtraData("5.1.0"); + profile.SetAccesser(accesser); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(remoteUdid); + profile.SetAccessee(accessee); + + profiles.push_back(profile); + + std::string result = DeviceProfileConnector::GetInstance().GetAppServiceAuthVersionInfo( + localUdid, remoteUdid, tokenId, userId, profiles); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAppServiceAuthVersionInfo_008, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + std::vector profiles; + + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_ACROSS_ACCOUNT); + profile.SetBindLevel(APP); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserUserId(userId); + accesser.SetAccesserTokenId(tokenId); + accesser.SetAccesserDeviceId("wrongDeviceId"); + accesser.SetAccesserExtraData("5.1.0"); + profile.SetAccesser(accesser); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(remoteUdid); + profile.SetAccessee(accessee); + + profiles.push_back(profile); + + std::string result = DeviceProfileConnector::GetInstance().GetAppServiceAuthVersionInfo( + localUdid, remoteUdid, tokenId, userId, profiles); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetAppServiceAuthVersionInfo_009, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + int32_t tokenId = 12345; + int32_t userId = 1001; + std::vector profiles; + + DistributedDeviceProfile::AccessControlProfile profile1; + profile1.SetBindType(DM_IDENTICAL_ACCOUNT); + profiles.push_back(profile1); + + DistributedDeviceProfile::AccessControlProfile profile2; + profile2.SetBindType(DM_ACROSS_ACCOUNT); + profile2.SetBindLevel(USER); + profiles.push_back(profile2); + + DistributedDeviceProfile::AccessControlProfile profile3; + profile3.SetBindType(DM_ACROSS_ACCOUNT); + profile3.SetBindLevel(APP); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserUserId(userId); + accesser.SetAccesserTokenId(tokenId); + accesser.SetAccesserDeviceId(localUdid); + accesser.SetAccesserExtraData("5.1.0"); + profile3.SetAccesser(accesser); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(remoteUdid); + profile3.SetAccessee(accessee); + + profiles.push_back(profile3); + + std::string result = DeviceProfileConnector::GetInstance().GetAppServiceAuthVersionInfo( + localUdid, remoteUdid, tokenId, userId, profiles); + EXPECT_EQ(result, "5.1.0"); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceAuthVersionInfo_001, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + std::vector profiles; + + std::string result = DeviceProfileConnector::GetInstance() + .GetDeviceAuthVersionInfo(localUdid, remoteUdid, profiles); + EXPECT_EQ(result, ""); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceAuthVersionInfo_002, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_IDENTICAL_ACCOUNT); + std::vector profiles = {profile}; + + std::string result = DeviceProfileConnector::GetInstance() + .GetDeviceAuthVersionInfo(localUdid, remoteUdid, profiles); + EXPECT_EQ(result, ""); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceAuthVersionInfo_003, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_POINT_TO_POINT); + profile.SetBindLevel(APP); + std::vector profiles = {profile}; + + std::string result = DeviceProfileConnector::GetInstance() + .GetDeviceAuthVersionInfo(localUdid, remoteUdid, profiles); + EXPECT_EQ(result, ""); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceAuthVersionInfo_004, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_POINT_TO_POINT); + profile.SetBindLevel(USER); + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(localUdid); + accesser.SetAccesserExtraData("AccesserExtraData"); + profile.SetAccesser(accesser); + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(remoteUdid); + profile.SetAccessee(accessee); + std::vector profiles = {profile}; + + std::string result = DeviceProfileConnector::GetInstance() + .GetDeviceAuthVersionInfo(localUdid, remoteUdid, profiles); + EXPECT_EQ(result, "AccesserExtraData"); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceAuthVersionInfo_005, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_POINT_TO_POINT); + profile.SetBindLevel(USER); + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(remoteUdid); + profile.SetAccesser(accesser); + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(localUdid); + accessee.SetAccesseeExtraData("AccesseeExtraData"); + profile.SetAccessee(accessee); + std::vector profiles = {profile}; + + std::string result = DeviceProfileConnector::GetInstance() + .GetDeviceAuthVersionInfo(localUdid, remoteUdid, profiles); + EXPECT_EQ(result, "AccesseeExtraData"); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceAuthVersionInfo_006, testing::ext::TestSize.Level1) +{ + std::string localUdid = "localDeviceId"; + std::string remoteUdid = "remoteDeviceId"; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(DM_POINT_TO_POINT); + profile.SetBindLevel(USER); + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId("differentDeviceId"); + profile.SetAccesser(accesser); + std::vector profiles = {profile}; + + std::string result = DeviceProfileConnector::GetInstance() + .GetDeviceAuthVersionInfo(localUdid, remoteUdid, profiles); + EXPECT_EQ(result, ""); +} +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceIdAndUdidListByTokenId_001, testing::ext::TestSize.Level1) +{ + std::vector userIds; + std::string emptyUdid; + int32_t tokenId = 1234; + + auto result = DeviceProfileConnector::GetInstance().GetDeviceIdAndUdidListByTokenId(userIds, emptyUdid, tokenId); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceIdAndUdidListByTokenId_002, testing::ext::TestSize.Level1) +{ + std::vector emptyUserIds; + std::string localUdid = "localDeviceId"; + int32_t tokenId = 1234; + + auto result = DeviceProfileConnector::GetInstance().GetDeviceIdAndUdidListByTokenId(emptyUserIds, localUdid, tokenId); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceIdAndUdidListByTokenId_003, testing::ext::TestSize.Level1) +{ + std::vector userIds = {1, 2}; + std::string emptyUdid; + int32_t tokenId = 1234; + + auto result = DeviceProfileConnector::GetInstance().GetDeviceIdAndUdidListByTokenId(userIds, emptyUdid, tokenId); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceProfileConnectorSecondTest, GetDeviceIdAndUdidListByTokenId_004, testing::ext::TestSize.Level1) +{ + std::vector userIds = {1, 2}; + std::string localUdid = "localDeviceId"; + int32_t tokenId = 1234; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)).WillOnce(Return(DM_OK)); + auto result = DeviceProfileConnector::GetInstance().GetDeviceIdAndUdidListByTokenId(userIds, localUdid, tokenId); + EXPECT_TRUE(result.empty()); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/test/commonunittest/UTTest_hichain_auth_connector.cpp b/test/commonunittest/UTTest_hichain_auth_connector.cpp index a33d4b17b58f9f55bcb6b8d2f5e2cf78a6e43894..447e195b503127d606e56cf2158e2d7df642eafc 100644 --- a/test/commonunittest/UTTest_hichain_auth_connector.cpp +++ b/test/commonunittest/UTTest_hichain_auth_connector.cpp @@ -67,18 +67,12 @@ public: (void)sessionKey; (void)sessionKeyLen; } - int32_t GetPinCode(int32_t &code) override + char *AuthDeviceRequest(int64_t requestId, int operationCode, const char *reqParams) override { - if (pinCode == 0) { - code = 0; - return DM_OK; - } - code = ERR_DM_AUTH_NOT_START; - return ERR_DM_AUTH_NOT_START; - } - void GetRemoteDeviceId(std::string &deviceId) override - { - (void)deviceId; + (void)requestId; + (void)operationCode; + (void)reqParams; + return nullptr; } private: int32_t pinCode = 0; @@ -93,7 +87,7 @@ HWTEST_F(HiChainAuthConnectorTest, RegisterHiChainAuthCallback_001, testing::ext HWTEST_F(HiChainAuthConnectorTest, AuthDevice_001, testing::ext::TestSize.Level1) { - int32_t pinCode = 0; + std::string pinCode = "0"; int32_t osAccountId = 0; std::string udid; int64_t requestId = 0; @@ -162,20 +156,6 @@ HWTEST_F(HiChainAuthConnectorTest, onRequest_003, testing::ext::TestSize.Level1) EXPECT_NE(hiChain_->dmDeviceAuthCallback_, nullptr); } -HWTEST_F(HiChainAuthConnectorTest, onRequest_004, testing::ext::TestSize.Level1) -{ - int64_t requestId = 0; - int operationCode = 0; - char *reqParams = nullptr; - std::shared_ptr hiChainAuthConnector = std::make_shared(); - std::shared_ptr mockCallback = std::make_shared(); - hiChainAuthConnector->dmDeviceAuthCallback_ = mockCallback; - EXPECT_CALL(*mockCallback, GetPinCode(testing::_)) - .Times(1) - .WillOnce(testing::Return(ERR_DM_FAILED)); - EXPECT_NE(hiChainAuthConnector->onRequest(requestId, operationCode, reqParams), nullptr); -} - HWTEST_F(HiChainAuthConnectorTest, onFinish_001, testing::ext::TestSize.Level1) { int64_t requestId = 0; @@ -266,7 +246,7 @@ HWTEST_F(HiChainAuthConnectorTest, GenerateCredential_003, testing::ext::TestSiz g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": "not_an_int", "publicKey": "key"})"; int32_t ret = hiChain_->GenerateCredential(localUdid, osAccountId, publicKey); - EXPECT_NE(ret, DM_OK); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, GenerateCredential_004, testing::ext::TestSize.Level1) @@ -288,7 +268,7 @@ HWTEST_F(HiChainAuthConnectorTest, GenerateCredential_005, testing::ext::TestSiz g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": 1, "publicKey": "key"})"; int32_t ret = hiChain_->GenerateCredential(localUdid, osAccountId, publicKey); - EXPECT_NE(ret, DM_OK); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, GenerateCredential_006, testing::ext::TestSize.Level1) @@ -306,7 +286,8 @@ HWTEST_F(HiChainAuthConnectorTest, QueryCredential_001, testing::ext::TestSize.L { std::string localUdid = "2131351352"; int32_t osAccountId = 0; - bool ret = hiChain_->QueryCredential(localUdid, osAccountId); + int32_t peerOsAccountId = -1; + bool ret = hiChain_->QueryCredential(localUdid, osAccountId, peerOsAccountId); EXPECT_EQ(ret, false); } @@ -317,7 +298,8 @@ HWTEST_F(HiChainAuthConnectorTest, QueryCredential_002, testing::ext::TestSize.L jsonObject["publicKey"] = 0; std::string localUdid = SafetyDump(jsonObject); int32_t osAccountId = 1245; - bool ret = hiChain_->QueryCredential(localUdid, osAccountId); + int32_t peerOsAccountId = -1; + bool ret = hiChain_->QueryCredential(localUdid, osAccountId, peerOsAccountId); EXPECT_EQ(ret, false); } @@ -330,7 +312,8 @@ HWTEST_F(HiChainAuthConnectorTest, QueryCredential_003, testing::ext::TestSize.L g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = "{invalid_json}"; int32_t osAccountId = 1245; - bool ret = hiChain_->QueryCredential(localUdid, osAccountId); + int32_t peerOsAccountId = -1; + bool ret = hiChain_->QueryCredential(localUdid, osAccountId, peerOsAccountId); EXPECT_FALSE(ret); } @@ -343,8 +326,9 @@ HWTEST_F(HiChainAuthConnectorTest, QueryCredential_004, testing::ext::TestSize.L g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": "not_an_int", "publicKey": "key"})"; int32_t osAccountId = 1245; - bool ret = hiChain_->QueryCredential(localUdid, osAccountId); - EXPECT_FALSE(ret); + int32_t peerOsAccountId = -1; + bool ret = hiChain_->QueryCredential(localUdid, osAccountId, peerOsAccountId); + EXPECT_TRUE(ret); } HWTEST_F(HiChainAuthConnectorTest, QueryCredential_005, testing::ext::TestSize.Level1) @@ -356,8 +340,9 @@ HWTEST_F(HiChainAuthConnectorTest, QueryCredential_005, testing::ext::TestSize.L g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": -1, "publicKey": "key"})"; int32_t osAccountId = 1245; - bool ret = hiChain_->QueryCredential(localUdid, osAccountId); - EXPECT_FALSE(ret); + int32_t peerOsAccountId = -1; + bool ret = hiChain_->QueryCredential(localUdid, osAccountId, peerOsAccountId); + EXPECT_TRUE(ret); } HWTEST_F(HiChainAuthConnectorTest, QueryCredential_006, testing::ext::TestSize.Level1) @@ -369,7 +354,8 @@ HWTEST_F(HiChainAuthConnectorTest, QueryCredential_006, testing::ext::TestSize.L g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": 1, "publicKey": 0})"; int32_t osAccountId = 1245; - bool ret = hiChain_->QueryCredential(localUdid, osAccountId); + int32_t peerOsAccountId = -1; + bool ret = hiChain_->QueryCredential(localUdid, osAccountId, peerOsAccountId); EXPECT_FALSE(ret); } @@ -382,8 +368,9 @@ HWTEST_F(HiChainAuthConnectorTest, QueryCredential_007, testing::ext::TestSize.L g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": 1, "publicKey": "string"})"; int32_t osAccountId = 1245; - bool ret = hiChain_->QueryCredential(localUdid, osAccountId); - EXPECT_FALSE(ret); + int32_t peerOsAccountId = -1; + bool ret = hiChain_->QueryCredential(localUdid, osAccountId, peerOsAccountId); + EXPECT_TRUE(ret); } HWTEST_F(HiChainAuthConnectorTest, QueryCredential_008, testing::ext::TestSize.Level1) @@ -395,7 +382,8 @@ HWTEST_F(HiChainAuthConnectorTest, QueryCredential_008, testing::ext::TestSize.L g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": 2, "publicKey": "string"})"; int32_t osAccountId = 1245; - bool ret = hiChain_->QueryCredential(localUdid, osAccountId); + int32_t peerOsAccountId = -1; + bool ret = hiChain_->QueryCredential(localUdid, osAccountId, peerOsAccountId); EXPECT_TRUE(ret); } @@ -436,7 +424,7 @@ HWTEST_F(HiChainAuthConnectorTest, GetCredential_004, testing::ext::TestSize.Lev g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": "not_an_int", "publicKey": "key"})"; int32_t ret = hiChain_->GetCredential(localUdid, osAccountId, publicKey); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, GetCredential_005, testing::ext::TestSize.Level1) @@ -447,7 +435,7 @@ HWTEST_F(HiChainAuthConnectorTest, GetCredential_005, testing::ext::TestSize.Lev g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": -1, "publicKey": "key"})"; int32_t ret = hiChain_->GetCredential(localUdid, osAccountId, publicKey); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, GetCredential_006, testing::ext::TestSize.Level1) @@ -469,7 +457,7 @@ HWTEST_F(HiChainAuthConnectorTest, GetCredential_007, testing::ext::TestSize.Lev g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": 1, "publicKey": "string"})"; int32_t ret = hiChain_->GetCredential(localUdid, osAccountId, publicKey); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, GetCredential_008, testing::ext::TestSize.Level1) @@ -488,7 +476,8 @@ HWTEST_F(HiChainAuthConnectorTest, ImportCredential_001, testing::ext::TestSize. int32_t localUdid = 0; std::string deviceId; std::string publicKey; - int32_t ret = hiChain_->ImportCredential(localUdid, deviceId, publicKey); + int32_t peerUserId = 0; + int32_t ret = hiChain_->ImportCredential(localUdid, peerUserId, deviceId, publicKey); EXPECT_NE(ret, DM_OK); } @@ -497,7 +486,8 @@ HWTEST_F(HiChainAuthConnectorTest, ImportCredential_002, testing::ext::TestSize. int32_t localUdid = 0; std::string deviceId = "4513541351"; std::string publicKey = "42125143613"; - int32_t ret = hiChain_->ImportCredential(localUdid, deviceId, publicKey); + int32_t peerUserId = 0; + int32_t ret = hiChain_->ImportCredential(localUdid, peerUserId, deviceId, publicKey); EXPECT_NE(ret, DM_OK); } @@ -508,8 +498,9 @@ HWTEST_F(HiChainAuthConnectorTest, ImportCredential_003, testing::ext::TestSize. std::string publicKey = "test"; g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = "{invalid_json}"; - int32_t ret = hiChain_->ImportCredential(localUdid, deviceId, publicKey); - EXPECT_EQ(ret, ERR_DM_FAILED); + int32_t peerUserId = 0; + int32_t ret = hiChain_->ImportCredential(localUdid, peerUserId, deviceId, publicKey); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, ImportCredential_004, testing::ext::TestSize.Level1) @@ -519,8 +510,9 @@ HWTEST_F(HiChainAuthConnectorTest, ImportCredential_004, testing::ext::TestSize. std::string publicKey = "test"; g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": "not_an_int"})"; - int32_t ret = hiChain_->ImportCredential(localUdid, deviceId, publicKey); - EXPECT_EQ(ret, ERR_DM_FAILED); + int32_t peerUserId = 0; + int32_t ret = hiChain_->ImportCredential(localUdid, peerUserId, deviceId, publicKey); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, ImportCredential_005, testing::ext::TestSize.Level1) @@ -530,8 +522,9 @@ HWTEST_F(HiChainAuthConnectorTest, ImportCredential_005, testing::ext::TestSize. std::string publicKey = "test"; g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": -1})"; - int32_t ret = hiChain_->ImportCredential(localUdid, deviceId, publicKey); - EXPECT_EQ(ret, ERR_DM_FAILED); + int32_t peerUserId = 0; + int32_t ret = hiChain_->ImportCredential(localUdid, peerUserId, deviceId, publicKey); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, ImportCredential_006, testing::ext::TestSize.Level1) @@ -541,7 +534,8 @@ HWTEST_F(HiChainAuthConnectorTest, ImportCredential_006, testing::ext::TestSize. std::string publicKey = "test"; g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": 0})"; - int32_t ret = hiChain_->ImportCredential(localUdid, deviceId, publicKey); + int32_t peerUserId = 0; + int32_t ret = hiChain_->ImportCredential(localUdid, peerUserId, deviceId, publicKey); EXPECT_EQ(ret, DM_OK); } @@ -549,16 +543,18 @@ HWTEST_F(HiChainAuthConnectorTest, DeleteCredential_001, testing::ext::TestSize. { std::string deviceId; int32_t userId = 0; - int32_t ret = hiChain_->DeleteCredential(deviceId, userId); - EXPECT_EQ(ret, DM_OK); + int32_t peerUserId = 0; + int32_t ret = hiChain_->DeleteCredential(deviceId, userId, peerUserId); + EXPECT_NE(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, DeleteCredential_002, testing::ext::TestSize.Level1) { std::string deviceId = "864513535"; int32_t userId = 0; - int32_t ret = hiChain_->DeleteCredential(deviceId, userId); - EXPECT_EQ(ret, DM_OK); + int32_t peerUserId = 0; + int32_t ret = hiChain_->DeleteCredential(deviceId, userId, peerUserId); + EXPECT_NE(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, DeleteCredential_003, testing::ext::TestSize.Level1) @@ -567,7 +563,8 @@ HWTEST_F(HiChainAuthConnectorTest, DeleteCredential_003, testing::ext::TestSize. int32_t userId = 0; g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = "{invalid_json}"; - int32_t ret = hiChain_->DeleteCredential(deviceId, userId); + int32_t peerUserId = 0; + int32_t ret = hiChain_->DeleteCredential(deviceId, userId, peerUserId); EXPECT_EQ(ret, 0); } @@ -577,8 +574,9 @@ HWTEST_F(HiChainAuthConnectorTest, DeleteCredential_004, testing::ext::TestSize. int32_t userId = 0; g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": "not_an_int"})"; - int32_t ret = hiChain_->DeleteCredential(deviceId, userId); - EXPECT_EQ(ret, ERR_DM_FAILED); + int32_t peerUserId = 0; + int32_t ret = hiChain_->DeleteCredential(deviceId, userId, peerUserId); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(HiChainAuthConnectorTest, DeleteCredential_005, testing::ext::TestSize.Level1) @@ -587,8 +585,91 @@ HWTEST_F(HiChainAuthConnectorTest, DeleteCredential_005, testing::ext::TestSize. int32_t userId = 0; g_processCredentialResultCode = HC_SUCCESS; g_processCredentialReturnDataStr = R"({"result": 100})"; - int32_t ret = hiChain_->DeleteCredential(deviceId, userId); - EXPECT_EQ(ret, 100); + int32_t peerUserId = 0; + int32_t ret = hiChain_->DeleteCredential(deviceId, userId, peerUserId); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(HiChainAuthConnectorTest, ProcessCredData_001, testing::ext::TestSize.Level1) +{ + int64_t authReqId = 0; + std::string data; + int32_t ret = hiChain_->ProcessCredData(authReqId, data); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(HiChainAuthConnectorTest, AddCredential_001, testing::ext::TestSize.Level1) +{ + int32_t osAccountId = 0; + std::string authParams = "authParamsTest"; + std::string credId; + int32_t ret = hiChain_->AddCredential(osAccountId, authParams, credId); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(HiChainAuthConnectorTest, ExportCredential_001, testing::ext::TestSize.Level1) +{ + int32_t osAccountId = 0; + std::string credId = "credIdTest"; + std::string publicKey; + int32_t ret = hiChain_->ExportCredential(osAccountId, credId, publicKey); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(HiChainAuthConnectorTest, AgreeCredential_001, testing::ext::TestSize.Level1) +{ + int32_t osAccountId = 0; + std::string selfCredId = "selfCredIdTest"; + std::string authParams; + std::string credId; + int32_t ret = hiChain_->AgreeCredential(osAccountId, selfCredId, authParams, credId); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(HiChainAuthConnectorTest, AuthCredential_001, testing::ext::TestSize.Level1) +{ + int32_t osAccountId = 0; + int64_t authReqId = 1; + std::string credId = "credIdTest"; + std::string pinCode = "146894"; + int32_t ret = hiChain_->AuthCredential(osAccountId, authReqId, credId, pinCode); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(HiChainAuthConnectorTest, AuthCredentialPinCode_001, testing::ext::TestSize.Level1) +{ + int32_t osAccountId = 0; + int64_t authReqId = 1; + std::string pinCode = "233"; + int32_t ret = hiChain_->AuthCredentialPinCode(osAccountId, authReqId, pinCode); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(HiChainAuthConnectorTest, AuthCredentialPinCode_002, testing::ext::TestSize.Level1) +{ + int32_t osAccountId = 0; + int64_t authReqId = 1; + std::string pinCode = "369528"; + int32_t ret = hiChain_->AuthCredentialPinCode(osAccountId, authReqId, pinCode); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(HiChainAuthConnectorTest, QueryCredentialInfo_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 0; + JsonObject queryParam; + JsonObject resultJson; + int32_t ret = hiChain_->QueryCredentialInfo(userId, queryParam, resultJson); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(HiChainAuthConnectorTest, QueryCredInfoByCredId_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 0; + std::string credId; + JsonObject resultJson; + int32_t ret = hiChain_->QueryCredInfoByCredId(userId, credId, resultJson); + EXPECT_NE(ret, DM_OK); } } // namespace DistributedHardware } // namespace OHOS diff --git a/test/commonunittest/UTTest_hichain_auth_connector.h b/test/commonunittest/UTTest_hichain_auth_connector.h index 3c708b59809563ae030627fca58ac720f75859bf..fdff7c0cb49a42b48fb584e6502521bc6d887a1d 100644 --- a/test/commonunittest/UTTest_hichain_auth_connector.h +++ b/test/commonunittest/UTTest_hichain_auth_connector.h @@ -44,8 +44,7 @@ public: MOCK_METHOD(void, AuthDeviceError, (int64_t requestId, int32_t errorCode), (override)); MOCK_METHOD(void, AuthDeviceSessionKey, (int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen), (override)); - MOCK_METHOD(void, GetRemoteDeviceId, (std::string &deviceId), (override)); - MOCK_METHOD(int32_t, GetPinCode, (int32_t &code), (override)); + MOCK_METHOD(char *, AuthDeviceRequest, (int64_t requestId, int operationCode, const char *reqParams), (override)); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/test/commonunittest/UTTest_hichain_connector.cpp b/test/commonunittest/UTTest_hichain_connector.cpp index 908216828dcdab6f9d21a19ead67df8078351af4..81ea90399a3479917f9453b4bde9a8596a614f76 100755 --- a/test/commonunittest/UTTest_hichain_connector.cpp +++ b/test/commonunittest/UTTest_hichain_connector.cpp @@ -61,10 +61,9 @@ public: { return ""; } - int32_t GetPinCode(int32_t &code) + int32_t GetPinCode(std::string &code) { - int32_t pinCode = 123456; - code = pinCode; + code = "123456"; return DM_OK; } }; diff --git a/test/commonunittest/UTTest_hichain_connector.h b/test/commonunittest/UTTest_hichain_connector.h index 8de11bc2b7afc4b02d5d876710f8ffd5dc585400..e41fe69b91ae846ba38b83bc494fa804b84d2dc0 100644 --- a/test/commonunittest/UTTest_hichain_connector.h +++ b/test/commonunittest/UTTest_hichain_connector.h @@ -50,7 +50,7 @@ public: MOCK_METHOD(void, OnGroupCreated, (int64_t requestId, const std::string &groupId), (override)); MOCK_METHOD(void, OnMemberJoin, (int64_t requestId, int32_t status), (override)); MOCK_METHOD(std::string, GetConnectAddr, (std::string deviceId), (override)); - MOCK_METHOD(int32_t, GetPinCode, (int32_t &code), (override)); + MOCK_METHOD(int32_t, GetPinCode, (std::string &code), (override)); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/test/interfacesfuzztest/BUILD.gn b/test/interfacesfuzztest/BUILD.gn new file mode 100755 index 0000000000000000000000000000000000000000..b278cf8427a635c7b81f3076543ef1219d6cbb14 --- /dev/null +++ b/test/interfacesfuzztest/BUILD.gn @@ -0,0 +1,20 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +group("fuzztest") { + testonly = true + + deps = [ + "devicemanagerimpl_fuzzer:fuzztest", + ] +} diff --git a/test/interfacesfuzztest/devicemanagerimpl_fuzzer/BUILD.gn b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/BUILD.gn new file mode 100755 index 0000000000000000000000000000000000000000..a706fd85fd9b3811cc8d806586ca0ac77e5abd67 --- /dev/null +++ b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/BUILD.gn @@ -0,0 +1,96 @@ +# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("DeviceManagerImplFuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/interfacesfuzztest/devicemanagerimpl_fuzzer" + + include_dirs = [ + "${common_path}/include", + "${common_path}/include/ipc", + "${common_path}/include/ipc/model", + "${devicemanager_path}/interfaces/kits/js/include", + "${devicemanager_path}/test/unittest/mock", + "${innerkits_path}/native_cpp/include", + "${innerkits_path}/native_cpp/include/ipc/standard", + "${innerkits_path}/native_cpp/include/ipc", + "${innerkits_path}/native_cpp/include/notify", + "${utils_path}/include", + "${utils_path}/include/crypto", + "${utils_path}/include/ipc/standard", + "${utils_path}/include/kvadapter", + "${servicesimpl_path}/include", + "${servicesimpl_path}/include/dependency/timer", + "${servicesimpl_path}/include/discovery", + "${servicesimpl_path}/include/dependency/softbus", + "${servicesimpl_path}/include/authentication", + "${servicesimpl_path}/include/adapter", + "${servicesimpl_path}/include", + "${servicesimpl_path}/include/ipc/standard", + "${servicesimpl_path}/include/dependency/hichain", + "${servicesimpl_path}/include/devicestate", + "${servicesimpl_path}/include/ability", + "${servicesimpl_path}/include/config", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Werror", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + sources = [ "device_manager_impl_fuzzer.cpp" ] + + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${utils_path}:devicemanagerutils", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"DeviceManagerImplFuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] + + external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", + "cJSON:cjson_static", + "c_utils:utils", + "device_auth:deviceauth_sdk", + "ipc:ipc_single", + "napi:ace_napi", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + "selinux_adapter:librestorecon", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":DeviceManagerImplFuzzTest" ] +} +############################################################################### diff --git a/test/interfacesfuzztest/devicemanagerimpl_fuzzer/corpus/init b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/corpus/init new file mode 100755 index 0000000000000000000000000000000000000000..79c5ba7b76709fb31f739049a3ce0441f6af4327 --- /dev/null +++ b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ diff --git a/test/interfacesfuzztest/devicemanagerimpl_fuzzer/device_manager_impl_fuzzer.cpp b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/device_manager_impl_fuzzer.cpp new file mode 100755 index 0000000000000000000000000000000000000000..69cebe8cfdf924f777e0d2092c2be64143daae33 --- /dev/null +++ b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/device_manager_impl_fuzzer.cpp @@ -0,0 +1,265 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + #include + #include + #include + #include + #include + #include + #include + + #include "device_manager_impl.h" + + namespace OHOS { + namespace DistributedHardware { + + namespace { + + } + + void StopAuthenticateDeviceTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + DeviceManagerImpl::GetInstance().StopAuthenticateDevice(pkgName); + DeviceManagerImpl::GetInstance().OnDmServiceDied(); + } + + void UnBindDeviceTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string deviceId = fdp.ConsumeRandomLengthString(); + DeviceManagerImpl::GetInstance().UnBindDevice(pkgName, deviceId); + } + + void ShiftLNNGearTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + DeviceManagerImpl::GetInstance().ShiftLNNGear(pkgName); + } + + void RegDevTrustChangeCallbackTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::shared_ptr callback = nullptr; + std::string pkgName = fdp.ConsumeRandomLengthString(); + DeviceManagerImpl::GetInstance().RegDevTrustChangeCallback(pkgName, callback); + } + + void GetNetworkIdByUdidTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string udid = fdp.ConsumeRandomLengthString(); + std::string networkId = fdp.ConsumeRandomLengthString(); + DeviceManagerImpl::GetInstance().GetNetworkIdByUdid(pkgName, udid, networkId); + } + + void RegisterCredentialAuthStatusCallbackTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::shared_ptr callback = nullptr; + DeviceManagerImpl::GetInstance().RegisterCredentialAuthStatusCallback(pkgName, callback); + } + + void GetAllTrustedDeviceListTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string extra = fdp.ConsumeRandomLengthString(); + std::vector deviceList; + DeviceManagerImpl::GetInstance().GetAllTrustedDeviceList(pkgName, extra, deviceList); + } + + void RegisterSinkBindCallbackTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::shared_ptr callback = nullptr; + DeviceManagerImpl::GetInstance().RegisterSinkBindCallback(pkgName, callback); + } + + void GetDeviceProfileInfoListTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + DmDeviceProfileInfoFilterOptions filterOptions; + std::shared_ptr callback = nullptr; + DeviceManagerImpl::GetInstance().GetDeviceProfileInfoList(pkgName, filterOptions, callback); + } + + void GetDeviceIconInfoTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + DmDeviceProfileInfoFilterOptions filterOptions; + std::shared_ptr callback = nullptr; + DeviceManagerImpl::GetInstance().GetDeviceProfileInfoList(pkgName, filterOptions, callback); + } + + void PutDeviceProfileInfoListTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::vector deviceProfileInfoList; + DeviceManagerImpl::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); + } + + void GetLocalDisplayDeviceNameTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string displayName = fdp.ConsumeRandomLengthString(); + int32_t maxNameLength = fdp.ConsumeIntegral(); + DeviceManagerImpl::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); + } + + void GetDeviceNetworkIdListTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string bundleName = fdp.ConsumeRandomLengthString(); + NetworkIdQueryFilter queryFilter; + std::vector networkIds; + DeviceManagerImpl::GetInstance().GetDeviceNetworkIdList(bundleName, queryFilter, networkIds); + } + + void SetLocalDeviceNameTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string deviceName = fdp.ConsumeRandomLengthString(); + std::shared_ptr callback = nullptr; + DeviceManagerImpl::GetInstance().SetLocalDeviceName(pkgName, deviceName, callback); + } + + void SetRemoteDeviceNameTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string deviceId = fdp.ConsumeRandomLengthString(); + std::string deviceName = fdp.ConsumeRandomLengthString(); + std::shared_ptr callback = nullptr; + DeviceManagerImpl::GetInstance().SetRemoteDeviceName(pkgName, deviceId, deviceName, callback); + } + + void RestoreLocalDeviceNameTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + DeviceManagerImpl::GetInstance().RestoreLocalDeviceName(pkgName); + } + + void GetLocalServiceInfoByBundleNameAndPinExchangeTypeTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string bundleName = fdp.ConsumeRandomLengthString(); + int32_t maxNameLength = fdp.ConsumeIntegral(); + DMLocalServiceInfo info; + DeviceManagerImpl::GetInstance(). + GetLocalServiceInfoByBundleNameAndPinExchangeType(bundleName, maxNameLength, info); + } + + void UnRegisterPinHolderCallbackTest(const uint8_t* data, size_t size) + { + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string pkgName = fdp.ConsumeRandomLengthString(); + DeviceManagerImpl::GetInstance().UnRegisterPinHolderCallback(pkgName); + } + } + } + + /* Fuzzer entry point */ + extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) + { + /* Run your code on data */ + OHOS::DistributedHardware::StopAuthenticateDeviceTest(data, size); + OHOS::DistributedHardware::UnBindDeviceTest(data, size); + OHOS::DistributedHardware::ShiftLNNGearTest(data, size); + OHOS::DistributedHardware::RegDevTrustChangeCallbackTest(data, size); + OHOS::DistributedHardware::GetNetworkIdByUdidTest(data, size); + OHOS::DistributedHardware::RegisterCredentialAuthStatusCallbackTest(data, size); + OHOS::DistributedHardware::GetAllTrustedDeviceListTest(data, size); + OHOS::DistributedHardware::RegisterSinkBindCallbackTest(data, size); + OHOS::DistributedHardware::GetDeviceProfileInfoListTest(data, size); + OHOS::DistributedHardware::GetDeviceIconInfoTest(data, size); + OHOS::DistributedHardware::PutDeviceProfileInfoListTest(data, size); + OHOS::DistributedHardware::GetLocalDisplayDeviceNameTest(data, size); + OHOS::DistributedHardware::GetDeviceNetworkIdListTest(data, size); + OHOS::DistributedHardware::SetLocalDeviceNameTest(data, size); + OHOS::DistributedHardware::SetRemoteDeviceNameTest(data, size); + OHOS::DistributedHardware::RestoreLocalDeviceNameTest(data, size); + OHOS::DistributedHardware::GetLocalServiceInfoByBundleNameAndPinExchangeTypeTest(data, size); + OHOS::DistributedHardware::UnRegisterPinHolderCallbackTest(data, size); + return 0; + } + \ No newline at end of file diff --git a/test/interfacesfuzztest/devicemanagerimpl_fuzzer/device_manager_impl_fuzzer.h b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/device_manager_impl_fuzzer.h new file mode 100755 index 0000000000000000000000000000000000000000..123bb184669035b42cb1b42d1a0fa0dee69380b4 --- /dev/null +++ b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/device_manager_impl_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DEVICE_MANAGER_IMPL_FUZZER_TEST_H +#define DEVICE_MANAGER_IMPL_FUZZER_TEST_H + +#define FUZZ_PROJECT_NAME "devicemanagerimpl_fuzzer" + +#endif // DEVICE_MANAGER_IMPL_FUZZER_TEST_H diff --git a/test/interfacesfuzztest/devicemanagerimpl_fuzzer/project.xml b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/project.xml new file mode 100755 index 0000000000000000000000000000000000000000..afd90798db45dd3853b00cf9c476ad4b245107e1 --- /dev/null +++ b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + \ No newline at end of file diff --git a/test/servicesfuzztest/BUILD.gn b/test/servicesfuzztest/BUILD.gn index 2a5da309a6a3606ee6115ba73f6d946c134bc4ac..074d1cd33715a9f81bbaddd058e4493560e36ee3 100644 --- a/test/servicesfuzztest/BUILD.gn +++ b/test/servicesfuzztest/BUILD.gn @@ -15,15 +15,21 @@ group("fuzztest") { testonly = true deps = [ + "authconfirm_fuzzer:fuzztest", + "authmanager_fuzzer:fuzztest", + "authmessageprocessor_fuzzer:fuzztest", "cryptomgr_fuzzer:fuzztest", "devicediscovery_fuzzer:fuzztest", "devicelist_fuzzer:fuzztest", "devicelistrefresh_fuzzer:fuzztest", "devicemanagernotify_fuzzer:fuzztest", "devicemanagerservice_fuzzer:fuzztest", + "devicenamemanager_fuzzer:fuzztest", + "devicenamemanagerone_fuzzer:fuzztest", "deviceprofileconnector_fuzzer:fuzztest", "devicepublish_fuzzer:fuzztest", "dmcommtool_fuzzer:fuzztest", + "dmcommtooltwo_fuzzer:fuzztest", "dmtransport_fuzzer:fuzztest", "dmtransportmsg_fuzzer:fuzztest", "dpinitcallback_fuzzer:fuzztest", diff --git a/test/servicesfuzztest/authconfirm_fuzzer/BUILD.gn b/test/servicesfuzztest/authconfirm_fuzzer/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..810c280fa413d44bfa645e6d74ccd78f7bb6bb3b --- /dev/null +++ b/test/servicesfuzztest/authconfirm_fuzzer/BUILD.gn @@ -0,0 +1,77 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("AuthConfirmFuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/servicesfuzztest/authconfirm_fuzzer" + + include_dirs = [ + "${innerkits_path}/native_cpp/include", + "${innerkits_path}/native_cpp/include/ipc", + "${innerkits_path}/native_cpp/include/ipc/standard", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Werror", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "auth_confirm_fuzzer.cpp" ] + + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + "${services_path}:devicemanagerservicetest", + "${servicesimpl_path}:devicemanagerserviceimpl", + ] + + external_deps = [ + "bounds_checking_function:libsec_shared", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "hilog:libhilog", + "init:libbegetutil", + "ipc:ipc_single", + "kv_store:distributeddata_inner", + "samgr:samgr_proxy", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"AuthConfirmFuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":AuthConfirmFuzzTest" ] +} +############################################################################### diff --git a/test/servicesfuzztest/authconfirm_fuzzer/auth_confirm_fuzzer.cpp b/test/servicesfuzztest/authconfirm_fuzzer/auth_confirm_fuzzer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..631ee616cc28032942e7e75d3a9132422dd92c90 --- /dev/null +++ b/test/servicesfuzztest/authconfirm_fuzzer/auth_confirm_fuzzer.cpp @@ -0,0 +1,252 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include + +#include "auth_confirm_fuzzer.h" + +#include "auth_manager.h" +#include "deviceprofile_connector.h" +#include "device_manager_service_listener.h" +#include "dm_anonymous.h" +#include "dm_auth_context.h" +#include "dm_auth_manager_base.h" +#include "dm_auth_message_processor.h" +#include "dm_auth_state_machine.h" +#include "dm_constants.h" +#include "dm_crypto.h" +#include "dm_log.h" + + +namespace OHOS { +namespace DistributedHardware { +namespace { +std::shared_ptr authSrcConfirmState_ = std::make_shared(); +std::shared_ptr authSinkConfirmState_ = std::make_shared(); +std::shared_ptr authSinkStatePinAuthComm_ = std::make_shared(); +std::shared_ptr softbusConnector = std::make_shared(); +std::shared_ptr listener = std::make_shared(); +std::shared_ptr hiChainAuthConnector = std::make_shared(); +std::shared_ptr hiChainConnector = std::make_shared(); +std::shared_ptr authManager = std::make_shared(softbusConnector, hiChainConnector, + listener, hiChainAuthConnector); +std::shared_ptr context_ = authManager->GetAuthContext(); +std::shared_ptr authSrcPinAuthStartState_ = std::make_shared(); +std::shared_ptr authSinkPinAuthStartState_ = std::make_shared(); +std::shared_ptr authSrcPinAuthMsgNegotiateState_ = + std::make_shared(); +std::shared_ptr authSinkPinAuthMsgNegotiateState_ = + std::make_shared(); +std::shared_ptr authSinkPinAuthDoneState_ = std::make_shared(); +std::shared_ptr authSrcPinAuthDoneState_ = std::make_shared(); +std::shared_ptr authSrcPinNegotiateStartState_ = + std::make_shared(); +std::shared_ptr authSrcPinInputState_ = std::make_shared(); +std::shared_ptr authSinkPinNegotiateStartState_ = + std::make_shared(); +std::shared_ptr authSinkPinDisplayState_ = std::make_shared(); +std::shared_ptr authSrcReverseUltrasonicStartState_ = + std::make_shared(); +std::shared_ptr authSrcReverseUltrasonicDoneState_ = + std::make_shared(); +std::shared_ptr authSrcForwardUltrasonicStartState_ = + std::make_shared(); +std::shared_ptr authSrcForwardUltrasonicDoneState_ = + std::make_shared(); +std::shared_ptr authSinkReverseUltrasonicStartState_ = + std::make_shared(); +std::shared_ptr authSinkReverseUltrasonicDoneState_ = + std::make_shared(); +std::shared_ptr authSinkForwardUltrasonicStartState_ = + std::make_shared(); +std::shared_ptr authSinkForwardUltrasonicDoneState_ = + std::make_shared(); +std::shared_ptr authSrcCredentialAuthNegotiateState_ = + std::make_shared(); +std::shared_ptr authSrcCredentialAuthDoneState_ = + std::make_shared(); +std::shared_ptr authSinkCredentialAuthStartState_ = + std::make_shared(); +std::shared_ptr authSinkCredentialAuthNegotiateState_ = + std::make_shared(); +std::shared_ptr authSrcCredentialExchangeState_ = + std::make_shared(); +std::shared_ptr authSinkCredentialExchangeState_ = + std::make_shared(); +std::shared_ptr authSrcCredentialAuthStartState_ = + std::make_shared(); +std::shared_ptr authSrcStartState_ = std::make_shared(); +std::shared_ptr authSrcNegotiateStateMachine_ = + std::make_shared(); +std::shared_ptr authSinkNegotiateStateMachine_ = + std::make_shared(); +} + +void GenerateStrings(std::vector &strings, FuzzedDataProvider &fdp) +{ + size_t vectorSize = fdp.ConsumeIntegralInRange(2, 10); + + for (size_t i = 0; i < vectorSize; ++i) { + size_t strLen = fdp.ConsumeIntegralInRange(0, 50); + strings.push_back(fdp.ConsumeBytesAsString(strLen)); + } +} + +void GenerateJsonObject(JsonObject &jsonObject, FuzzedDataProvider &fdp) +{ + jsonObject[TAG_DATA] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_PEER_PKG_NAME] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_DM_VERSION_V2] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_USER_ID] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_DEVICE_ID_HASH] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_ACCOUNT_ID_HASH] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_TOKEN_ID_HASH] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_BUNDLE_NAME_V2] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_EXTRA_INFO] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_PEER_BUNDLE_NAME_V2] = fdp.ConsumeRandomLengthString(); + jsonObject[DM_TAG_LOGICAL_SESSION_ID] = fdp.ConsumeIntegral(); + jsonObject[TAG_PEER_DISPLAY_ID] = fdp.ConsumeIntegral(); +} + +void ActionFuzzTest() +{ + authSrcPinAuthStartState_->Action(context_); + authSinkPinAuthStartState_->Action(context_); + authSrcPinAuthMsgNegotiateState_->Action(context_); + authSinkPinAuthMsgNegotiateState_->Action(context_); + authSinkPinAuthDoneState_->Action(context_); + authSrcPinAuthDoneState_->Action(context_); + authSrcPinNegotiateStartState_->Action(context_); + authSinkPinNegotiateStartState_->Action(context_); + authSinkPinDisplayState_->Action(context_); + authSrcReverseUltrasonicStartState_->Action(context_); + authSrcReverseUltrasonicDoneState_->Action(context_); + authSrcForwardUltrasonicStartState_->Action(context_); + authSrcForwardUltrasonicDoneState_->Action(context_); + authSinkReverseUltrasonicStartState_->Action(context_); + authSinkReverseUltrasonicDoneState_->Action(context_); + authSinkForwardUltrasonicStartState_->Action(context_); + authSinkForwardUltrasonicDoneState_->Action(context_); + authSrcCredentialAuthNegotiateState_->Action(context_); + authSrcCredentialAuthDoneState_->Action(context_); + authSinkCredentialAuthStartState_->Action(context_); + authSinkCredentialAuthNegotiateState_->Action(context_); + authSrcCredentialExchangeState_->Action(context_); + authSinkCredentialExchangeState_->Action(context_); + authSrcCredentialAuthStartState_->Action(context_); + authSrcConfirmState_->Action(context_); + authSinkConfirmState_->Action(context_); + authSrcStartState_->Action(context_); + authSrcNegotiateStateMachine_->Action(context_); + authSinkNegotiateStateMachine_->Action(context_); +} + +void AuthConfirmFuzzTestNext(JsonObject &jsonObject, FuzzedDataProvider &fdp) +{ + DistributedDeviceProfile::Accesser accesser; + DistributedDeviceProfile::Accessee accessee; + accesser.SetAccesserExtraData(fdp.ConsumeRandomLengthString()); + accessee.SetAccesseeExtraData(fdp.ConsumeRandomLengthString()); + authSrcConfirmState_->NegotiateCredential(context_, jsonObject); + authSrcConfirmState_->NegotiateAcl(context_, jsonObject); + authSrcConfirmState_->GetIdenticalCredentialInfo(context_, jsonObject); + authSrcConfirmState_->GetShareCredentialInfo(context_, jsonObject); + authSrcConfirmState_->GetP2PCredentialInfo(context_, jsonObject); + authSinkConfirmState_->NegotiateCredential(context_, jsonObject); + authSinkConfirmState_->NegotiateAcl(context_, jsonObject); + authSinkNegotiateStateMachine_->GetIdenticalCredentialInfo(context_, jsonObject); + authSinkNegotiateStateMachine_->GetShareCredentialInfo(context_, jsonObject); + authSinkNegotiateStateMachine_->GetP2PCredentialInfo(context_, jsonObject); + authSrcConfirmState_->GetCustomDescBySinkLanguage(context_); + authSinkConfirmState_->ShowConfigDialog(context_); + authSinkConfirmState_->ReadServiceInfo(context_); + authSinkConfirmState_->ProcessBindAuthorize(context_); + authSinkConfirmState_->ProcessNoBindAuthorize(context_); + authSinkStatePinAuthComm_->IsAuthCodeReady(context_); + authSinkStatePinAuthComm_->GeneratePincode(context_); + authSinkStatePinAuthComm_->ShowAuthInfoDialog(context_); + authSinkNegotiateStateMachine_->RespQueryAcceseeIds(context_); + authSinkNegotiateStateMachine_->ProcRespNegotiate5_1_0(context_); + authSrcConfirmState_->IdenticalAccountAclCompare(context_, accesser, accessee); + authSrcConfirmState_->ShareAclCompare(context_, accesser, accessee); + authSrcConfirmState_->Point2PointAclCompare(context_, accesser, accessee); + authSrcConfirmState_->LnnAclCompare(context_, accesser, accessee); + authSinkNegotiateStateMachine_->IdenticalAccountAclCompare(context_, accesser, accessee); + authSinkNegotiateStateMachine_->ShareAclCompare(context_, accesser, accessee); + authSinkNegotiateStateMachine_->Point2PointAclCompare(context_, accesser, accessee); + authSinkNegotiateStateMachine_->LnnAclCompare(context_, accesser, accessee); +} + +void AuthConfirmFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + FuzzedDataProvider fdp(data, size); + uint32_t bindType = fdp.ConsumeIntegralInRange(0, 1024); + int32_t credType = fdp.ConsumeIntegral(); + int32_t numpin = fdp.ConsumeIntegral(); + std::string credId = fdp.ConsumeRandomLengthString(); + std::string name = fdp.ConsumeRandomLengthString(); + std::string strpin = fdp.ConsumeRandomLengthString(); + bool checkResult = fdp.ConsumeBool(); + DistributedDeviceProfile::AccessControlProfile acl; + DistributedDeviceProfile::Accesser accesser; + DistributedDeviceProfile::Accessee accessee; + acl.SetExtraData(fdp.ConsumeRandomLengthString()); + accesser.SetAccesserExtraData(fdp.ConsumeRandomLengthString()); + accessee.SetAccesseeExtraData(fdp.ConsumeRandomLengthString()); + JsonObject jsonObject; + JsonObject jsonObjectTwo; + JsonObject jsonObjectThree; + GenerateJsonObject(jsonObject, fdp); + GenerateJsonObject(jsonObjectTwo, fdp); + GenerateJsonObject(jsonObjectThree, fdp); + std::vector deleteCredInfo; + GenerateStrings(deleteCredInfo, fdp); + context_->extraInfo = fdp.ConsumeRandomLengthString(); + authSrcConfirmState_->GetSrcAclInfoForP2P(context_, acl, jsonObject, jsonObjectTwo); + authSrcConfirmState_->CheckCredIdInAcl(context_, acl, jsonObject, bindType); + authSrcConfirmState_->CheckCredIdInAclForP2P(context_, credId, acl, jsonObjectTwo, bindType, checkResult); + authSrcConfirmState_->GetSrcCredType(context_, jsonObject, jsonObjectTwo, jsonObjectThree); + authSrcConfirmState_->GetSrcCredTypeForP2P(context_, jsonObject, jsonObjectTwo, jsonObjectThree, credType, + deleteCredInfo); + authSinkConfirmState_->MatchFallBackCandidateList(context_, DmAuthType::AUTH_TYPE_PIN); + authSinkConfirmState_->GetCredIdByCredType(context_, credType); + authSinkStatePinAuthComm_->HandleSessionHeartbeat(context_, name); + authSinkStatePinAuthComm_->IsPinCodeValid(numpin); + authSinkStatePinAuthComm_->IsPinCodeValid(strpin); + authSinkNegotiateStateMachine_->GetSinkAclInfo(context_, jsonObject, jsonObjectTwo); + authSinkNegotiateStateMachine_->GetSinkAclInfoForP2P(context_, acl, jsonObject, jsonObjectTwo); + authSinkNegotiateStateMachine_->CheckCredIdInAcl(context_, acl, jsonObject, bindType); + authSinkNegotiateStateMachine_->CheckCredIdInAclForP2P(context_, credId, acl, jsonObject, bindType, checkResult); + authSinkNegotiateStateMachine_->GetSinkCredType(context_, jsonObject, jsonObjectTwo, jsonObjectThree); + authSinkNegotiateStateMachine_->GetSinkCredTypeForP2P(context_, jsonObject, jsonObjectTwo, jsonObjectThree, + credType, deleteCredInfo); + authSrcConfirmState_->GetSrcAclInfo(context_, jsonObject, jsonObjectTwo); + ActionFuzzTest(); + AuthConfirmFuzzTestNext(jsonObject, fdp); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::AuthConfirmFuzzTest(data, size); + + return 0; +} diff --git a/test/servicesfuzztest/authconfirm_fuzzer/auth_confirm_fuzzer.h b/test/servicesfuzztest/authconfirm_fuzzer/auth_confirm_fuzzer.h new file mode 100644 index 0000000000000000000000000000000000000000..80295878b84742ead78cdb16f35f8e303e85aca4 --- /dev/null +++ b/test/servicesfuzztest/authconfirm_fuzzer/auth_confirm_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef AUTH_CONFIRM_FUZZER_H +#define AUTH_CONFIRM_FUZZER_H + +#define FUZZ_PROJECT_NAME "authconfirm_fuzzer" + +#endif // AUTH_CONFIRM_FUZZER_H diff --git a/test/servicesfuzztest/authconfirm_fuzzer/corpus/init b/test/servicesfuzztest/authconfirm_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..9c560fe896401f2d179c49f5946f5f1dc4a4b3ea --- /dev/null +++ b/test/servicesfuzztest/authconfirm_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ diff --git a/test/servicesfuzztest/authconfirm_fuzzer/project.xml b/test/servicesfuzztest/authconfirm_fuzzer/project.xml new file mode 100644 index 0000000000000000000000000000000000000000..66e1dcac475475fb101b6f8670ec699e6e9696aa --- /dev/null +++ b/test/servicesfuzztest/authconfirm_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + diff --git a/test/servicesfuzztest/authmanager_fuzzer/BUILD.gn b/test/servicesfuzztest/authmanager_fuzzer/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..c2add4c2d3e2dec16c3e15b5de7c93fe3a0eac8a --- /dev/null +++ b/test/servicesfuzztest/authmanager_fuzzer/BUILD.gn @@ -0,0 +1,77 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("AuthManagerFuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/servicesfuzztest/authmanager_fuzzer" + + include_dirs = [ + "${innerkits_path}/native_cpp/include", + "${innerkits_path}/native_cpp/include/ipc", + "${innerkits_path}/native_cpp/include/ipc/standard", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Werror", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "auth_manager_fuzzer.cpp" ] + + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + "${services_path}:devicemanagerservicetest", + "${servicesimpl_path}:devicemanagerserviceimpl", + ] + + external_deps = [ + "bounds_checking_function:libsec_shared", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "hilog:libhilog", + "init:libbegetutil", + "ipc:ipc_single", + "kv_store:distributeddata_inner", + "samgr:samgr_proxy", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"AuthManagerFuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":AuthManagerFuzzTest" ] +} +############################################################################### diff --git a/test/servicesfuzztest/authmanager_fuzzer/auth_manager_fuzzer.cpp b/test/servicesfuzztest/authmanager_fuzzer/auth_manager_fuzzer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f5026935e9549c36f04c656b654dc0a4f983793b --- /dev/null +++ b/test/servicesfuzztest/authmanager_fuzzer/auth_manager_fuzzer.cpp @@ -0,0 +1,410 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include + +#include "auth_manager_fuzzer.h" + +#include "auth_manager.h" +#include "deviceprofile_connector.h" +#include "device_manager_service_listener.h" +#include "dm_anonymous.h" +#include "dm_auth_context.h" +#include "dm_auth_manager_base.h" +#include "auth_manager.h" +#include "dm_auth_state_machine.h" +#include "dm_constants.h" +#include "dm_crypto.h" +#include "dm_log.h" + + +namespace OHOS { +namespace DistributedHardware { +namespace { + std::shared_ptr dmAuthMessageProcessor_ = std::make_shared(); + std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr listener = std::make_shared(); + std::shared_ptr hiChainAuthConnector = std::make_shared(); + std::shared_ptr hiChainConnector = std::make_shared(); + std::shared_ptr authManager = std::make_shared(softbusConnector, + hiChainConnector, listener, hiChainAuthConnector); + std::shared_ptr context_ = authManager->GetAuthContext(); + std::shared_ptr authSinkManager = std::make_shared(softbusConnector, hiChainConnector, + listener, hiChainAuthConnector); +} + +void ConvertSrcVersionFuzzTest(FuzzedDataProvider &fdp) +{ + std::string version = fdp.ConsumeRandomLengthString(); + std::string edition = fdp.ConsumeRandomLengthString(); + CleanNotifyCallback cleanNotifyCallback; + authManager->RegisterCleanNotifyCallback(cleanNotifyCallback); + authManager->SetAuthContext(context_); + authManager->GetAuthContext(); + authManager->GeneratePincode(); + authManager->ConvertSrcVersion(version, edition); +} + +void RegisterUiStateCallbackFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + authManager->RegisterUiStateCallback(pkgName); +} + +void UnRegisterUiStateCallbackFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + authManager->UnRegisterUiStateCallback(pkgName); +} + +void UnAuthenticateDeviceFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string udid = fdp.ConsumeRandomLengthString(); + int32_t bindLevel = fdp.ConsumeIntegral(); + authManager->UnAuthenticateDevice(pkgName, udid, bindLevel); +} + +void ImportAuthCodeFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string authCode = fdp.ConsumeRandomLengthString(); + authManager->ImportAuthCode(pkgName, authCode); +} + +void UnBindDeviceFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + int32_t bindLevel = fdp.ConsumeIntegral(); + std::string udid = fdp.ConsumeRandomLengthString(); + std::string extra = fdp.ConsumeRandomLengthString(); + authManager->UnBindDevice(pkgName, udid, bindLevel, extra); +} + +void StopAuthenticateDeviceFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + authManager->StopAuthenticateDevice(pkgName); + authManager->OnScreenLocked(); +} + +void HandleDeviceNotTrustFuzzTest(FuzzedDataProvider &fdp) +{ + std::string udid = fdp.ConsumeRandomLengthString(); + authManager->HandleDeviceNotTrust(udid); +} + +void RegisterAuthenticationTypeFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t authenticationType = fdp.ConsumeIntegral(); + authManager->RegisterAuthenticationType(authenticationType); + authManager->GetReason(); +} + +void AuthDeviceSessionKeyFuzzTest(FuzzedDataProvider &fdp) +{ + int64_t requestId = fdp.ConsumeIntegral(); + uint8_t sessionKey = fdp.ConsumeIntegral(); + uint32_t sessionKeyLen = fdp.ConsumeIntegral(); + authManager->AuthDeviceSessionKey(requestId, &sessionKey, sessionKeyLen); +} + +void AuthDeviceRequestFuzzTest(FuzzedDataProvider &fdp) +{ + int64_t requestId = fdp.ConsumeIntegral(); + int operationCode = fdp.ConsumeIntegral(); + const char* reqParams = fdp.ConsumeRandomLengthString().c_str(); + authManager->AuthDeviceRequest(requestId, operationCode, reqParams); +} + +void SetAuthTypeFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t authType = fdp.ConsumeIntegral(); + authManager->SetAuthType(authType); +} + +void IsAuthTypeSupportedFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t authType = fdp.ConsumeIntegral(); + authManager->IsAuthTypeSupported(authType); +} + +void CheckAuthParamVaildFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string deviceId = fdp.ConsumeRandomLengthString(); + std::string extra = fdp.ConsumeRandomLengthString(); + int32_t authType = fdp.ConsumeIntegral(); + authManager->CheckAuthParamVaild(pkgName, authType, deviceId, extra); +} + +void ParseHmlInfoInJsonObjectFuzzTest(FuzzedDataProvider &fdp) +{ + JsonObject jsonObject; + jsonObject[PARAM_KEY_CONN_SESSIONTYPE] = fdp.ConsumeRandomLengthString(); + jsonObject[PARAM_KEY_HML_ENABLE_160M] = fdp.ConsumeBool(); + jsonObject[PARAM_KEY_HML_ACTIONID] = fdp.ConsumeRandomLengthString(); + authManager->ParseHmlInfoInJsonObject(jsonObject); +} + +void ParseJsonObjectFuzzTest(FuzzedDataProvider &fdp) +{ + JsonObject jsonObject; + jsonObject[APP_OPERATION_KEY] = fdp.ConsumeRandomLengthString(); + jsonObject[CUSTOM_DESCRIPTION_KEY] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_APP_THUMBNAIL2] = fdp.ConsumeRandomLengthString(); + jsonObject[PARAM_CLOSE_SESSION_DELAY_SECONDS] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_PEER_PKG_NAME] = fdp.ConsumeRandomLengthString(); + authManager->ParseJsonObject(jsonObject); +} + +void GetTokenIdByBundleNameFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t userId = fdp.ConsumeIntegral(); + std::string bundleName = fdp.ConsumeRandomLengthString(); + int64_t tokenId = fdp.ConsumeIntegral(); + authManager->GetTokenIdByBundleName(userId, bundleName, tokenId); +} + +void GetBindLevelFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t bindLevel = fdp.ConsumeIntegral(); + authManager->GetBindLevel(bindLevel); +} + +void GetAuthParamFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t authType = fdp.ConsumeIntegral(); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string deviceId = fdp.ConsumeRandomLengthString(); + std::string extra = fdp.ConsumeRandomLengthString(); + authManager->GetAuthParam(pkgName, authType, deviceId, extra); +} + +void InitAuthStateFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t authType = fdp.ConsumeIntegral(); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string deviceId = fdp.ConsumeRandomLengthString(); + std::string extra = fdp.ConsumeRandomLengthString(); + authManager->InitAuthState(pkgName, authType, deviceId, extra); +} + +void AuthenticateDeviceFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t authType = fdp.ConsumeIntegral(); + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string deviceId = fdp.ConsumeRandomLengthString(); + std::string extra = fdp.ConsumeRandomLengthString(); + authManager->AuthenticateDevice(pkgName, authType, deviceId, extra); +} + +void AuthDeviceErrorFuzzTest(FuzzedDataProvider &fdp) +{ + int64_t requestId = fdp.ConsumeIntegral(); + int32_t errorCode = fdp.ConsumeIntegral(); + authManager->AuthDeviceError(requestId, errorCode); +} + +void AuthDeviceFinishFuzzTest(FuzzedDataProvider &fdp) +{ + int64_t requestId = fdp.ConsumeIntegral(); + authManager->AuthDeviceFinish(requestId); +} + +void GetPinCodeFuzzTest(FuzzedDataProvider &fdp) +{ + std::string code = fdp.ConsumeRandomLengthString(); + authManager->GetPinCode(code); +} + +void GetAuthCodeAndPkgNameFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + std::string authCode = fdp.ConsumeRandomLengthString(); + authManager->GetAuthCodeAndPkgName(pkgName, authCode); +} + +void IsAuthCodeReadyFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + authManager->IsAuthCodeReady(pkgName); +} + +void ParseUltrasonicSideFuzzTest(FuzzedDataProvider &fdp) +{ + JsonObject jsonObject; + jsonObject[TAG_ULTRASONIC_SIDE] = fdp.ConsumeRandomLengthString(); + authManager->ParseUltrasonicSide(jsonObject); +} + +void BindTargetFuzzTest(FuzzedDataProvider &fdp) +{ + std::string pkgName = fdp.ConsumeRandomLengthString(); + PeerTargetId targetId; + std::map bindParam; + int sessionId = fdp.ConsumeIntegral(); + uint64_t logicalSessionId = fdp.ConsumeIntegral(); + authManager->BindTarget(pkgName, targetId, bindParam, sessionId, logicalSessionId); +} + +void OnSessionClosedFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t sessionId = fdp.ConsumeIntegral(); + authSinkManager->OnSessionClosed(sessionId); +} + +void OnDataReceivedFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t sessionId = fdp.ConsumeIntegral(); + std::string message = fdp.ConsumeRandomLengthString(); + authSinkManager->OnDataReceived(sessionId, message); + authSinkManager->GetIsCryptoSupport(); +} + +void GetRemoteDeviceIdFuzzTest(FuzzedDataProvider &fdp) +{ + std::string deviceId = fdp.ConsumeRandomLengthString(); + authManager->GetRemoteDeviceId(deviceId); +} + +void OnUserOperationFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t action = fdp.ConsumeIntegral(); + std::string params = fdp.ConsumeRandomLengthString(); + authSinkManager->OnUserOperation(action, params); +} + +void OnSessionOpenedFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t sessionId = fdp.ConsumeIntegral(); + int32_t sessionSide = fdp.ConsumeIntegral(); + int32_t result = fdp.ConsumeIntegral(); + authManager->OnSessionOpened(sessionId, sessionSide, result); +} + +void OnSrcSessionClosedFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t sessionId = fdp.ConsumeIntegral(); + authManager->OnSessionClosed(sessionId); +} + +void OnSrcDataReceivedFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t sessionId = fdp.ConsumeIntegral(); + std::string message = fdp.ConsumeRandomLengthString(); + authManager->OnDataReceived(sessionId, message); + authManager->OnSessionDisable(); + authManager->GetIsCryptoSupport(); +} + +void OnSrcUserOperationFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t action = fdp.ConsumeIntegral(); + std::string params = fdp.ConsumeRandomLengthString(); + authManager->OnUserOperation(action, params); +} + +void AuthDeviceTransmitFuzzTest(FuzzedDataProvider &fdp) +{ + int64_t requestId = fdp.ConsumeIntegral(); + uint8_t data = fdp.ConsumeIntegral(); + uint32_t dataLen = fdp.ConsumeIntegral(); + authManager->AuthDeviceTransmit(requestId, &data, dataLen); +} + +void AuthSinkDeviceTransmitFuzzTest(FuzzedDataProvider &fdp) +{ + int64_t requestId = fdp.ConsumeIntegral(); + uint8_t data = fdp.ConsumeIntegral(); + uint32_t dataLen = fdp.ConsumeIntegral(); + authSinkManager->AuthDeviceTransmit(requestId, &data, dataLen); +} + +void AuthSinkDeviceSessionKeyFuzzTest(FuzzedDataProvider &fdp) +{ + int64_t requestId = fdp.ConsumeIntegral(); + uint8_t sessionKey = fdp.ConsumeIntegral(); + uint32_t sessionKeyLen = fdp.ConsumeIntegral(); + authSinkManager->AuthDeviceSessionKey(requestId, &sessionKey, sessionKeyLen); +} + +void AuthSinkDeviceRequestFuzzTest(FuzzedDataProvider &fdp) +{ + int64_t requestId = fdp.ConsumeIntegral(); + int operationCode = fdp.ConsumeIntegral(); + const char* reqParams = fdp.ConsumeRandomLengthString().c_str(); + authSinkManager->AuthDeviceRequest(requestId, operationCode, reqParams); + authManager->DeleteTimer(); + authManager->GetBindCallerInfo(); +} + +void AuthManagerFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size == 0)) { + return; + } + FuzzedDataProvider fdp(data, size); + ConvertSrcVersionFuzzTest(fdp); + RegisterUiStateCallbackFuzzTest(fdp); + UnRegisterUiStateCallbackFuzzTest(fdp); + UnAuthenticateDeviceFuzzTest(fdp); + ImportAuthCodeFuzzTest(fdp); + UnBindDeviceFuzzTest(fdp); + StopAuthenticateDeviceFuzzTest(fdp); + HandleDeviceNotTrustFuzzTest(fdp); + RegisterAuthenticationTypeFuzzTest(fdp); + AuthDeviceSessionKeyFuzzTest(fdp); + AuthDeviceRequestFuzzTest(fdp); + SetAuthTypeFuzzTest(fdp); + IsAuthTypeSupportedFuzzTest(fdp); + ParseHmlInfoInJsonObjectFuzzTest(fdp); + CheckAuthParamVaildFuzzTest(fdp); + ParseJsonObjectFuzzTest(fdp); + GetBindLevelFuzzTest(fdp); + GetAuthParamFuzzTest(fdp); + InitAuthStateFuzzTest(fdp); + AuthDeviceErrorFuzzTest(fdp); + AuthDeviceFinishFuzzTest(fdp); + GetAuthCodeAndPkgNameFuzzTest(fdp); + GetPinCodeFuzzTest(fdp); + GetTokenIdByBundleNameFuzzTest(fdp); + AuthenticateDeviceFuzzTest(fdp); + BindTargetFuzzTest(fdp); + ParseUltrasonicSideFuzzTest(fdp); + IsAuthCodeReadyFuzzTest(fdp); + AuthSinkDeviceSessionKeyFuzzTest(fdp); + OnSessionClosedFuzzTest(fdp); + OnDataReceivedFuzzTest(fdp); + GetRemoteDeviceIdFuzzTest(fdp); + OnUserOperationFuzzTest(fdp); + OnSessionOpenedFuzzTest(fdp); + OnSrcSessionClosedFuzzTest(fdp); + OnSrcUserOperationFuzzTest(fdp); + AuthDeviceTransmitFuzzTest(fdp); + AuthSinkDeviceTransmitFuzzTest(fdp); + AuthSinkDeviceSessionKeyFuzzTest(fdp); + AuthSinkDeviceRequestFuzzTest(fdp); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::AuthManagerFuzzTest(data, size); + return 0; +} diff --git a/test/servicesfuzztest/authmanager_fuzzer/auth_manager_fuzzer.h b/test/servicesfuzztest/authmanager_fuzzer/auth_manager_fuzzer.h new file mode 100644 index 0000000000000000000000000000000000000000..175ded70754c7aa60efd9338715183dab34a7820 --- /dev/null +++ b/test/servicesfuzztest/authmanager_fuzzer/auth_manager_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef AUTH_MANAGER_FUZZER_H +#define AUTH_MANAGER_FUZZER_H + +#define FUZZ_PROJECT_NAME "authmanager_fuzzer" + +#endif // AUTH_MANAGER_FUZZER_H diff --git a/test/servicesfuzztest/authmanager_fuzzer/corpus/init b/test/servicesfuzztest/authmanager_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..490dc43564005848ae0dfbd1d6f79cd81c28e2db --- /dev/null +++ b/test/servicesfuzztest/authmanager_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ diff --git a/test/servicesfuzztest/authmanager_fuzzer/project.xml b/test/servicesfuzztest/authmanager_fuzzer/project.xml new file mode 100644 index 0000000000000000000000000000000000000000..0aef325cd0f79cb8cfb98a9313436e3633dad54c --- /dev/null +++ b/test/servicesfuzztest/authmanager_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + diff --git a/test/servicesfuzztest/authmessageprocessor_fuzzer/BUILD.gn b/test/servicesfuzztest/authmessageprocessor_fuzzer/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..03a5e37e89f666721cb7be213e389163c67875b4 --- /dev/null +++ b/test/servicesfuzztest/authmessageprocessor_fuzzer/BUILD.gn @@ -0,0 +1,77 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("AuthMessageProcessorFuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/servicesfuzztest/authmessageprocessor_fuzzer" + + include_dirs = [ + "${innerkits_path}/native_cpp/include", + "${innerkits_path}/native_cpp/include/ipc", + "${innerkits_path}/native_cpp/include/ipc/standard", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Werror", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "auth_message_processor_fuzzer.cpp" ] + + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${json_path}:devicemanagerjson", + "${services_path}:devicemanagerservicetest", + "${servicesimpl_path}:devicemanagerserviceimpl", + ] + + external_deps = [ + "bounds_checking_function:libsec_shared", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "hilog:libhilog", + "init:libbegetutil", + "ipc:ipc_single", + "kv_store:distributeddata_inner", + "samgr:samgr_proxy", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"AuthMessageProcessorFuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":AuthMessageProcessorFuzzTest" ] +} +############################################################################### diff --git a/test/servicesfuzztest/authmessageprocessor_fuzzer/auth_message_processor_fuzzer.cpp b/test/servicesfuzztest/authmessageprocessor_fuzzer/auth_message_processor_fuzzer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..73a030896499aef157bc126129a446879c062779 --- /dev/null +++ b/test/servicesfuzztest/authmessageprocessor_fuzzer/auth_message_processor_fuzzer.cpp @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include + +#include "auth_message_processor_fuzzer.h" + +#include "auth_manager.h" +#include "deviceprofile_connector.h" +#include "device_manager_service_listener.h" +#include "dm_anonymous.h" +#include "dm_auth_context.h" +#include "dm_auth_manager_base.h" +#include "dm_auth_message_processor.h" +#include "dm_auth_state_machine.h" +#include "dm_constants.h" +#include "dm_crypto.h" +#include "dm_log.h" + + +namespace OHOS { +namespace DistributedHardware { +namespace { +std::shared_ptr dmAuthMessageProcessor_ = std::make_shared(); +std::shared_ptr softbusConnector = std::make_shared(); +std::shared_ptr listener = std::make_shared(); +std::shared_ptr hiChainAuthConnector = std::make_shared(); +std::shared_ptr hiChainConnector = std::make_shared(); +std::shared_ptr authManager = std::make_shared(softbusConnector, + hiChainConnector, listener, hiChainAuthConnector); +std::shared_ptr context_ = authManager->GetAuthContext(); +} + +void GenerateJsonObject(JsonObject &jsonObject, FuzzedDataProvider &fdp) +{ + jsonObject[TAG_DATA] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_PEER_PKG_NAME] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_DM_VERSION_V2] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_USER_ID] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_DEVICE_ID_HASH] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_ACCOUNT_ID_HASH] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_TOKEN_ID_HASH] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_BUNDLE_NAME_V2] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_EXTRA_INFO] = fdp.ConsumeRandomLengthString(); + jsonObject[TAG_PEER_BUNDLE_NAME_V2] = fdp.ConsumeRandomLengthString(); + jsonObject[DM_TAG_LOGICAL_SESSION_ID] = fdp.ConsumeIntegral(); + jsonObject[TAG_PEER_DISPLAY_ID] = fdp.ConsumeIntegral(); +} + +void AuthMessageProcessorFuzzTestNext(JsonObject &jsonObject) +{ + dmAuthMessageProcessor_ -> ParseAuthStartMessage(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseNegotiateMessage(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageRespAclNegotiate(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageReqUserConfirm(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageRespUserConfirm(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageReqPinAuthStart(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageRespPinAuthStart(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageReqPinAuthNegotiate(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageRespPinAuthNegotiate(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageReqCredExchange(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageRspCredExchange(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageNegotiateTransmit(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageSyncReq(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageSyncResp(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageSinkFinish(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageSrcFinish(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageReverseUltrasonicStart(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageReverseUltrasonicDone(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageForwardUltrasonicStart(jsonObject, context_); + dmAuthMessageProcessor_ -> ParseMessageForwardUltrasonicNegotiate(jsonObject, context_); + dmAuthMessageProcessor_ -> CreateNegotiateMessage(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateRespNegotiateMessage(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageReqUserConfirm(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageRespUserConfirm(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageReqPinAuthStart(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageRespPinAuthStart(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageReqPinAuthNegotiate(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageRespPinAuthNegotiate(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageReqCredExchange(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageRspCredExchange(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageReqCredAuthStart(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateCredentialNegotiateMessage(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateNegotiateOldMessage(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateSyncMessage(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageSyncResp(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageFinish(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageForwardUltrasonicStart(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageReverseUltrasonicStart(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageForwardUltrasonicNegotiate(context_, jsonObject); + dmAuthMessageProcessor_ -> CreateMessageReverseUltrasonicDone(context_, jsonObject); +} + +void AuthMessageProcessorFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string message = fdp.ConsumeRandomLengthString(); + std::string inputStr = fdp.ConsumeRandomLengthString(); + std::string compressed = fdp.ConsumeRandomLengthString(); + std::string trustDeviceId = fdp.ConsumeRandomLengthString(); + std::string encSyncMsg = fdp.ConsumeRandomLengthString(); + std::string enSyncMsg = fdp.ConsumeRandomLengthString(); + std::string aclStr = fdp.ConsumeRandomLengthString(); + uint32_t keyLen = fdp.ConsumeIntegralInRange(0, 1024); + uint32_t oriLen = fdp.ConsumeIntegralInRange(0, 1024); + std::vector sessionKey = fdp.ConsumeBytes(keyLen); + int32_t userId = fdp.ConsumeIntegral(); + int32_t skId = fdp.ConsumeIntegral(); + DistributedDeviceProfile::AccessControlProfile acl; + DistributedDeviceProfile::Accesser accesser; + DistributedDeviceProfile::Accessee accessee; + acl.SetExtraData(fdp.ConsumeRandomLengthString()); + accesser.SetAccesserExtraData(fdp.ConsumeRandomLengthString()); + accessee.SetAccesseeExtraData(fdp.ConsumeRandomLengthString()); + DmAccess access; + JsonObject jsonObject; + GenerateJsonObject(jsonObject, fdp); + dmAuthMessageProcessor_ -> ParseMessage(context_, message); + dmAuthMessageProcessor_ -> CreateMessage(DmMessageType::MSG_TYPE_REQ_ACL_NEGOTIATE, context_); + dmAuthMessageProcessor_ -> CreateAndSendMsg(DmMessageType::MSG_TYPE_REQ_ACL_NEGOTIATE, context_); + dmAuthMessageProcessor_ -> SaveSessionKey(sessionKey.data(), keyLen); + dmAuthMessageProcessor_ -> SaveSessionKeyToDP(userId, skId); + dmAuthMessageProcessor_ -> DeleteSessionKeyToDP(userId, skId); + dmAuthMessageProcessor_ -> CompressSyncMsg(inputStr); + dmAuthMessageProcessor_ -> DecompressSyncMsg(compressed, oriLen); + dmAuthMessageProcessor_ -> Base64Encode(inputStr); + dmAuthMessageProcessor_ -> Base64Decode(inputStr); + dmAuthMessageProcessor_ -> PutAccessControlList(context_, access, trustDeviceId); + dmAuthMessageProcessor_ -> EncryptSyncMessage(context_, access, encSyncMsg); + dmAuthMessageProcessor_ -> DecryptSyncMessage(context_, access, enSyncMsg); + dmAuthMessageProcessor_ -> ParseSyncMessage(context_, access, jsonObject); + dmAuthMessageProcessor_ -> CheckAccessValidityAndAssign(context_, access, access); + dmAuthMessageProcessor_ -> ACLToStr(acl, aclStr); + dmAuthMessageProcessor_ -> SetAccessControlList(context_, acl); + dmAuthMessageProcessor_ -> SetTransmitAccessControlList(context_, accesser, accessee); + dmAuthMessageProcessor_ -> SetLnnAccessControlList(context_, accesser, accessee); + AuthMessageProcessorFuzzTestNext(jsonObject); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::AuthMessageProcessorFuzzTest(data, size); + + return 0; +} diff --git a/test/servicesfuzztest/authmessageprocessor_fuzzer/auth_message_processor_fuzzer.h b/test/servicesfuzztest/authmessageprocessor_fuzzer/auth_message_processor_fuzzer.h new file mode 100644 index 0000000000000000000000000000000000000000..bf270770c6ff2917a12b5ce7744aee71302e71e4 --- /dev/null +++ b/test/servicesfuzztest/authmessageprocessor_fuzzer/auth_message_processor_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef AUTH_MESSAGE_PROCESSOR_FUZZER_H +#define AUTH_MESSAGE_PROCESSOR_FUZZER_H + +#define FUZZ_PROJECT_NAME "authmessageprocessor_fuzzer" + +#endif // AUTH_MESSAGE_PROCESSOR_FUZZER_H diff --git a/test/servicesfuzztest/authmessageprocessor_fuzzer/corpus/init b/test/servicesfuzztest/authmessageprocessor_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..9c560fe896401f2d179c49f5946f5f1dc4a4b3ea --- /dev/null +++ b/test/servicesfuzztest/authmessageprocessor_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ diff --git a/test/servicesfuzztest/authmessageprocessor_fuzzer/project.xml b/test/servicesfuzztest/authmessageprocessor_fuzzer/project.xml new file mode 100644 index 0000000000000000000000000000000000000000..66e1dcac475475fb101b6f8670ec699e6e9696aa --- /dev/null +++ b/test/servicesfuzztest/authmessageprocessor_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + diff --git a/test/servicesfuzztest/cryptomgr_fuzzer/BUILD.gn b/test/servicesfuzztest/cryptomgr_fuzzer/BUILD.gn index 91803e3b59cc9d8eabd8162a0e3a0e455d7babc5..5d38cb5fc249ba5014cbaa731ef65762c341bd31 100644 --- a/test/servicesfuzztest/cryptomgr_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/cryptomgr_fuzzer/BUILD.gn @@ -63,7 +63,7 @@ ohos_fuzztest("CryptoMgrFuzzTest") { deps = [ "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] defines = [ diff --git a/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn b/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn index e36d2a8885bb7779717ecf2c5c57f04dd0ec581c..21041b11a8e10d60cb6d6176ba98092a71aa77c0 100644 --- a/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn @@ -58,8 +58,8 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") { sources = [ "device_manager_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", - "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", ] defines = [ @@ -77,6 +77,7 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", ] diff --git a/test/servicesfuzztest/devicemanagerservice_fuzzer/device_manager_service_fuzzer.cpp b/test/servicesfuzztest/devicemanagerservice_fuzzer/device_manager_service_fuzzer.cpp index 51e187c50c56a1ecd380d87920ea11b7e01c79bf..749ed9e2224894ab04786ebf16131479d5c4e3c8 100644 --- a/test/servicesfuzztest/devicemanagerservice_fuzzer/device_manager_service_fuzzer.cpp +++ b/test/servicesfuzztest/devicemanagerservice_fuzzer/device_manager_service_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -66,6 +66,7 @@ void DeviceManagerServiceFuzzTest(const uint8_t* data, size_t size) DeviceManagerService::GetInstance().ImportCredential(inputStr, inputStr, inputStr); DeviceManagerService::GetInstance().DeleteCredential(inputStr, inputStr, inputStr); DeviceManagerService::GetInstance().DpAclAdd(inputStr); + DeviceManagerService::GetInstance().GetLocalDeviceName(retStr); } } } diff --git a/test/servicesfuzztest/devicenamemanager_fuzzer/BUILD.gn b/test/servicesfuzztest/devicenamemanager_fuzzer/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..e769025ecf720aa789b5e680076772cf2d957812 --- /dev/null +++ b/test/servicesfuzztest/devicenamemanager_fuzzer/BUILD.gn @@ -0,0 +1,96 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("DeviceNameManagerFuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/servicesfuzztest/devicenamemanager_fuzzer" + + include_dirs = [ + "${utils_path}/include", + "${innerkits_path}/native_cpp/include", + "${innerkits_path}/native_cpp/include/ipc/standard", + "${innerkits_path}/native_cpp/include/ipc", + "${innerkits_path}/native_cpp/include/notify", + "${common_path}/include", + "${common_path}/include/ipc", + "${common_path}/include/ipc/model", + "${utils_path}/include/ipc/standard", + "${servicesimpl_path}/include", + "${servicesimpl_path}/include/dependency/timer", + "${servicesimpl_path}/include/discovery", + "${servicesimpl_path}/include/dependency/softbus", + "${servicesimpl_path}/include/authentication", + "${servicesimpl_path}/include/adapter", + "${servicesimpl_path}/include/ipc/standard", + "${servicesimpl_path}/include/publish", + "${servicesimpl_path}/include/dependency/cryptomgr", + "${servicesimpl_path}/include/dependency/deviceprofile", + "${servicesimpl_path}/include/dependency/hichain", + "${servicesimpl_path}/include/devicestate", + "${devicemanager_path}/interfaces/kits/js/include", + "${devicemanager_path}/test/unittest/mock", + "${servicesimpl_path}/include/ability", + "${servicesimpl_path}/include/config", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "device_name_manager_fuzzer.cpp" ] + + deps = [ + "${devicemanager_path}/services/service:devicemanagerservice", + "${utils_path}:devicemanagerutils", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"DeviceNameManagerFuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] + + external_deps = [ + "c_utils:utils", + "data_share:datashare_common", + "data_share:datashare_consumer", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "hilog:libhilog", + "ipc:ipc_single", + "napi:ace_napi", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":DeviceNameManagerFuzzTest" ] +} +############################################################################### diff --git a/test/servicesfuzztest/devicenamemanager_fuzzer/corpus/init b/test/servicesfuzztest/devicenamemanager_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..9c560fe896401f2d179c49f5946f5f1dc4a4b3ea --- /dev/null +++ b/test/servicesfuzztest/devicenamemanager_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ diff --git a/test/servicesfuzztest/devicenamemanager_fuzzer/device_name_manager_fuzzer.cpp b/test/servicesfuzztest/devicenamemanager_fuzzer/device_name_manager_fuzzer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d10be1a5f6700cd97bcf77b2acdbe2e062c478e7 --- /dev/null +++ b/test/servicesfuzztest/devicenamemanager_fuzzer/device_name_manager_fuzzer.cpp @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "device_name_manager_fuzzer.h" +#include "device_name_manager.h" +#include "dm_constants.h" + + +namespace OHOS { +namespace DistributedHardware { + +namespace { + constexpr int32_t INT32_SIZE = 5; +} + +std::shared_ptr deviceNameMgr_ = std::make_shared(); +void DeviceNameManagerFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < (sizeof(int32_t) * INT32_SIZE))) { + return; + } + FuzzedDataProvider fdp(data, size); + deviceNameMgr_->InitDeviceNameWhenSoftBusReady(); + int32_t curUserId = fdp.ConsumeIntegral(); + deviceNameMgr_->InitDeviceNameWhenUserSwitch(curUserId, curUserId); + deviceNameMgr_->InitDeviceNameWhenLogout(); + deviceNameMgr_->InitDeviceNameWhenLogin(); + deviceNameMgr_->InitDeviceNameWhenNickChange(); + deviceNameMgr_->InitDeviceNameWhenNameChange(curUserId); + int32_t preUserId = fdp.ConsumeIntegral(); + deviceNameMgr_->RegisterDeviceNameChangeMonitor(curUserId, preUserId); + deviceNameMgr_->UnRegisterDeviceNameChangeMonitor(curUserId); + int32_t userId = fdp.ConsumeIntegral(); + deviceNameMgr_->InitDeviceName(userId); + + deviceNameMgr_->InitDeviceName(-1); + std::string prefixName(reinterpret_cast(data), size); + std::string subffixName(reinterpret_cast(data), size); + deviceNameMgr_->InitDeviceNameToSoftBus(prefixName, subffixName); + + int32_t maxNamelength = fdp.ConsumeIntegral(); + std::string displayName(reinterpret_cast(data), size); + deviceNameMgr_->GetLocalDisplayDeviceName(maxNamelength, displayName); + deviceNameMgr_->ModifyUserDefinedName(displayName); + deviceNameMgr_->RestoreLocalDeviceName(); + std::string nickName(reinterpret_cast(data), size); + std::string deviceName(reinterpret_cast(data), size); + deviceNameMgr_->InitDisplayDeviceNameToSettingsData(nickName, deviceName, userId); + deviceNameMgr_->GetUserDefinedDeviceName(userId, deviceName); + std::string str(reinterpret_cast(data), size); + int32_t maxNumBytes = fdp.ConsumeIntegral(); + deviceNameMgr_->SubstrByBytes(str, maxNumBytes); + deviceNameMgr_->GetSystemLanguage(); + deviceNameMgr_->GetLocalMarketName(); + deviceNameMgr_->SetUserDefinedDeviceName(deviceName, userId); + deviceNameMgr_->GetDisplayDeviceName(userId, deviceName); + std::string state(reinterpret_cast(data), size); + deviceNameMgr_->SetDisplayDeviceNameState(state, userId); +} + +void DeviceNameManagerFirstFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + FuzzedDataProvider fdp(data, size); + std::string deviceName(reinterpret_cast(data), size); + int32_t userId = fdp.ConsumeIntegral(); + deviceNameMgr_->SetDisplayDeviceName(deviceName, userId); + deviceNameMgr_->SetDisplayDeviceName("", userId); + deviceNameMgr_->GetDeviceName(deviceName); + deviceNameMgr_->SetDeviceName(deviceName); + deviceNameMgr_->SetDeviceName(""); + deviceNameMgr_->GetRemoteObj(); + std::string tableName(reinterpret_cast(data), size); + std::string key(reinterpret_cast(data), size); + std::string value(reinterpret_cast(data), size); + deviceNameMgr_->GetValue(tableName, userId, key, value); + deviceNameMgr_->SetValue(tableName, userId, key, value); + std::string proxyUri(reinterpret_cast(data), size); + deviceNameMgr_->CreateDataShareHelper(proxyUri); + deviceNameMgr_->GetProxyUriStr(tableName, userId); + deviceNameMgr_->MakeUri(proxyUri, key); + deviceNameMgr_->MakeUri("", key); + std::shared_ptr helper = nullptr; + deviceNameMgr_->ReleaseDataShareHelper(helper); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::DeviceNameManagerFuzzTest(data, size); + OHOS::DistributedHardware::DeviceNameManagerFirstFuzzTest(data, size); + return 0; +} diff --git a/test/servicesfuzztest/devicenamemanager_fuzzer/device_name_manager_fuzzer.h b/test/servicesfuzztest/devicenamemanager_fuzzer/device_name_manager_fuzzer.h new file mode 100644 index 0000000000000000000000000000000000000000..361ba9d83b334d1767067bb918241d544d23b5eb --- /dev/null +++ b/test/servicesfuzztest/devicenamemanager_fuzzer/device_name_manager_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DEVICE_NAME_MANAGER_FUZZER_TEST_H +#define DEVICE_NAME_MANAGER_FUZZER_TEST_H + +#define FUZZ_PROJECT_NAME "devicenamemanager_fuzzer" + +#endif // DEVICE_NAME_MANAGER_FUZZER_TEST_H diff --git a/test/servicesfuzztest/devicenamemanager_fuzzer/project.xml b/test/servicesfuzztest/devicenamemanager_fuzzer/project.xml new file mode 100644 index 0000000000000000000000000000000000000000..66e1dcac475475fb101b6f8670ec699e6e9696aa --- /dev/null +++ b/test/servicesfuzztest/devicenamemanager_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + diff --git a/test/servicesfuzztest/devicenamemanagerone_fuzzer/BUILD.gn b/test/servicesfuzztest/devicenamemanagerone_fuzzer/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..4de76326b3cf2ce128a7d845a8c0cbbefbc5f90b --- /dev/null +++ b/test/servicesfuzztest/devicenamemanagerone_fuzzer/BUILD.gn @@ -0,0 +1,93 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("DeviceNameManagerOneFuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/servicesfuzztest/devicenamemanagerone_fuzzer" + + include_dirs = [ + "${innerkits_path}/native_cpp/include", + "${innerkits_path}/native_cpp/include/ipc/standard", + "${innerkits_path}/native_cpp/include/ipc", + "${innerkits_path}/native_cpp/include/notify", + "${common_path}/include", + "${common_path}/include/ipc", + "${common_path}/include/ipc/model", + "${utils_path}/include", + "${utils_path}/include/ipc/standard", + "${servicesimpl_path}/include", + "${servicesimpl_path}/include/dependency/timer", + "${servicesimpl_path}/include/discovery", + "${servicesimpl_path}/include/dependency/softbus", + "${servicesimpl_path}/include/authentication", + "${servicesimpl_path}/include/adapter", + "${servicesimpl_path}/include/ipc/standard", + "${servicesimpl_path}/include/dependency/hichain", + "${servicesimpl_path}/include/deviceinfo/", + "${servicesimpl_path}/include/devicestate", + "${servicesimpl_path}/include/ability", + "${servicesimpl_path}/include/config", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Werror", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + sources = [ "device_name_manager_one_fuzzer.cpp" ] + + deps = [ + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"DeviceNameManagerOneFuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] + + external_deps = [ + "ability_base:want", + "cJSON:cjson", + "data_share:datashare_common", + "data_share:datashare_consumer", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "hilog:libhilog", + "ipc:ipc_single", + "safwk:system_ability_fwk", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":DeviceNameManagerOneFuzzTest" ] +} +############################################################################### diff --git a/test/servicesfuzztest/devicenamemanagerone_fuzzer/corpus/init b/test/servicesfuzztest/devicenamemanagerone_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..c5f10bf72d43fc972162a945f0be33e02d4b2c7f --- /dev/null +++ b/test/servicesfuzztest/devicenamemanagerone_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ \ No newline at end of file diff --git a/test/servicesfuzztest/devicenamemanagerone_fuzzer/device_name_manager_one_fuzzer.cpp b/test/servicesfuzztest/devicenamemanagerone_fuzzer/device_name_manager_one_fuzzer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..0c22674f78235ea8ec5b7634dfab2ac95fd14525 --- /dev/null +++ b/test/servicesfuzztest/devicenamemanagerone_fuzzer/device_name_manager_one_fuzzer.cpp @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include "device_name_manager.h" +#include "device_name_manager_one_fuzzer.h" + +namespace OHOS { +namespace DistributedHardware { +void DeviceNameManagerOnePrivateFuzzTest(FuzzedDataProvider &fdp) +{ + int32_t userId = fdp.ConsumeIntegral(); + int32_t maxNamelength = fdp.ConsumeIntegral(); + std::string deviceName = fdp.ConsumeRandomLengthString(); + std::string prefix = fdp.ConsumeRandomLengthString(); + std::string suffix = fdp.ConsumeRandomLengthString(); + std::string state = fdp.ConsumeRandomLengthString(); + std::string tableName = fdp.ConsumeRandomLengthString(); + std::string key = fdp.ConsumeRandomLengthString(); + std::string proxyUri = fdp.ConsumeRemainingBytesAsString(); + std::string value; + + DeviceNameManager::GetInstance().RegisterDeviceNameChangeMonitor(fdp.ConsumeIntegral(), + fdp.ConsumeIntegral()); + DeviceNameManager::GetInstance().UnRegisterDeviceNameChangeMonitor(userId); + DeviceNameManager::GetInstance().InitDeviceName(userId); + DeviceNameManager::GetInstance().InitDeviceNameToSoftBus(prefix, suffix); + DeviceNameManager::GetInstance().SubstrByBytes(fdp.ConsumeRandomLengthString(), + fdp.ConsumeIntegral()); + DeviceNameManager::GetInstance().GetSystemLanguage(); + DeviceNameManager::GetInstance().GetSystemRegion(); + DeviceNameManager::GetInstance().GetLocalMarketName(); + DeviceNameManager::GetInstance().InitDisplayDeviceNameToSettingsData(fdp.ConsumeRandomLengthString(), + fdp.ConsumeRandomLengthString(), userId); + DeviceNameManager::GetInstance().GetUserDefinedDeviceName(userId, deviceName); + DeviceNameManager::GetInstance().SetUserDefinedDeviceName(fdp.ConsumeRandomLengthString(), userId); + DeviceNameManager::GetInstance().GetDisplayDeviceName(userId, deviceName); + DeviceNameManager::GetInstance().SetDisplayDeviceName(fdp.ConsumeRandomLengthString(), userId); + DeviceNameManager::GetInstance().SetDisplayDeviceNameState(state, userId); + DeviceNameManager::GetInstance().GetDeviceName(deviceName); + DeviceNameManager::GetInstance().SetDeviceName(fdp.ConsumeRandomLengthString()); + DeviceNameManager::GetInstance().GetValue(tableName, userId, key, value); + DeviceNameManager::GetInstance().SetValue(tableName, userId, key, fdp.ConsumeRandomLengthString()); + DeviceNameManager::GetInstance().GetProxyUriStr(tableName, userId); + auto helper = DeviceNameManager::GetInstance().CreateDataShareHelper(proxyUri); + DeviceNameManager::GetInstance().MakeUri(proxyUri, key); + DeviceNameManager::GetInstance().ReleaseDataShareHelper(helper); +} + +void DeviceNameManagerOneFuzzTest(const uint8_t* data, size_t size) +{ + if (data == nullptr) { + return; + } + FuzzedDataProvider fdp(data, size); + + int32_t userId = fdp.ConsumeIntegral(); + int32_t maxNamelength = fdp.ConsumeIntegral(); + std::string displayName; + std::string deviceName = fdp.ConsumeRandomLengthString(); + int32_t curUserId = fdp.ConsumeIntegral(); + int32_t preUserId = fdp.ConsumeIntegral(); + std::string prefix = fdp.ConsumeRandomLengthString(); + std::string suffix = fdp.ConsumeRandomLengthString(); + std::string state = fdp.ConsumeRandomLengthString(); + std::string tableName = fdp.ConsumeRandomLengthString(); + std::string key = fdp.ConsumeRandomLengthString(); + std::string proxyUri = fdp.ConsumeRemainingBytesAsString(); + + DeviceNameManager::GetInstance().AccountSysReady(userId); + DeviceNameManager::GetInstance().DataShareReady(); + DeviceNameManager::GetInstance().InitDeviceNameWhenSoftBusReady(); + DeviceNameManager::GetInstance().GetLocalDisplayDeviceName(maxNamelength, displayName); + DeviceNameManager::GetInstance().ModifyUserDefinedName(deviceName); + DeviceNameManager::GetInstance().RestoreLocalDeviceName(); + DeviceNameManager::GetInstance().InitDeviceNameWhenUserSwitch(curUserId, preUserId); + DeviceNameManager::GetInstance().InitDeviceNameWhenNameChange(userId); + DeviceNameManager::GetInstance().InitDeviceNameWhenLogout(); + DeviceNameManager::GetInstance().InitDeviceNameWhenLogin(); + DeviceNameManager::GetInstance().InitDeviceNameWhenNickChange(); + DeviceNameManager::GetInstance().InitDeviceNameWhenLanguageOrRegionChanged(); + + OHOS::DistributedHardware::DeviceNameManagerOnePrivateFuzzTest(fdp); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::DeviceNameManagerOneFuzzTest(data, size); + + return 0; +} diff --git a/test/servicesfuzztest/devicenamemanagerone_fuzzer/device_name_manager_one_fuzzer.h b/test/servicesfuzztest/devicenamemanagerone_fuzzer/device_name_manager_one_fuzzer.h new file mode 100644 index 0000000000000000000000000000000000000000..ab70ba675f642a96443d77786348bde76973334f --- /dev/null +++ b/test/servicesfuzztest/devicenamemanagerone_fuzzer/device_name_manager_one_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DP_ACL_ADD_FUZZER_H +#define DP_ACL_ADD_FUZZER_H + +#define FUZZ_PROJECT_NAME "dpacladd_fuzzer" + +#endif // DP_ACL_ADD_FUZZER_H diff --git a/test/servicesfuzztest/devicenamemanagerone_fuzzer/project.xml b/test/servicesfuzztest/devicenamemanagerone_fuzzer/project.xml new file mode 100644 index 0000000000000000000000000000000000000000..afd90798db45dd3853b00cf9c476ad4b245107e1 --- /dev/null +++ b/test/servicesfuzztest/devicenamemanagerone_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + \ No newline at end of file diff --git a/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn b/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn index b102ae8b0991bd98c7274d26f0c865cec9147eda..e0189ea62bdfb93e88a80094e1cec1274b38451c 100644 --- a/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn @@ -36,14 +36,16 @@ ohos_fuzztest("DeviceProfileConnectorFuzzTest") { sources = [ "device_profile_connector_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/commondependency:devicemanagerdependency", - "${services_path}:devicemanagerservice", + "${devicemanager_path}/commondependency:devicemanagerdependencytest", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] external_deps = [ + "c_utils:utils", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", + "init:libbegetutil", "ipc:ipc_single", ] diff --git a/test/servicesfuzztest/deviceprofileconnector_fuzzer/device_profile_connector_fuzzer.cpp b/test/servicesfuzztest/deviceprofileconnector_fuzzer/device_profile_connector_fuzzer.cpp index c7875807c9ff81f52e3cf37edc222dbb06ecaaea..5301a71782fd64d4eafd411a7bc5d7883da3a616 100644 --- a/test/servicesfuzztest/deviceprofileconnector_fuzzer/device_profile_connector_fuzzer.cpp +++ b/test/servicesfuzztest/deviceprofileconnector_fuzzer/device_profile_connector_fuzzer.cpp @@ -56,14 +56,14 @@ void DeviceProfileConnectorFuzzTest(const uint8_t* data, size_t size) dmAccessee.trustBundleName = trustBundleName; int32_t userId = fdp.ConsumeIntegral(); std::string accountId(reinterpret_cast(data), size); + DmOfflineParam offlineParam; DeviceProfileConnector::GetInstance().CheckBindType(trustDeviceId, requestDeviceId); DeviceProfileConnector::GetInstance().GetBindTypeByPkgName(pkgName, requestDeviceId, trustUdid); DeviceProfileConnector::GetInstance().GetProcessInfoFromAclByUserId(localDeviceId, targetDeviceId, userId); DeviceProfileConnector::GetInstance().PutAccessControlList(aclInfo, dmAccesser, dmAccessee); DeviceProfileConnector::GetInstance().UpdateAccessControlList(userId, accountId, accountId); - DeviceProfileConnector::GetInstance().CheckIdenticalAccount(userId, accountId); DeviceProfileConnector::GetInstance().CheckDevIdInAclForDevBind(pkgName, localDeviceId); - DeviceProfileConnector::GetInstance().DeleteTimeOutAcl(localDeviceId); + DeviceProfileConnector::GetInstance().DeleteTimeOutAcl(localDeviceId, offlineParam); DeviceProfileConnector::GetInstance().GetTrustNumber(localDeviceId); } } diff --git a/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn b/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn index 1ece87b4dc638f990e38c9fa77610505186df388..52a8b23f3a4d3d82a062eafabda45b0d44e6444c 100644 --- a/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn @@ -62,7 +62,7 @@ ohos_fuzztest("DevicePublishFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] defines = [ diff --git a/test/servicesfuzztest/dmcommtool_fuzzer/BUILD.gn b/test/servicesfuzztest/dmcommtool_fuzzer/BUILD.gn index 778de4cef16448e29cc631fcdbd697fa711eb6ea..996046c408949617bf9eb0b3fdf7d7a1b79af265 100644 --- a/test/servicesfuzztest/dmcommtool_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dmcommtool_fuzzer/BUILD.gn @@ -62,8 +62,8 @@ ohos_fuzztest("DmCommToolFuzzTest") { sources = [ "dm_comm_tool_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", - "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", ] defines = [ @@ -77,6 +77,7 @@ ohos_fuzztest("DmCommToolFuzzTest") { "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "ffrt:libffrt", "ipc:ipc_single", "napi:ace_napi", "safwk:system_ability_fwk", diff --git a/test/servicesfuzztest/dmcommtool_fuzzer/dm_comm_tool_fuzzer.cpp b/test/servicesfuzztest/dmcommtool_fuzzer/dm_comm_tool_fuzzer.cpp index 4ab2117144813abee624cf109dfad9f10e2ba95a..f8b0b9354412c9bd1ac7b07b3f0fae1872009f62 100644 --- a/test/servicesfuzztest/dmcommtool_fuzzer/dm_comm_tool_fuzzer.cpp +++ b/test/servicesfuzztest/dmcommtool_fuzzer/dm_comm_tool_fuzzer.cpp @@ -57,6 +57,8 @@ void DmCommToolFuzzTest(const uint8_t* data, size_t size) std::shared_ptr innerCommMsg = std::make_shared(remoteNetworkId, commMsg, socketId); dmCommToolPtr_->ProcessReceiveUserIdsEvent(innerCommMsg); dmCommToolPtr_->ProcessResponseUserIdsEvent(innerCommMsg); + dmCommToolPtr_->ProcessReceiveCommonEvent(innerCommMsg); + dmCommToolPtr_->ProcessResponseCommonEvent(innerCommMsg); dmCommToolPtr_->GetDMTransportPtr(); dmCommToolPtr_->GetEventHandler(); } diff --git a/test/servicesfuzztest/dmcommtooltwo_fuzzer/BUILD.gn b/test/servicesfuzztest/dmcommtooltwo_fuzzer/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..0bd52b8c36f31610d51a9f2efa932e842da7141a --- /dev/null +++ b/test/servicesfuzztest/dmcommtooltwo_fuzzer/BUILD.gn @@ -0,0 +1,94 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("DmCommToolTwoFuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/servicesfuzztest/dmcommtooltwo_fuzzer" + + include_dirs = [ + "${utils_path}/include", + "${innerkits_path}/native_cpp/include", + "${innerkits_path}/native_cpp/include/ipc/standard", + "${innerkits_path}/native_cpp/include/ipc", + "${innerkits_path}/native_cpp/include/notify", + "${common_path}/include", + "${common_path}/include/ipc", + "${common_path}/include/ipc/model", + "${utils_path}/include/ipc/standard", + "${servicesimpl_path}/include", + "${servicesimpl_path}/include/dependency/timer", + "${servicesimpl_path}/include/discovery", + "${servicesimpl_path}/include/dependency/softbus", + "${servicesimpl_path}/include/authentication", + "${servicesimpl_path}/include/adapter", + "${servicesimpl_path}/include/ipc/standard", + "${servicesimpl_path}/include/publish", + "${servicesimpl_path}/include/dependency/deviceprofile", + "${servicesimpl_path}/include/dependency/hichain", + "${servicesimpl_path}/include/devicestate", + "${devicemanager_path}/interfaces/kits/js/include", + "${devicemanager_path}/services/service/include/relationshipsyncmgr", + "${devicemanager_path}/test/unittest/mock", + "${servicesimpl_path}/include/ability", + "${servicesimpl_path}/include/config", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "dm_comm_tool_two_fuzzer.cpp" ] + + deps = [ + "${json_path}:devicemanagerjson", + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"DmCommToolTwoFuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] + + external_deps = [ + "cJSON:cjson", + "device_auth:deviceauth_sdk", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "ffrt:libffrt", + "ipc:ipc_single", + "napi:ace_napi", + "safwk:system_ability_fwk", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":DmCommToolTwoFuzzTest" ] +} +############################################################################### diff --git a/test/servicesfuzztest/dmcommtooltwo_fuzzer/corpus/init b/test/servicesfuzztest/dmcommtooltwo_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..9c560fe896401f2d179c49f5946f5f1dc4a4b3ea --- /dev/null +++ b/test/servicesfuzztest/dmcommtooltwo_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ diff --git a/test/servicesfuzztest/dmcommtooltwo_fuzzer/dm_comm_tool_two_fuzzer.cpp b/test/servicesfuzztest/dmcommtooltwo_fuzzer/dm_comm_tool_two_fuzzer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..18652864e2bd7fe9a6845e685e14076c159c094c --- /dev/null +++ b/test/servicesfuzztest/dmcommtooltwo_fuzzer/dm_comm_tool_two_fuzzer.cpp @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "dm_comm_tool_two_fuzzer.h" +#include "dm_comm_tool.h" + + +namespace OHOS { +namespace DistributedHardware { + +std::shared_ptr dmCommToolPtr_ = std::make_shared(); + +void GenerateUserIds(FuzzedDataProvider& fdp, std::vector& outIds) +{ + outIds.clear(); + + auto count = fdp.ConsumeIntegralInRange(0, 10); + + while(count-- > 0 && fdp.remaining_bytes() >= sizeof(uint32_t)) { + outIds.push_back(fdp.ConsumeIntegral()); + } +} + +void DmCommToolTwoFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < sizeof(int32_t))) { + return; + } + FuzzedDataProvider fdp(data, size); + + int32_t commCode = fdp.ConsumeIntegral(); + std::string commMsgStr = fdp.ConsumeRandomLengthString(); + auto commMsgPtr = std::make_shared(commCode, commMsgStr); + + std::string networkId = fdp.ConsumeRandomLengthString(); + int32_t socketId = fdp.ConsumeIntegral(); + auto innerCommMsg = std::make_shared(networkId, commMsgPtr, socketId); + + std::string accountId = fdp.ConsumeRandomLengthString(); + int32_t userId = fdp.ConsumeIntegral(); + + dmCommToolPtr_->ProcessReceiveUserIdsEvent(innerCommMsg); + dmCommToolPtr_->SendLogoutAccountInfo(networkId, accountId, userId); + dmCommToolPtr_->ProcessReceiveLogoutEvent(innerCommMsg); + dmCommToolPtr_->ProcessReceiveCommonEvent(innerCommMsg); + + std::vector foregroundIds; + std::vector backgroundIds; + + GenerateUserIds(fdp, foregroundIds); + GenerateUserIds(fdp, backgroundIds); + + std::string msgStr = fdp.ConsumeRandomLengthString(); + int32_t stopUserId = fdp.ConsumeIntegral(); + + dmCommToolPtr_->SendUserIds(networkId, foregroundIds, backgroundIds); + dmCommToolPtr_->RspLocalFrontOrBackUserIds(networkId, foregroundIds, backgroundIds, socketId); + + dmCommToolPtr_->CreateUserStopMessage(stopUserId, msgStr); + dmCommToolPtr_->SendMsg(networkId, fdp.ConsumeIntegral(), msgStr); + dmCommToolPtr_->SendUserStop(networkId, stopUserId); + + int32_t parsedUserId = fdp.ConsumeIntegral(); + dmCommToolPtr_->ParseUserStopMessage(msgStr, parsedUserId); + + dmCommToolPtr_->ProcessReceiveUserStopEvent(innerCommMsg); + dmCommToolPtr_->RspUserStop(networkId, socketId, stopUserId); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::DmCommToolTwoFuzzTest(data, size); + return 0; +} diff --git a/test/servicesfuzztest/dmcommtooltwo_fuzzer/dm_comm_tool_two_fuzzer.h b/test/servicesfuzztest/dmcommtooltwo_fuzzer/dm_comm_tool_two_fuzzer.h new file mode 100644 index 0000000000000000000000000000000000000000..259795e80fff6c88fb81a5af8469da56bfdac94d --- /dev/null +++ b/test/servicesfuzztest/dmcommtooltwo_fuzzer/dm_comm_tool_two_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DM_COMM_TOOL_TWO_FUZZER_TEST_H +#define DM_COMM_TOOL_TWO_FUZZER_TEST_H + +#define FUZZ_PROJECT_NAME "dmcommtooltwo_fuzzer" + +#endif // DM_COMM_TOOL_TWO_FUZZER_TEST_H diff --git a/test/servicesfuzztest/dmcommtooltwo_fuzzer/project.xml b/test/servicesfuzztest/dmcommtooltwo_fuzzer/project.xml new file mode 100644 index 0000000000000000000000000000000000000000..66e1dcac475475fb101b6f8670ec699e6e9696aa --- /dev/null +++ b/test/servicesfuzztest/dmcommtooltwo_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + diff --git a/test/servicesfuzztest/dmsoftbuslistener_fuzzer/BUILD.gn b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..414caff5abfa17dc56bf5c8fb441f024548bd039 --- /dev/null +++ b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/BUILD.gn @@ -0,0 +1,94 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#####################hydra-fuzz################### +import("//build/config/features.gni") +import("//build/test.gni") +import("//foundation/distributedhardware/device_manager/device_manager.gni") + +##############################fuzztest########################################## +ohos_fuzztest("DmSoftbusListenerFuzzTest") { + module_out_path = fuzz_test_output_path + fuzz_config_file = + "${devicemanager_path}/test/servicesfuzztest/dmsoftbuslistener_fuzzer" + + include_dirs = [ + "${utils_path}/include", + "${innerkits_path}/native_cpp/include", + "${innerkits_path}/native_cpp/include/ipc/standard", + "${innerkits_path}/native_cpp/include/ipc", + "${innerkits_path}/native_cpp/include/notify", + "${common_path}/include", + "${common_path}/include/ipc", + "${common_path}/include/ipc/model", + "${utils_path}/include/ipc/standard", + "${servicesimpl_path}/include", + "${servicesimpl_path}/include/dependency/timer", + "${servicesimpl_path}/include/discovery", + "${servicesimpl_path}/include/dependency/softbus", + "${servicesimpl_path}/include/authentication", + "${servicesimpl_path}/include/adapter", + "${servicesimpl_path}/include/ipc/standard", + "${servicesimpl_path}/include/dependency/hichain", + "${servicesimpl_path}/include/devicestate", + "${devicemanager_path}/test/unittest/mock", + "${servicesimpl_path}/include/ability", + "${servicesimpl_path}/include/config", + ] + + cflags = [ + "-g", + "-O0", + "-Dprivate=public", + "-Dprotected=public", + "-Werror", + "-Wno-unused-variable", + "-fno-omit-frame-pointer", + ] + + sources = [ "dm_softbus_listener_fuzzer.cpp" ] + + deps = [ + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${json_path}:devicemanagerjson", + "${utils_path}:devicemanagerutilstest", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"DmSoftbusListenerFuzzTest\"", + "LOG_DOMAIN=0xD004110", + ] + + external_deps = [ + "ability_base:want", + "cJSON:cjson", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "hilog:libhilog", + "init:libbegetutil", + "ipc:ipc_single", + "safwk:system_ability_fwk", + ] +} + +############################################################################### +group("fuzztest") { + testonly = true + + deps = [ ":DmSoftbusListenerFuzzTest" ] +} +############################################################################### diff --git a/test/servicesfuzztest/dmsoftbuslistener_fuzzer/corpus/init b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..8f37f09254457133cae0f828d0a5faee7dcbd779 --- /dev/null +++ b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/corpus/init @@ -0,0 +1,13 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +FUZZ \ No newline at end of file diff --git a/test/servicesfuzztest/dmsoftbuslistener_fuzzer/dm_softbus_listener_fuzzer.cpp b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/dm_softbus_listener_fuzzer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c2471bb76c80e64816efd178a8ce09417acfca5e --- /dev/null +++ b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/dm_softbus_listener_fuzzer.cpp @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include "dm_constants.h" +#include "dm_device_info.h" +#include "device_manager_service.h" +#include "device_manager_impl.h" +#include "device_manager.h" +#include "device_manager_callback.h" +#include "dm_softbus_listener_fuzzer.h" +#include "softbus_listener.h" + +namespace OHOS { +namespace DistributedHardware { +void DmSoftbusListenerFuzzTestNext(FuzzedDataProvider &fdp) +{ + SoftbusListener listener; + std::string networkIdStr = fdp.ConsumeRandomLengthString(); + if (!networkIdStr.empty()) { + int32_t networkType = fdp.ConsumeIntegral(); + listener.GetNetworkTypeByNetworkId(networkIdStr.c_str(), networkType); + } + std::string name = fdp.ConsumeRandomLengthString(); + SoftbusListener::CloseDmRadarHelperObj(name); + std::string msg = fdp.ConsumeRandomLengthString(); + listener.SendAclChangedBroadcast(msg); + int32_t screenStatus = fdp.ConsumeIntegral(); + listener.GetDeviceScreenStatus(networkIdStr.c_str(), screenStatus); + listener.DeleteCacheDeviceInfo(); + std::string displayName = fdp.ConsumeRandomLengthString(); + listener.SetLocalDisplayName(displayName); +} + +void DmSoftbusListenerFuzzTest(const uint8_t* data, size_t size) +{ + if ((data == nullptr) || (size < (sizeof(uint16_t) + (sizeof(int32_t) + sizeof(int32_t))) || + (size > DM_MAX_DEVICE_ID_LEN))) { + return; + } + FuzzedDataProvider fdp(data, size); + DmDeviceInfo deviceInfo; + deviceInfo.deviceTypeId = fdp.ConsumeIntegral(); + deviceInfo.range = fdp.ConsumeIntegral(); + deviceInfo.networkType = fdp.ConsumeIntegral(); + deviceInfo.extraData = fdp.ConsumeRandomLengthString(); + SoftbusListener::DeviceNameChange(deviceInfo); + SoftbusListener::DeviceScreenStatusChange(deviceInfo); + int32_t errcode = fdp.ConsumeIntegral(); + uint16_t deviceTypeId = fdp.ConsumeIntegral(); + string proofInfoStr = fdp.ConsumeRandomLengthString(); + SoftbusListener::CredentialAuthStatusProcess(proofInfoStr, deviceTypeId, errcode); + const char* proofInfo = proofInfoStr.c_str(); + DevUserInfo localDevUserInfo; + std::string localDeviceId = fdp.ConsumeRandomLengthString(DM_MAX_DEVICE_ID_LEN); + localDevUserInfo.deviceId = localDeviceId.substr(0, DM_MAX_DEVICE_ID_LEN - 1); + localDevUserInfo.userId = fdp.ConsumeIntegral(); + DevUserInfo remoteDevUserInfo; + std::string remoteDeviceId = fdp.ConsumeRandomLengthString(DM_MAX_DEVICE_ID_LEN); + remoteDevUserInfo.deviceId = remoteDeviceId.substr(0, DM_MAX_DEVICE_ID_LEN - 1); + remoteDevUserInfo.userId = fdp.ConsumeIntegral(); + string remoteAclList = fdp.ConsumeRandomLengthString(); + SoftbusListener::OnSyncLocalAclList(localDevUserInfo, remoteDevUserInfo, remoteAclList); + string aclList = fdp.ConsumeRandomLengthString(); + SoftbusListener::OnGetAclListHash(localDevUserInfo, remoteDevUserInfo, aclList); + uint32_t proofLen = fdp.ConsumeIntegral(); + SoftbusListener::OnCredentialAuthStatus(proofInfo, proofLen, deviceTypeId, errcode); + uint16_t typeValue = fdp.ConsumeIntegral(); + NodeStatusType type = static_cast(typeValue); + NodeStatus status; + status.basicInfo.deviceTypeId = fdp.ConsumeIntegral(); + status.basicInfo.osType = fdp.ConsumeIntegral(); + status.reserved[0] = fdp.ConsumeIntegral(); + SoftbusListener::OnDeviceScreenStatusChanged(type, &status); + DmSoftbusListenerFuzzTestNext(fdp); +} +} +} + +/* Fuzzer entry point */ +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + /* Run your code on data */ + OHOS::DistributedHardware::DmSoftbusListenerFuzzTest(data, size); + return 0; +} diff --git a/test/servicesfuzztest/dmsoftbuslistener_fuzzer/dm_softbus_listener_fuzzer.h b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/dm_softbus_listener_fuzzer.h new file mode 100644 index 0000000000000000000000000000000000000000..2117ac3fa570ddad42d743dd924dfddaf4ac0d55 --- /dev/null +++ b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/dm_softbus_listener_fuzzer.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DM_SOFTBUS_LISTENER_FUZZER_H +#define DM_SOFTBUS_LISTENER_FUZZER_H + +#define FUZZ_PROJECT_NAME "dm_softbus_listener_fuzzer" + +#endif // DM_SOFTBUS_LISTENER_FUZZER_H diff --git a/test/servicesfuzztest/dmsoftbuslistener_fuzzer/project.xml b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/project.xml new file mode 100644 index 0000000000000000000000000000000000000000..500f6f414493290025d8dea9b066e5d5021a9377 --- /dev/null +++ b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/project.xml @@ -0,0 +1,25 @@ + + + + + + 1000 + + 300 + + 4096 + + \ No newline at end of file diff --git a/test/servicesfuzztest/dmtransport_fuzzer/BUILD.gn b/test/servicesfuzztest/dmtransport_fuzzer/BUILD.gn index 9bffadc22986e6ece631ed73d336d2a93ddf7056..cb9f486296cf6b19a82f0ded415635120821e79e 100644 --- a/test/servicesfuzztest/dmtransport_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dmtransport_fuzzer/BUILD.gn @@ -62,8 +62,8 @@ ohos_fuzztest("DmTransPortFuzzTest") { sources = [ "dm_transport_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", - "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", ] defines = [ @@ -77,6 +77,7 @@ ohos_fuzztest("DmTransPortFuzzTest") { "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "ffrt:libffrt", "ipc:ipc_single", "napi:ace_napi", "safwk:system_ability_fwk", diff --git a/test/servicesfuzztest/dmtransportmsg_fuzzer/BUILD.gn b/test/servicesfuzztest/dmtransportmsg_fuzzer/BUILD.gn index 4ea5f51755e92a79c84e8c00b5d2463c19591b81..ae85c6248d77454d9803f6c782929f647c967f9f 100644 --- a/test/servicesfuzztest/dmtransportmsg_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dmtransportmsg_fuzzer/BUILD.gn @@ -32,6 +32,7 @@ ohos_fuzztest("DmTransPortMsgFuzzTest") { "${common_path}/include/ipc", "${common_path}/include/ipc/model", "${utils_path}/include/ipc/standard", + "${json_path}/include", "${servicesimpl_path}/include", "${servicesimpl_path}/include/dependency/timer", "${servicesimpl_path}/include/discovery", @@ -62,8 +63,9 @@ ohos_fuzztest("DmTransPortMsgFuzzTest") { sources = [ "dm_transport_msg_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", - "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${json_path}:devicemanagerjson", + "${utils_path}:devicemanagerutilstest", ] defines = [ @@ -77,6 +79,7 @@ ohos_fuzztest("DmTransPortMsgFuzzTest") { "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "ffrt:libffrt", "ipc:ipc_single", "napi:ace_napi", "safwk:system_ability_fwk", diff --git a/test/servicesfuzztest/dmtransportmsg_fuzzer/dm_transport_msg_fuzzer.cpp b/test/servicesfuzztest/dmtransportmsg_fuzzer/dm_transport_msg_fuzzer.cpp index fa52cb012ad9827c04d5ea017ca09f879e6c76c0..663947393fd90036cde76c0d6d9d4efc114cb1e0 100644 --- a/test/servicesfuzztest/dmtransportmsg_fuzzer/dm_transport_msg_fuzzer.cpp +++ b/test/servicesfuzztest/dmtransportmsg_fuzzer/dm_transport_msg_fuzzer.cpp @@ -63,7 +63,7 @@ void DmTransPortMsgFuzzTest(const uint8_t* data, size_t size) foregroundUserIds.push_back(FORUSERID); std::vector backgroundUserIds; backgroundUserIds.push_back(BACKUSERID); - UserIdsMsg userIdsMsg(foregroundUserIds, backgroundUserIds); + UserIdsMsg userIdsMsg(foregroundUserIds, backgroundUserIds, true); CommMsg commMsg(code, msg); std::vector userIds; userIds.push_back(USERID); @@ -84,6 +84,7 @@ void DmTransPortMsgFuzzTest(const uint8_t* data, size_t size) ToJson(jsonObject, notifyUserIds); FromJson(jsonObject, notifyUserIds); notifyUserIds.ToString(); + cJSON_Delete(jsonObject); } } } diff --git a/test/servicesfuzztest/dpinitcallback_fuzzer/BUILD.gn b/test/servicesfuzztest/dpinitcallback_fuzzer/BUILD.gn index 817f64bfbc92eb00aa3d0e1db35b1ed86bffc296..85a96b54a1c10c663e7cd7cb115df6e665474eec 100644 --- a/test/servicesfuzztest/dpinitcallback_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dpinitcallback_fuzzer/BUILD.gn @@ -63,7 +63,8 @@ ohos_fuzztest("DpInitCallbackFuzzTest") { deps = [ "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", "${innerkits_path}/native_cpp:devicemanagersdk", - "${utils_path}:devicemanagerutils", + "${json_path}:devicemanagerjson", + "${utils_path}:devicemanagerutilstest", ] defines = [ diff --git a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn index 443914fdbb29a109d43a69f6ec5323ae5e7f046f..f90940c283f0fa28cd3ec4c6fb31212d66eab56c 100644 --- a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("GetLocalDeviceInfoFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn b/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn index 11d35cdb68f100161d5f0fa008164a0727e30d7a..7c353daa95ce804e8b2107f7a9d9cf9c0bcd3a5c 100644 --- a/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn @@ -58,8 +58,8 @@ ohos_fuzztest("GetTrustedDeviceListServiceFuzzTest") { sources = [ "get_trusted_devicelist_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", - "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -71,6 +71,7 @@ ohos_fuzztest("GetTrustedDeviceListServiceFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", ] diff --git a/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn index bfb878bf10e9be2dd35470a13d3b969c9dbbaaee..30ec4560599aebe452fa7e8b30b50c83e7e39da6 100644 --- a/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn @@ -78,7 +78,7 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "safwk:system_ability_fwk", ] - public_deps = [ "${utils_path}:devicemanagerutils" ] + public_deps = [ "${utils_path}:devicemanagerutilstest" ] } ############################################################################### diff --git a/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn index 78d50c55c364cb6fe428569f74a46056e6b8dff9..0382de7c20dfd90e8d451435e372fa0d96d12b02 100644 --- a/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { sources = [ "ipc_server_client_proxy_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicetest", "${innerkits_path}/native_cpp:devicemanagersdk", ] diff --git a/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn index c106a22a90c14b0915f439821ff02990aec99a46..1e442b1ff93c7faa4c9ae16754cd6291815a6cf0 100644 --- a/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { sources = [ "ipc_server_listener_fuzzer.cpp" ] - deps = [ "${devicemanager_path}/services/service:devicemanagerservice" ] + deps = [ "${devicemanager_path}/services/service:devicemanagerservicetest" ] external_deps = [ "c_utils:utils", diff --git a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn index 4564380c3efbf313a87de98cb3229ae9e45f8747..a021875d7d5d56c2d21c49abe99fc350f4e6e78e 100644 --- a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -60,7 +60,7 @@ ohos_fuzztest("IpcServerStubFuzzTest") { sources = [ "ipc_server_stub_fuzzer.cpp" ] - deps = [ "${devicemanager_path}/services/service:devicemanagerservice" ] + deps = [ "${devicemanager_path}/services/service:devicemanagerservicetest" ] defines = [ "HI_LOG_ENABLE", @@ -71,7 +71,6 @@ ohos_fuzztest("IpcServerStubFuzzTest") { external_deps = [ "ability_base:want", "c_utils:utils", - "common_event_service:cesfwk_core", "data_share:datashare_common", "data_share:datashare_consumer", "device_auth:deviceauth_sdk", diff --git a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn index eb5fd0593bc9e3ac6a9b2a81a3f3027aa704ba39..dfd1270d57c54b9dc0118f620ea02bd4d017590d 100644 --- a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("NotifyEventFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn b/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn index 46b4586f0bd9d374b3d062dd0a5ce0e43ccec677..a43f96e63a55531e3fb205e09ab9fccb7fc4857c 100644 --- a/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn @@ -58,8 +58,8 @@ ohos_fuzztest("ShiftLNNGearDeviceServiceFuzzTest") { sources = [ "shift_lnn_gear_device_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", - "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -71,6 +71,7 @@ ohos_fuzztest("ShiftLNNGearDeviceServiceFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_single", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn index 88fd909884babf85967172f857bf76049b12f608..be65e803c71cc017401a696d1edd29caab62a0f4 100644 --- a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("CloseDmRadarHelperObjFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn b/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn index e78a4ddf5aa5cd52e791acf4f409f8ee00e3a266..872e0c8a2e6246e43ec7944faae911f92ad0c0ad 100644 --- a/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn @@ -52,9 +52,9 @@ ohos_fuzztest("OnBytesReceivedFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -62,6 +62,7 @@ ohos_fuzztest("OnBytesReceivedFuzzTest") { "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "init:libbegetutil", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/onbytesreceived_fuzzer/on_bytes_received_fuzzer.cpp b/test/softbusfuzztest/onbytesreceived_fuzzer/on_bytes_received_fuzzer.cpp index 2d0979540abe7b696cf88c84ccf7174a15facdf1..2fe1110fdb279e1bf0a31e18fd22d9a0bb1147d5 100644 --- a/test/softbusfuzztest/onbytesreceived_fuzzer/on_bytes_received_fuzzer.cpp +++ b/test/softbusfuzztest/onbytesreceived_fuzzer/on_bytes_received_fuzzer.cpp @@ -57,11 +57,9 @@ void OnBytesReceivedFuzzTest(const uint8_t* data, size_t size) if ((data == nullptr) || (size < sizeof(int))) { return; } - int sessionId = *(reinterpret_cast(data)); std::shared_ptr softbusSession = std::make_shared(); softbusSession->RegisterSessionCallback(std::make_shared()); - softbusSession->OnBytesReceived(sessionId, data, size); } } } diff --git a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn index 6f263a95e0a9a06e33598ea7f67dfb6c20ed6880..7ba953e6c881dda203cea0e306c56a8ac23b056a 100644 --- a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("OnParameterChgCallbackFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn b/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn index 234a9f3444d9171f148592222a475e56e75bf6e4..cb057edf61d7989f91db29676998b43a5d200e17 100644 --- a/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn @@ -52,9 +52,9 @@ ohos_fuzztest("OnSessionOpenedFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -64,6 +64,7 @@ ohos_fuzztest("OnSessionOpenedFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn index f960bcba3d8ec88dde0db3a0556d17a6a0a9322f..d2195a85ea8dfda03894389144a3ad76b4fe64b9 100644 --- a/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdevicefound_fuzzer/BUILD.gn @@ -50,7 +50,6 @@ ohos_fuzztest("OnSoftbusDeviceFoundFuzzTest") { ] external_deps = [ - "cJSON:cjson", "c_utils:utils", "dsoftbus:softbus_client", "safwk:system_ability_fwk", diff --git a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn index e7343c9a8a048c43ca2f6f74520ce8802e1d1ec7..420fe22764d20857ee06c49a31cbd8c2d43d3110 100644 --- a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("OnSoftbusDeviceInfoChangedFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn index f873ba8c62f9dc251b5b7405036fb29ce25ba558..aa9cd8d97b35452d029e68379cdd3113aa461314 100644 --- a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("OnSoftbusDeviceOfflineFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn index e3ad25568bef687a1b46ec784b36b8f6966c098d..83ffef54469c1a1a9b70e28c44fd8ba9260ef27b 100644 --- a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("OnSoftbusDeviceOnlineFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn index 8cb126fd2162bdcb513df825ff4d0ec0303b68f0..fc2e6cd206a218d9f7622be4d4434bfc028cfe84 100644 --- a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("OnSoftbusListenerDeviceFoundFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn index cf2bf5d8ccf3d8ad27839d261c79896faff5c21f..c3066fa506e90d0e45bb12206983b5898580e37f 100644 --- a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("PublishSoftbusLnnFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn index a7c76cb553ac65d17393b4939f1ee28a5cf6a9a2..2a4a650e9ec5459b9bafe91e6721f71723a78486 100644 --- a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("RefreshSoftbusLnnFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/softbusconnector_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnector_fuzzer/BUILD.gn index cff815de991dadff0dc5b7c28052b2cfe5e34dd1..278ad04ea35282064ded30f1aaec64f54e3e0401 100644 --- a/test/softbusfuzztest/softbusconnector_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnector_fuzzer/BUILD.gn @@ -52,7 +52,12 @@ ohos_fuzztest("SoftbusConnectorFuzzTest") { external_deps = [ "bounds_checking_function:libsec_shared", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "init:libbegetutil", + "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/softbusconnectorcommon_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorcommon_fuzzer/BUILD.gn index 4112453d5c8e30a226811e27b4b01381472efbce..a9b8b5aa62b08afc86984c72081bc27e21af7ea8 100644 --- a/test/softbusfuzztest/softbusconnectorcommon_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorcommon_fuzzer/BUILD.gn @@ -52,7 +52,12 @@ ohos_fuzztest("SoftbusConnectorCommonFuzzTest") { external_deps = [ "bounds_checking_function:libsec_shared", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "init:libbegetutil", + "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/softbusconnectorpublish_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorpublish_fuzzer/BUILD.gn index 048f39fd995b8cfe10e672d37bf1a737c0ce4fc8..9669c6d31ac88880d82b562cf4d834a7e2c4a6c9 100644 --- a/test/softbusfuzztest/softbusconnectorpublish_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorpublish_fuzzer/BUILD.gn @@ -51,7 +51,12 @@ ohos_fuzztest("SoftbusConnectorPublishFuzzTest") { external_deps = [ "bounds_checking_function:libsec_shared", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "init:libbegetutil", + "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/softbusconnectorstate_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorstate_fuzzer/BUILD.gn index a1d6a4c28204ed159c500138b5f55d620a75e9ae..b8f593bcbbdb4b4f05096ab5961627098f76ffcd 100644 --- a/test/softbusfuzztest/softbusconnectorstate_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorstate_fuzzer/BUILD.gn @@ -52,7 +52,12 @@ ohos_fuzztest("SoftbusConnectorStateFuzzTest") { external_deps = [ "bounds_checking_function:libsec_shared", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "init:libbegetutil", + "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/softbusconnectorstatic_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorstatic_fuzzer/BUILD.gn index ef1a119c6f85860ff1c0ba16bd8529832f9510aa..07cf961cb816861037480cfa4f24de6535235cf3 100644 --- a/test/softbusfuzztest/softbusconnectorstatic_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorstatic_fuzzer/BUILD.gn @@ -52,7 +52,12 @@ ohos_fuzztest("SoftbusConnectorStaticFuzzTest") { external_deps = [ "bounds_checking_function:libsec_shared", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "init:libbegetutil", + "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn b/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn index 29e00614b7b49043ddf507bd4fded4be701db6fe..56c9f5fac539b66bc84fc4972390d371c0ab3321 100644 --- a/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn @@ -46,7 +46,8 @@ ohos_fuzztest("SoftbusListenerFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${json_path}:devicemanagerjson", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/softbuslistener_fuzzer/softbus_listener_fuzzer.cpp b/test/softbusfuzztest/softbuslistener_fuzzer/softbus_listener_fuzzer.cpp index ef06fa1c3f46149b548e00ae73bc8bba1f9daa9e..7041f169dad8d787183bf4cb4bedd1ff4a96479f 100644 --- a/test/softbusfuzztest/softbuslistener_fuzzer/softbus_listener_fuzzer.cpp +++ b/test/softbusfuzztest/softbuslistener_fuzzer/softbus_listener_fuzzer.cpp @@ -246,6 +246,8 @@ void SoftBusListenerThirdFuzzTest(const uint8_t* data, size_t size) softbusListener_->ParseConnAddrInfo(&addrInfo, jsonObj); addrInfo.type = ConnectionAddrType::CONNECTION_ADDR_WLAN; softbusListener_->ParseConnAddrInfo(&addrInfo, jsonObj); + addrInfo.type = ConnectionAddrType::CONNECTION_ADDR_NCM; + softbusListener_->ParseConnAddrInfo(&addrInfo, jsonObj); addrInfo.type = ConnectionAddrType::CONNECTION_ADDR_SESSION; softbusListener_->ParseConnAddrInfo(&addrInfo, jsonObj); softbusListener_->ParseConnAddrInfo(&addrInfo1, jsonObj); diff --git a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn index 9256e79cf6250fe68d6f991b99f4a44a84262718..46986b2f80415ee98a9c38a12e0e094b50a6cae6 100644 --- a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn @@ -42,9 +42,9 @@ ohos_fuzztest("SoftbusListenerGetLocalDeviceInfoFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ diff --git a/test/softbusfuzztest/softbussession_fuzzer/BUILD.gn b/test/softbusfuzztest/softbussession_fuzzer/BUILD.gn index f31b185a1693866076bd7e6c1d850900f1fd7587..158f1f9a99b5e45d9a483196e50a76cbeb42c0af 100644 --- a/test/softbusfuzztest/softbussession_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbussession_fuzzer/BUILD.gn @@ -52,7 +52,12 @@ ohos_fuzztest("SoftbusSessionFuzzTest") { external_deps = [ "bounds_checking_function:libsec_shared", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "init:libbegetutil", + "ipc:ipc_core", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/softbussession_fuzzer/softbus_session_fuzzer.cpp b/test/softbusfuzztest/softbussession_fuzzer/softbus_session_fuzzer.cpp index a079a5c9e2322e124616c2320badb8891170d377..9df6f8cdc50bfc013fe330e613e6b8d09cabff27 100644 --- a/test/softbusfuzztest/softbussession_fuzzer/softbus_session_fuzzer.cpp +++ b/test/softbusfuzztest/softbussession_fuzzer/softbus_session_fuzzer.cpp @@ -70,7 +70,6 @@ void SoftBusSessionFuzzTest(const uint8_t* data, size_t size) softbusSession->OnSessionOpened(result, result); softbusSession->OpenAuthSession(str); softbusSession->CloseAuthSession(sessionId); - softbusSession->OnBytesReceived(result, str.c_str(), str.size()); softbusSession->GetPeerDeviceId(sessionId, str); softbusSession->SendData(sessionId, str); softbusSession->SendHeartbeatData(sessionId, str); diff --git a/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn b/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn index 218ca7c9e15d72fcec363d97fc56d649d579939c..7f61cc1610435e9f11573f65cb16b8ad34d6dc35 100644 --- a/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn @@ -47,13 +47,17 @@ ohos_fuzztest("SoftbusSessionObjectFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "init:libbegetutil", "safwk:system_ability_fwk", ] diff --git a/test/softbusfuzztest/softbussessionobject_fuzzer/softbus_session_object_fuzzer.cpp b/test/softbusfuzztest/softbussessionobject_fuzzer/softbus_session_object_fuzzer.cpp index fe688c42f599ad3d63da0832dddb28801925fd5c..3d76c29caee89fac337cd42db5a3d29f9939e7eb 100644 --- a/test/softbusfuzztest/softbussessionobject_fuzzer/softbus_session_object_fuzzer.cpp +++ b/test/softbusfuzztest/softbussessionobject_fuzzer/softbus_session_object_fuzzer.cpp @@ -58,21 +58,8 @@ void SoftBusSessionFuzzTest(const uint8_t* data, size_t size) return; } - int32_t socket = *(reinterpret_cast(data)); - QoSEvent eventId = static_cast(1); - uint32_t qosCount = 3; - QosTV qos[] = { - { .qos = QOS_TYPE_MIN_BW, .value = 64 * 1024 }, - { .qos = QOS_TYPE_MAX_LATENCY, .value = 19000}, - { .qos = QOS_TYPE_MIN_LATENCY, .value = 500 }, - }; - ShutdownReason reason = ShutdownReason::SHUTDOWN_REASON_UNKNOWN; - std::shared_ptr softbusSession = std::make_shared(); softbusSession->RegisterSessionCallback(std::make_shared()); - softbusSession->iSocketListener_.OnBytes(socket, data, size); - softbusSession->iSocketListener_.OnShutdown(socket, reason); - softbusSession->iSocketListener_.OnQos(socket, eventId, qos, qosCount); } } } diff --git a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn index 278981ad99c56bbff9a63bb3a71fbf5730b6e12a..c844e2e0c4c9d455e33d0da29903cde9b6110cb9 100644 --- a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("StopRefreshSoftbusLnnFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusunittest/UTTest_softbus_connector.cpp b/test/softbusunittest/UTTest_softbus_connector.cpp index c510b8492bfe0bfe6c9218e83054b2e854962bc6..7d97ecee6ed72975ee1f41599c66f7caf37ac763 100644 --- a/test/softbusunittest/UTTest_softbus_connector.cpp +++ b/test/softbusunittest/UTTest_softbus_connector.cpp @@ -220,7 +220,7 @@ HWTEST_F(SoftbusConnectorTest, GetConnectAddr_001, testing::ext::TestSize.Level1 std::string deviceId; std::string connectAddr; std::shared_ptr softbusConnector = std::make_shared(); - ConnectionAddr *ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); + std::shared_ptr ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); EXPECT_EQ(ret, nullptr); } @@ -234,11 +234,13 @@ HWTEST_F(SoftbusConnectorTest, GetConnectAddr_002, testing::ext::TestSize.Level1 { std::string deviceId = "123345"; std::string connectAddr; - DeviceInfo deviceInfo; - deviceInfo.addrNum = -1; + std::shared_ptr deviceInfo = std::make_shared(); + deviceInfo->addrNum = -1; + SoftbusConnector::discoveryDeviceInfoMap_[deviceId] = deviceInfo; std::shared_ptr softbusConnector = std::make_shared(); - ConnectionAddr *ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); + std::shared_ptr ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); EXPECT_EQ(ret, nullptr); + SoftbusConnector::discoveryDeviceInfoMap_.clear(); } /** @@ -259,7 +261,7 @@ HWTEST_F(SoftbusConnectorTest, GetConnectAddr_003, testing::ext::TestSize.Level1 deviceInfo->addr[0].info.ip.port = 0; SoftbusConnector::discoveryDeviceInfoMap_[deviceId] = deviceInfo; std::shared_ptr softbusConnector = std::make_shared(); - ConnectionAddr *ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); + std::shared_ptr ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); EXPECT_NE(ret, nullptr); SoftbusConnector::discoveryDeviceInfoMap_.clear(); } @@ -282,7 +284,7 @@ HWTEST_F(SoftbusConnectorTest, GetConnectAddr_004, testing::ext::TestSize.Level1 deviceInfo->addr[0].info.ip.port = 0; SoftbusConnector::discoveryDeviceInfoMap_[deviceId] = deviceInfo; std::shared_ptr softbusConnector = std::make_shared(); - ConnectionAddr *ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); + std::shared_ptr ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); EXPECT_NE(ret, nullptr); SoftbusConnector::discoveryDeviceInfoMap_.clear(); } @@ -304,7 +306,7 @@ HWTEST_F(SoftbusConnectorTest, GetConnectAddr_005, testing::ext::TestSize.Level1 (void)strncpy_s(deviceInfo->addr[0].info.br.brMac, IP_STR_MAX_LEN, brMac, strlen(brMac)); SoftbusConnector::discoveryDeviceInfoMap_[deviceId] = deviceInfo; std::shared_ptr softbusConnector = std::make_shared(); - ConnectionAddr *ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); + std::shared_ptr ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); EXPECT_NE(ret, nullptr); SoftbusConnector::discoveryDeviceInfoMap_.clear(); } @@ -326,11 +328,57 @@ HWTEST_F(SoftbusConnectorTest, GetConnectAddr_006, testing::ext::TestSize.Level1 (void)strncpy_s(deviceInfo->addr[0].info.ble.bleMac, IP_STR_MAX_LEN, bleMac, strlen(bleMac)); SoftbusConnector::discoveryDeviceInfoMap_[deviceId] = deviceInfo; std::shared_ptr softbusConnector = std::make_shared(); - ConnectionAddr *ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); + std::shared_ptr ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); + EXPECT_NE(ret, nullptr); + SoftbusConnector::discoveryDeviceInfoMap_.clear(); +} + +/** + * @tc.name: GetConnectAddr_007 + * @tc.desc:set deviceInfo.addrNum = 1 + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(SoftbusConnectorTest, GetConnectAddr_007, testing::ext::TestSize.Level1) +{ + std::string deviceId = "123345"; + std::shared_ptr deviceInfo = std::make_shared(); + std::string connectAddr; + constexpr char ncmIp[] = "4.4.4.4"; + deviceInfo->addrNum = 1; + deviceInfo->addr[0].type = CONNECTION_ADDR_NCM; + (void)strncpy_s(deviceInfo->addr[0].info.ip.ip, IP_STR_MAX_LEN, ncmIp, strlen(ncmIp)); + deviceInfo->addr[0].info.ip.port = 0; + SoftbusConnector::discoveryDeviceInfoMap_[deviceId] = deviceInfo; + std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); EXPECT_NE(ret, nullptr); SoftbusConnector::discoveryDeviceInfoMap_.clear(); } +/** + * @tc.name: GetConnectAddr_008 + * @tc.desc:set deviceInfo.addrNum = 1 + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(SoftbusConnectorTest, GetConnectAddr_008, testing::ext::TestSize.Level1) +{ + std::string deviceId = "123345"; + std::shared_ptr deviceInfo = std::make_shared(); + std::string connectAddr; + constexpr char addrIp[] = "5.5.5.5"; + deviceInfo->addrNum = 1; + deviceInfo->addr[0].type = CONNECTION_ADDR_MAX; + (void)strncpy_s(deviceInfo->addr[0].info.ip.ip, IP_STR_MAX_LEN, addrIp, strlen(addrIp)); + deviceInfo->addr[0].info.ip.port = 0; + SoftbusConnector::discoveryDeviceInfoMap_[deviceId] = deviceInfo; + std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr ret = softbusConnector->GetConnectAddr(deviceId, connectAddr); + EXPECT_EQ(ret, nullptr); + SoftbusConnector::discoveryDeviceInfoMap_.clear(); +} + /** * @tc.name: ConvertNodeBasicInfoToDmDevice_001 * @tc.desc: go to the correct case and return DM_OK diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index 9b18faf5ca0a2729a79632cb6fc92e24f40d1315..b76deb9e82f3018147987172461cbde3bece81f3 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -488,6 +488,56 @@ HWTEST_F(SoftbusListenerTest, ConvertDeviceInfoToDmDevice_006, testing::ext::Tes EXPECT_EQ(softbusListener->isRadarSoLoad_, true); } +HWTEST_F(SoftbusListenerTest, ConvertDeviceInfoToDmDevice_007, testing::ext::TestSize.Level1) +{ + DmDeviceInfo dmDevice; + DeviceInfo deviceInfo = { + .devId = "deviceId", + .devType = (DeviceType)1, + .devName = "11111", + .addrNum = 1, + .addr[0] = { + .type = static_cast(CONNECTION_ADDR_USB), + .info { + .ip { + .ip = "172.0.0.1", + .port = 0, + } + } + } + }; + if (softbusListener == nullptr) { + softbusListener = std::make_shared(); + } + softbusListener->ConvertDeviceInfoToDmDevice(deviceInfo, dmDevice); + EXPECT_EQ(softbusListener->isRadarSoLoad_, true); +} + +HWTEST_F(SoftbusListenerTest, ConvertDeviceInfoToDmDevice_008, testing::ext::TestSize.Level1) +{ + DmDeviceInfo dmDevice; + DeviceInfo deviceInfo = { + .devId = "deviceId", + .devType = (DeviceType)1, + .devName = "11111", + .addrNum = 1, + .addr[0] = { + .type = ConnectionAddrType::CONNECTION_ADDR_NCM, + .info { + .ip { + .ip = "172.0.0.1", + .port = 0, + } + } + } + }; + if (softbusListener == nullptr) { + softbusListener = std::make_shared(); + } + softbusListener->ConvertDeviceInfoToDmDevice(deviceInfo, dmDevice); + EXPECT_EQ(softbusListener->isRadarSoLoad_, true); +} + HWTEST_F(SoftbusListenerTest, GetNetworkTypeByNetworkId_001, testing::ext::TestSize.Level1) { char *networkId; @@ -941,6 +991,7 @@ HWTEST_F(SoftbusListenerTest, GetIPAddrTypeFromCache_002, testing::ext::TestSize } int32_t ret = softbusListener->GetIPAddrTypeFromCache(deviceId, ip, addrType); EXPECT_EQ(ret, ERR_DM_BIND_INPUT_PARA_INVALID); + discoveredDeviceMap.clear(); } HWTEST_F(SoftbusListenerTest, GetIPAddrTypeFromCache_003, testing::ext::TestSize.Level1) @@ -958,6 +1009,7 @@ HWTEST_F(SoftbusListenerTest, GetIPAddrTypeFromCache_003, testing::ext::TestSize } int32_t ret = softbusListener->GetIPAddrTypeFromCache(deviceId, ip, addrType); EXPECT_EQ(ret, ERR_DM_BIND_INPUT_PARA_INVALID); + discoveredDeviceMap.clear(); } HWTEST_F(SoftbusListenerTest, GetIPAddrTypeFromCache_004, testing::ext::TestSize.Level1) @@ -986,7 +1038,95 @@ HWTEST_F(SoftbusListenerTest, GetIPAddrTypeFromCache_004, testing::ext::TestSize } int32_t ret = softbusListener->GetIPAddrTypeFromCache(deviceId, ip, addrType); softbusListener->CacheDeviceInfo(deviceId, infoPtr); + EXPECT_EQ(ret, DM_OK); + discoveredDeviceMap.clear(); +} + +HWTEST_F(SoftbusListenerTest, GetIPAddrTypeFromCache_005, testing::ext::TestSize.Level1) +{ + std::string deviceId = "deviceId"; + std::string ip = "172.0.0.1"; + ConnectionAddrType addrType = ConnectionAddrType::CONNECTION_ADDR_ETH; + std::shared_ptr infoPtr = std::make_shared(); + infoPtr->devType = (DeviceType)1; + infoPtr->addrNum = 1; + infoPtr->addr[0] = { + .type = ConnectionAddrType::CONNECTION_ADDR_ETH, + .info { + .ip { + .ip = "172.0.0.1", + .port = 0, + } + } + }; + std::vector>> deviceVec; + deviceVec.push_back(std::pair>(addrType, infoPtr)); + discoveredDeviceMap.insert(std::pair>>>(deviceId, deviceVec)); + if (softbusListener == nullptr) { + softbusListener = std::make_shared(); + } + int32_t ret = softbusListener->GetIPAddrTypeFromCache(deviceId, ip, addrType); + EXPECT_EQ(ret, DM_OK); + discoveredDeviceMap.clear(); +} + +HWTEST_F(SoftbusListenerTest, GetIPAddrTypeFromCache_006, testing::ext::TestSize.Level1) +{ + std::string deviceId = "deviceId"; + std::string ip = "172.0.0.1"; + ConnectionAddrType addrType = ConnectionAddrType::CONNECTION_ADDR_NCM; + std::shared_ptr infoPtr = std::make_shared(); + infoPtr->devType = (DeviceType)1; + infoPtr->addrNum = 1; + infoPtr->addr[0] = { + .type = ConnectionAddrType::CONNECTION_ADDR_NCM, + .info { + .ip { + .ip = "172.0.0.1", + .port = 0, + } + } + }; + std::vector>> deviceVec; + deviceVec.push_back(std::pair>(addrType, infoPtr)); + discoveredDeviceMap.insert(std::pair>>>(deviceId, deviceVec)); + if (softbusListener == nullptr) { + softbusListener = std::make_shared(); + } + int32_t ret = softbusListener->GetIPAddrTypeFromCache(deviceId, ip, addrType); + EXPECT_EQ(ret, DM_OK); + discoveredDeviceMap.clear(); +} + +HWTEST_F(SoftbusListenerTest, GetIPAddrTypeFromCache_007, testing::ext::TestSize.Level1) +{ + std::string deviceId = "deviceId"; + std::string ip = "172.0.0.2"; + ConnectionAddrType addrType = ConnectionAddrType::CONNECTION_ADDR_NCM; + std::shared_ptr infoPtr = std::make_shared(); + infoPtr->devType = (DeviceType)1; + infoPtr->addrNum = 1; + infoPtr->addr[0] = { + .type = ConnectionAddrType::CONNECTION_ADDR_NCM, + .info { + .ip { + .ip = "172.0.0.1", + .port = 0, + } + } + }; + std::vector>> deviceVec; + deviceVec.push_back(std::pair>(addrType, infoPtr)); + discoveredDeviceMap.insert(std::pair>>>(deviceId, deviceVec)); + if (softbusListener == nullptr) { + softbusListener = std::make_shared(); + } + int32_t ret = softbusListener->GetIPAddrTypeFromCache(deviceId, ip, addrType); EXPECT_EQ(ret, ERR_DM_BIND_INPUT_PARA_INVALID); + discoveredDeviceMap.clear(); } HWTEST_F(SoftbusListenerTest, InitSoftbusListener_001, testing::ext::TestSize.Level1) diff --git a/test/softbusunittest/UTTest_softbus_session.cpp b/test/softbusunittest/UTTest_softbus_session.cpp index e5618bb35a4801c8146e5374e8c107e00e20e702..3559e9d18fdece35730974946351d143f03839e0 100644 --- a/test/softbusunittest/UTTest_softbus_session.cpp +++ b/test/softbusunittest/UTTest_softbus_session.cpp @@ -80,7 +80,7 @@ HWTEST_F(SoftbusSessionTest, OpenAuthSession_002, testing::ext::TestSize.Level1) /** * @tc.name: SendData_001 - * @tc.desc: set message null and return ERR_DM_FAILED + * @tc.desc: set message null but sessionId is invalid, return SOFTBUS_INVALID_PARAM * @tc.type: FUNC * @tc.require: AR000GHSJK */ @@ -92,7 +92,7 @@ HWTEST_F(SoftbusSessionTest, SendData_001, testing::ext::TestSize.Level1) softbusSession = std::make_shared(); } int ret = softbusSession->SendData(sessionId, message); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); } /** @@ -119,7 +119,7 @@ HWTEST_F(SoftbusSessionTest, SendData_002, testing::ext::TestSize.Level1) /** * @tc.name: SendData_003 - * @tc.desc: set jsonObject[TAG_MSG_TYPE] is string and return ERR_DM_FAILED + * @tc.desc: set jsonObject[TAG_MSG_TYPE] is string but not openAuthSession, return SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED * @tc.type: FUNC * @tc.require: AR000GHSJK */ @@ -135,7 +135,7 @@ HWTEST_F(SoftbusSessionTest, SendData_003, testing::ext::TestSize.Level1) softbusSession = std::make_shared(); } int32_t ret = softbusSession->SendData(sessionId, message); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_SERVER_NOINIT); } /** @@ -241,12 +241,7 @@ HWTEST_F(SoftbusSessionTest, OnSessionOpened_001, testing::ext::TestSize.Level1) softbusSession->RegisterSessionCallback(discoveryMgr); int sessionId = 1; int result = 0; - void *data = nullptr; - unsigned int dataLen = 1; - softbusSession->OnBytesReceived(sessionId, data, dataLen); - softbusSession->OnBytesReceived(sessionId, data, -1); - sessionId = -1; - softbusSession->OnBytesReceived(sessionId, data, dataLen); + int ret = softbusSession->OnSessionOpened(sessionId, result); softbusSession->OnSessionClosed(sessionId); EXPECT_EQ(ret, DM_OK); diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 0b5a1995981dd49338dfd2fa55508420e53a3d8b..4901c787a25e7b7b385bad8cfb3cb6578736629d 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -21,7 +21,13 @@ group("unittest") { deps = [ ":UTTest_advertise_manager", ":UTTest_app_manager", + ":UTTest_auth_acl", + ":UTTest_auth_confirm", + ":UTTest_auth_credential_state", + ":UTTest_auth_manager", ":UTTest_auth_message_processor", + ":UTTest_auth_negotiate", + ":UTTest_auth_pin_auth_state", ":UTTest_auth_request_state", ":UTTest_auth_response_state", ":UTTest_crypto_mgr", @@ -42,6 +48,7 @@ group("unittest") { ":UTTest_dm_auth_manager_first", ":UTTest_dm_auth_manager_second", ":UTTest_dm_auth_manager_third", + ":UTTest_dm_auth_message_processor", ":UTTest_dm_comm_tool", ":UTTest_dm_common_event_manager", ":UTTest_dm_credential_manager", @@ -63,6 +70,7 @@ group("unittest") { ":UTTest_dm_transport", ":UTTest_dm_transport_msg", ":UTTest_dp_inited_callback", + ":UTTest_freeze_process", ":UTTest_hichain_auth_connector", ":UTTest_hichain_connector", ":UTTest_hichain_listener", @@ -81,7 +89,9 @@ group("unittest") { ":UTTest_kv_adapter_manager", ":UTTest_mine_hichain_connector", ":UTTest_mine_softbus_listener", + ":UTTest_mini_tools_kit", ":UTTest_multiple_user_connector", + ":UTTest_oh_device_manager", ":UTTest_permission_manager", ":UTTest_pin_auth", ":UTTest_pin_auth_ui", @@ -108,7 +118,6 @@ ohos_unittest("UTTest_pin_auth") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", "device_auth:deviceauth_sdk", @@ -204,6 +213,7 @@ ohos_unittest("UTTest_ipc_cmd_parser_service") { "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", + "eventhandler:libeventhandler", "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock", @@ -257,11 +267,13 @@ ohos_unittest("UTTest_dm_pin_holder") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "cJSON:cjson", "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock", "hilog:libhilog", + "selinux_adapter:librestorecon", ] } @@ -342,11 +354,13 @@ ohos_unittest("UTTest_dm_credential_manager") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "cJSON:cjson_static", "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock", "hilog:libhilog", + "selinux_adapter:librestorecon", ] } @@ -387,6 +401,7 @@ ohos_unittest("UTTest_device_manager_service") { "googletest:gmock", "googletest:gmock_main", "hilog:libhilog", + "selinux_adapter:librestorecon", ] } @@ -413,6 +428,7 @@ ohos_unittest("UTTest_dm_softbus_cache") { "googletest:gmock", "googletest:gmock_main", "hilog:libhilog", + "selinux_adapter:librestorecon", ] } @@ -445,6 +461,7 @@ ohos_unittest("UTTest_device_manager_service_three") { "googletest:gmock", "googletest:gmock_main", "hilog:libhilog", + "selinux_adapter:librestorecon", ] } @@ -462,7 +479,6 @@ ohos_unittest("UTTest_device_manager_service_notify") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", @@ -557,8 +573,8 @@ ohos_unittest("UTTest_mine_softbus_listener") { deps = [ ":device_manager_test_common", - "${services_path}:devicemanagerservice", - "${utils_path}:devicemanagerutils", + "${services_path}:devicemanagerservicetest", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -810,6 +826,7 @@ ohos_unittest("UTTest_dm_transport") { "cJSON:cjson", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "ffrt:libffrt", "googletest:gmock", "hilog:libhilog", ] @@ -826,6 +843,7 @@ ohos_unittest("UTTest_dm_transport_msg") { deps = [ ":device_manager_test_common" ] external_deps = [ "cJSON:cjson", + "ffrt:libffrt", "googletest:gmock", "hilog:libhilog", ] @@ -924,6 +942,7 @@ ohos_unittest("UTTest_ipc_server_client_proxy") { "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", + "eventhandler:libeventhandler", "ffrt:libffrt", "googletest:gmock", "hicollie:libhicollie", @@ -943,7 +962,6 @@ ohos_unittest("UTTest_ipc_server_listener") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", "device_auth:deviceauth_sdk", @@ -997,12 +1015,14 @@ ohos_unittest("UTTest_device_manager_impl") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "cJSON:cjson_static", "device_auth:deviceauth_sdk", "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock", "googletest:gmock_main", "hilog:libhilog", + "selinux_adapter:librestorecon", ] cflags = [ @@ -1028,10 +1048,12 @@ ohos_unittest("UTTest_dm_import_auth_code") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", + "cJSON:cjson_static", "device_auth:deviceauth_sdk", "ffrt:libffrt", "googletest:gmock", "hilog:libhilog", + "selinux_adapter:librestorecon", ] } @@ -1084,11 +1106,49 @@ ohos_unittest("UTTest_permission_manager") { "googletest:gmock", "googletest:gmock_main", "hilog:libhilog", + "selinux_adapter:librestorecon", ] } ## UnitTest UTTest_permission_manager }}} +## UnitTest UTTest_oh_device_manager {{{ +ohos_unittest("UTTest_oh_device_manager") { + module_out_path = module_out_path + + include_dirs = [ + "${devicemanager_path}/interfaces/kits/ndk/include", + "${common_path}/include", + "${common_path}/include/ipc", + "${innerkits_path}/native_cpp/include", + ] + sources = [ + "${devicemanager_path}/interfaces/kits/ndk/src/dm_client.cpp", + "${devicemanager_path}/interfaces/kits/ndk/src/oh_device_manager.cpp", + "${devicemanager_path}/test/unittest/UTTest_oh_device_manager.cpp", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanager_ndk\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${utils_path}:devicemanagerutils", + ] + + external_deps = [ + "c_utils:utils", + "eventhandler:libeventhandler", + "hilog:libhilog", + "ipc:ipc_core", + ] +} + +## UnitTest UTTest_oh_device_manager }}} + ## UnitTest UTTest_device_manager_notify {{{ ohos_unittest("UTTest_device_manager_notify") { module_out_path = module_out_path @@ -1140,6 +1200,8 @@ ohos_unittest("UTTest_dm_device_state_manager") { external_deps = [ "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock", @@ -1159,6 +1221,7 @@ ohos_unittest("UTTest_dm_device_state_manager_two") { sources = [ "${devicemanager_path}/test/commonunittest/UTTest_dm_device_state_manager_two.cpp", + "mock/dm_crypto_mock.cpp", "mock/softbus_connector_mock.cpp", ] @@ -1166,6 +1229,8 @@ ohos_unittest("UTTest_dm_device_state_manager_two") { external_deps = [ "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock", @@ -1202,7 +1267,6 @@ ohos_unittest("UTTest_device_manager_service_impl") { module_out_path = module_out_path sources = [ - "${devicemanager_path}/commondependency/src/multiple_user_connector.cpp", "${servicesimpl_path}/src/device_manager_service_impl.cpp", "UTTest_device_manager_service_impl.cpp", "mock/deviceprofile_connector_mock.cpp", @@ -1657,6 +1721,7 @@ ohos_unittest("UTTest_dm_comm_tool") { "cJSON:cjson", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "ffrt:libffrt", "googletest:gmock", "googletest:gmock_main", "hilog:libhilog", @@ -1755,6 +1820,7 @@ ohos_unittest("UTTest_relationship_sync_mgr") { external_deps = [ "cJSON:cjson", + "ffrt:libffrt", "hilog:libhilog", ] } @@ -1772,10 +1838,7 @@ ohos_unittest("UTTest_hichain_listener") { deps = [ ":device_manager_test_common" ] - external_deps = [ - "cJSON:cjson", - "hilog:libhilog", - ] + external_deps = [ "hilog:libhilog" ] } ## UnitTest UTTest_hichain_listener }}} @@ -1912,7 +1975,6 @@ ohos_unittest("UTTest_device_name_manager") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", "googletest:gmock", @@ -1943,6 +2005,7 @@ ohos_unittest("UTTest_advertise_manager") { external_deps = [ "cJSON:cjson", + "device_auth:deviceauth_sdk", "device_info_manager:distributed_device_profile_common", "device_info_manager:distributed_device_profile_sdk", "dsoftbus:softbus_client", @@ -1954,6 +2017,21 @@ ohos_unittest("UTTest_advertise_manager") { ## UnitTest UTTest_advertise_manager }}} +## UnitTest UTTest_mini_tools_kit +ohos_unittest("UTTest_mini_tools_kit") { + module_out_path = module_out_path + + sources = [ "${devicemanager_path}/test/unittest/UTTest_mini_tools_kit.cpp" ] + + deps = [ ":device_manager_test_common" ] + + external_deps = [ + "ffrt:libffrt", + "googletest:gmock", + "googletest:gmock_main", + ] +} + ## UnitTest UTTest_json_object {{{ ohos_unittest("UTTest_json_object") { module_out_path = module_out_path @@ -1965,7 +2043,6 @@ ohos_unittest("UTTest_json_object") { deps = [ ":device_manager_test_common" ] external_deps = [ - "cJSON:cjson", "ffrt:libffrt", "googletest:gmock", "googletest:gmock_main", @@ -1975,6 +2052,218 @@ ohos_unittest("UTTest_json_object") { ## UnitTest UTTest_json_object }}} +## UnitTest UTTest_auth_pin_auth_state {{{ + +ohos_unittest("UTTest_auth_pin_auth_state") { + module_out_path = module_out_path + + include_dirs = [] + + sources = [ + "${devicemanager_path}/test/unittest/UTTest_auth_pin_auth_state.cpp", + "${devicemanager_path}/test/unittest/mock/dm_auth_state_machine_mock.cpp", + "${devicemanager_path}/test/unittest/mock/hichain_auth_connector_mock.cpp", + ] + + deps = [ ":device_manager_test_common" ] + + external_deps = [ + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "googletest:gmock", + "googletest:gmock_main", + "hilog:libhilog", + ] +} + +## UnitTest UTTest_auth_pin_auth_state }}} + +## UnitTest UTTest_dm_auth_message_processor {{{ + +ohos_unittest("UTTest_dm_auth_message_processor") { + module_out_path = module_out_path + + include_dirs = [] + + sources = [ + "${devicemanager_path}/test/unittest/UTTest_dm_auth_message_processor.cpp", + ] + + deps = [ ":device_manager_test_common" ] + + external_deps = [ + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "googletest:gmock", + "googletest:gmock_main", + "hilog:libhilog", + ] +} + +## UnitTest UTTest_dm_auth_message_processor }}} + +## UnitTest UTTest_auth_credential_state {{{ + +ohos_unittest("UTTest_auth_credential_state") { + module_out_path = module_out_path + + include_dirs = [] + + sources = [ + "${devicemanager_path}/test/unittest/UTTest_auth_credential_state.cpp", + "${devicemanager_path}/test/unittest/mock/dm_auth_message_processor_mock.cpp", + "${devicemanager_path}/test/unittest/mock/dm_auth_state_machine_mock.cpp", + "${devicemanager_path}/test/unittest/mock/hichain_auth_connector_mock.cpp", + "${devicemanager_path}/test/unittest/mock/softbus_session_mock.cpp", + ] + + deps = [ ":device_manager_test_common" ] + + external_deps = [ + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "googletest:gmock", + "googletest:gmock_main", + "hilog:libhilog", + ] +} + +## UnitTest UTTest_auth_credential_state }}} +## UnitTest UTTest_auth_acl {{{ + +ohos_unittest("UTTest_auth_acl") { + module_out_path = module_out_path + + include_dirs = [] + + sources = [ + "${devicemanager_path}/test/unittest/UTTest_auth_acl.cpp", + "${devicemanager_path}/test/unittest/mock/dm_auth_message_processor_mock.cpp", + "${devicemanager_path}/test/unittest/mock/dm_auth_state_machine_mock.cpp", + "${devicemanager_path}/test/unittest/mock/hichain_auth_connector_mock.cpp", + "${devicemanager_path}/test/unittest/mock/softbus_connector_mock.cpp", + "${devicemanager_path}/test/unittest/mock/softbus_session_mock.cpp", + ] + + deps = [ ":device_manager_test_common" ] + + external_deps = [ + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "googletest:gmock", + "googletest:gmock_main", + "hilog:libhilog", + ] +} + +## UnitTest UTTest_auth_acl }}} + +## UnitTest UTTest_auth_negotiate {{{ + +ohos_unittest("UTTest_auth_negotiate") { + module_out_path = module_out_path + + include_dirs = [] + + sources = [ + "${devicemanager_path}/test/unittest/UTTest_auth_negotiate.cpp", + "${devicemanager_path}/test/unittest/mock/accesstoken_kit_mock.cpp", + "${devicemanager_path}/test/unittest/mock/softbus_connector_mock.cpp", + "${devicemanager_path}/test/unittest/mock/softbus_session_mock.cpp", + "${devicemanager_path}/test/unittest/mock/distributed_device_profile_client_mock.cpp", + ] + + deps = [ ":device_manager_test_common" ] + + external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "googletest:gmock", + "googletest:gmock_main", + "hilog:libhilog", + ] +} + +## UnitTest UTTest_auth_negotiate }}} + +## UnitTest UTTest_auth_manager {{{ + +ohos_unittest("UTTest_auth_manager") { + module_out_path = module_out_path + + include_dirs = [] + + sources = [ + "${devicemanager_path}/test/unittest/UTTest_auth_manager.cpp", + "${devicemanager_path}/test/unittest/mock/distributed_device_profile_client_mock.cpp", + ] + + deps = [ ":device_manager_test_common" ] + + external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "googletest:gmock", + "googletest:gmock_main", + "hilog:libhilog", + ] +} + +## UnitTest UTTest_auth_manager }}} + +## UnitTest UTTest_auth_confirm {{{ + +ohos_unittest("UTTest_auth_confirm") { + module_out_path = module_out_path + + include_dirs = [] + + sources = [ + "${devicemanager_path}/test/unittest/UTTest_auth_confirm.cpp", + "${devicemanager_path}/test/unittest/mock/deviceprofile_connector_mock.cpp", + "${devicemanager_path}/test/unittest/mock/hichain_auth_connector_mock.cpp", + ] + + deps = [ ":device_manager_test_common" ] + + external_deps = [ + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "ffrt:libffrt", + "googletest:gmock", + "googletest:gmock_main", + "hilog:libhilog", + ] +} + +## UnitTest UTTest_auth_confirm }}} + ## Build device_manager_test_common.a {{{ config("device_manager_test_common_public_config") { include_dirs = [ @@ -1991,6 +2280,7 @@ config("device_manager_test_common_public_config") { "${utils_path}/include/crypto", "${utils_path}/include/fwkload/standard", "${utils_path}/include/timer", + "${json_path}/include", "${servicesimpl_path}/include", "${servicesimpl_path}/include/credential", "${servicesimpl_path}/include/discovery", @@ -2043,15 +2333,17 @@ ohos_static_library("device_manager_test_common") { public_configs = [ ":device_manager_test_common_public_config" ] public_deps = [ - "${devicemanager_path}/commondependency:devicemanagerdependency", + "${devicemanager_path}/commondependency:devicemanagerdependencytest", "${devicemanager_path}/interfaces/kits/js:devicemanager", - "${devicemanager_path}/radar:devicemanagerradar", + "${devicemanager_path}/radar:devicemanagerradartest", "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${json_path}:devicemanagerjson", + "${mini_tools_kits_path}/native_cpp:devicemanagerminisdk", + "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", "${softbuscache_parh}:dmdevicecache", - "${utils_path}:devicemanagerutils", + "${utils_path}:devicemanagerutilstest", ] external_deps = [ @@ -2059,9 +2351,7 @@ ohos_static_library("device_manager_test_common") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", - "cJSON:cjson", "c_utils:utils", - "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", @@ -2092,3 +2382,24 @@ ohos_static_library("device_manager_test_common") { part_name = "device_manager" } ## Build device_manager_test_common.a }}} + +## UnitTest UTTest_freeze_process {{{ + +ohos_unittest("UTTest_freeze_process") { + module_out_path = module_out_path + + sources = [ "UTTest_freeze_process.cpp" ] + + deps = [ ":device_manager_test_common" ] + + external_deps = [ + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "ffrt:libffrt", + "googletest:gmock", + "hilog:libhilog", + ] +} + +## UnitTest UTTest_freeze_process }}} diff --git a/test/unittest/UTTest_app_manager.cpp b/test/unittest/UTTest_app_manager.cpp index b9901d222a98c412a8bddcff38e39c31aa6d8383..0c1d7c4d34b53e20f38f11bd4f8e7c3a4f82df00 100644 --- a/test/unittest/UTTest_app_manager.cpp +++ b/test/unittest/UTTest_app_manager.cpp @@ -333,5 +333,26 @@ HWTEST_F(AppManagerTest, GetCallerProcessName_002, testing::ext::TestSize.Level2 auto ret = AppManager::GetInstance().GetCallerProcessName(output); EXPECT_EQ(ret, ERR_DM_FAILED); } + +HWTEST_F(AppManagerTest, GetBundleNameForSelf_001, testing::ext::TestSize.Level2) +{ + ASSERT_TRUE(client_ != nullptr); + auto bundleMgr = sptr(new (std::nothrow) BundleMgrMock()); + auto systemAbilityManager = sptr(new (std::nothrow) SystemAbilityManagerMock()); + EXPECT_CALL(*systemAbilityManager, GetSystemAbility(_)) + .Times(INVOKE_COUNT) + .WillOnce(Return(bundleMgr)); + EXPECT_CALL(*client_, GetSystemAbilityManager()) + .Times(INVOKE_COUNT) + .WillOnce(Return(systemAbilityManager)); + EXPECT_CALL(*bundleMgr, GetBundleInfoForSelf(_, _)) + .Times(INVOKE_COUNT) + .WillOnce(Return(ERR_OK)); + + std::string bundleName = ""; + auto result = AppManager::GetInstance().GetBundleNameForSelf(bundleName); + EXPECT_EQ(result, DM_OK); + EXPECT_EQ(bundleName, ""); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_auth_acl.cpp b/test/unittest/UTTest_auth_acl.cpp new file mode 100644 index 0000000000000000000000000000000000000000..922aa65f5becb5172be34b0e84b4b33c923231f9 --- /dev/null +++ b/test/unittest/UTTest_auth_acl.cpp @@ -0,0 +1,137 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_auth_state.h" +#include "UTTest_auth_acl.h" +#include "dm_auth_message_processor_mock.h" +#include "device_manager_service_listener.h" + +using namespace testing; + +namespace OHOS { +namespace DistributedHardware { +constexpr const char *TEST_NONE_EMPTY_STRING = "test"; +void AuthAclTest::SetUpTestCase() +{ + LOGI("AuthAclTest::SetUpTestCase start."); + DmSoftbusConnector::dmSoftbusConnector = dmSoftbusConnectorMock; + DmSoftbusSession::dmSoftbusSession = dmSoftbusSessionMock; + DmAuthMessageProcessorMock::dmAuthMessageProcessorMock = std::make_shared(); +} + +void AuthAclTest::TearDownTestCase() +{ + LOGI("AuthAclTest::TearDownTestCase start."); + DmSoftbusConnector::dmSoftbusConnector = nullptr; + dmSoftbusConnectorMock = nullptr; + DmSoftbusSession::dmSoftbusSession = nullptr; + dmSoftbusSessionMock = nullptr; + DmAuthMessageProcessorMock::dmAuthMessageProcessorMock = nullptr; +} + +void AuthAclTest::SetUp() +{ + LOGI("AuthAclTest::SetUp start."); + softbusConnector = std::make_shared(); + listener = std::make_shared(); + hiChainAuthConnector = std::make_shared(); + hiChainConnector = std::make_shared(); +} + +void AuthAclTest::TearDown() +{ + LOGI("AuthAclTest::TearDown start."); + authManager = nullptr; + context = nullptr; + + Mock::VerifyAndClearExpectations(&*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock); + Mock::VerifyAndClearExpectations(&*DmSoftbusConnector::dmSoftbusConnector); + Mock::VerifyAndClearExpectations(&*DmSoftbusSession::dmSoftbusSession); +} + +HWTEST_F(AuthAclTest, AuthSinkAcl_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->accessee.deviceId = "accessee_deviceId"; + context->accesser.deviceId = "accesser_deviceId"; + context->accesser.aclStrList = "aclList"; + EXPECT_CALL(*dmSoftbusConnectorMock, SyncLocalAclListProcess(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthAclTest, AuthSinkAcl_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_DATA_SYNC_STATE); +} + +HWTEST_F(AuthAclTest, AuthSrcAcl_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction = DM_AUTH_SOURCE; + context->accesser.isAuthed = true; // no need to agree acl + context->accesser.isOnline = true; // no need to join network + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(DM_OK)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthAclTest, AuthSrcAcl_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_DATA_SYNC_STATE); +} + +HWTEST_F(AuthAclTest, AuthSrcFinish_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->reason = DM_OK; + context->connDelayCloseTime = 10; + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthAclTest, AuthSrcFinish_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_FINISH_STATE); +} +} +} \ No newline at end of file diff --git a/test/unittest/UTTest_auth_acl.h b/test/unittest/UTTest_auth_acl.h new file mode 100644 index 0000000000000000000000000000000000000000..3f61374c08a58ae720326dd6cd2bbf89e43955e0 --- /dev/null +++ b/test/unittest/UTTest_auth_acl.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DM_AUTH_ACL_TEST_H +#define OHOS_DM_AUTH_ACL_TEST_H + + +#include +#include "hichain_auth_connector_mock.h" +#include "softbus_connector_mock.h" +#include "softbus_session_mock.h" +#include "auth_manager.h" + +namespace OHOS { +namespace DistributedHardware { +class AuthAclTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); +private: + static inline std::shared_ptr dmSoftbusConnectorMock = + std::make_shared(); + static inline std::shared_ptr dmSoftbusSessionMock = + std::make_shared(); + std::shared_ptr softbusConnector; + std::shared_ptr listener; + std::shared_ptr hiChainAuthConnector; + std::shared_ptr hiChainConnector; + std::shared_ptr authManager; + std::shared_ptr context; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif diff --git a/test/unittest/UTTest_auth_confirm.cpp b/test/unittest/UTTest_auth_confirm.cpp new file mode 100644 index 0000000000000000000000000000000000000000..941637c7e0ccfbbd0531d9ba6c2ba7f79fc839ed --- /dev/null +++ b/test/unittest/UTTest_auth_confirm.cpp @@ -0,0 +1,454 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "device_manager_service_listener.h" +#include "dm_auth_state.h" +#include "dm_crypto.h" +#include "UTTest_auth_confirm.h" + +namespace OHOS { +namespace DistributedHardware { + +using namespace testing; + +namespace { +constexpr const char *TEST_DEVICE_ID = "deviceId"; +constexpr const int32_t TEST_USER_ID = 0; +constexpr const int64_t TEST_TOKEN_ID = 0; +constexpr const char *TEST_CREDENTIAL_ID = "credentialId"; +constexpr const char *TEST_IDENTIAL_CRED_ID = "identialCredId"; +constexpr const char *TEST_SHARE_CRED_ID = "shareCredId"; +constexpr const char *TEST_POINT_TO_POINT_CRED_ID = "p2pCredId"; +constexpr const char *TEST_LNN_CRED_ID = "lnnCredId"; + +DistributedDeviceProfile::AccessControlProfile TestCreateAcl(const std::string credIdStr, int32_t bindType) +{ + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(TEST_DEVICE_ID); + accesser.SetAccesserUserId(TEST_USER_ID); + accesser.SetAccesserTokenId(TEST_TOKEN_ID); + accesser.SetAccesserCredentialIdStr(credIdStr); + + DistributedDeviceProfile::Accessee accesee; + accesee.SetAccesseeDeviceId(TEST_DEVICE_ID); + accesee.SetAccesseeUserId(TEST_USER_ID); + accesee.SetAccesseeTokenId(TEST_TOKEN_ID); + accesee.SetAccesseeCredentialIdStr(credIdStr); + + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetAccesser(accesser); + profile.SetAccessee(accesee); + profile.SetTrustDeviceId(TEST_DEVICE_ID); + profile.SetBindType(bindType); + return profile; +} + +void TestSetContext(std::shared_ptr context) +{ + context->accesser.deviceId = TEST_DEVICE_ID; + context->accesser.userId = TEST_USER_ID; + context->accesser.tokenId = TEST_TOKEN_ID; + context->accesser.deviceIdHash = Crypto::Sha256(context->accesser.deviceId); + context->accesser.tokenIdHash = Crypto::Sha256(std::to_string(context->accesser.tokenId)); + context->accessee.deviceId = TEST_DEVICE_ID; + context->accessee.userId = TEST_USER_ID; + context->accessee.tokenId = TEST_TOKEN_ID; + context->accessee.deviceIdHash = Crypto::Sha256(context->accessee.deviceId); + context->accessee.tokenIdHash = Crypto::Sha256(std::to_string(context->accessee.tokenId)); +} +} + +std::shared_ptr AuthConfirmTest::deviceProfileConnectorMock = nullptr; +std::shared_ptr AuthConfirmTest::dmHiChainAuthConnectorMock = nullptr; + +void AuthConfirmTest::SetUpTestCase() +{ + deviceProfileConnectorMock = std::make_shared(); + DmDeviceProfileConnector::dmDeviceProfileConnector = deviceProfileConnectorMock; + dmHiChainAuthConnectorMock = std::make_shared(); + DmHiChainAuthConnector::dmHiChainAuthConnector = dmHiChainAuthConnectorMock; +} + +void AuthConfirmTest::TearDownTestCase() +{ + deviceProfileConnectorMock = nullptr; + DmDeviceProfileConnector::dmDeviceProfileConnector = nullptr; + dmHiChainAuthConnectorMock = nullptr; + DmHiChainAuthConnector::dmHiChainAuthConnector = nullptr; +} + +void AuthConfirmTest::SetUp() +{ + LOGI("AuthConfirmTest::SetUp start."); + softbusConnector = std::make_shared(); + listener = std::make_shared(); + hiChainAuthConnector = std::make_shared(); + hiChainConnector = std::make_shared(); +} + +void AuthConfirmTest::TearDown() +{ + LOGI("AuthConfirmTest::TearDown start."); + softbusConnector = nullptr; + listener = nullptr; + hiChainAuthConnector = nullptr; + hiChainConnector = nullptr; + authManager = nullptr; + context = nullptr; + Mock::VerifyAndClearExpectations(deviceProfileConnectorMock.get()); + Mock::VerifyAndClearExpectations(dmHiChainAuthConnectorMock.get()); +} + +bool DmAuthState::IsScreenLocked() +{ + return false; +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_GetStateType_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_CONFIRM_STATE); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_Action_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->accessee.dmVersion = "6.0.0"; + EXPECT_EQ(authState->Action(context), ERR_DM_VERSION_INCOMPATIBLE); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_Action_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->accessee.dmVersion = DM_VERSION_5_1_0; + std::vector allProfiles; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetTrustDeviceId(context->accesser.deviceId); + profile.SetBindType(0); + allProfiles.push_back(profile); + profile.SetBindType(DM_IDENTICAL_ACCOUNT); + allProfiles.push_back(profile); + profile.SetBindType(DM_SHARE); + allProfiles.push_back(profile); + profile.SetBindType(DM_POINT_TO_POINT); + allProfiles.push_back(profile); + EXPECT_CALL(*deviceProfileConnectorMock, GetAllAclIncludeLnnAcl()).WillOnce(Return(allProfiles)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_NegotiateCredential_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + std::string jsonStr = R"({"identicalCredType":1,"shareCredType":2,"pointTopointCredType":256,"lnnCredType":3})"; + context = authManager->GetAuthContext(); + context->accessee.credTypeList = jsonStr; + context->accesser.credTypeList = jsonStr; + JsonObject jsonObject; + authState->NegotiateCredential(context, jsonObject); + EXPECT_TRUE(jsonObject["identicalCredType"].Get() == 1); + EXPECT_TRUE(jsonObject["shareCredType"].Get() == 2); + EXPECT_TRUE(jsonObject["pointTopointCredType"].Get() == 256); + EXPECT_TRUE(jsonObject["lnnCredType"].Get() == 3); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_NegotiateAcl_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + std::string jsonStr = R"({"identicalAcl":1,"shareAcl":2,"pointTopointAcl":256,"lnnAcl":3})"; + context = authManager->GetAuthContext(); + context->accessee.aclTypeList = jsonStr; + context->accesser.aclTypeList = jsonStr; + JsonObject jsonObject; + authState->NegotiateAcl(context, jsonObject); + EXPECT_TRUE(jsonObject["identicalAcl"].Get() == 1); + EXPECT_TRUE(jsonObject["shareAcl"].Get() == 2); + EXPECT_TRUE(jsonObject["pointTopointAcl"].Get() == 256); + EXPECT_TRUE(jsonObject["lnnAcl"].Get() == 3); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_GetSrcCredentialInfo_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + JsonObject jsonObject; + + context->accesser.accountIdHash = context->accessee.accountIdHash = ""; + EXPECT_CALL(*dmHiChainAuthConnectorMock, QueryCredentialInfo(_, _, _)).WillOnce(Return(DM_OK)); + authState->GetSrcCredentialInfo(context, jsonObject); + + context->accesser.accountIdHash = "0"; + context->accessee.accountIdHash = "1"; + EXPECT_CALL(*dmHiChainAuthConnectorMock, QueryCredentialInfo(_, _, _)) + .WillOnce(Return(DM_OK)) + .WillOnce(Return(DM_OK)); + authState->GetSrcCredentialInfo(context, jsonObject); + + context->accesser.accountIdHash = Crypto::Sha256("ohosAnonymousUid"); + EXPECT_CALL(*dmHiChainAuthConnectorMock, QueryCredentialInfo(_, _, _)) + .WillOnce(Return(DM_OK)) + .WillOnce(Return(DM_OK)); + authState->GetSrcCredentialInfo(context, jsonObject); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_IdenticalAccountAclCompare_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + TestSetContext(context); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(TEST_DEVICE_ID); + accesser.SetAccesserUserId(TEST_USER_ID); + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(TEST_DEVICE_ID); + EXPECT_FALSE(authState->IdenticalAccountAclCompare(context, accesser, accessee)); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_ShareAclCompare_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + TestSetContext(context); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(TEST_DEVICE_ID); + accesser.SetAccesserUserId(TEST_USER_ID); + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(TEST_DEVICE_ID); + + EXPECT_FALSE(authState->ShareAclCompare(context, accesser, accessee)); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_Point2PointAclCompare_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + TestSetContext(context); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(TEST_DEVICE_ID); + accesser.SetAccesserUserId(TEST_USER_ID); + accesser.SetAccesserTokenId(TEST_TOKEN_ID); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(TEST_DEVICE_ID); + accessee.SetAccesseeUserId(TEST_USER_ID); + accessee.SetAccesseeTokenId(TEST_TOKEN_ID); + + EXPECT_FALSE(authState->Point2PointAclCompare(context, accesser, accessee)); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_LnnAclCompare_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + TestSetContext(context); + + DistributedDeviceProfile::Accesser accesser; + accesser.SetAccesserDeviceId(TEST_DEVICE_ID); + accesser.SetAccesserUserId(TEST_USER_ID); + accesser.SetAccesserTokenId(TEST_TOKEN_ID); + accesser.SetAccesserBundleName(""); + + DistributedDeviceProfile::Accessee accessee; + accessee.SetAccesseeDeviceId(TEST_DEVICE_ID); + accessee.SetAccesseeUserId(TEST_USER_ID); + accessee.SetAccesseeTokenId(TEST_TOKEN_ID); + accessee.SetAccesseeBundleName(""); + + EXPECT_FALSE(authState->LnnAclCompare(context, accesser, accessee)); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_CheckCredIdInAcl_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + + + DistributedDeviceProfile::AccessControlProfile profile = TestCreateAcl(TEST_CREDENTIAL_ID, DM_LNN); + + std::string jsonStr = R"({ + "credentialId": { + "credType": 3, + "authorizedAppList": [0, 0] + } + })"; + JsonObject credInfo(jsonStr); + + EXPECT_TRUE(authState->CheckCredIdInAcl(context, profile, credInfo, DM_LNN)); +} + +HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_GetSrcCredType_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + + std::string jsonCredStr = R"([ + {"credType": 1, "credId": "0"}, + {"credType": 2, "credId": "0"} + ])"; + JsonObject credInfo(jsonCredStr); + + std::string aclJsonStr = R"({"lnnAcl":3,"pointTopointAcl":256})"; + JsonObject aclInfo(aclJsonStr); + + std::string credTypeJsonStr = R"({"identicalCredType":1,"shareCredType":2})"; + JsonObject credTypeJson; + authState->GetSrcCredType(context, credInfo, aclInfo, credTypeJson); + EXPECT_TRUE(credTypeJson.Dump() == credTypeJsonStr); +} + +HWTEST_F(AuthConfirmTest, AuthSinkConfirmState_GetStateType_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_CONFIRM_STATE); +} + +HWTEST_F(AuthConfirmTest, AuthSinkConfirmState_Action_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthConfirmTest, AuthSinkConfirmState_ShowConfigDialog_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + context->authType = DmAuthType::AUTH_TYPE_PIN; + EXPECT_EQ(authState->ShowConfigDialog(context), STOP_BIND); +} + +HWTEST_F(AuthConfirmTest, AuthSinkConfirmState_ReadServiceInfo_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + + context->authType = DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE; + context->serviceInfoFound = true; + + OHOS::DistributedDeviceProfile::LocalServiceInfo srvInfo; + srvInfo.SetAuthBoxType(static_cast(DMLocalServiceInfoAuthBoxType::SKIP_CONFIRM)); + + srvInfo.SetAuthType(static_cast(DMLocalServiceInfoAuthType::TRUST_ONETIME)); + EXPECT_CALL(*deviceProfileConnectorMock, GetLocalServiceInfoByBundleNameAndPinExchangeType(_, _, _)) + .WillOnce(DoAll(SetArgReferee<2>(srvInfo), Return(DM_OK))); + authState->ReadServiceInfo(context); + + srvInfo.SetAuthType(static_cast(DMLocalServiceInfoAuthType::CANCEL)); + EXPECT_CALL(*deviceProfileConnectorMock, GetLocalServiceInfoByBundleNameAndPinExchangeType(_, _, _)) + .WillOnce(DoAll(SetArgReferee<2>(srvInfo), Return(DM_OK))); + authState->ReadServiceInfo(context); + + srvInfo.SetAuthType(static_cast(DMLocalServiceInfoAuthType::TRUST_ALWAYS)); + EXPECT_CALL(*deviceProfileConnectorMock, GetLocalServiceInfoByBundleNameAndPinExchangeType(_, _, _)) + .WillOnce(DoAll(SetArgReferee<2>(srvInfo), Return(DM_OK))); + authState->ReadServiceInfo(context); +} + +HWTEST_F(AuthConfirmTest, AuthSinkConfirmState_MatchFallBackCandidateList_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + + authState->MatchFallBackCandidateList(context, DmAuthType::AUTH_TYPE_NFC); + EXPECT_TRUE(context->authTypeList.empty()); + + context->accessee.bundleName = "cast_engine_service"; + authState->MatchFallBackCandidateList(context, DmAuthType::AUTH_TYPE_NFC); + EXPECT_EQ(context->authTypeList[0], DmAuthType::AUTH_TYPE_PIN); +} + +HWTEST_F(AuthConfirmTest, AuthSinkConfirmState_ProcessBindAuthorize_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + + context->authType = DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE; + context->importAuthCode = "123456"; + context->importPkgName = "pkgName"; + context->pkgName = "pkgName"; + + OHOS::DistributedDeviceProfile::LocalServiceInfo srvInfo; + srvInfo.SetAuthBoxType(static_cast(DMLocalServiceInfoAuthBoxType::SKIP_CONFIRM)); + + srvInfo.SetAuthType(static_cast(DMLocalServiceInfoAuthType::TRUST_ONETIME)); + EXPECT_CALL(*deviceProfileConnectorMock, GetLocalServiceInfoByBundleNameAndPinExchangeType(_, _, _)) + .WillOnce(DoAll(SetArgReferee<2>(srvInfo), Return(DM_OK))); + + EXPECT_EQ(authState->ProcessBindAuthorize(context), DM_OK); +} + +HWTEST_F(AuthConfirmTest, AuthSinkConfirmState_ProcessNoBindAuthorize_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + std::shared_ptr authState = std::make_shared(); + context = authManager->GetAuthContext(); + + EXPECT_EQ(authState->ProcessNoBindAuthorize(context), ERR_DM_FAILED); + + context->accessee.credTypeList = R"({"identicalCredType": true})"; + EXPECT_EQ(authState->ProcessNoBindAuthorize(context), DM_OK); + + context->accessee.credTypeList = R"({"shareCredType": true})"; + EXPECT_EQ(authState->ProcessNoBindAuthorize(context), DM_OK); + + context->accessee.credTypeList = R"({"pointTopointCredType": true})"; + EXPECT_EQ(authState->ProcessNoBindAuthorize(context), DM_OK); + + context->accessee.credTypeList = R"({"lnnCredType": true})"; + EXPECT_EQ(authState->ProcessNoBindAuthorize(context), DM_OK); +} +} // end namespace DistributedHardware +} // end namespace OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_auth_confirm.h b/test/unittest/UTTest_auth_confirm.h new file mode 100644 index 0000000000000000000000000000000000000000..3009ba07912d6ff154806e301ff22930a70b5b20 --- /dev/null +++ b/test/unittest/UTTest_auth_confirm.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef UTTEST_AUTH_CONFIRM_H +#define UTTEST_AUTH_CONFIRM_H + +#include + +#include "auth_manager.h" +#include "deviceprofile_connector_mock.h" +#include "hichain_auth_connector_mock.h" + +namespace OHOS { +namespace DistributedHardware { + +class AuthConfirmTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); +private: + std::shared_ptr softbusConnector; + std::shared_ptr listener; + std::shared_ptr hiChainAuthConnector; + std::shared_ptr hiChainConnector; + std::shared_ptr authManager; + std::shared_ptr context; + static std::shared_ptr deviceProfileConnectorMock; + static std::shared_ptr dmHiChainAuthConnectorMock; +}; + +} // end namespace DistributedHardware +} // end namespace OHOS +#endif // end UTTEST_AUTH_CONFIRM_H \ No newline at end of file diff --git a/test/unittest/UTTest_auth_credential_state.cpp b/test/unittest/UTTest_auth_credential_state.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e8108c187c6e373bc9dea2499949eab13c1c00b6 --- /dev/null +++ b/test/unittest/UTTest_auth_credential_state.cpp @@ -0,0 +1,943 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_auth_state.h" +#include "UTTest_auth_credential_state.h" +#include "dm_auth_message_processor_mock.h" +#include "device_manager_service_listener.h" + +using namespace testing; + +namespace OHOS { +namespace DistributedHardware { + +constexpr const char *TEST_NONE_EMPTY_STRING = "test"; + +void AuthCredentialStateTest::SetUpTestCase() +{ + LOGI("AuthCredentialStateTest::SetUpTestCase start."); + DmHiChainAuthConnector::dmHiChainAuthConnector = dmHiChainAuthConnectorMock; + DmSoftbusSession::dmSoftbusSession = dmSoftbusSessionMock; + DmAuthStateMachineMock::dmAuthStateMachineMock = dmAuthStateMachineMock; + DmAuthMessageProcessorMock::dmAuthMessageProcessorMock = std::make_shared(); +} + +void AuthCredentialStateTest::TearDownTestCase() +{ + LOGI("AuthCredentialStateTest::TearDownTestCase start."); + DmHiChainAuthConnector::dmHiChainAuthConnector = nullptr; + dmHiChainAuthConnectorMock = nullptr; + DmSoftbusSession::dmSoftbusSession = nullptr; + dmSoftbusSessionMock = nullptr; + DmAuthStateMachineMock::dmAuthStateMachineMock = nullptr; + dmAuthStateMachineMock = nullptr; + DmAuthMessageProcessorMock::dmAuthMessageProcessorMock = nullptr; +} + +void AuthCredentialStateTest::SetUp() +{ + LOGI("AuthCredentialStateTest::SetUp start."); + softbusConnector = std::make_shared(); + listener = std::make_shared(); + hiChainAuthConnector = std::make_shared(); + hiChainConnector = std::make_shared(); +} + +void AuthCredentialStateTest::TearDown() +{ + LOGI("AuthCredentialStateTest::TearDown start."); + softbusConnector = nullptr; + listener = nullptr; + hiChainAuthConnector = nullptr; + authManager = nullptr; + context = nullptr; + Mock::VerifyAndClearExpectations(&*DmHiChainAuthConnector::dmHiChainAuthConnector); + Mock::VerifyAndClearExpectations(&*DmSoftbusSession::dmSoftbusSession); + Mock::VerifyAndClearExpectations(&*DmAuthStateMachineMock::dmAuthStateMachineMock); + Mock::VerifyAndClearExpectations(&*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialExchangeState_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_CREDENTIAL_EXCHANGE_STATE); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialExchangeState_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->isOnline = false; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)).WillRepeatedly(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)).WillRepeatedly(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialExchangeState_003, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialExchangeState_004, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialExchangeState_005, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialExchangeState_006, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialExchangeState_007, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->isOnline = false; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialExchangeState_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_CREDENTIAL_EXCHANGE_STATE); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialExchangeState_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(DM_OK)); + + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialExchangeState_003, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialExchangeState_004, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialExchangeState_005, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->isOnline = false; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialExchangeState_006, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->isOnline = false; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialExchangeState_007, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->isOnline = false; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialExchangeState_008, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialExchangeState_009, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AddCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ExportCredential(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthStartState_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_START_STATE); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthStartState_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(DM_OK)); + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthStartState_003, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthStartState_005, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthStartState_006, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthStartState_007, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthStartState_008, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->direction == DM_AUTH_SOURCE; + context->accesser.isAuthed = false; + context->needAgreeCredential = true; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AgreeCredential(_, _, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthStartState_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_START_STATE); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthStartState_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)).WillOnce(Return(ON_TRANSMIT)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthStartState_003, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthStartState_004, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)).WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthStartState_005, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)).WillOnce(Return(ON_TRANSMIT)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthNegotiateState_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_NEGOTIATE_STATE); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthNegotiateState_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)).WillOnce(Return(ON_TRANSMIT)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthNegotiateState_003, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthNegotiateState_004, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)).WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthNegotiateState_005, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)).WillOnce(Return(ON_TRANSMIT)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthNegotiateState_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_CREDENTIAL_AUTH_NEGOTIATE_STATE); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthNegotiateState_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, SaveSessionKeyToDP(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthNegotiateState_003, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthNegotiateState_004, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthNegotiateState_005, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthNegotiateState_006, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_ERROR)); + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthNegotiateState_007, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, SaveSessionKeyToDP(_, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSinkCredentialAuthNegotiateState_008, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_001, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_CREDENTIAL_AUTH_DONE_STATE); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_002, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + context->accesser.isGenerateLnnCredential == true; + context->isAppCredentialVerified = false; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)) + .WillOnce(Return(ON_TRANSMIT)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, SaveSessionKeyToDP(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AuthCredential(_, _, _, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_003, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_004, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_005, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_006, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_007, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, SaveSessionKeyToDP(_, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_008, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, SaveSessionKeyToDP(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AuthCredential(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_009, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)) + .WillOnce(Return(ON_TRANSMIT)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, SaveSessionKeyToDP(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AuthCredential(_, _, _, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return("")); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthCredentialStateTest, AuthSrcCredentialAuthDoneState_0010, testing::ext::TestSize.Level1) +{ + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + std::shared_ptr authState = std::make_shared(); + context->transmitData = "test"; + + EXPECT_CALL(*dmHiChainAuthConnectorMock, ProcessCredData(_, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)) + .WillOnce(Return(ON_TRANSMIT)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, SaveSessionKeyToDP(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*dmHiChainAuthConnectorMock, AuthCredential(_, _, _, _)).WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthMessageProcessorMock::dmAuthMessageProcessorMock, CreateMessage(_, _)) + .WillOnce(Return(TEST_NONE_EMPTY_STRING)); + + EXPECT_CALL(*dmSoftbusSessionMock, SendData(_, _)).WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +} +} \ No newline at end of file diff --git a/test/unittest/UTTest_auth_credential_state.h b/test/unittest/UTTest_auth_credential_state.h new file mode 100644 index 0000000000000000000000000000000000000000..0ca5fa31f3d47201f94d324b8f8675bdc748e028 --- /dev/null +++ b/test/unittest/UTTest_auth_credential_state.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef UTTEST_AUTH_CREDENTIAL_STATE_H +#define UTTEST_AUTH_CREDENTIAL_STATE_H + +#include +#include "hichain_auth_connector_mock.h" +#include "softbus_session_mock.h" +#include "dm_auth_state_machine_mock.h" +#include "auth_manager.h" + +namespace OHOS { +namespace DistributedHardware { + +class AuthCredentialStateTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); +private: + static inline std::shared_ptr dmHiChainAuthConnectorMock = + std::make_shared(); + static inline std::shared_ptr dmSoftbusSessionMock = + std::make_shared(); + static inline std::shared_ptr dmAuthStateMachineMock = + std::make_shared(); + std::shared_ptr softbusConnector; + std::shared_ptr listener; + std::shared_ptr hiChainAuthConnector; + std::shared_ptr hiChainConnector; + std::shared_ptr authManager; + std::shared_ptr context; +}; + +} +} +#endif \ No newline at end of file diff --git a/test/unittest/UTTest_auth_manager.cpp b/test/unittest/UTTest_auth_manager.cpp new file mode 100644 index 0000000000000000000000000000000000000000..1af89b982050a0edae87bb3c8cc30cd7f0f09668 --- /dev/null +++ b/test/unittest/UTTest_auth_manager.cpp @@ -0,0 +1,200 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "UTTest_auth_manager.h" + +#include "distributed_device_profile_client.h" +#include "dm_auth_state.h" + +using namespace testing; +namespace OHOS { +namespace DistributedHardware { + +void AuthManagerTest::SetUp() +{ + softbusConnector = std::make_shared(); + deviceManagerServicelistener = std::make_shared(); + hiChainAuthConnector = std::make_shared(); + hiChainConnector = std::make_shared(); + authManager = std::make_shared(softbusConnector, hiChainConnector, deviceManagerServicelistener, + hiChainAuthConnector); +} + +void AuthManagerTest::TearDown() +{ + softbusConnector = nullptr; + deviceManagerServicelistener = nullptr; + hiChainAuthConnector = nullptr; + hiChainConnector = nullptr; + authManager = nullptr; +} + +void AuthManagerTest::SetUpTestCase() +{ + DistributedDeviceProfile::DpDistributedDeviceProfileClient::dpDistributedDeviceProfileClient = + distributedDeviceProfileClientMock_; +} + +void AuthManagerTest::TearDownTestCase() +{ + DistributedDeviceProfile::DpDistributedDeviceProfileClient::dpDistributedDeviceProfileClient = nullptr; + distributedDeviceProfileClientMock_ = nullptr; +} + +HWTEST_F(AuthManagerTest, HandleBusinessEvents_001, testing::ext::TestSize.Level1) +{ + std::string businessId = "testBusinessId"; + int32_t action = USER_OPERATION_TYPE_CANCEL_AUTH; + EXPECT_CALL(*distributedDeviceProfileClientMock_, + PutBusinessEvent(::testing::_)).WillOnce(::testing::Return(DM_OK)); + + int32_t ret = authManager->HandleBusinessEvents(businessId, action); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(AuthManagerTest, HandleBusinessEvents_002, testing::ext::TestSize.Level1) +{ + std::string businessId = "testBusinessId"; + int32_t action = USER_OPERATION_TYPE_CANCEL_AUTH; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, + PutBusinessEvent(::testing::_)).WillOnce(::testing::Return(ERR_DM_AUTH_NOT_START)); + + int32_t ret = authManager->HandleBusinessEvents(businessId, action); + EXPECT_EQ(ret, ERR_DM_AUTH_NOT_START); +} + +HWTEST_F(AuthManagerTest, HandleBusinessEvents_003, testing::ext::TestSize.Level1) +{ + std::string businessId = "testBusinessId"; + int32_t action = USER_OPERATION_TYPE_ALLOW_AUTH; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, PutBusinessEvent(::testing::_)) + .WillOnce(::testing::Return(DM_OK)); + + int32_t result = authManager->HandleBusinessEvents(businessId, action); + + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(AuthManagerTest, HandleBusinessEvents_004, testing::ext::TestSize.Level1) +{ + std::string businessId = ""; + int32_t action = USER_OPERATION_TYPE_CANCEL_AUTH; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, PutBusinessEvent(::testing::_)) + .WillOnce(::testing::Return(DM_OK)); + + int32_t result = authManager->HandleBusinessEvents(businessId, action); + + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(AuthManagerTest, ParseJsonObject_001, testing::ext::TestSize.Level1) +{ + JsonObject jsonObject; + jsonObject[DM_BUSINESS_ID] = "testBusinessId"; + + authManager->ParseJsonObject(jsonObject); + EXPECT_EQ(jsonObject[DM_BUSINESS_ID].Get(), "testBusinessId"); +} + +HWTEST_F(AuthManagerTest, ParseJsonObject_002, testing::ext::TestSize.Level1) +{ + JsonObject jsonObject; + authManager->ParseJsonObject(jsonObject); + EXPECT_EQ(jsonObject[DM_BUSINESS_ID].Get(), ""); +} + +HWTEST_F(AuthManagerTest, OnUserOperation_001, testing::ext::TestSize.Level1) +{ + int32_t action = UiAction::USER_OPERATION_TYPE_CANCEL_AUTH; + std::string params = "testParams"; + int32_t ret = authManager->OnUserOperation(action, params); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(AuthManagerTest, OnUserOperation_002, testing::ext::TestSize.Level1) +{ + authManager->SetAuthContext(nullptr); + + int32_t action = USER_OPERATION_TYPE_CANCEL_AUTH; + std::string params = ""; + + int32_t ret = authManager->OnUserOperation(action, params); + + EXPECT_EQ(ret, ERR_DM_AUTH_NOT_START); +} + +HWTEST_F(AuthManagerTest, OnUserOperation_003, testing::ext::TestSize.Level1) +{ + authManager->GetAuthContext()->businessId = ""; + + int32_t action = USER_OPERATION_TYPE_CANCEL_AUTH; + std::string params = ""; + + int32_t ret = authManager->OnUserOperation(action, params); + + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(AuthManagerTest, OnUserOperation_004, testing::ext::TestSize.Level1) +{ + authManager->GetAuthContext()->businessId = "testBusinessId"; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, PutBusinessEvent(::testing::_)) + .WillOnce(::testing::Return(ERR_DM_FAILED)); + + int32_t action = USER_OPERATION_TYPE_CANCEL_AUTH; + std::string params = ""; + + int32_t ret = authManager->OnUserOperation(action, params); + + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(AuthManagerTest, OnUserOperation_005, testing::ext::TestSize.Level1) +{ + int32_t action = USER_OPERATION_TYPE_AUTH_CONFIRM_TIMEOUT; + std::string params = ""; + + int32_t ret = authManager->OnUserOperation(action, params); + + EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(authManager->GetAuthContext()->reason, ERR_DM_TIME_OUT); +} + +HWTEST_F(AuthManagerTest, OnUserOperation_006, testing::ext::TestSize.Level1) +{ + int32_t action = USER_OPERATION_TYPE_CANCEL_PINCODE_DISPLAY; + std::string params = ""; + + int32_t ret = authManager->OnUserOperation(action, params); + + EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(authManager->GetAuthContext()->reason, ERR_DM_BIND_USER_CANCEL_PIN_CODE_DISPLAY); +} + +HWTEST_F(AuthManagerTest, OnUserOperation_007, testing::ext::TestSize.Level1) +{ + int32_t action = -1; + std::string params = ""; + + int32_t ret = authManager->OnUserOperation(action, params); + + EXPECT_EQ(ret, DM_OK); +} +} // namespace DistributedHardware +} // namespace OHOS diff --git a/test/unittest/UTTest_auth_manager.h b/test/unittest/UTTest_auth_manager.h new file mode 100644 index 0000000000000000000000000000000000000000..e2c0b995d4d78b676cb94e226cd7aa94587ac1fc --- /dev/null +++ b/test/unittest/UTTest_auth_manager.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_UTTEST_AUTH_MANAGER_H +#define OHOS_UTTEST_AUTH_MANAGER_H + +#include + +#include "auth_manager.h" +#include "device_manager_service_listener.h" +#include "hichain_connector.h" +#include "softbus_connector.h" +#include "distributed_device_profile_client_mock.h" + +namespace OHOS { +namespace DistributedHardware { +class AuthManagerTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); +private: + static inline std::shared_ptr + distributedDeviceProfileClientMock_ = + std::make_shared(); + + std::shared_ptr softbusConnector; + std::shared_ptr deviceManagerServicelistener; + std::shared_ptr hiChainAuthConnector; + std::shared_ptr hiChainConnector; + std::shared_ptr authManager; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif diff --git a/test/unittest/UTTest_auth_message_processor.cpp b/test/unittest/UTTest_auth_message_processor.cpp index 21c03d7ce53189f2af7e973893f29a04ae63be4a..21fd2b8de39a722cd5469b2358a934f68dd0d404 100644 --- a/test/unittest/UTTest_auth_message_processor.cpp +++ b/test/unittest/UTTest_auth_message_processor.cpp @@ -29,7 +29,6 @@ namespace OHOS { namespace DistributedHardware { constexpr const char* TAG_APP_THUMBNAIL = "APPTHUM"; -constexpr const char* TAG_HOST = "HOST"; using namespace testing; using namespace testing::ext; diff --git a/test/unittest/UTTest_auth_negotiate.cpp b/test/unittest/UTTest_auth_negotiate.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8bc9f61238275199f68ab34b94fc58b4820e7bad --- /dev/null +++ b/test/unittest/UTTest_auth_negotiate.cpp @@ -0,0 +1,386 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "device_manager_service_listener.h" +#include "dm_crypto.h" +#include "dm_auth_state.h" +#include "UTTest_auth_negotiate.h" + +using namespace testing; + +namespace OHOS { +namespace DistributedHardware { + +constexpr const char* TEST_STRING = "test_string"; +constexpr int32_t TEST_NEGATIVE = -1; +constexpr int32_t TEST_POSITIVE = 1; + +void AuthNegotiateTest::SetUpTestCase() +{ + LOGI("AuthNegotiateTest::SetUpTestCase start."); + + DmSoftbusConnector::dmSoftbusConnector = softbusConnectorMock; + DmSoftbusSession::dmSoftbusSession = softbusSessionMock; + DistributedDeviceProfile::DpDistributedDeviceProfileClient::dpDistributedDeviceProfileClient = + distributedDeviceProfileClientMock_; +} + +void AuthNegotiateTest::TearDownTestCase() +{ + LOGI("AuthNegotiateTest::TearDownTestCase done."); + softbusConnectorMock = nullptr; + softbusSessionMock = nullptr; + DmSoftbusConnector::dmSoftbusConnector = nullptr; + DmSoftbusSession::dmSoftbusSession = nullptr; + DistributedDeviceProfile::DpDistributedDeviceProfileClient::dpDistributedDeviceProfileClient = nullptr; + distributedDeviceProfileClientMock_ = nullptr; +} + +void AuthNegotiateTest::SetUp() +{ + LOGI("AuthNegotiateTest::SetUp start."); + softbusConnector = std::make_shared(); + listener = std::make_shared(); + hiChainAuthConnector = std::make_shared(); + hiChainConnector = std::make_shared(); + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + softbusSession = std::make_shared(); + + auto token = AccessTokenKitInterface::GetOrCreateAccessTokenKit(); + tokenMock = std::static_pointer_cast(token); + + Mock::VerifyAndClearExpectations(&*softbusConnectorMock); + Mock::VerifyAndClearExpectations(&*softbusSessionMock); + Mock::VerifyAndClearExpectations(&*distributedDeviceProfileClientMock_); +} + +void AuthNegotiateTest::TearDown() +{ + LOGI("AuthNegotiateTest::TearDown done."); + softbusConnector = nullptr; + listener = nullptr; + hiChainAuthConnector = nullptr; + authManager = nullptr; + context = nullptr; + softbusSession = nullptr; + + Mock::VerifyAndClearExpectations(&*tokenMock); + tokenMock = nullptr; +} + +int32_t GetBusinessEventMockTrue(DistributedDeviceProfile::BusinessEvent &event) +{ + event.SetBusinessValue("{\"business_id\":\"test_business_id\",\"is_in_anti_disturbance_mode\":true}"); + return DM_OK; +} + +int32_t GetBusinessEventMockEmpty(DistributedDeviceProfile::BusinessEvent &event) +{ + event.SetBusinessValue(""); + return DM_OK; +} + +int32_t GetBusinessEventMockFalse(DistributedDeviceProfile::BusinessEvent &event) +{ + event.SetBusinessValue("{\"business_id\":\"test_business_id\",\"is_in_anti_disturbance_mode\":false}"); + return DM_OK; +} + +HWTEST_F(AuthNegotiateTest, AuthSrcStartState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_START_STATE); +} + +HWTEST_F(AuthNegotiateTest, AuthSrcStartState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthNegotiateTest, AuthSrcNegotiateStateMachine_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_NEGOTIATE_STATE); +} + +HWTEST_F(AuthNegotiateTest, AuthSrcNegotiateStateMachine_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*softbusConnectorMock, GetSoftbusSession) + .WillOnce(Return(softbusSession)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthNegotiateTest, AuthSinkNegotiateStateMachine_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_NEGOTIATE_STATE); +} + +HWTEST_F(AuthNegotiateTest, AuthSinkNegotiateStateMachine_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->accesser.dmVersion = DM_VERSION_5_1_0; + context->accessee.displayId = -1; + EXPECT_CALL(*softbusConnectorMock, GetSoftbusSession).WillOnce(Return(softbusSession)); + EXPECT_CALL(*tokenMock, GetNativeTokenId(_)).WillOnce(Return(1)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthNegotiateTest, AuthSinkNegotiateStateMachine_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + JsonItemObject credObj; + JsonObject aclInfo; + aclInfo["pointTopointAcl"] = 1; + JsonObject credTypeJson; + int32_t credType = 1; + std::vector deleteCredInfo; + + authState->GetSinkCredTypeForP2P(context, credObj, aclInfo, credTypeJson, credType, deleteCredInfo); + EXPECT_EQ(credTypeJson["pointTopointCredType"].Get(), credType); +} + +HWTEST_F(AuthNegotiateTest, AuthSinkNegotiateStateMachine_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + DistributedDeviceProfile::AccessControlProfile profile; + DistributedDeviceProfile::Accesser accesser; + DistributedDeviceProfile::Accessee accessee; + accesser.SetAccesserTokenId(123); + accessee.SetAccesseeTokenId(456); + profile.SetAccesser(accesser); + profile.SetAccessee(accessee); + + JsonObject credIdJson; + credIdJson[FILED_CRED_TYPE] = DM_POINT_TO_POINT; + std::vector appList = {"123", "456"}; + credIdJson[FILED_AUTHORIZED_APP_LIST] = appList; + JsonObject credInfo; + std::string test_cred_id = "123"; + credInfo.Insert(test_cred_id, credIdJson); + + bool checkResult = false; + authState->CheckCredIdInAclForP2P(context, test_cred_id, profile, credInfo, DM_POINT_TO_POINT, checkResult); + EXPECT_TRUE(checkResult); +} + +HWTEST_F(AuthNegotiateTest, AuthSinkNegotiateStateMachine_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->accessee.deviceId = "1"; + context->accessee.userId = 0; + context->accesser.deviceIdHash = Crypto::Sha256("1"); + + DistributedDeviceProfile::Accesser accesser; + DistributedDeviceProfile::Accessee accessee; + accesser.SetAccesserDeviceId("1"); + accesser.SetAccesserUserId(0); + accessee.SetAccesseeDeviceId("1"); + accessee.SetAccesseeUserId(0); + + bool result = authState->IdenticalAccountAclCompare(context, accesser, accessee); + EXPECT_FALSE(result); +} + +HWTEST_F(AuthNegotiateTest, AuthSinkNegotiateStateMachine_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::shared_ptr context = std::make_shared(); + context->accessee.deviceId = "1"; + context->accessee.userId = 0; + context->accesser.deviceIdHash = Crypto::Sha256("1"); + + DistributedDeviceProfile::Accesser accesser; + DistributedDeviceProfile::Accessee accessee; + accesser.SetAccesserDeviceId("1"); + accesser.SetAccesserUserId(0); + accessee.SetAccesseeDeviceId("1"); + accessee.SetAccesseeUserId(0); + + bool result = authState->ShareAclCompare(context, accesser, accessee); + EXPECT_FALSE(result); +} + +HWTEST_F(AuthNegotiateTest, AuthSinkNegotiateStateMachine_008, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::shared_ptr context = std::make_shared(); + context->accessee.deviceId = "1"; + context->accessee.userId = 0; + context->accesser.deviceIdHash = Crypto::Sha256("1"); + + DistributedDeviceProfile::Accesser accesser; + DistributedDeviceProfile::Accessee accessee; + accesser.SetAccesserDeviceId("1"); + accesser.SetAccesserUserId(0); + accesser.SetAccesserTokenId(0); + accesser.SetAccesserBundleName(""); + accessee.SetAccesseeDeviceId("1"); + accessee.SetAccesseeUserId(0); + accessee.SetAccesseeTokenId(0); + accessee.SetAccesseeBundleName(""); + + bool result = authState->LnnAclCompare(context, accesser, accessee); + + EXPECT_FALSE(result); +} + +HWTEST_F(AuthNegotiateTest, AuthSinkNegotiateStateMachine_Action_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + std::shared_ptr context = std::make_shared(); + context->businessId = "test_business_id"; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetBusinessEvent(::testing::_)) + .WillOnce(::testing::Invoke(GetBusinessEventMockTrue)); + + int32_t result = authState->Action(context); + + EXPECT_EQ(result, ERR_DM_ANTI_DISTURB_MODE); + EXPECT_EQ(context->reason, ERR_DM_ANTI_DISTURB_MODE); +} + +HWTEST_F(AuthNegotiateTest, AuthSinkNegotiateStateMachine_Action_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + std::shared_ptr context = std::make_shared(); + context->businessId = "test_business_id"; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetBusinessEvent(::testing::_)) + .WillOnce(::testing::Invoke(GetBusinessEventMockFalse)); + + int32_t result = authState->Action(context); + + EXPECT_NE(result, ERR_DM_ANTI_DISTURB_MODE); + EXPECT_NE(context->reason, ERR_DM_ANTI_DISTURB_MODE); +} + +HWTEST_F(AuthNegotiateTest, IsAntiDisturbanceMode_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = ""; + businessId.clear(); + EXPECT_FALSE(authState->IsAntiDisturbanceMode(businessId)); +} + +HWTEST_F(AuthNegotiateTest, IsAntiDisturbanceMode_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetBusinessEvent(::testing::_)) + .WillOnce(::testing::Return(ERR_DM_FAILED)); + + EXPECT_FALSE(authState->IsAntiDisturbanceMode(businessId)); +} + +HWTEST_F(AuthNegotiateTest, IsAntiDisturbanceMode_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetBusinessEvent(::testing::_)) + .WillOnce(::testing::Invoke(GetBusinessEventMockEmpty)); + + EXPECT_FALSE(authState->IsAntiDisturbanceMode(businessId)); +} + +HWTEST_F(AuthNegotiateTest, IsAntiDisturbanceMode_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetBusinessEvent(::testing::_)) + .WillOnce(::testing::Invoke(GetBusinessEventMockTrue)); + + EXPECT_TRUE(authState->IsAntiDisturbanceMode(businessId)); +} + +HWTEST_F(AuthNegotiateTest, ParseAndCheckAntiDisturbanceMode_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + std::string businessValue = "invalid_json"; + EXPECT_FALSE(authState->ParseAndCheckAntiDisturbanceMode(businessId, businessValue)); +} + +HWTEST_F(AuthNegotiateTest, ParseAndCheckAntiDisturbanceMode_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + std::string businessValue = "{\"is_in_anti_disturbance_mode\":true}"; + EXPECT_FALSE(authState->ParseAndCheckAntiDisturbanceMode(businessId, businessValue)); +} + +HWTEST_F(AuthNegotiateTest, ParseAndCheckAntiDisturbanceMode_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + std::string businessValue = "{\"business_id\":\"wrong_id\",\"is_in_anti_disturbance_mode\":true}"; + EXPECT_FALSE(authState->ParseAndCheckAntiDisturbanceMode(businessId, businessValue)); +} + +HWTEST_F(AuthNegotiateTest, ParseAndCheckAntiDisturbanceMode_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + std::string businessValue = "{\"business_id\":\"test_business_id\"}"; + EXPECT_FALSE(authState->ParseAndCheckAntiDisturbanceMode(businessId, businessValue)); +} + +HWTEST_F(AuthNegotiateTest, ParseAndCheckAntiDisturbanceMode_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + std::string businessValue = "{\"business_id\":\"test_business_id\",\"is_in_anti_disturbance_mode\":true}"; + EXPECT_TRUE(authState->ParseAndCheckAntiDisturbanceMode(businessId, businessValue)); +} + +HWTEST_F(AuthNegotiateTest, ParseAndCheckAntiDisturbanceMode_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + std::string businessValue = "{\"business_id\":\"test_business_id\",\"is_in_anti_disturbance_mode\":false}"; + EXPECT_FALSE(authState->ParseAndCheckAntiDisturbanceMode(businessId, businessValue)); +} + +HWTEST_F(AuthNegotiateTest, ParseAndCheckAntiDisturbanceMode_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + std::string businessValue = "{\"business_id\":123,\"is_in_anti_disturbance_mode\":true}"; + + EXPECT_FALSE(authState->ParseAndCheckAntiDisturbanceMode(businessId, businessValue)); +} + +HWTEST_F(AuthNegotiateTest, ParseAndCheckAntiDisturbanceMode_008, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + std::string businessId = "test_business_id"; + std::string businessValue = "{\"business_id\":\"test_business_id\",\"is_in_anti_disturbance_mode\":123}"; + + EXPECT_FALSE(authState->ParseAndCheckAntiDisturbanceMode(businessId, businessValue)); +} +} +} \ No newline at end of file diff --git a/test/unittest/UTTest_auth_negotiate.h b/test/unittest/UTTest_auth_negotiate.h new file mode 100644 index 0000000000000000000000000000000000000000..e3c9ab90961e9531b78349cad9747063702896f0 --- /dev/null +++ b/test/unittest/UTTest_auth_negotiate.h @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef UTTEST_AUTH_NEGOTIATE_STATE_H +#define UTTEST_AUTH_NEGOTIATE_STATE_H + +#include "gtest/gtest.h" +#include "auth_manager.h" +#include "accesstoken_kit_mock.h" +#include "softbus_connector_mock.h" +#include "softbus_session_mock.h" +#include "distributed_device_profile_client_mock.h" + +namespace OHOS { +namespace DistributedHardware { + +class AuthNegotiateTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); +private: + static inline std::shared_ptr softbusConnectorMock = + std::make_shared(); + static inline std::shared_ptr softbusSessionMock = + std::make_shared(); + static inline std::shared_ptr + distributedDeviceProfileClientMock_ = + std::make_shared(); + static inline std::shared_ptr tokenMock = nullptr; + std::shared_ptr softbusConnector; + std::shared_ptr listener; + std::shared_ptr hiChainAuthConnector; + std::shared_ptr hiChainConnector; + std::shared_ptr authManager; + std::shared_ptr context; + std::shared_ptr softbusSession; +}; + +} +} +#endif \ No newline at end of file diff --git a/test/unittest/UTTest_auth_pin_auth_state.cpp b/test/unittest/UTTest_auth_pin_auth_state.cpp new file mode 100644 index 0000000000000000000000000000000000000000..6ec32b49ceee47a44ea9ee71e7a2aa01f0895e22 --- /dev/null +++ b/test/unittest/UTTest_auth_pin_auth_state.cpp @@ -0,0 +1,1325 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#include "dm_auth_state_machine_mock.h" +#include "UTTest_auth_pin_auth_state.h" + +using namespace testing; + +namespace OHOS { +namespace DistributedHardware { + +void AuthPinAuthStateTest::SetUpTestCase() +{ + LOGI("AuthPinAuthStateTest::SetUpTestCase start."); + DmHiChainAuthConnector::dmHiChainAuthConnector = hiChainAuthConnectorMock; + DmAuthStateMachineMock::dmAuthStateMachineMock = std::make_shared(); +} + +void AuthPinAuthStateTest::TearDownTestCase() +{ + LOGI("AuthPinAuthStateTest::TearDownTestCase start."); + DmHiChainAuthConnector::dmHiChainAuthConnector = nullptr; + DmAuthStateMachineMock::dmAuthStateMachineMock = nullptr; + hiChainAuthConnectorMock = nullptr; +} + +void AuthPinAuthStateTest::SetUp() +{ + LOGI("AuthPinAuthStateTest::SetUp start."); + softbusConnector = std::make_shared(); + listener = std::make_shared(); + hiChainAuthConnector = std::make_shared(); + hiChainConnector = std::make_shared(); + authManager = std::make_shared(softbusConnector, hiChainConnector, listener, + hiChainAuthConnector); + context = authManager->GetAuthContext(); + + Mock::VerifyAndClearExpectations(&*hiChainAuthConnectorMock); + Mock::VerifyAndClearExpectations(&*DmAuthStateMachineMock::dmAuthStateMachineMock); +} + +void AuthPinAuthStateTest::TearDown() +{ + LOGI("AuthPinAuthStateTest::TearDown start."); + softbusConnector = nullptr; + listener = nullptr; + hiChainAuthConnector = nullptr; + authManager = nullptr; + context = nullptr; +} + +bool DmAuthState::IsScreenLocked() +{ + return false; +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthStartState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_PIN_AUTH_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthStartState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthStartState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthStartState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthStartState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthStartState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_PIN_AUTH_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthStartState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthStartState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthStartState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthStartState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthMsgNegotiateState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_PIN_AUTH_MSG_NEGOTIATE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthMsgNegotiateState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthMsgNegotiateState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthMsgNegotiateState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthMsgNegotiateState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_REQUEST)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthMsgNegotiateState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_PIN_AUTH_MSG_NEGOTIATE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthMsgNegotiateState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthMsgNegotiateState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthMsgNegotiateState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthMsgNegotiateState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthMsgNegotiateState_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthMsgNegotiateState_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthDoneState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_PIN_AUTH_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthDoneState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_FINISH)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthDoneState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthDoneState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthDoneState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_REQUEST)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthDoneState_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_ERROR)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinAuthDoneState_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)) + .WillOnce(Return(ON_REQUEST)); + + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthDoneState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_PIN_AUTH_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinAuthDoneState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicStartState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicStartState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicStartState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicStartState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicDoneState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicDoneState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicDoneState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicDoneState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)); + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicDoneState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_REVERSE_ULTRASONIC_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicDoneState_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_TRANSMIT)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicDoneState_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_ERROR)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicDoneState_008, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_FAIL)); + EXPECT_EQ(authState->Action(context), STOP_BIND); +} +HWTEST_F(AuthPinAuthStateTest, AuthSrcReverseUltrasonicDoneState_009, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(STOP_BIND)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicStartState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicStartState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicStartState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicStartState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ULTRASONIC_PIN_CHANGED)); + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(ERR_DM_FAILED)); + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ULTRASONIC_PIN_CHANGED)) + .WillOnce(Return(ON_TRANSMIT)); + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ULTRASONIC_PIN_CHANGED)) + .WillOnce(Return(ON_ERROR)); + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ULTRASONIC_PIN_TIMEOUT)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)); + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_FORWARD_ULTRASONIC_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_008, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_ULTRASONIC_PIN_CHANGED)) + .WillOnce(Return(DmEventType::ON_TRANSMIT)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_009, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(DM_OK)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_ULTRASONIC_PIN_CHANGED)) + .WillOnce(Return(DmEventType::ON_ERROR)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_010, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_ULTRASONIC_PIN_TIMEOUT)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_011, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_FAIL)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcForwardUltrasonicDoneState_012, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + EXPECT_CALL(*hiChainAuthConnectorMock, AuthCredentialPinCode(_, _, _)) + .WillOnce(Return(STOP_BIND)); + + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_ULTRASONIC_PIN_CHANGED)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicStartState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicStartState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ULTRASONIC_PIN_CHANGED)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicStartState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ULTRASONIC_PIN_TIMEOUT)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicStartState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)); + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicStartState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicStartState_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_ULTRASONIC_PIN_CHANGED)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicStartState_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_ULTRASONIC_PIN_TIMEOUT)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicStartState_008, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_FAIL)); + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(ERR_DM_FAILED)); + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ERROR)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)); + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_REVERSE_ULTRASONIC_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_TRANSMIT)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_008, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_ERROR)); + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_009, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_FAIL)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkReverseUltrasonicDoneState_010, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(STOP_BIND)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicStartState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicStartState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicStartState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicStartState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SINK; + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(ERR_DM_FAILED)); + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_TRANSMIT)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_ERROR)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(ON_SESSION_KEY_RETURNED)); + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = + std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_FORWARD_ULTRASONIC_DONE_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_TRANSMIT)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_008, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_ERROR)); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_009, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(DM_OK)); + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_FAIL)); + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkForwardUltrasonicDoneState_010, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SINK; + EXPECT_CALL(*hiChainAuthConnectorMock, ProcessCredData(_, _)) + .WillOnce(Return(STOP_BIND)); + + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_PIN_NEGOTIATE_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + context->pinNegotiateStarted = false; + + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->ultrasonicInfo = DM_Ultrasonic_Forward; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + context->pinNegotiateStarted = false; + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->ultrasonicInfo = DM_Ultrasonic_Reverse; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + context->pinNegotiateStarted = false; + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE); + context->importAuthCode = "123456"; + context->importPkgName = "com.test.example"; + context->pkgName = "com.test.example"; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + context->pinNegotiateStarted = false; + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + context->authType = DmAuthType::AUTH_TYPE_PIN; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + context->accesser.credentialInfos[DM_IDENTICAL_ACCOUNT] = R"({"credId": 1234})"; + + context->pinNegotiateStarted = true; + context->needBind = false; + context->needAgreeCredential = false; + context->needAuth = true; + context->accesser.credTypeList = R"({"identicalCredType": 1})"; + EXPECT_EQ(authState->Action(context), DM_OK); + context->accesser.credTypeList = R"({"shareCredType": 2})"; + EXPECT_EQ(authState->Action(context), DM_OK); + context->accesser.credTypeList = R"({"pointTopointCredType": 256})"; + EXPECT_EQ(authState->Action(context), DM_OK); + context->accesser.credTypeList = R"({"lnnCredType": 3})"; + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_007, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + context->authType = DmAuthType::AUTH_TYPE_PIN; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + context->pinNegotiateStarted = true; + context->needBind = false; + context->needAgreeCredential = false; + context->needAuth = false; + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_008, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + context->authType = DmAuthType::AUTH_TYPE_PIN; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + context->pinNegotiateStarted = true; + context->needBind = false; + context->needAgreeCredential = true; + context->needAuth = false; + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_009, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + context->authType = DmAuthType::AUTH_TYPE_PIN; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + context->pinNegotiateStarted = false; + + EXPECT_EQ(authState->Action(context), DM_OK); + EXPECT_EQ(context->pinNegotiateStarted, true); + context->needBind = true; + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinNegotiateStartState_010, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_UNKNOW); + context->authType = DmAuthType::AUTH_TYPE_UNKNOW; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + context->pinNegotiateStarted = true; + context->needBind = true; + EXPECT_EQ(authState->Action(context), ERR_DM_BIND_PIN_CODE_ERROR); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinInputState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SRC_PIN_INPUT_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSrcPinInputState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + context->authType = DmAuthType::AUTH_TYPE_PIN; + context->direction = DmAuthDirection::DM_AUTH_SOURCE; + EXPECT_CALL(*DmAuthStateMachineMock::dmAuthStateMachineMock, WaitExpectEvent(_)) + .WillOnce(Return(DmEventType::ON_USER_OPERATION)) + .WillOnce(Return(DmEventType::ON_USER_OPERATION)) + .WillOnce(Return(DmEventType::ON_USER_OPERATION)) + .WillOnce(Return(DmEventType::ON_FAIL)); + + context->pinInputResult = USER_OPERATION_TYPE_DONE_PINCODE_INPUT; + EXPECT_EQ(authState->Action(context), DM_OK); + context->inputPinAuthFailTimes = 1; + EXPECT_EQ(authState->Action(context), DM_OK); + + context->pinInputResult = USER_OPERATION_TYPE_CANCEL_PINCODE_INPUT; + EXPECT_EQ(authState->Action(context), STOP_BIND); + + context->pinInputResult = USER_OPERATION_TYPE_DONE_PINCODE_INPUT; + EXPECT_EQ(authState->Action(context), STOP_BIND); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinNegotiateStartState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_PIN_NEGOTIATE_START_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinNegotiateStartState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + context->authType = DmAuthType::AUTH_TYPE_PIN; + context->direction = DmAuthDirection::DM_AUTH_SINK; + context->pinNegotiateStarted = false; + EXPECT_EQ(authState->Action(context), DM_OK); + + EXPECT_EQ(context->pinNegotiateStarted, true); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinNegotiateStartState_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE); + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + context->authType = DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE; + context->direction = DmAuthDirection::DM_AUTH_SINK; + context->pinNegotiateStarted = false; + EXPECT_EQ(authState->Action(context), DM_OK); + + EXPECT_EQ(context->pinNegotiateStarted, true); + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinNegotiateStartState_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE); + context->authType = DmAuthType::AUTH_TYPE_IMPORT_AUTH_CODE; + context->direction = DmAuthDirection::DM_AUTH_SINK; + context->pinNegotiateStarted = false; + EXPECT_EQ(authState->Action(context), DM_OK); + + EXPECT_EQ(context->pinNegotiateStarted, true); + EXPECT_EQ(authState->Action(context), ERR_DM_BIND_PIN_CODE_ERROR); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinNegotiateStartState_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN_ULTRASONIC); + context->authType = DmAuthType::AUTH_TYPE_PIN_ULTRASONIC; + context->direction = DmAuthDirection::DM_AUTH_SINK; + context->pinNegotiateStarted = false; + EXPECT_EQ(authState->Action(context), DM_OK); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinNegotiateStartState_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_UNKNOW); + context->authType = DmAuthType::AUTH_TYPE_UNKNOW; + context->direction = DmAuthDirection::DM_AUTH_SINK; + context->pinNegotiateStarted = false; + EXPECT_EQ(authState->Action(context), ERR_DM_FAILED); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinDisplayState_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + EXPECT_EQ(authState->GetStateType(), DmAuthStateType::AUTH_SINK_PIN_DISPLAY_STATE); +} + +HWTEST_F(AuthPinAuthStateTest, AuthSinkPinDisplayState_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr authState = std::make_shared(); + context->confirmOperation = UiAction::USER_OPERATION_TYPE_ALLOW_AUTH_ALWAYS; + context->authTypeList.push_back(DmAuthType::AUTH_TYPE_PIN); + context->authType = DmAuthType::AUTH_TYPE_PIN; + context->direction = DmAuthDirection::DM_AUTH_SINK; + context->inputPinAuthFailTimes = 0; + EXPECT_EQ(authState->Action(context), DM_OK); + + context->inputPinAuthFailTimes = 1; + EXPECT_EQ(authState->Action(context), DM_OK); +} + +} +} \ No newline at end of file diff --git a/test/unittest/UTTest_auth_pin_auth_state.h b/test/unittest/UTTest_auth_pin_auth_state.h new file mode 100644 index 0000000000000000000000000000000000000000..bef236cc13801af59f88252e7d69471444af3efe --- /dev/null +++ b/test/unittest/UTTest_auth_pin_auth_state.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef UTTEST_AUTH_PIN_AUTH_STATE_H +#define UTTEST_AUTH_PIN_AUTH_STATE_H + +#include +#include "device_manager_service_listener.h" +#include "hichain_auth_connector_mock.h" +#include "auth_manager.h" +#include "dm_negotiate_process.h" + +namespace OHOS { +namespace DistributedHardware { + +class AuthPinAuthStateTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); +private: + static inline std::shared_ptr hiChainAuthConnectorMock = + std::make_shared(); + std::shared_ptr softbusConnector; + std::shared_ptr listener; + std::shared_ptr hiChainAuthConnector; + std::shared_ptr hiChainConnector; + std::shared_ptr authManager; + std::shared_ptr context; +}; + +} +} +#endif \ No newline at end of file diff --git a/test/unittest/UTTest_auth_response_state.cpp b/test/unittest/UTTest_auth_response_state.cpp index 1a7ec5796ef4f07b29027aa2d4cbe45da40d10fe..25b68d7bc10ded13c37acba0052eb66ab787cfe4 100644 --- a/test/unittest/UTTest_auth_response_state.cpp +++ b/test/unittest/UTTest_auth_response_state.cpp @@ -402,7 +402,7 @@ HWTEST_F(AuthResponseStateTest, Enter_009, testing::ext::TestSize.Level1) authManager->authResponseContext_ = std::make_shared(); std::shared_ptr authResponseState = std::make_shared(); authManager->authPtr_ = authManager->authenticationMap_[1]; - authManager->authResponseContext_->code = 123456; + authManager->authResponseContext_->code = "123456"; authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_OK); diff --git a/test/unittest/UTTest_device_manager_impl.cpp b/test/unittest/UTTest_device_manager_impl.cpp index e711089afc466a6b264883a7cbc63b8b558435b4..4ce462374eecef75b91c35cad411777042449323 100644 --- a/test/unittest/UTTest_device_manager_impl.cpp +++ b/test/unittest/UTTest_device_manager_impl.cpp @@ -68,17 +68,22 @@ void DeviceManagerImplTest::SetUp() void DeviceManagerImplTest::TearDown() { + testing::Mock::VerifyAndClearExpectations(deviceManagerNotifyMock_.get()); + testing::Mock::VerifyAndClearExpectations(ipcClientProxyMock_.get()); } void DeviceManagerImplTest::SetUpTestCase() { DmDeviceManagerNotify::dmDeviceManagerNotify = deviceManagerNotifyMock_; + DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxyMock_; } void DeviceManagerImplTest::TearDownTestCase() { DmDeviceManagerNotify::dmDeviceManagerNotify = nullptr; deviceManagerNotifyMock_ = nullptr; + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; + ipcClientProxyMock_ = nullptr; } namespace { @@ -203,6 +208,8 @@ HWTEST_F(DeviceManagerImplTest, GetLocalDeviceNetWorkId_101, testing::ext::TestS { std::string packName; std::string networkId; + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().GetLocalDeviceNetWorkId(packName, networkId); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); } @@ -241,6 +248,8 @@ HWTEST_F(DeviceManagerImplTest, GetLocalDeviceId_101, testing::ext::TestSize.Lev { std::string packName; std::string deviceId; + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().GetLocalDeviceId(packName, deviceId); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); } @@ -279,6 +288,8 @@ HWTEST_F(DeviceManagerImplTest, GetLocalDeviceName_101, testing::ext::TestSize.L { std::string packName; std::string deviceName; + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().GetLocalDeviceName(packName, deviceName); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); } @@ -318,6 +329,8 @@ HWTEST_F(DeviceManagerImplTest, GetLocalDeviceType_101, testing::ext::TestSize.L { std::string packName; int32_t deviceType = 0; + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().GetLocalDeviceType(packName, deviceType); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); } @@ -396,6 +409,8 @@ HWTEST_F(DeviceManagerImplTest, GetDeviceName_103, testing::ext::TestSize.Level0 std::string packName = "com.ohos.test"; std::string networkId = "networkId"; std::string deviceName; + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().GetDeviceName(packName, networkId, deviceName); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); } @@ -476,14 +491,10 @@ HWTEST_F(DeviceManagerImplTest, GetDeviceType_103, testing::ext::TestSize.Level0 std::string packName = "com.ohos.test"; std::string networkId = "networkId"; int32_t deviceType = 0; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().GetDeviceType(packName, networkId, deviceType); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -556,14 +567,10 @@ HWTEST_F(DeviceManagerImplTest, UnBindDevice_103, testing::ext::TestSize.Level0) { std::string packName = "com.ohos.test"; std::string deviceId = "deviceId"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().UnBindDevice(packName, deviceId); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -670,14 +677,10 @@ HWTEST_F(DeviceManagerImplTest, BindDevice_103, testing::ext::TestSize.Level0) std::string deviceId = "deviceId"; std::string bindParam = "{\"status\":1}"; std::shared_ptr callback = nullptr; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().BindDevice(packName, bindType, deviceId, bindParam, callback); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -726,7 +729,8 @@ HWTEST_F(DeviceManagerImplTest, RegisterDevStateCallback_101, testing::ext::Test std::shared_ptr initCallback = std::make_shared(); int32_t ret = DeviceManager::GetInstance().InitDeviceManager(packName, initCallback); ret = DeviceManager::GetInstance().RegisterDevStateCallback(packName, extra, callback); - ASSERT_NE(ret, ERR_DM_INPUT_PARA_INVALID); + bool res = (ret == ERR_DM_NO_PERMISSION) || (ret == DM_OK); + ASSERT_EQ(res, true); DeviceManager::GetInstance().UnInitDeviceManager(packName); } @@ -846,12 +850,9 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery_101, testing::ext::TestSize std::string extra = ""; DmSubscribeInfo subscribeInfo; std::shared_ptr callback = std::make_shared(); - auto ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = std::make_shared(); int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, subscribeInfo, extra, callback); ASSERT_EQ(ret, DM_OK); DeviceManager::GetInstance().StopDeviceDiscovery(packName, subscribeInfo.subscribeId); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -871,12 +872,9 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery_102, testing::ext::TestSize std::string extra = "{\"findDeviceMode\":1}"; DmSubscribeInfo subscribeInfo; std::shared_ptr callback = std::make_shared(); - auto ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = std::make_shared(); int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, subscribeInfo, extra, callback); ASSERT_EQ(ret, DM_OK); ret = DeviceManager::GetInstance().StopDeviceDiscovery(packName, subscribeInfo.subscribeId); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -897,12 +895,9 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery_103, testing::ext::TestSize uint16_t subscribeId = 0; std::string filterOptions; std::shared_ptr callback = std::make_shared(); - auto ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = std::make_shared(); int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, subscribeId, filterOptions, callback); ASSERT_EQ(ret, DM_OK); DeviceManager::GetInstance().StopDeviceDiscovery(packName, subscribeId); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -925,6 +920,8 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery_104, testing::ext::TestSize std::shared_ptr callback = std::make_shared(); DmDeviceInfo deviceInfo; callback->OnDeviceFound(subscribeId, deviceInfo); + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, subscribeId, filterOptions, callback); ASSERT_NE(ret, DM_OK); } @@ -946,11 +943,8 @@ HWTEST_F(DeviceManagerImplTest, StopDeviceDiscovery_101, testing::ext::TestSize. std::string extra = ""; DmSubscribeInfo subscribeInfo; std::shared_ptr callback = std::make_shared(); - auto ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = std::make_shared(); int32_t ret = DeviceManager::GetInstance().StopDeviceDiscovery(packName, subscribeInfo.subscribeId); ASSERT_NE(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -996,11 +990,8 @@ HWTEST_F(DeviceManagerImplTest, PublishDeviceDiscovery_101, testing::ext::TestSi std::string packName = "com.ohos.helloworld"; DmPublishInfo publishInfo; std::shared_ptr callback = std::make_shared(); - auto ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = std::make_shared(); int32_t ret = DeviceManager::GetInstance().PublishDeviceDiscovery(packName, publishInfo, callback); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1018,11 +1009,8 @@ HWTEST_F(DeviceManagerImplTest, UnPublishDeviceDiscovery_101, testing::ext::Test std::string packName = "com.ohos.test"; int32_t publishId = 0; std::shared_ptr callback = std::make_shared(); - auto ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = std::make_shared(); int32_t ret = DeviceManager::GetInstance().UnPublishDeviceDiscovery(packName, publishId); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1185,14 +1173,10 @@ HWTEST_F(DeviceManagerImplTest, InitDeviceManager_003, testing::ext::TestSize.Le // set dmInitCallback not null std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy Init return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; // 3. call DeviceManagerImpl::InitDeviceManager with parameter int32_t ret = DeviceManager::GetInstance().InitDeviceManager(packName, callback); // 4. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1264,14 +1248,10 @@ HWTEST_F(DeviceManagerImplTest, UnInitDeviceManager_002, testing::ext::TestSize. // 1. set packName not null std::string packName = "com.ohos.test"; // 2. call DeviceManagerImpl::InitDeviceManager with parameter - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, UnInit(testing::_)).Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); + EXPECT_CALL(*ipcClientProxyMock_, UnInit(testing::_)).Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().UnInitDeviceManager(packName); // 3. check ret is ERR_DM_FAILED ASSERT_EQ(ret, ERR_DM_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1311,14 +1291,10 @@ HWTEST_F(DeviceManagerImplTest, UnInitDeviceManager_004, testing::ext::TestSize. // 1. set packNamen not null std::string packName = "com.ohos.test"; // 2. call DeviceManagerImpl::InitDeviceManager with parameter - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, UnInit(testing::_)).Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); + EXPECT_CALL(*ipcClientProxyMock_, UnInit(testing::_)).Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); int32_t ret = DeviceManager::GetInstance().UnInitDeviceManager(packName); // 3. check ret is ERR_DM_FAILED ASSERT_EQ(ret, ERR_DM_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1336,14 +1312,10 @@ HWTEST_F(DeviceManagerImplTest, UnInitDeviceManager_005, testing::ext::TestSize. // 1. set packName not null std::string packName = "com.ohos.test"; // 2. call DeviceManagerImpl::InitDeviceManager with parameter - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, UnInit(testing::_)).Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); + EXPECT_CALL(*ipcClientProxyMock_, UnInit(testing::_)).Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); int32_t ret = DeviceManager::GetInstance().UnInitDeviceManager(packName); // 3. check ret is ERR_DM_FAILED ASSERT_EQ(ret, ERR_DM_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1392,16 +1364,12 @@ HWTEST_F(DeviceManagerImplTest, GetTrustedDeviceList_002, testing::ext::TestSize // set deviceList null std::vector deviceList; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_IPC_SEND_REQUEST_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); // 2. call DeviceManagerImpl::GetTrustedDeviceList with parameter int32_t ret = DeviceManager::GetInstance().GetTrustedDeviceList(packName, extra, deviceList); // 3. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1453,16 +1421,12 @@ HWTEST_F(DeviceManagerImplTest, GetTrustedDeviceList_004, testing::ext::TestSize // set deviceList null std::vector deviceList; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); // 2. call DeviceManagerImpl::GetTrustedDeviceList with parameter int32_t ret = DeviceManager::GetInstance().GetTrustedDeviceList(packName, extra, deviceList); // 3. check ret is DEVICEMANAGER_IPC_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1552,6 +1516,8 @@ HWTEST_F(DeviceManagerImplTest, GetTrustedDeviceList_008, testing::ext::TestSize int32_t ret = DeviceManager::GetInstance().GetTrustedDeviceList(packName, filterOptions, isRefresh, deviceList); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); packName = "packNameTest"; + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); ret = DeviceManager::GetInstance().GetTrustedDeviceList(packName, filterOptions, isRefresh, deviceList); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); } @@ -1589,11 +1555,11 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_001, testing::ext::TestSize.Lev pkgName = "pkgNameTest"; ret = DeviceManager::GetInstance().ImportCredential(pkgName, reqJsonStr, returnJsonStr); ASSERT_NE(ret, ERR_DM_TIME_OUT); + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(3).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)) + .WillOnce(testing::Return(DM_OK)).WillOnce(testing::Return(DM_OK)); ret = DeviceManager::GetInstance().DeleteCredential(pkgName, reqJsonStr, returnJsonStr); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; ret = DeviceManager::GetInstance().ImportCredential(pkgName, reqJsonStr, returnJsonStr); ASSERT_EQ(ret, DM_OK); ret = DeviceManager::GetInstance().DeleteCredential(pkgName, reqJsonStr, returnJsonStr); @@ -1665,9 +1631,6 @@ HWTEST_F(DeviceManagerImplTest, GenerateEncryptedUuid_001, testing::ext::TestSiz pkgName = "pkgNameTest"; ret = DeviceManager::GetInstance().GenerateEncryptedUuid(pkgName, uuid, appId, encryptedUuid); ASSERT_EQ(ret, DM_OK); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; ret = DeviceManager::GetInstance().GenerateEncryptedUuid(pkgName, uuid, appId, encryptedUuid); ASSERT_EQ(ret, DM_OK); } @@ -1699,9 +1662,6 @@ HWTEST_F(DeviceManagerImplTest, GetNetworkTypeByNetworkId_001, testing::ext::Tes pkgName = "pkgNameTest"; ret = DeviceManager::GetInstance().GetNetworkTypeByNetworkId(pkgName, networkId, netWorkType); ASSERT_EQ(ret, DM_OK); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; ret = DeviceManager::GetInstance().GetNetworkTypeByNetworkId(pkgName, networkId, netWorkType); ASSERT_EQ(ret, DM_OK); } @@ -1882,16 +1842,12 @@ HWTEST_F(DeviceManagerImplTest, GetLocalDeviceInfo_002, testing::ext::TestSize.L // set extra null DmDeviceInfo info; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_IPC_SEND_REQUEST_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); // 2. call DeviceManagerImpl::GetTrustedDeviceList with parameter int32_t ret = DeviceManager::GetInstance().GetLocalDeviceInfo(packName, info); // 3. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1940,16 +1896,12 @@ HWTEST_F(DeviceManagerImplTest, GetLocalDeviceInfo_004, testing::ext::TestSize.L // set extra null DmDeviceInfo info; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); // 2. call DeviceManagerImpl::GetTrustedDeviceList with parameter int32_t ret = DeviceManager::GetInstance().GetLocalDeviceInfo(packName, info); // 3. check ret is DEVICEMANAGER_IPC_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1970,16 +1922,12 @@ HWTEST_F(DeviceManagerImplTest, GetLocalDeviceInfo_005, testing::ext::TestSize.L // set extra null DmDeviceInfo info; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); // 2. call DeviceManagerImpl::GetTrustedDeviceList with parameter int32_t ret = DeviceManager::GetInstance().GetLocalDeviceInfo(packName, info); // 3. check ret is DEVICEMANAGER_IPC_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -2306,16 +2254,12 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery_003, testing::ext::TestSize std::string extra = "test"; std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::StopDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, subscribeInfo, extra, callback); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -2340,16 +2284,12 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery_004, testing::ext::TestSize // set callback not null std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return DM_OK - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); // 3. call DeviceManagerImpl::StartDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, subscribeInfo, extra, callback); // 4. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -2374,16 +2314,12 @@ HWTEST_F(DeviceManagerImplTest, StartDeviceDiscovery_005, testing::ext::TestSize // set callback not null std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::StartDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, subscribeInfo, extra, callback); // 4. check ret is DEVICEMANAGER_IPC_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -2481,9 +2417,6 @@ HWTEST_F(DeviceManagerImplTest, CreatePinHolder_001, testing::ext::TestSize.Leve payload.resize(10); ret = DeviceManager::GetInstance().CreatePinHolder(pkgName, targetId, pinType, payload); ASSERT_EQ(ret, DM_OK); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; ret = DeviceManager::GetInstance().CreatePinHolder(pkgName, targetId, pinType, payload); ASSERT_EQ(ret, DM_OK); } @@ -2518,9 +2451,6 @@ HWTEST_F(DeviceManagerImplTest, DestoryPinHolder_001, testing::ext::TestSize.Lev payload.resize(10); ret = DeviceManager::GetInstance().DestroyPinHolder(pkgName, targetId, pinType, payload); ASSERT_EQ(ret, DM_OK); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; ret = DeviceManager::GetInstance().DestroyPinHolder(pkgName, targetId, pinType, payload); ASSERT_EQ(ret, DM_OK); } @@ -2542,9 +2472,6 @@ HWTEST_F(DeviceManagerImplTest, DpAclAdd_001, testing::ext::TestSize.Level0) bindType = IDENTICAL_ACCOUNT; ret = DeviceManager::GetInstance().DpAclAdd(accessControlId, udid, bindType); ASSERT_EQ(ret, DM_OK); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; ret = DeviceManager::GetInstance().DpAclAdd(accessControlId, udid, bindType); ASSERT_EQ(ret, DM_OK); } @@ -2583,74 +2510,58 @@ HWTEST_F(DeviceManagerImplTest, GetAllTrustedDeviceList_001, testing::ext::TestS ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); pkgName = "p*******lo"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); ret = DeviceManager::GetInstance().GetAllTrustedDeviceList(pkgName, extra, deviceList); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); ret = DeviceManager::GetInstance().GetAllTrustedDeviceList(pkgName, extra, deviceList); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, RegisterLocalServiceInfo_001, testing::ext::TestSize.Level0) { DMLocalServiceInfo info; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().RegisterLocalServiceInfo(info); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); ret = DeviceManager::GetInstance().RegisterLocalServiceInfo(info); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, UnRegisterLocalServiceInfo_001, testing::ext::TestSize.Level0) { std::string bundleName = "b*********kl"; int32_t pinExchangeType = 1; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().UnRegisterLocalServiceInfo(bundleName, pinExchangeType); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); ret = DeviceManager::GetInstance().UnRegisterLocalServiceInfo(bundleName, pinExchangeType); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, UpdateLocalServiceInfo_001, testing::ext::TestSize.Level0) { DMLocalServiceInfo info; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().UpdateLocalServiceInfo(info); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); ret = DeviceManager::GetInstance().UpdateLocalServiceInfo(info); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, GetLocalServiceInfoByBundleNameAndPinExchangeType_001, testing::ext::TestSize.Level0) @@ -2658,21 +2569,17 @@ HWTEST_F(DeviceManagerImplTest, GetLocalServiceInfoByBundleNameAndPinExchangeTyp std::string bundleName = "b*********kl"; int32_t pinExchangeType = 1; DMLocalServiceInfo info; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); int32_t ret = DeviceManager::GetInstance().GetLocalServiceInfoByBundleNameAndPinExchangeType(bundleName, pinExchangeType, info); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); ret = DeviceManager::GetInstance().GetLocalServiceInfoByBundleNameAndPinExchangeType(bundleName, pinExchangeType, info); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } } // namespace } // namespace DistributedHardware diff --git a/test/unittest/UTTest_device_manager_impl.h b/test/unittest/UTTest_device_manager_impl.h index 05550beebbc9f11784454e1bfe062ab46d1a39c2..21c5bdfbce7801f999a964e2c6f520e7e6be98d9 100644 --- a/test/unittest/UTTest_device_manager_impl.h +++ b/test/unittest/UTTest_device_manager_impl.h @@ -39,6 +39,7 @@ public: static inline std::shared_ptr deviceManagerNotifyMock_ = std::make_shared(); + static inline std::shared_ptr ipcClientProxyMock_ = std::make_shared(); }; class DeviceDiscoveryCallbackTest : public DiscoveryCallback { diff --git a/test/unittest/UTTest_device_manager_impl_three.cpp b/test/unittest/UTTest_device_manager_impl_three.cpp index 952cbe49d7f192208988bcdf0a5e703a1077759f..4fec18209a9c054faae66cda9e76164cba92ba0c 100644 --- a/test/unittest/UTTest_device_manager_impl_three.cpp +++ b/test/unittest/UTTest_device_manager_impl_three.cpp @@ -84,15 +84,11 @@ HWTEST_F(DeviceManagerImplTest, RequestCredential_002, testing::ext::TestSize.Le } )"; std::string returnJsonStr; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) - .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().RequestCredential(packName, reqJsonStr, returnJsonStr); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -112,12 +108,15 @@ HWTEST_F(DeviceManagerImplTest, RequestCredential_003, testing::ext::TestSize.Le std::string reqJsonStr = R"( { "version":"1.0.0.1", - "userId":"4269DC28B639681698809A67EDAD08E39F207900038F91EFF95DD042FE2874E4" + "userId":"4269DC28B639681698809A67EDAD08E39F207900038F91EFF95DD042FE2874E4", + "CREDENTIAL_TYPE":"MINE", } )"; std::string returnJsonStr; std::shared_ptr callback = std::make_shared(); DeviceManager::GetInstance().InitDeviceManager(packName, callback); + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().RequestCredential(packName, reqJsonStr, returnJsonStr); ASSERT_EQ(ret, DM_OK); @@ -145,15 +144,11 @@ HWTEST_F(DeviceManagerImplTest, RequestCredential_004, testing::ext::TestSize.Le } )"; std::string returnJsonStr; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); int32_t ret = DeviceManager::GetInstance().RequestCredential(packName, reqJsonStr, returnJsonStr); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -207,14 +202,10 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_002, testing::ext::TestSize.Lev ] } )"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().ImportCredential(packName, credentialInfo); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -250,14 +241,10 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_003, testing::ext::TestSize.Lev ] } )"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().ImportCredential(packName, credentialInfo); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -293,14 +280,10 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_004, testing::ext::TestSize.Lev ] } )"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); int32_t ret = DeviceManager::GetInstance().ImportCredential(packName, credentialInfo); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -336,14 +319,10 @@ HWTEST_F(DeviceManagerImplTest, DeleteCredential_002, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string deleteInfo = R"({"processType":1,"authType":1,"userId":"123"})"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().DeleteCredential(packName, deleteInfo); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -361,14 +340,10 @@ HWTEST_F(DeviceManagerImplTest, DeleteCredential_003, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string deleteInfo = R"({"processType":1,"authType":1,"userId":"123"})"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().DeleteCredential(packName, deleteInfo); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -386,14 +361,10 @@ HWTEST_F(DeviceManagerImplTest, DeleteCredential_004, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string deleteInfo = R"({"processType":1,"authType":1,"userId":"123"})"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); int32_t ret = DeviceManager::GetInstance().DeleteCredential(packName, deleteInfo); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -430,6 +401,8 @@ HWTEST_F(DeviceManagerImplTest, RegisterCredentialCallback_002, testing::ext::Te std::shared_ptr callback = std::make_shared(); std::shared_ptr initCallback = std::make_shared(); DeviceManager::GetInstance().InitDeviceManager(packName, initCallback); + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().RegisterCredentialCallback(packName, callback); ASSERT_EQ(ret, DM_OK); DeviceManager::GetInstance().UnInitDeviceManager(packName); @@ -499,14 +472,10 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_001, testing::ext:: HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_002, testing::ext::TestSize.Level0) { std::string packName = "com.ohos.test"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().UnRegisterCredentialCallback(packName); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -523,14 +492,10 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_003, testing::ext:: { // 1. set packName null std::string packName = "com.ohos.test"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); int32_t ret = DeviceManager::GetInstance().UnRegisterCredentialCallback(packName); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -547,6 +512,8 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_004, testing::ext:: std::string packName = "com.ohos.test"; std::shared_ptr callback = std::make_shared(); DeviceManager::GetInstance().InitDeviceManager(packName, callback); + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().UnRegisterCredentialCallback(packName); ASSERT_EQ(ret, DM_OK); DeviceManager::GetInstance().UnInitDeviceManager(packName); @@ -563,12 +530,8 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_004, testing::ext:: */ HWTEST_F(DeviceManagerImplTest, OnDmServiceDied_001, testing::ext::TestSize.Level0) { - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; int32_t ret = DeviceManagerImpl::GetInstance().OnDmServiceDied(); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -583,15 +546,11 @@ HWTEST_F(DeviceManagerImplTest, OnDmServiceDied_001, testing::ext::TestSize.Leve HWTEST_F(DeviceManagerImplTest, OnDmServiceDied_002, testing::ext::TestSize.Level0) { // 1. mock IpcClientProxy - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, OnDmServiceDied()).Times(1).WillOnce(testing::Return(ERR_DM_POINT_NULL)); + EXPECT_CALL(*ipcClientProxyMock_, OnDmServiceDied()).Times(1).WillOnce(testing::Return(ERR_DM_POINT_NULL)); // 2. call DeviceManagerImpl::OnDmServiceDied int32_t ret = DeviceManagerImpl::GetInstance().OnDmServiceDied(); // 3. check ret is DM_OK ASSERT_EQ(ret, ERR_DM_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -607,14 +566,10 @@ HWTEST_F(DeviceManagerImplTest, NotifyEvent_001, testing::ext::TestSize.Level0) std::string packName = "com.ohos.test"; int32_t eventId = DM_NOTIFY_EVENT_ONDEVICEREADY; std::string event = R"({"extra": {"deviceId": "123"})"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().NotifyEvent(packName, eventId, event); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1192,14 +1147,10 @@ HWTEST_F(DeviceManagerImplTest, SetDnPolicy006, testing::ext::TestSize.Level0) std::map policy; policy[PARAM_KEY_POLICY_STRATEGY_FOR_BLE] = "100"; policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().SetDnPolicy(packName, policy); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, StopDeviceDiscovery_301, testing::ext::TestSize.Level0) @@ -1445,6 +1396,46 @@ HWTEST_F(DeviceManagerImplTest, RegisterAuthenticationType_004, testing::ext::Te ASSERT_EQ(ret, DM_OK); DeviceManager::GetInstance().UnInitDeviceManager(packName); } + +HWTEST_F(DeviceManagerImplTest, UnRegisterPinHolderCallback_001, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.UnRegisterPinHolderCallback"; + std::shared_ptr callback = std::make_shared(); + DeviceManager::GetInstance().InitDeviceManager(packName, callback); + int32_t ret = DeviceManager::GetInstance().UnRegisterPinHolderCallback(packName); + ASSERT_EQ(ret, DM_OK); + DeviceManager::GetInstance().UnInitDeviceManager(packName); +} + +HWTEST_F(DeviceManagerImplTest, ImportAuthCode_301, testing::ext::TestSize.Level0) +{ + std::string pkgName = "com.ohos.test"; + std::string authCode; + authCode.append(1025, 'a'); + int32_t ret = DeviceManager::GetInstance().ImportAuthCode(pkgName, authCode); + ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DeviceManagerImplTest, ImportAuthCode_302, testing::ext::TestSize.Level0) +{ + std::string pkgName = "com.ohos.ImportAuthCode"; + std::string authCode = "950800"; + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1) + .WillOnce(testing::Return(DM_OK)); + int32_t ret = DeviceManager::GetInstance().ImportAuthCode(pkgName, authCode); + ASSERT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerImplTest, ExportAuthCode_301, testing::ext::TestSize.Level0) +{ + std::string authCode; + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1) + .WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); + int32_t ret = DeviceManager::GetInstance().ExportAuthCode(authCode); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_device_manager_impl_two.cpp b/test/unittest/UTTest_device_manager_impl_two.cpp index ea0aa57f4241a00f207a7fbc49242b5e2287ae8a..176d8f2ea820dae3f0a107f25980e5b45f13487a 100644 --- a/test/unittest/UTTest_device_manager_impl_two.cpp +++ b/test/unittest/UTTest_device_manager_impl_two.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -82,19 +82,17 @@ HWTEST_F(DeviceManagerImplTest, StopDeviceDiscovery_002, testing::ext::TestSize. { // 1. set packName not null std::string packName = "com.ohos.test"; - // set subscribeInfo is 0 - uint16_t subscribeId = 0; + // set subscribeInfo is 1 + uint16_t subscribeId = 1; + std::string pkgNameTemp = ComposeStr(packName, 1); + DeviceManagerImpl::GetInstance().pkgName2SubIdMap_[pkgNameTemp] = 10; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::StopDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().StopDeviceDiscovery(packName, subscribeId); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -112,20 +110,18 @@ HWTEST_F(DeviceManagerImplTest, StopDeviceDiscovery_003, testing::ext::TestSize. { // 1. set packName not null std::string packName = "com.ohos.test"; - // set subscribeInfo is 0 - uint16_t subscribeId = 0; + // set subscribeInfo is 1 + uint16_t subscribeId = 1; + std::string pkgNameTemp = ComposeStr(packName, 1); + DeviceManagerImpl::GetInstance().pkgName2SubIdMap_[pkgNameTemp] = 10; // 2. MOCK IpcClientProxy SendRequest return DM_OK - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); std::shared_ptr callback = std::make_shared(); // 3. call DeviceManagerImpl::StopDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().StopDeviceDiscovery(packName, subscribeId); // 4. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -146,14 +142,10 @@ HWTEST_F(DeviceManagerImplTest, StopDeviceDiscovery_004, testing::ext::TestSize. // set subscribeInfo is 0 uint16_t subscribeId = 0; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; // 3. call DeviceManagerImpl::StopDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().StopDeviceDiscovery(packName, subscribeId); - // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED - ASSERT_NE(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; + // 4. check ret is DM_OK + ASSERT_EQ(ret, DM_OK); } /** @@ -174,14 +166,10 @@ HWTEST_F(DeviceManagerImplTest, StopDeviceDiscovery_005, testing::ext::TestSize. // set subscribeInfo is 0 uint16_t subscribeId = 0; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_POINT_NULL - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; // 3. call DeviceManagerImpl::StopDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().StopDeviceDiscovery(packName, subscribeId); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_NE(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -253,16 +241,12 @@ HWTEST_F(DeviceManagerImplTest, PublishDeviceDiscovery_003, testing::ext::TestSi DmPublishInfo publishInfo; std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::PublishDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().PublishDeviceDiscovery(packName, publishInfo, callback); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -286,16 +270,12 @@ HWTEST_F(DeviceManagerImplTest, PublishDeviceDiscovery_004, testing::ext::TestSi // set callback not null std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return DM_OK - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - std::shared_ptr mockInstance = std::make_shared(); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); // 3. call DeviceManagerImpl::PublishDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().PublishDeviceDiscovery(packName, publishInfo, callback); // 4. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -319,16 +299,12 @@ HWTEST_F(DeviceManagerImplTest, PublishDeviceDiscovery_005, testing::ext::TestSi // set callback not null std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - std::shared_ptr mockInstance = std::make_shared(); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::PublishDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().PublishDeviceDiscovery(packName, publishInfo, callback); // 4. check ret is DEVICEMANAGER_IPC_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -370,16 +346,12 @@ HWTEST_F(DeviceManagerImplTest, UnPublishDeviceDiscovery_002, testing::ext::Test // set subscribeInfo is 0 int32_t publishId = 0; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::UnPublishDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().UnPublishDeviceDiscovery(packName, publishId); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -400,16 +372,12 @@ HWTEST_F(DeviceManagerImplTest, UnPublishDeviceDiscovery_003, testing::ext::Test // set subscribeInfo is 0 int32_t publishId = 0; // 2. MOCK IpcClientProxy SendRequest return DM_OK - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); // 3. call DeviceManagerImpl::UnPublishDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().UnPublishDeviceDiscovery(packName, publishId); // 4. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -430,16 +398,12 @@ HWTEST_F(DeviceManagerImplTest, UnPublishDeviceDiscovery_004, testing::ext::Test // set publishId is 0 int32_t publishId = 0; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); // 3. call DeviceManagerImpl::UnPublishDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().UnPublishDeviceDiscovery(packName, publishId); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -460,16 +424,12 @@ HWTEST_F(DeviceManagerImplTest, UnPublishDeviceDiscovery_005, testing::ext::Test // set publishId is 0 int32_t publishId = 0; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_POINT_NULL - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_POINT_NULL)); // 3. call DeviceManagerImpl::StopDeviceDiscovery with parameter int32_t ret = DeviceManager::GetInstance().UnPublishDeviceDiscovery(packName, publishId); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -528,16 +488,12 @@ HWTEST_F(DeviceManagerImplTest, AuthenticateDevice_002, testing::ext::TestSize.L // set callback null std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::AuthenticateDevice with parameter int32_t ret = DeviceManager::GetInstance().AuthenticateDevice(packName, authType, dmDeviceInfo, extra, callback); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -567,16 +523,12 @@ HWTEST_F(DeviceManagerImplTest, AuthenticateDevice_003, testing::ext::TestSize.L // set callback null std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return DM_OK - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); // 3. call DeviceManagerImpl::AuthenticateDevice with parameter int32_t ret = DeviceManager::GetInstance().AuthenticateDevice(packName, authType, dmDeviceInfo, extra, callback); // 4. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -606,16 +558,12 @@ HWTEST_F(DeviceManagerImplTest, AuthenticateDevice_004, testing::ext::TestSize.L // set callback null std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); // 3. call DeviceManagerImpl::AuthenticateDevice with parameter int32_t ret = DeviceManager::GetInstance().AuthenticateDevice(packName, authType, dmDeviceInfo, extra, callback); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -645,16 +593,12 @@ HWTEST_F(DeviceManagerImplTest, AuthenticateDevice_005, testing::ext::TestSize.L // set callback null std::shared_ptr callback = std::make_shared(); // 2. MOCK IpcClientProxy SendRequest return ERR_DM_POINT_NULL - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_POINT_NULL)); // 3. call DeviceManagerImpl::AuthenticateDevice with parameter int32_t ret = DeviceManager::GetInstance().AuthenticateDevice(packName, authType, dmDeviceInfo, extra, callback); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -732,16 +676,12 @@ HWTEST_F(DeviceManagerImplTest, UnAuthenticateDevice_003, testing::ext::TestSize // set callback null std::shared_ptr callback = nullptr; // 2. MOCK IpcClientProxy SendRequest return DM_OK - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); // 3. call DeviceManagerImpl::AuthenticateDevice with parameter int32_t ret = DeviceManager::GetInstance().UnAuthenticateDevice(packName, deviceInfo); // 4. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -769,16 +709,12 @@ HWTEST_F(DeviceManagerImplTest, UnAuthenticateDevice_004, testing::ext::TestSize deviceInfo.networkId[2] = '\0'; std::shared_ptr callback = nullptr; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); // 3. call DeviceManagerImpl::AuthenticateDevice with parameter int32_t ret = DeviceManager::GetInstance().UnAuthenticateDevice(packName, deviceInfo); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -806,16 +742,12 @@ HWTEST_F(DeviceManagerImplTest, UnAuthenticateDevice_005, testing::ext::TestSize deviceInfo.networkId[2] = '\0'; std::shared_ptr callback = nullptr; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_POINT_NULL - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_POINT_NULL)); // 3. call DeviceManagerImpl::AuthenticateDevice with parameter int32_t ret = DeviceManager::GetInstance().UnAuthenticateDevice(packName, deviceInfo); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -834,7 +766,7 @@ HWTEST_F(DeviceManagerImplTest, SetUserOperation_001, testing::ext::TestSize.Lev std::string packName = ""; // set authParam null int32_t action = 0; - const std::string param = "extra"; + const std::string param = R"({"test":"extra"})"; // 2. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret= DeviceManager::GetInstance().SetUserOperation(packName, action, param); // 3. check ret is ERR_DM_INPUT_PARA_INVALID @@ -858,18 +790,14 @@ HWTEST_F(DeviceManagerImplTest, SetUserOperation_002, testing::ext::TestSize.Lev std::string packName = "com.ohos.test"; // set authParam null int32_t action = 0; - const std::string param = "extra"; + const std::string param = R"({"test":"extra"})"; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret= DeviceManager::GetInstance().SetUserOperation(packName, action, param); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -889,7 +817,7 @@ HWTEST_F(DeviceManagerImplTest, SetUserOperation_003, testing::ext::TestSize.Lev std::string packName = "com.ohos.test"; // set authParam null int32_t action = 0; - const std::string param = "extra"; + const std::string param = R"({"test":"extra"})"; // 2. MOCK IpcClientProxy SendRequest return DM_OK std::shared_ptr callback = std::make_shared(); int32_t ret = DeviceManager::GetInstance().InitDeviceManager(packName, callback); @@ -917,18 +845,14 @@ HWTEST_F(DeviceManagerImplTest, SetUserOperation_004, testing::ext::TestSize.Lev std::string packName = "com.ohos.test"; // set authParam null int32_t action = 0; - const std::string param = "extra"; + const std::string param = R"({"test":"extra"})"; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); // 3. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret= DeviceManager::GetInstance().SetUserOperation(packName, action, param); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -948,18 +872,14 @@ HWTEST_F(DeviceManagerImplTest, SetUserOperation_005, testing::ext::TestSize.Lev std::string packName = "com.ohos.test"; // set authParam null int32_t action = 0; - const std::string param = "extra"; + const std::string param = R"({"test":"extra"})"; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_POINT_NULL - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_POINT_NULL)); // 3. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret= DeviceManager::GetInstance().SetUserOperation(packName, action, param); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1004,16 +924,12 @@ HWTEST_F(DeviceManagerImplTest, GetUdidByNetworkId_002, testing::ext::TestSize.L std::string netWorkId = "111"; std::string udid = "222"; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret = DeviceManager::GetInstance().GetUdidByNetworkId(packName, netWorkId, udid); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1035,17 +951,13 @@ HWTEST_F(DeviceManagerImplTest, GetUdidByNetworkId_003, testing::ext::TestSize.L std::string netWorkId = "111"; std::string udid = "222"; // 2. MOCK IpcClientProxy SendRequest return DM_OK - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::GetUdidByNetworkId with parameter int32_t ret = DeviceManager::GetInstance().GetUdidByNetworkId(packName, netWorkId, udid); // 4. check ret is DM_OK ASSERT_NE(ret, ERR_DM_INPUT_PARA_INVALID); // DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1067,16 +979,12 @@ HWTEST_F(DeviceManagerImplTest, GetUdidByNetworkId_004, testing::ext::TestSize.L std::string netWorkId = "111"; std::string udid = "222"; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); // 3. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret = DeviceManager::GetInstance().GetUdidByNetworkId(packName, netWorkId, udid); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1098,16 +1006,12 @@ HWTEST_F(DeviceManagerImplTest, GetUdidByNetworkId_005, testing::ext::TestSize.L std::string netWorkId = "111"; std::string udid = "222"; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_POINT_NULL - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_POINT_NULL)); // 3. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret = DeviceManager::GetInstance().GetUdidByNetworkId(packName, netWorkId, udid); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1152,16 +1056,12 @@ HWTEST_F(DeviceManagerImplTest, GetUuidByNetworkId_002, testing::ext::TestSize.L std::string netWorkId = "111"; std::string uuid = "222"; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret = DeviceManager::GetInstance().GetUuidByNetworkId(packName, netWorkId, uuid); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1183,16 +1083,12 @@ HWTEST_F(DeviceManagerImplTest, GetUuidByNetworkId_003, testing::ext::TestSize.L std::string netWorkId = "111"; std::string uuid = "222"; // 2. MOCK IpcClientProxy SendRequest return DM_OK - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_FAILED)); // 3. call DeviceManagerImpl::GetUuidByNetworkId with parameter int32_t ret = DeviceManager::GetInstance().GetUuidByNetworkId(packName, netWorkId, uuid); // 4. check ret is DM_OK ASSERT_NE(ret, ERR_DM_INPUT_PARA_INVALID); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1214,16 +1110,12 @@ HWTEST_F(DeviceManagerImplTest, GetUuidByNetworkId_004, testing::ext::TestSize.L std::string netWorkId = "111"; std::string uuid = "222"; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); // 3. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret = DeviceManager::GetInstance().GetUuidByNetworkId(packName, netWorkId, uuid); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1245,16 +1137,12 @@ HWTEST_F(DeviceManagerImplTest, GetUuidByNetworkId_005, testing::ext::TestSize.L std::string netWorkId = "111"; std::string uuid = "222"; // 2. MOCK IpcClientProxy SendRequest return ERR_DM_POINT_NULL - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_POINT_NULL)); // 3. call DeviceManagerImpl::SetUserOperation with parameter int32_t ret = DeviceManager::GetInstance().GetUuidByNetworkId(packName, netWorkId, uuid); // 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1297,15 +1185,11 @@ HWTEST_F(DeviceManagerImplTest, RegisterDeviceManagerFaCallback_002, testing::ex // set callback null std::shared_ptr callback = std::make_shared(); // 2. call DeviceManagerImpl::RegisterDeviceManagerFaCallback with parameter - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().RegisterDeviceManagerFaCallback(packName, callback); // 3. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1407,15 +1291,11 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterDeviceManagerFaCallback_002, testing:: // 1. set packName null std::string packName = "com.ohos.test"; // 2. call DeviceManagerImpl::RegisterDeviceManagerFaCallback with parameter - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().UnRegisterDeviceManagerFaCallback(packName); // 3. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1440,10 +1320,7 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterDeviceManagerFaCallback_003, testing:: // set callback not null std::shared_ptr callback = std::make_shared(); // 2. call DeviceManager RegisterDeviceManagerFaCallback with parameter - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().RegisterDeviceManagerFaCallback(pkgName, callback); // 3. check ret is DM_OK @@ -1455,14 +1332,13 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterDeviceManagerFaCallback_003, testing:: // 5. check checkMap not null ASSERT_NE(checkMap, nullptr); // 6. call DeviceManager UnRegisterDeviceManagerFaCallback with parameter - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); DeviceManager::GetInstance().UnRegisterDeviceManagerFaCallback(pkgName); // 7. Get checkMap from pkgName checkMap = DeviceManagerNotify::GetInstance().dmUiCallback_[pkgName]; // 8 check checkMap null ASSERT_EQ(checkMap, nullptr); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } /** @@ -1487,15 +1363,11 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterDeviceManagerFaCallback_004, testing:: // set callback not null std::shared_ptr callback = std::make_shared(); // 2. call DeviceManager RegisterDeviceManagerFaCallback with parameter - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) - .Times(1).WillOnce(testing::Return(DM_OK)); + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(testing::AtLeast(1)).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().RegisterDeviceManagerFaCallback(pkgName, callback); // 3. check ret is DM_OK ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; // 4. set checkMap null std::shared_ptr checkMap = nullptr; // 5. Get checkMap from DeviceManagerNotify @@ -1595,14 +1467,10 @@ HWTEST_F(DeviceManagerImplTest, StopAuthenticateDevice_201, testing::ext::TestSi ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); pkgName = "pkgName"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); ret = DeviceManager::GetInstance().StopAuthenticateDevice(pkgName); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, VerifyAuthentication_201, testing::ext::TestSize.Level0) @@ -1657,42 +1525,30 @@ HWTEST_F(DeviceManagerImplTest, RequestCredential_201, testing::ext::TestSize.Le std::string pkgName = "pkgName"; std::string reqJsonStr = "reqJsonStr"; std::string returnJsonStr = ""; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().RequestCredential(pkgName, reqJsonStr, returnJsonStr); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, ImportCredential_201, testing::ext::TestSize.Level0) { std::string pkgName = "pkgName"; std::string credentialInfo = "credentialInfo"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().ImportCredential(pkgName, credentialInfo); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, DeleteCredential_201, testing::ext::TestSize.Level0) { std::string pkgName = "pkgName"; std::string deleteInfo = "deleteInfo"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().DeleteCredential(pkgName, deleteInfo); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, RegisterCredentialCallback_201, testing::ext::TestSize.Level0) @@ -1709,14 +1565,10 @@ HWTEST_F(DeviceManagerImplTest, RegisterCredentialCallback_201, testing::ext::Te pkgName = "pkgName"; callback = std::make_shared(); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); ret = DeviceManager::GetInstance().RegisterCredentialCallback(pkgName, callback); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_201, testing::ext::TestSize.Level0) @@ -1726,14 +1578,10 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_201, testing::ext:: ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); pkgName = "pkgName"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); ret = DeviceManager::GetInstance().UnRegisterCredentialCallback(pkgName); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, NotifyEvent_201, testing::ext::TestSize.Level0) @@ -1750,14 +1598,10 @@ HWTEST_F(DeviceManagerImplTest, NotifyEvent_201, testing::ext::TestSize.Level0) ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); eventId = DM_NOTIFY_EVENT_ONDEVICEREADY; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); ret = DeviceManager::GetInstance().NotifyEvent(pkgName, eventId, event); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, OnDmServiceDied_201, testing::ext::TestSize.Level0) @@ -1768,26 +1612,18 @@ HWTEST_F(DeviceManagerImplTest, OnDmServiceDied_201, testing::ext::TestSize.Leve HWTEST_F(DeviceManagerImplTest, CheckAPIAccessPermission_201, testing::ext::TestSize.Level0) { - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().CheckAPIAccessPermission(); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, CheckNewAPIAccessPermission_201, testing::ext::TestSize.Level0) { - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().CheckNewAPIAccessPermission(); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, UnBindDevice_201, testing::ext::TestSize.Level0) @@ -1795,14 +1631,10 @@ HWTEST_F(DeviceManagerImplTest, UnBindDevice_201, testing::ext::TestSize.Level0) std::string pkgName = "pkgName_201"; std::string deviceId = "deviceId201"; std::string extra = "extra"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().UnBindDevice(pkgName, deviceId, extra); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, ImportAuthCode_201, testing::ext::TestSize.Level0) @@ -1813,14 +1645,10 @@ HWTEST_F(DeviceManagerImplTest, ImportAuthCode_201, testing::ext::TestSize.Level ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); authCode = "123456"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); ret = DeviceManager::GetInstance().ImportAuthCode(pkgName, authCode); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, StartAdvertising_201, testing::ext::TestSize.Level0) @@ -1926,13 +1754,9 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialAuthStatusCallback_201, test DeviceManagerImpl::GetInstance().SyncCallbackToService(dmCommonNotifyEvent, pkgName); dmCommonNotifyEvent = DmCommonNotifyEvent::REG_DEVICE_SCREEN_STATE; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); DeviceManagerImpl::GetInstance().SyncCallbackToService(dmCommonNotifyEvent, pkgName); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, RegisterSinkBindCallback_201, testing::ext::TestSize.Level0) @@ -1972,14 +1796,10 @@ HWTEST_F(DeviceManagerImplTest, GetDeviceProfileInfoList_201, testing::ext::Test EXPECT_CALL(*deviceManagerNotifyMock_, RegisterGetDeviceProfileInfoListCallback(_, _)) .WillOnce(Return(DM_OK)); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); ret = DeviceManager::GetInstance().GetDeviceProfileInfoList(pkgName, filterOptions, callback); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, GetDeviceProfileInfoList_202, testing::ext::TestSize.Level0) @@ -1990,14 +1810,10 @@ HWTEST_F(DeviceManagerImplTest, GetDeviceProfileInfoList_202, testing::ext::Test std::make_shared(); EXPECT_CALL(*deviceManagerNotifyMock_, RegisterGetDeviceProfileInfoListCallback(_, _)) .WillOnce(Return(DM_OK)); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().GetDeviceProfileInfoList(pkgName, filterOptions, callback); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, GetDeviceIconInfo_201, testing::ext::TestSize.Level0) @@ -2012,14 +1828,10 @@ HWTEST_F(DeviceManagerImplTest, GetDeviceIconInfo_201, testing::ext::TestSize.Le EXPECT_CALL(*deviceManagerNotifyMock_, RegisterGetDeviceIconInfoCallback(_, _, _)) .WillOnce(Return(DM_OK)); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); ret = DeviceManager::GetInstance().GetDeviceIconInfo(pkgName, filterOptions, callback); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, GetDeviceIconInfo_202, testing::ext::TestSize.Level0) @@ -2029,27 +1841,19 @@ HWTEST_F(DeviceManagerImplTest, GetDeviceIconInfo_202, testing::ext::TestSize.Le std::shared_ptr callback = std::make_shared(); EXPECT_CALL(*deviceManagerNotifyMock_, RegisterGetDeviceIconInfoCallback(_, _, _)) .WillOnce(Return(DM_OK)); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().GetDeviceIconInfo(pkgName, filterOptions, callback); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, StopAuthenticateDevice_202, testing::ext::TestSize.Level0) { std::string pkgName = "pkgName"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().StopAuthenticateDevice(pkgName); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, UnBindDevice_202, testing::ext::TestSize.Level0) @@ -2057,28 +1861,20 @@ HWTEST_F(DeviceManagerImplTest, UnBindDevice_202, testing::ext::TestSize.Level0) std::string pkgName = "pkgName_201"; std::string deviceId = "deviceId201"; std::string extra = "extra"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().UnBindDevice(pkgName, deviceId, extra); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, UnBindDevice_203, testing::ext::TestSize.Level0) { std::string pkgName = "pkgName_201"; std::string deviceId = "deviceId201"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().UnBindDevice(pkgName, deviceId); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, RegisterDiscoveryCallback_201, testing::ext::TestSize.Level0) @@ -2087,15 +1883,11 @@ HWTEST_F(DeviceManagerImplTest, RegisterDiscoveryCallback_201, testing::ext::Tes std::map discoverParam; std::map filterOptions; std::shared_ptr callback = std::make_shared(); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().RegisterDiscoveryCallback(pkgName, discoverParam, filterOptions, callback); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, RegisterDiscoveryCallback_202, testing::ext::TestSize.Level0) @@ -2104,15 +1896,11 @@ HWTEST_F(DeviceManagerImplTest, RegisterDiscoveryCallback_202, testing::ext::Tes std::map discoverParam; std::map filterOptions; std::shared_ptr callback = std::make_shared(); - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().RegisterDiscoveryCallback(pkgName, discoverParam, filterOptions, callback); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, UnRegisterDiscoveryCallback_201, testing::ext::TestSize.Level0) @@ -2120,14 +1908,10 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterDiscoveryCallback_201, testing::ext::T std::string pkgName = "pkgName"; std::string pkgNameTemp = ComposeStr(pkgName, 0); DeviceManagerImpl::GetInstance().pkgName2SubIdMap_[pkgNameTemp] = 10; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().UnRegisterDiscoveryCallback(pkgName); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, UnRegisterDiscoveryCallback_202, testing::ext::TestSize.Level0) @@ -2135,14 +1919,10 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterDiscoveryCallback_202, testing::ext::T std::string pkgName = "pkgName"; std::string pkgNameTemp = ComposeStr(pkgName, 0); DeviceManagerImpl::GetInstance().pkgName2SubIdMap_[pkgNameTemp] = 10; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().UnRegisterDiscoveryCallback(pkgName); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, StopAdvertising_201, testing::ext::TestSize.Level0) @@ -2150,14 +1930,10 @@ HWTEST_F(DeviceManagerImplTest, StopAdvertising_201, testing::ext::TestSize.Leve std::string packName = "pkgName"; std::map advertiseParam; advertiseParam[PARAM_KEY_PUBLISH_ID] = "10"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INPUT_PARA_INVALID)); int32_t ret = DeviceManager::GetInstance().StopAdvertising(packName, advertiseParam); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, StopAdvertising_202, testing::ext::TestSize.Level0) @@ -2165,42 +1941,30 @@ HWTEST_F(DeviceManagerImplTest, StopAdvertising_202, testing::ext::TestSize.Leve std::string packName = "pkgName"; std::map advertiseParam; advertiseParam[PARAM_KEY_PUBLISH_ID] = "10"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().StopAdvertising(packName, advertiseParam); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, CheckIsSameAccount_201, testing::ext::TestSize.Level0) { DmAccessCaller caller; DmAccessCallee callee; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INPUT_PARA_INVALID)); bool ret = DeviceManager::GetInstance().CheckIsSameAccount(caller, callee); ASSERT_FALSE(ret); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, CheckIsSameAccount_202, testing::ext::TestSize.Level0) { DmAccessCaller caller; DmAccessCallee callee; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); bool ret = DeviceManager::GetInstance().CheckIsSameAccount(caller, callee); - ASSERT_TRUE(ret); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; + ASSERT_FALSE(ret); } HWTEST_F(DeviceManagerImplTest, SetDnPolicy_202, testing::ext::TestSize.Level0) @@ -2209,14 +1973,10 @@ HWTEST_F(DeviceManagerImplTest, SetDnPolicy_202, testing::ext::TestSize.Level0) std::map policy; policy["policy01"] = "101"; policy["policy02"] = "102"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_INPUT_PARA_INVALID)); int32_t ret = DeviceManager::GetInstance().SetDnPolicy(pkgName, policy); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, SetDnPolicy_203, testing::ext::TestSize.Level0) @@ -2225,14 +1985,10 @@ HWTEST_F(DeviceManagerImplTest, SetDnPolicy_203, testing::ext::TestSize.Level0) std::map policy; policy["policy01"] = "101"; policy["policy02"] = "102"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().SetDnPolicy(pkgName, policy); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, GetDeviceScreenStatus_201, testing::ext::TestSize.Level0) @@ -2249,14 +2005,10 @@ HWTEST_F(DeviceManagerImplTest, GetDeviceScreenStatus_202, testing::ext::TestSiz std::string pkgName = "pkgName"; std::string networkId = "networkId"; int32_t screenStatus = 1; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().GetDeviceScreenStatus(pkgName, networkId, screenStatus); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, GetDeviceScreenStatus_203, testing::ext::TestSize.Level0) @@ -2264,14 +2016,10 @@ HWTEST_F(DeviceManagerImplTest, GetDeviceScreenStatus_203, testing::ext::TestSiz std::string pkgName = "pkgName"; std::string networkId = "networkId"; int32_t screenStatus = 1; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().GetDeviceScreenStatus(pkgName, networkId, screenStatus); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, GetNetworkIdByUdid_202, testing::ext::TestSize.Level0) @@ -2279,14 +2027,10 @@ HWTEST_F(DeviceManagerImplTest, GetNetworkIdByUdid_202, testing::ext::TestSize.L std::string pkgName = "pkgName"; std::string udid = "udid"; std::string networkId = "networkId"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) - .Times(1).WillOnce(testing::Return(DM_OK)); + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(testing::AtLeast(1)).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().GetNetworkIdByUdid(pkgName, udid, networkId); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; std::map> callbackMap; DeviceManagerImpl::GetInstance().SyncCallbacksToService(callbackMap); @@ -2301,28 +2045,20 @@ HWTEST_F(DeviceManagerImplTest, PutDeviceProfileInfoList_201, testing::ext::Test { std::string pkgName = "pkgName"; std::vector deviceProfileInfoList; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, PutDeviceProfileInfoList_202, testing::ext::TestSize.Level0) { std::string pkgName = "pkgName"; std::vector deviceProfileInfoList; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); int32_t ret = DeviceManager::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } HWTEST_F(DeviceManagerImplTest, GetLocalDisplayDeviceName_201, testing::ext::TestSize.Level0) @@ -2330,19 +2066,29 @@ HWTEST_F(DeviceManagerImplTest, GetLocalDisplayDeviceName_201, testing::ext::Tes std::string pkgName = "pkgName"; int32_t maxNameLength = 1; std::string displayName = "displayName"; - std::shared_ptr mockInstance = std::make_shared(); - std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; - DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); int32_t ret = DeviceManager::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); - EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); ret = DeviceManager::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); ASSERT_EQ(ret, DM_OK); - DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; +} + +HWTEST_F(DeviceManagerImplTest, GetLocalDeviceName_201, testing::ext::TestSize.Level0) +{ + std::string deviceName = "deviceName"; + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); + int32_t ret = DeviceManager::GetInstance().GetLocalDeviceName(deviceName); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + + EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); + ret = DeviceManager::GetInstance().GetLocalDeviceName(deviceName); + ASSERT_EQ(ret, DM_OK); } } // namespace } // namespace DistributedHardware diff --git a/test/unittest/UTTest_device_manager_notify_two.cpp b/test/unittest/UTTest_device_manager_notify_two.cpp index b3589cf126bfb8325621fdf63462c84f36a06d54..5ac4518129119b0ae0a379fb7898433f1fbc6366 100644 --- a/test/unittest/UTTest_device_manager_notify_two.cpp +++ b/test/unittest/UTTest_device_manager_notify_two.cpp @@ -842,7 +842,8 @@ HWTEST_F(DeviceManagerNotifyTest, OnDeviceChanged_001, testing::ext::TestSize.Le DeviceManagerNotify::GetInstance().OnDeviceChanged(pkgName, deviceInfo); // 7. check if callback OnDeviceChanged called sleep(1); - ASSERT_EQ(count, 1); + // 8. call OnDeviceChanged,count != 0 + ASSERT_NE(count, 0); } /* diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index 08e5dd4e5eb2624908288ca937c5161086ae8fe0..28dbe38324c9ab2aa75bd2647b888b0e90980102 100644 --- a/test/unittest/UTTest_device_manager_service.cpp +++ b/test/unittest/UTTest_device_manager_service.cpp @@ -61,6 +61,16 @@ void DeviceManagerServiceTest::SetUp() void DeviceManagerServiceTest::TearDown() { + Mock::VerifyAndClearExpectations(permissionManagerMock_.get()); + Mock::VerifyAndClearExpectations(softbusListenerMock_.get()); + Mock::VerifyAndClearExpectations(kVAdapterManagerMock_.get()); + Mock::VerifyAndClearExpectations(appManagerMock_.get()); + Mock::VerifyAndClearExpectations(deviceManagerServiceImplMock_.get()); + Mock::VerifyAndClearExpectations(softbusCacheMock_.get()); + Mock::VerifyAndClearExpectations(cryptoMock_.get()); + Mock::VerifyAndClearExpectations(multipleUserConnectorMock_.get()); + Mock::VerifyAndClearExpectations(dMCommToolMock_.get()); + Mock::VerifyAndClearExpectations(deviceProfileConnectorMock_.get()); } void DeviceManagerServiceTest::SetUpTestCase() @@ -273,23 +283,18 @@ HWTEST_F(DeviceManagerServiceTest, UnPublishDeviceDiscovery_004, testing::ext::T std::map preUserDeviceMap; std::multimap curMultiMap; std::string commonEventType = EventFwk::CommonEventSupport::COMMON_EVENT_USER_SWITCHED; - EXPECT_CALL(*deviceManagerServiceImplMock_, - GetDeviceIdAndBindLevel(_)).WillOnce(Return(curUserDeviceMap)).WillOnce(Return(preUserDeviceMap)); DeviceManagerService::GetInstance().AccountCommonEventCallback(commonEventType, userId, preUserId); commonEventType = EventFwk::CommonEventSupport::COMMON_EVENT_HWID_LOGIN; DMAccountInfo dmAccountInfo; DeviceManagerService::GetInstance().AccountCommonEventCallback(commonEventType, userId, preUserId); commonEventType = EventFwk::CommonEventSupport::COMMON_EVENT_HWID_LOGOUT; EXPECT_CALL(*multipleUserConnectorMock_, GetAccountInfoByUserId(_)).WillOnce(Return(dmAccountInfo)); - EXPECT_CALL(*deviceManagerServiceImplMock_, GetDeviceIdAndUserId(_)).WillOnce(Return(curMultiMap)); DeviceManagerService::GetInstance().AccountCommonEventCallback(commonEventType, userId, preUserId); commonEventType = EventFwk::CommonEventSupport::COMMON_EVENT_USER_REMOVED; EXPECT_CALL(*deviceManagerServiceImplMock_, GetDeviceIdAndUserId(_)).WillOnce(Return(curMultiMap)); DeviceManagerService::GetInstance().AccountCommonEventCallback(commonEventType, userId, preUserId); commonEventType = EventFwk::CommonEventSupport::COMMON_EVENT_BOOT_COMPLETED; DeviceManagerService::GetInstance().AccountCommonEventCallback(commonEventType, userId, preUserId); - EXPECT_CALL(*deviceManagerServiceImplMock_, GetDeviceIdAndUserId(_)) - .WillOnce(Return(curMultiMap)).WillOnce(Return(curMultiMap)); DeviceManagerService::GetInstance().HandleAccountLogout(userId, accountId, pkgName); EXPECT_CALL(*deviceManagerServiceImplMock_, GetDeviceIdAndUserId(_)).WillOnce(Return(curMultiMap)); DeviceManagerService::GetInstance().HandleUserRemoved(preUserId); @@ -768,7 +773,7 @@ HWTEST_F(DeviceManagerServiceTest, SetUserOperation_001, testing::ext::TestSize. DeletePermission(); std::string pkgName = "com.ohos.test"; int32_t action = 0; - const std::string param = "extra"; + const std::string param = "{\"test\": \"extra\"}";; int ret = DeviceManagerService::GetInstance().SetUserOperation(pkgName, action, param); EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); } @@ -784,7 +789,7 @@ HWTEST_F(DeviceManagerServiceTest, SetUserOperation_002, testing::ext::TestSize. { std::string pkgName = ""; int32_t action = 0; - const std::string param = "extra"; + const std::string param = "{\"test\": \"extra\"}"; int ret = DeviceManagerService::GetInstance().SetUserOperation(pkgName, action, param); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -816,7 +821,7 @@ HWTEST_F(DeviceManagerServiceTest, SetUserOperation_004, testing::ext::TestSize. { std::string pkgName = "pkgName"; int32_t action = 0; - const std::string param = "extra"; + const std::string param = R"({"test":"extra"})"; int ret = DeviceManagerService::GetInstance().SetUserOperation(pkgName, action, param); EXPECT_EQ(ret, DM_OK); } @@ -1239,7 +1244,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_001, testing::ext::TestSize.Leve EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -1277,7 +1282,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_005, testing::ext::TestSize.Leve EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -1322,19 +1327,6 @@ HWTEST_F(DeviceManagerServiceTest, OnSessionOpened_001, testing::ext::TestSize.L EXPECT_NE(ret, ERR_DM_NOT_INIT); } -HWTEST_F(DeviceManagerServiceTest, OnPinHolderSessionOpened_001, testing::ext::TestSize.Level1) -{ - DeviceManagerService::GetInstance().isImplsoLoaded_ = false; - int sessionId = 0; - int result = 0; - void *data = nullptr; - unsigned int dataLen = 0; - int ret = DeviceManagerService::GetInstance().OnPinHolderSessionOpened(sessionId, result); - DeviceManagerService::GetInstance().OnPinHolderBytesReceived(sessionId, data, dataLen); - DeviceManagerService::GetInstance().OnPinHolderSessionClosed(sessionId); - EXPECT_NE(ret, DM_OK); -} - HWTEST_F(DeviceManagerServiceTest, MineRequestCredential_001, testing::ext::TestSize.Level1) { DeviceManagerService::GetInstance().isImplsoLoaded_ = false; @@ -1458,22 +1450,6 @@ HWTEST_F(DeviceManagerServiceTest, UnRegisterUiStateCallback_003, testing::ext:: EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); } - -HWTEST_F(DeviceManagerServiceTest, IsDMImplSoLoaded_001, testing::ext::TestSize.Level1) -{ - DeviceManagerService::GetInstance().isImplsoLoaded_ = false; - bool ret = DeviceManagerService::GetInstance().IsDMImplSoLoaded(); - EXPECT_FALSE(ret); -} - -HWTEST_F(DeviceManagerServiceTest, DmHiDumper_001, testing::ext::TestSize.Level1) -{ - std::vector args; - std::string result; - int32_t ret = DeviceManagerService::GetInstance().DmHiDumper(args, result); - EXPECT_EQ(ret, DM_OK); -} - HWTEST_F(DeviceManagerServiceTest, NotifyEvent_001, testing::ext::TestSize.Level1) { std::string pkgName; @@ -1564,26 +1540,6 @@ HWTEST_F(DeviceManagerServiceTest, GetEncryptedUuidByNetworkId_003, testing::ext EXPECT_EQ(ret, ERR_DM_FAILED); } -HWTEST_F(DeviceManagerServiceTest, GenerateEncryptedUuid_001, testing::ext::TestSize.Level1) -{ - std::string pkgName; - std::string uuid; - std::string appId; - std::string encryptedUuid; - int32_t ret = DeviceManagerService::GetInstance().GenerateEncryptedUuid(pkgName, uuid, appId, encryptedUuid); - EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); -} - -HWTEST_F(DeviceManagerServiceTest, GenerateEncryptedUuid_002, testing::ext::TestSize.Level1) -{ - std::string pkgName = "pkgName"; - std::string uuid; - std::string appId; - std::string encryptedUuid; - int32_t ret = DeviceManagerService::GetInstance().GenerateEncryptedUuid(pkgName, uuid, appId, encryptedUuid); - EXPECT_EQ(ret, DM_OK); -} - HWTEST_F(DeviceManagerServiceTest, CheckApiPermission_002, testing::ext::TestSize.Level1) { DeletePermission(); @@ -1657,7 +1613,7 @@ HWTEST_F(DeviceManagerServiceTest, GetNetworkTypeByNetworkId_004, testing::ext:: std::string netWorkId = "netWorkId"; int32_t networkType = 0; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)).Times(::testing::AtLeast(2)) + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) .WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().GetNetworkTypeByNetworkId(pkgName, netWorkId, networkType); DeviceManagerService::GetInstance().softbusListener_ = nullptr; @@ -1731,8 +1687,6 @@ HWTEST_F(DeviceManagerServiceTest, StartDiscovering_003, testing::ext::TestSize. std::map discoverParam; std::map filterOptions; DeviceManagerService::GetInstance().InitDMServiceListener(); - EXPECT_CALL(*softbusListenerMock_, StopRefreshSoftbusLNN(_)).Times(::testing::AtLeast(1)) - .WillOnce(Return(SOFTBUS_NETWORK_NOT_INIT)); int32_t ret = DeviceManagerService::GetInstance().StartDiscovering(pkgName, discoverParam, filterOptions); EXPECT_TRUE(ret == SOFTBUS_IPC_ERR || ret == DM_OK || ret == SOFTBUS_DISCOVER_MANAGER_INNERFUNCTION_FAIL); ret = DeviceManagerService::GetInstance().StopDiscovering(pkgName, discoverParam); @@ -1780,8 +1734,6 @@ HWTEST_F(DeviceManagerServiceTest, StopDiscovering_003, testing::ext::TestSize.L std::string pkgName = "pkgName"; std::map discoverParam; DeviceManagerService::GetInstance().InitDMServiceListener(); - EXPECT_CALL(*softbusListenerMock_, StopRefreshSoftbusLNN(_)).Times(::testing::AtLeast(1)) - .WillOnce(Return(SOFTBUS_NETWORK_NOT_INIT)); int32_t ret = DeviceManagerService::GetInstance().StopDiscovering(pkgName, discoverParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); DeviceManagerService::GetInstance().UninitDMServiceListener(); @@ -1822,7 +1774,7 @@ HWTEST_F(DeviceManagerServiceTest, EnableDiscoveryListener_004, testing::ext::Te std::map filterOptions; DeviceManagerService::GetInstance().InitDMServiceListener(); int32_t ret = DeviceManagerService::GetInstance().EnableDiscoveryListener(pkgName, discoverParam, filterOptions); - EXPECT_NE(ret, DM_OK); + EXPECT_NE(ret, ERR_DM_NO_PERMISSION); DeviceManagerService::GetInstance().UninitDMServiceListener(); } @@ -1856,7 +1808,6 @@ HWTEST_F(DeviceManagerServiceTest, DisableDiscoveryListener_004, testing::ext::T std::string pkgName = "pkgName"; std::map extraParam; DeviceManagerService::GetInstance().InitDMServiceListener(); - EXPECT_CALL(*softbusListenerMock_, StopRefreshSoftbusLNN(_)).WillOnce(Return(SOFTBUS_NETWORK_NOT_INIT)); int32_t ret = DeviceManagerService::GetInstance().DisableDiscoveryListener(pkgName, extraParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); DeviceManagerService::GetInstance().UninitDMServiceListener(); @@ -1973,7 +1924,7 @@ HWTEST_F(DeviceManagerServiceTest, BindTarget_006, testing::ext::TestSize.Level1 DeviceManagerService::GetInstance().isImplsoLoaded_ = false; DeviceManagerService::GetInstance().dmServiceImpl_ = nullptr; int32_t ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); - EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(DeviceManagerServiceTest, UnbindTarget_004, testing::ext::TestSize.Level1) @@ -2155,15 +2106,6 @@ HWTEST_F(DeviceManagerServiceTest, IsSameAccount_003, testing::ext::TestSize.Lev EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); } -HWTEST_F(DeviceManagerServiceTest, HandleDeviceStatusChange_001, testing::ext::TestSize.Level1) -{ - DmDeviceState devState = DmDeviceState::DEVICE_INFO_READY; - DmDeviceInfo devInfo; - EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)).Times(::testing::AtLeast(2)).WillOnce(Return(DM_OK)); - DeviceManagerService::GetInstance().HandleDeviceStatusChange(devState, devInfo); - EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); -} - HWTEST_F(DeviceManagerServiceTest, CheckIsSameAccount_001, testing::ext::TestSize.Level1) { DmAccessCaller caller; @@ -2211,7 +2153,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_003, testing::ext::TestSize.Level std::vector peerUdids; int32_t userId = 1; uint64_t tokenId = 87; - DeviceManagerService::GetInstance().SendUnBindBroadCast(peerUdids, userId, tokenId, DEVICE); + DeviceManagerService::GetInstance().SendUnBindBroadCast(peerUdids, userId, tokenId, USER); DeviceManagerService::GetInstance().SendUnBindBroadCast(peerUdids, userId, tokenId, APP); DeviceManagerService::GetInstance().SendUnBindBroadCast(peerUdids, userId, tokenId, 2); DeviceManagerService::GetInstance().SendDeviceUnBindBroadCast(peerUdids, userId); @@ -2238,50 +2180,6 @@ HWTEST_F(DeviceManagerServiceTest, DestroyPinHolder_003, testing::ext::TestSize. EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } -HWTEST_F(DeviceManagerServiceTest, SendAppUnBindBroadCast_001, testing::ext::TestSize.Level1) -{ - std::vector peerUdids; - int32_t userId = 12; - uint64_t tokenId = 23; - DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); - DeviceManagerService::GetInstance().SendAppUnBindBroadCast(peerUdids, userId, tokenId); - EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); - DeviceManagerService::GetInstance().softbusListener_ = nullptr; -} - -HWTEST_F(DeviceManagerServiceTest, SendAppUnBindBroadCast_002, testing::ext::TestSize.Level1) -{ - std::vector peerUdids; - int32_t userId = 12; - uint64_t peerTokenId = 3; - uint64_t tokenId = 23; - DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); - DeviceManagerService::GetInstance().SendAppUnBindBroadCast(peerUdids, userId, tokenId, peerTokenId); - EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); - DeviceManagerService::GetInstance().softbusListener_ = nullptr; -} - -HWTEST_F(DeviceManagerServiceTest, SendServiceUnBindBroadCast_001, testing::ext::TestSize.Level1) -{ - std::vector peerUdids; - int32_t userId = 12; - uint64_t tokenId = 23; - DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); - DeviceManagerService::GetInstance().SendServiceUnBindBroadCast(peerUdids, userId, tokenId); - EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); - DeviceManagerService::GetInstance().softbusListener_ = nullptr; -} - -HWTEST_F(DeviceManagerServiceTest, ClearDiscoveryCache_001, testing::ext::TestSize.Level1) -{ - ProcessInfo processInfo; - processInfo.pkgName = "pkgName001"; - DeviceManagerService::GetInstance().InitDMServiceListener(); - DeviceManagerService::GetInstance().ClearDiscoveryCache(processInfo); - EXPECT_NE(DeviceManagerService::GetInstance().discoveryMgr_, nullptr); - DeviceManagerService::GetInstance().UninitDMServiceListener(); -} - HWTEST_F(DeviceManagerServiceTest, GetDeviceScreenStatus_001, testing::ext::TestSize.Level1) { std::string pkgName; @@ -2379,7 +2277,6 @@ HWTEST_F(DeviceManagerServiceTest, GetLocalDeviceInfo_002, testing::ext::TestSiz "peerUdid" : "110", "accountName" : "account_wang" })"; - DeviceManagerService::GetInstance().HandleDeviceTrustedChange(msg); int32_t ret = DeviceManagerService::GetInstance().GetLocalDeviceInfo(info); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } @@ -2408,7 +2305,7 @@ HWTEST_F(DeviceManagerServiceTest, GetNetworkIdByUdid_003, testing::ext::TestSiz std::string pkgName = "pkgName_003"; std::string udid = "sewdwed98897"; std::string networkId = "networkIdTest_003"; - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).Times(::testing::AtLeast(2)) + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) .WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().GetNetworkIdByUdid(pkgName, udid, networkId); EXPECT_EQ(ret, ERR_DM_FAILED); @@ -2596,6 +2493,15 @@ HWTEST_F(DeviceManagerServiceTest, GetEncryptedUuidByNetworkId_004, testing::ext EXPECT_EQ(ret, DM_OK); } +HWTEST_F(DeviceManagerServiceTest, OpenAuthSessionWithPara_001, testing::ext::TestSize.Level1) +{ + const std::string deviceId = "OpenAuthSessionWithPara"; + int32_t actionId = 0; + bool isEnable160m = false; + int32_t ret = DeviceManagerService::GetInstance().OpenAuthSessionWithPara(deviceId, actionId, isEnable160m); + EXPECT_NE(ret, DM_OK); +} + #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) HWTEST_F(DeviceManagerServiceTest, ConvertUdidHashToAnoyDeviceId_001, testing::ext::TestSize.Level1) { diff --git a/test/unittest/UTTest_device_manager_service_impl.cpp b/test/unittest/UTTest_device_manager_service_impl.cpp index 7c5db51b4a5a03de66535a58783d0db676ac7ab7..c2c5a453e4d6edd33613bd957b1ebb2a86efd3b2 100644 --- a/test/unittest/UTTest_device_manager_service_impl.cpp +++ b/test/unittest/UTTest_device_manager_service_impl.cpp @@ -30,11 +30,16 @@ void DeviceManagerServiceImplTest::SetUp() deviceManagerServiceImpl_ = std::make_shared(); } deviceManagerServiceImpl_->Initialize(listener_); + auto session = std::make_shared(0, ""); + session->version_ = DM_VERSION_5_0_OLD_MAX; + uint64_t tokenId = IPCSkeleton::GetCallingTokenID(); + deviceManagerServiceImpl_->InitAndRegisterAuthMgr(true, tokenId, session, 0, "com.test"); } const std::string testID("111111"); void DeviceManagerServiceImplTest::TearDown() { + Mock::VerifyAndClearExpectations(deviceProfileConnectorMock_.get()); } void DeviceManagerServiceImplTest::SetUpTestCase() @@ -69,7 +74,7 @@ void AddAccessControlProfileFirst(std::vector& accessContr int32_t userId = 123456; int32_t bindType = 4; int32_t deviceIdType = 1; - uint32_t bindLevel = DEVICE; + uint32_t bindLevel = USER; uint32_t status = 0; uint32_t authenticationType = 2; uint32_t accesserId = 1; @@ -120,7 +125,7 @@ void AddAccessControlProfileSecond(std::vector& accessCont int32_t userId = 123456; int32_t bindType = 1; int32_t deviceIdType = 1; - uint32_t bindLevel = DEVICE; + uint32_t bindLevel = USER; uint32_t status = 0; uint32_t authenticationType = 2; uint32_t accesserId = 1; @@ -171,7 +176,7 @@ void AddAccessControlProfileThird(std::vector& accessContr int32_t userId = 123456; int32_t bindType = 4; int32_t deviceIdType = 1; - uint32_t bindLevel = DEVICE; + uint32_t bindLevel = USER; uint32_t status = 0; uint32_t authenticationType = 2; uint32_t accesserId = 1; @@ -465,7 +470,7 @@ HWTEST_F(DeviceManagerServiceImplTest, NotifyEvent_005, testing::ext::TestSize.L devIdAndUserMap.insert(std::make_pair("devId02", 102)); devIdAndUserMap.insert(std::make_pair("devId03", 103)); EXPECT_CALL(*deviceProfileConnectorMock_, GetDevIdAndUserIdByActHash(_, _, _, _)).WillOnce(Return(devIdAndUserMap)); - EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _)) + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _, _)) .Times(::testing::AtLeast(3)).WillOnce(Return(true)); deviceManagerServiceImpl_->HandleAccountLogoutEvent(remoteUserId, remoteAccountHash, remoteUdid); @@ -473,7 +478,7 @@ HWTEST_F(DeviceManagerServiceImplTest, NotifyEvent_005, testing::ext::TestSize.L int32_t localUserId = 123; std::string peerUdid = "peerUdid"; int32_t peerUserId = 456; - EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _)).WillOnce(Return(true)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _, _)).WillOnce(Return(true)); deviceManagerServiceImpl_->HandleIdentAccountLogout(localUdid, localUserId, peerUdid, peerUserId); EXPECT_CALL(*dmDeviceStateManagerMock_, ProcNotifyEvent(_, _)).WillOnce(Return(DM_OK)); @@ -844,7 +849,7 @@ HWTEST_F(DeviceManagerServiceImplTest, SetUserOperation_001, testing::ext::TestS { std::string pkgName = ""; int32_t action = 1; - const std::string params = "params"; + const std::string params = R"({"test":"extra"})"; if (deviceManagerServiceImpl_ == nullptr) { deviceManagerServiceImpl_ = std::make_shared(); } @@ -861,7 +866,7 @@ HWTEST_F(DeviceManagerServiceImplTest, SetUserOperation_002, testing::ext::TestS { std::string pkgName = "com.ohos.test"; int32_t action = 1; - const std::string params = "paramsTest"; + const std::string params = R"({"test":"extra"})"; if (deviceManagerServiceImpl_ == nullptr) { deviceManagerServiceImpl_ = std::make_shared(); } @@ -903,24 +908,6 @@ HWTEST_F(DeviceManagerServiceImplTest, SetUserOperation_004, testing::ext::TestS EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } -/** - * @tc.name: SetUserOperation_005 - * @tc.desc: return ERR_DM_INPUT_PARA_INVALID - * @tc.type: FUNC - */ -HWTEST_F(DeviceManagerServiceImplTest, SetUserOperation_005, testing::ext::TestSize.Level1) -{ - std::string pkgName = "com.ohos.test"; - int32_t action = 1; - const std::string params; - if (deviceManagerServiceImpl_ == nullptr) { - deviceManagerServiceImpl_ = std::make_shared(); - } - deviceManagerServiceImpl_->authMgr_ = nullptr; - int32_t ret = deviceManagerServiceImpl_->SetUserOperation(pkgName, action, params); - EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); -} - /** * @tc.name: HandleOffline_001 * @tc.type: FUNC @@ -1305,21 +1292,6 @@ HWTEST_F(DeviceManagerServiceImplTest, BindTarget_001, testing::ext::TestSize.Le EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } -/** - * @tc.name: PutIdenticalAccountToAcl_001 - * @tc.type: FUNC - */ -HWTEST_F(DeviceManagerServiceImplTest, PutIdenticalAccountToAcl_001, testing::ext::TestSize.Level1) -{ - std::string requestDeviceId; - std::string trustDeviceId; - if (deviceManagerServiceImpl_ == nullptr) { - deviceManagerServiceImpl_ = std::make_shared(); - } - deviceManagerServiceImpl_->PutIdenticalAccountToAcl(requestDeviceId, trustDeviceId); - EXPECT_NE(deviceManagerServiceImpl_->hiChainConnector_, nullptr); -} - /** * @tc.name: DpAclAdd_001 * @tc.type: FUNC @@ -1417,16 +1389,17 @@ HWTEST_F(DeviceManagerServiceImplTest, HandleDeviceNotTrust_001, testing::ext::T HWTEST_F(DeviceManagerServiceImplTest, CheckDeleteCredential_001, testing::ext::TestSize.Level1) { std::string remoteUdid = "123456"; + int32_t remoteUserId = -1; std::vector profiles; AddAccessControlProfileFirst(profiles); EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); - deviceManagerServiceImpl_->CheckDeleteCredential(remoteUdid); + deviceManagerServiceImpl_->CheckDeleteCredential(remoteUdid, remoteUserId); std::vector profiles1; AddAccessControlProfileFirst(profiles1); remoteUdid = "666678"; EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles1)); - deviceManagerServiceImpl_->CheckDeleteCredential(remoteUdid); + deviceManagerServiceImpl_->CheckDeleteCredential(remoteUdid, remoteUserId); } HWTEST_F(DeviceManagerServiceImplTest, DeleteAlwaysAllowTimeOut_001, testing::ext::TestSize.Level1) @@ -1523,10 +1496,11 @@ HWTEST_F(DeviceManagerServiceImplTest, UnBindDevice_104, testing::ext::TestSize. int32_t ret = deviceManagerServiceImpl_->UnBindDevice(pkgName, udid, bindLevel); int32_t userId = 100; std::string accountId = "60008"; - EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _)) + std::vector peerUdids; + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _, _)) .Times(::testing::AtLeast(1)).WillOnce(Return(true)); deviceManagerServiceImpl_->HandleIdentAccountLogout(udid, userId, udid, userId); - deviceManagerServiceImpl_->HandleUserRemoved(userId); + deviceManagerServiceImpl_->HandleUserRemoved(peerUdids, userId); deviceManagerServiceImpl_->HandleDeviceNotTrust(udid); EXPECT_NE(ret, ERR_DM_INPUT_PARA_INVALID); @@ -1579,7 +1553,7 @@ HWTEST_F(DeviceManagerServiceImplTest, GetBindLevel_101, testing::ext::TestSize. HWTEST_F(DeviceManagerServiceImplTest, ConvertBindTypeToAuthForm_101, testing::ext::TestSize.Level1) { - int32_t bindType = DM_INVALIED_BINDTYPE; + int32_t bindType = DM_INVALIED_TYPE; DmAuthForm authForm = deviceManagerServiceImpl_->ConvertBindTypeToAuthForm(bindType); EXPECT_EQ(authForm, DmAuthForm::INVALID_TYPE); } @@ -1629,7 +1603,7 @@ HWTEST_F(DeviceManagerServiceImplTest, ProcessAppUnintall_102, testing::ext::Tes int32_t accessTokenId = 102; std::vector profiles; AddAccessControlProfileFirst(profiles); - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAclIncludeLnnAcl()).WillOnce(Return(profiles)); int ret = deviceManagerServiceImpl_->ProcessAppUnintall(appId, accessTokenId); EXPECT_EQ(ret, DM_OK); } @@ -1640,7 +1614,7 @@ HWTEST_F(DeviceManagerServiceImplTest, ProcessAppUnintall_103, testing::ext::Tes int32_t accessTokenId = 1001; std::vector profiles; AddAccessControlProfileFirst(profiles); - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAclIncludeLnnAcl()).WillOnce(Return(profiles)); if (deviceManagerServiceImpl_->hiChainConnector_ == nullptr) { deviceManagerServiceImpl_->Initialize(listener_); } @@ -1675,9 +1649,8 @@ HWTEST_F(DeviceManagerServiceImplTest, CheckIsSameAccount_001, testing::ext::Tes deviceManagerServiceImpl_->Initialize(listener_); } std::vector profiles; - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); - int ret = deviceManagerServiceImpl_->CheckIsSameAccount(caller, srcUdid, callee, sinkUdid); - EXPECT_EQ(ret, ERR_DM_FAILED); + bool ret = deviceManagerServiceImpl_->CheckIsSameAccount(caller, srcUdid, callee, sinkUdid); + EXPECT_EQ(ret, false); } HWTEST_F(DeviceManagerServiceImplTest, CheckAccessControl_001, testing::ext::TestSize.Level1) @@ -1690,9 +1663,8 @@ HWTEST_F(DeviceManagerServiceImplTest, CheckAccessControl_001, testing::ext::Tes deviceManagerServiceImpl_->Initialize(listener_); } std::vector profiles; - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); - int ret = deviceManagerServiceImpl_->CheckAccessControl(caller, srcUdid, callee, sinkUdid); - EXPECT_EQ(ret, ERR_DM_FAILED); + bool ret = deviceManagerServiceImpl_->CheckAccessControl(caller, srcUdid, callee, sinkUdid); + EXPECT_EQ(ret, false); } HWTEST_F(DeviceManagerServiceImplTest, HandleDeviceScreenStatusChange_001, testing::ext::TestSize.Level1) @@ -1715,7 +1687,6 @@ HWTEST_F(DeviceManagerServiceImplTest, HandleDeviceScreenStatusChange_001, testi std::vector profiles; EXPECT_CALL(*softbusConnectorMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceProfileConnectorMock_, CheckBindType(_, _)).WillOnce(Return(APP_PEER_TO_PEER_TYPE)); - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); deviceManagerServiceImpl_->HandleDeviceScreenStatusChange(devInfo); EXPECT_NE(deviceManagerServiceImpl_->softbusConnector_, nullptr); } @@ -1766,15 +1737,17 @@ HWTEST_F(DeviceManagerServiceImplTest, HandleOnline_003, testing::ext::TestSize. EXPECT_CALL(*deviceProfileConnectorMock_, CheckBindType(_, _)).WillOnce(Return(DEVICE_ACROSS_ACCOUNT_TYPE)); deviceManagerServiceImpl_->HandleOnline(devState, devInfo); + EXPECT_CALL(*softbusConnectorMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*deviceProfileConnectorMock_, CheckBindType(_, _)).WillOnce(Return(SHARE_TYPE)); + deviceManagerServiceImpl_->HandleOnline(devState, devInfo); + std::vector profiles; EXPECT_CALL(*softbusConnectorMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceProfileConnectorMock_, CheckBindType(_, _)).WillOnce(Return(APP_PEER_TO_PEER_TYPE)); - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); deviceManagerServiceImpl_->HandleOnline(devState, devInfo); EXPECT_CALL(*softbusConnectorMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceProfileConnectorMock_, CheckBindType(_, _)).WillOnce(Return(APP_ACROSS_ACCOUNT_TYPE)); - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); deviceManagerServiceImpl_->HandleOnline(devState, devInfo); EXPECT_NE(deviceManagerServiceImpl_->softbusConnector_, nullptr); } @@ -1793,14 +1766,13 @@ HWTEST_F(DeviceManagerServiceImplTest, HandleOffline_003, testing::ext::TestSize std::map userIdAndBindLevel; userIdAndBindLevel[1] = INVALIED_TYPE; - userIdAndBindLevel[2] = DEVICE; + userIdAndBindLevel[2] = USER; userIdAndBindLevel[3] = SERVICE; userIdAndBindLevel[4] = APP; std::vector profiles; EXPECT_CALL(*dmDeviceStateManagerMock_, GetUdidByNetWorkId(_)).WillOnce(Return("123456")); EXPECT_CALL(*deviceProfileConnectorMock_, GetUserIdAndBindLevel(_, _)).WillOnce(Return(userIdAndBindLevel)); - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()) - .WillOnce(Return(profiles)).WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, CheckBindType(_, _)).WillOnce(Return(SHARE_TYPE)); deviceManagerServiceImpl_->HandleOffline(devState, devInfo); EXPECT_NE(deviceManagerServiceImpl_->deviceStateMgr_, nullptr); } @@ -1871,7 +1843,7 @@ HWTEST_F(DeviceManagerServiceImplTest, GetDeviceIdAndUserId_001, testing::ext::T int32_t localUserId = 123456; std::string peerUdid = "remoteUdid"; int32_t peerUserId = 1; - EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _)).WillOnce(Return(true)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _, _)).WillRepeatedly(Return(true)); if (deviceManagerServiceImpl_->softbusConnector_ == nullptr) { deviceManagerServiceImpl_->Initialize(listener_); } @@ -1910,21 +1882,23 @@ HWTEST_F(DeviceManagerServiceImplTest, SaveOnlineDeviceInfo_001, testing::ext::T int32_t remoteUserId = 1; std::string remoteUdid = "remoteDeviceId"; int32_t tokenId = 0; - ProcessInfo processInfo; - EXPECT_CALL(*deviceProfileConnectorMock_, HandleAppUnBindEvent(_, _, _, _)).WillOnce(Return(processInfo)); + DmOfflineParam dmOfflineParam; + EXPECT_CALL(*deviceProfileConnectorMock_, HandleAppUnBindEvent(_, _, _, _)).WillOnce(Return(dmOfflineParam)); deviceManagerServiceImpl_->HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId); + ProcessInfo processInfo; processInfo.pkgName = "pkgName"; + dmOfflineParam.processVec.push_back(processInfo); if (deviceManagerServiceImpl_->softbusConnector_ == nullptr) { deviceManagerServiceImpl_->Initialize(listener_); } - EXPECT_CALL(*deviceProfileConnectorMock_, HandleAppUnBindEvent(_, _, _, _)).WillOnce(Return(processInfo)); + EXPECT_CALL(*deviceProfileConnectorMock_, HandleAppUnBindEvent(_, _, _, _)).WillOnce(Return(dmOfflineParam)); deviceManagerServiceImpl_->HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId); - EXPECT_CALL(*deviceProfileConnectorMock_, HandleDevUnBindEvent(_, _, _)).WillOnce(Return(DM_INVALIED_BINDTYPE)); + EXPECT_CALL(*deviceProfileConnectorMock_, HandleDevUnBindEvent(_, _, _, _)).WillOnce(Return(DM_INVALIED_TYPE)); deviceManagerServiceImpl_->HandleDevUnBindEvent(remoteUserId, remoteUdid); - EXPECT_CALL(*deviceProfileConnectorMock_, HandleDevUnBindEvent(_, _, _)).WillOnce(Return(DM_IDENTICAL_ACCOUNT)); + EXPECT_CALL(*deviceProfileConnectorMock_, HandleDevUnBindEvent(_, _, _, _)).WillOnce(Return(DM_IDENTICAL_ACCOUNT)); if (deviceManagerServiceImpl_->authMgr_ == nullptr) { deviceManagerServiceImpl_->Initialize(listener_); } @@ -1938,7 +1912,7 @@ HWTEST_F(DeviceManagerServiceImplTest, SaveOnlineDeviceInfo_001, testing::ext::T std::vector localUserIds; localUserIds.push_back(123); localUserIds.push_back(456); - EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForRemoteUserRemoved(_, _, _)) + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForRemoteUserRemoved(_, _, _, _)) .WillOnce(DoAll(SetArgReferee<2>(localUserIds), Return())); deviceManagerServiceImpl_->HandleRemoteUserRemoved(userId, remoteUdid); } @@ -1955,7 +1929,6 @@ HWTEST_F(DeviceManagerServiceImplTest, GetDeviceIdAndBindLevel_001, testing::ext { int32_t userId = 123456; std::vector profiles; - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); auto ret = deviceManagerServiceImpl_->GetDeviceIdAndBindLevel(userId); EXPECT_TRUE(ret.empty()); } @@ -1964,7 +1937,6 @@ HWTEST_F(DeviceManagerServiceImplTest, GetDeviceIdAndUserId_002, testing::ext::T { int32_t localUserId = 123456; std::vector profiles; - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); auto ret = deviceManagerServiceImpl_->GetDeviceIdAndUserId(localUserId); EXPECT_TRUE(ret.empty()); } @@ -1990,14 +1962,16 @@ HWTEST_F(DeviceManagerServiceImplTest, GetTokenIdByNameAndDeviceId_001, testing: int32_t tokenId = 0; int32_t peerTokenId = 1; ProcessInfo processInfo; - EXPECT_CALL(*deviceProfileConnectorMock_, HandleAppUnBindEvent(_, _, _, _, _)).WillOnce(Return(processInfo)); + DmOfflineParam dmOfflineParam; + EXPECT_CALL(*deviceProfileConnectorMock_, HandleAppUnBindEvent(_, _, _, _, _)).WillOnce(Return(dmOfflineParam)); deviceManagerServiceImpl_->HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, peerTokenId); processInfo.pkgName = "pkgName"; + dmOfflineParam.processVec.push_back(processInfo); if (deviceManagerServiceImpl_->softbusConnector_ == nullptr) { deviceManagerServiceImpl_->Initialize(listener_); } - EXPECT_CALL(*deviceProfileConnectorMock_, HandleAppUnBindEvent(_, _, _, _, _)).WillOnce(Return(processInfo)); + EXPECT_CALL(*deviceProfileConnectorMock_, HandleAppUnBindEvent(_, _, _, _, _)).WillOnce(Return(dmOfflineParam)); deviceManagerServiceImpl_->HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, peerTokenId); int32_t bindType = 1; @@ -2020,7 +1994,7 @@ HWTEST_F(DeviceManagerServiceImplTest, RegisterAuthenticationType_001, testing:: int32_t userId = 0; std::string remoteUdid = "remoteUdid"; std::vector localUserIds; - EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForRemoteUserRemoved(_, _, _)) + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForRemoteUserRemoved(_, _, _, _)) .WillOnce(DoAll(SetArgReferee<2>(localUserIds), Return())); deviceManagerServiceImpl_->HandleRemoteUserRemoved(userId, remoteUdid); } @@ -2074,14 +2048,88 @@ HWTEST_F(DeviceManagerServiceImplTest, DeleteCredential_010, testing::ext::TestS deviceManagerServiceImpl_->DeleteAlwaysAllowTimeOut(); std::string remoteUdid = "remoteUdid"; + int32_t remoteUserId = -1; profiles.clear(); EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); - deviceManagerServiceImpl_->CheckDeleteCredential(remoteUdid); + deviceManagerServiceImpl_->CheckDeleteCredential(remoteUdid, remoteUserId); accessProfile.SetTrustDeviceId(remoteUdid); profiles.push_back(accessProfile); EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(profiles)); - deviceManagerServiceImpl_->CheckDeleteCredential(remoteUdid); + deviceManagerServiceImpl_->CheckDeleteCredential(remoteUdid, remoteUserId); +} + +HWTEST_F(DeviceManagerServiceImplTest, ChangeUltrasonicTypeToPin_001, testing::ext::TestSize.Level1) +{ + std::map bindParam; + int32_t ret = deviceManagerServiceImpl_->ChangeUltrasonicTypeToPin(bindParam); + EXPECT_EQ(ret, ERR_DM_AUTH_FAILED); +} + +HWTEST_F(DeviceManagerServiceImplTest, ChangeUltrasonicTypeToPin_002, testing::ext::TestSize.Level1) +{ + std::map bindParam; + bindParam["AUTH_TYPE"] = "1"; + int32_t ret = deviceManagerServiceImpl_->ChangeUltrasonicTypeToPin(bindParam); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceImplTest, ReleaseMaps_001, testing::ext::TestSize.Level1) +{ + int32_t sessionId = 100012; + uint64_t logicalSessionId = 456789102; + deviceManagerServiceImpl_->logicalSessionId2SessionIdMap_[logicalSessionId] = sessionId; + deviceManagerServiceImpl_->ReleaseMaps(); + EXPECT_EQ(deviceManagerServiceImpl_->logicalSessionId2SessionIdMap_.size(), 0); +} + +HWTEST_F(DeviceManagerServiceImplTest, GetLogicalIdAndTokenIdBySessionId_001, testing::ext::TestSize.Level1) +{ + int32_t sessionId = 10001; + uint64_t tokenId = 1000023; + uint64_t logicalSessionId = 45678910; + int32_t ret = deviceManagerServiceImpl_->GetLogicalIdAndTokenIdBySessionId(logicalSessionId, tokenId, sessionId); + EXPECT_EQ(ret, DM_OK); + + logicalSessionId = 0; + ret = deviceManagerServiceImpl_->GetLogicalIdAndTokenIdBySessionId(logicalSessionId, tokenId, sessionId); + EXPECT_EQ(ret, ERR_DM_AUTH_FAILED); + + logicalSessionId = 45678910; + tokenId = 0; + ret = deviceManagerServiceImpl_->GetLogicalIdAndTokenIdBySessionId(logicalSessionId, tokenId, sessionId); + EXPECT_EQ(ret, ERR_DM_AUTH_FAILED); + + deviceManagerServiceImpl_->logicalSessionId2SessionIdMap_[logicalSessionId] = sessionId; + deviceManagerServiceImpl_->logicalSessionId2TokenIdMap_[logicalSessionId] = tokenId; + ret = deviceManagerServiceImpl_->GetLogicalIdAndTokenIdBySessionId(logicalSessionId, tokenId, sessionId); + EXPECT_EQ(ret, ERR_DM_AUTH_FAILED); +} + +HWTEST_F(DeviceManagerServiceImplTest, InitNewProtocolAuthMgr_001, testing::ext::TestSize.Level1) +{ + bool isSrcSide = true; + uint64_t tokenId = 1000023; + uint64_t logicalSessionId = 456789; + const std::string pkgName = "InitNewProtocolAuthMgr"; + int32_t ret = deviceManagerServiceImpl_->InitNewProtocolAuthMgr(isSrcSide, tokenId, logicalSessionId, pkgName); + EXPECT_EQ(ret, DM_OK); + + isSrcSide = false; + ret = deviceManagerServiceImpl_->InitNewProtocolAuthMgr(isSrcSide, tokenId, logicalSessionId, pkgName); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceImplTest, InitOldProtocolAuthMgr_001, testing::ext::TestSize.Level1) +{ + uint64_t tokenId = 100002311; + const std::string pkgName = "InitOldProtocolAuthMgr"; + int32_t ret = deviceManagerServiceImpl_->InitOldProtocolAuthMgr(tokenId, pkgName); + EXPECT_EQ(ret, DM_OK); + + deviceManagerServiceImpl_->authMgr_ = nullptr; + ret = deviceManagerServiceImpl_->InitOldProtocolAuthMgr(tokenId, pkgName); + EXPECT_EQ(ret, DM_OK); } } // namespace } // namespace DistributedHardware diff --git a/test/unittest/UTTest_device_manager_service_impl_first.cpp b/test/unittest/UTTest_device_manager_service_impl_first.cpp index c01e5136aadd9657f9035c70f2c3c8dcdbc30e16..3badcf2992de30ab7a6b0953da5f31fdb3e8f0a8 100644 --- a/test/unittest/UTTest_device_manager_service_impl_first.cpp +++ b/test/unittest/UTTest_device_manager_service_impl_first.cpp @@ -40,6 +40,10 @@ void DeviceManagerServiceImplFirstTest::SetUpTestCase() { DmDeviceProfileConnector::dmDeviceProfileConnector = deviceProfileConnectorMock_; DmMultipleUserConnector::dmMultipleUserConnector = multipleUserConnectorMock_; + DmSoftbusConnector::dmSoftbusConnector = softbusConnectorMock_; + DmDmDeviceStateManager::dmDeviceStateManager = dmDeviceStateManagerMock_; + DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl = deviceManagerServiceImplMock_; + DmHiChainConnector::dmHiChainConnector = hiChainConnectorMock_; } void DeviceManagerServiceImplFirstTest::TearDownTestCase() @@ -48,6 +52,14 @@ void DeviceManagerServiceImplFirstTest::TearDownTestCase() deviceProfileConnectorMock_ = nullptr; DmMultipleUserConnector::dmMultipleUserConnector = nullptr; multipleUserConnectorMock_ = nullptr; + DmSoftbusConnector::dmSoftbusConnector = nullptr; + softbusConnectorMock_ = nullptr; + DmDmDeviceStateManager::dmDeviceStateManager = nullptr; + dmDeviceStateManagerMock_ = nullptr; + DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl = nullptr; + deviceManagerServiceImplMock_ = nullptr; + DmHiChainConnector::dmHiChainConnector = nullptr; + hiChainConnectorMock_ = nullptr; } namespace { @@ -65,7 +77,7 @@ HWTEST_F(DeviceManagerServiceImplFirstTest, GetDeviceIdAndUserId_101, testing::e int32_t localUserId = 123456; std::string peerUdid = "remoteUdid"; int32_t peerUserId = 1; - EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _)).WillOnce(Return(true)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAclForAccountLogOut(_, _, _, _, _)).WillOnce(Return(true)); if (deviceManagerServiceImpl_->softbusConnector_ == nullptr) { deviceManagerServiceImpl_->Initialize(listener_); } @@ -88,6 +100,690 @@ HWTEST_F(DeviceManagerServiceImplFirstTest, GetDeviceIdAndUserId_101, testing::e .WillOnce(DoAll(SetArgReferee<0>(localUserIds), Return(DM_OK))); deviceManagerServiceImpl_->HandleSyncUserIdEvent(foregroundUserIds, backgroundUserIds, remoteUdid, false); } + +HWTEST_F(DeviceManagerServiceImplFirstTest, CheckSharePeerSrc_001, testing::ext::TestSize.Level1) +{ + std::string peerUdid = "peerUdid"; + std::string localUdid = "localUdid"; + std::vector profiles; + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + + bool result = deviceManagerServiceImpl_->CheckSharePeerSrc(peerUdid, localUdid); + EXPECT_FALSE(result); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, CheckSharePeerSrc_002, testing::ext::TestSize.Level1) +{ + std::string peerUdid = "peerUdid"; + std::string localUdid = "localUdid"; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_SHARE); + profile.SetTrustDeviceId(peerUdid); + Accesser accesser; + accesser.SetAccesserDeviceId(peerUdid); + profile.SetAccesser(accesser); + + Accessee accessee; + accessee.SetAccesseeDeviceId(localUdid); + profile.SetAccessee(accessee); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + + bool result = deviceManagerServiceImpl_->CheckSharePeerSrc(peerUdid, localUdid); + EXPECT_TRUE(result); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, CheckSharePeerSrc_003, testing::ext::TestSize.Level1) +{ + std::string peerUdid = "peerUdid"; + std::string localUdid = "localUdid"; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_SHARE); + profile.SetTrustDeviceId(peerUdid); + Accesser accesser; + accesser.SetAccesserDeviceId(localUdid); + profile.SetAccesser(accesser); + profile.GetAccessee().SetAccesseeDeviceId(peerUdid); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + + bool result = deviceManagerServiceImpl_->CheckSharePeerSrc(peerUdid, localUdid); + EXPECT_FALSE(result); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, CheckSharePeerSrc_004, testing::ext::TestSize.Level1) +{ + std::string peerUdid = "peerUdid"; + std::string localUdid = "localUdid"; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_IDENTICAL_ACCOUNT); + profile.SetTrustDeviceId(peerUdid); + Accesser accesser; + accesser.SetAccesserDeviceId(peerUdid); + profile.SetAccesser(accesser); + Accessee accessee; + accessee.SetAccesseeDeviceId(localUdid); + profile.SetAccessee(accessee); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + + bool result = deviceManagerServiceImpl_->CheckSharePeerSrc(peerUdid, localUdid); + EXPECT_FALSE(result); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, CheckSharePeerSrc_005, testing::ext::TestSize.Level1) +{ + std::string peerUdid = "peerUdid"; + std::string localUdid = "localUdid"; + std::string trustDevideId = "trustDevideId"; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_SHARE); + profile.SetTrustDeviceId(trustDevideId); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + + bool result = deviceManagerServiceImpl_->CheckSharePeerSrc(peerUdid, localUdid); + EXPECT_FALSE(result); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, HandleCredentialDeleted_001, testing::ext::TestSize.Level1) +{ + const char *credId = "123456"; + const char *credInfo = "invalid_json"; + std::string localUdid = "localUdid"; + std::string remoteUdid; + + std::vector profiles; + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAccessControlById(_)) + .Times(0); + + deviceManagerServiceImpl_->HandleCredentialDeleted(credId, credInfo, localUdid, remoteUdid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, HandleCredentialDeleted_002, testing::ext::TestSize.Level1) +{ + const char *credId = "123456"; + const char *credInfo = R"({"deviceId": "remoteUdid", "userId": 1})"; + std::string localUdid = "localUdid"; + std::string remoteUdid; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_POINT_TO_POINT); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAccessControlById(_)).Times(0); + + deviceManagerServiceImpl_->HandleCredentialDeleted(credId, credInfo, localUdid, remoteUdid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, HandleCredentialDeleted_003, testing::ext::TestSize.Level1) +{ + const char *credId = "123456"; + const char *credInfo = R"({"deviceId": "remoteUdid", "userId": 1})"; + std::string localUdid = "localUdid"; + std::string remoteUdid; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_SHARE); + + profile.GetAccesser().SetAccesserCredentialId(atoi(credId)); + profile.GetAccesser().SetAccesserDeviceId(localUdid); + profile.GetAccessee().SetAccesseeDeviceId("remoteUdid"); + profile.GetAccessee().SetAccesseeUserId(1); + + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAccessControlById(_)) + .Times(1); + + deviceManagerServiceImpl_->HandleCredentialDeleted(credId, credInfo, localUdid, remoteUdid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, HandleCredentialDeleted_004, testing::ext::TestSize.Level1) +{ + const char *credId = "123456"; + const char *credInfo = R"({"deviceId": "remoteUdid", "userId": 1})"; + std::string localUdid = "localUdid"; + std::string remoteUdid; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_SHARE); + + profile.GetAccessee().SetAccesseeCredentialId(atoi(credId)); + profile.GetAccessee().SetAccesseeDeviceId(localUdid); + profile.GetAccesser().SetAccesserDeviceId("remoteUdid"); + profile.GetAccesser().SetAccesserUserId(1); + + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAccessControlById(_)) + .Times(1); + + deviceManagerServiceImpl_->HandleCredentialDeleted(credId, credInfo, localUdid, remoteUdid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, HandleShareUnbindBroadCast_001, testing::ext::TestSize.Level1) +{ + std::string credId = "12345"; + std::string localUdid = "localId"; + int32_t userId = 123456; + + std::vector profiles; + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAccessControlById(_)) + .Times(0); + + deviceManagerServiceImpl_->HandleShareUnbindBroadCast(credId, userId, localUdid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, HandleShareUnbindBroadCast_002, testing::ext::TestSize.Level1) +{ + std::string credId = "12345"; + std::string localUdid = "localId"; + int32_t userId = 123456; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_IDENTICAL_ACCOUNT); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAccessControlById(_)) + .Times(0); + + deviceManagerServiceImpl_->HandleShareUnbindBroadCast(credId, userId, localUdid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, HandleShareUnbindBroadCast_003, testing::ext::TestSize.Level1) +{ + std::string credId = "12345"; + std::string localUdid = "localId"; + int32_t userId = 123456; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_SHARE); + + Accesser accesser; + accesser.SetAccesserCredentialId(atoi(credId.c_str())); + accesser.SetAccesserUserId(userId); + profile.SetAccesser(accesser); + Accessee accessee; + accessee.SetAccesseeDeviceId(localUdid); + profile.SetAccessee(accessee); + + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAccessControlById(_)) + .Times(1); + + deviceManagerServiceImpl_->HandleShareUnbindBroadCast(credId, userId, localUdid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, HandleShareUnbindBroadCast_004, testing::ext::TestSize.Level1) +{ + std::string credId = "12345"; + std::string localUdid = "localUdid"; + int32_t userId = 123456; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_SHARE); + + Accesser accesser; + accesser.SetAccesserDeviceId(localUdid); + profile.SetAccesser(accesser); + Accessee accessee; + accessee.SetAccesseeCredentialId(atoi(credId.c_str())); + accessee.SetAccesseeUserId(userId); + profile.SetAccessee(accessee); + + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAccessControlById(_)) + .Times(1); + + deviceManagerServiceImpl_->HandleShareUnbindBroadCast(credId, userId, localUdid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, HandleShareUnbindBroadCast_005, testing::ext::TestSize.Level1) +{ + std::string credId = "12345"; + std::string localUdid = "localUdid"; + int32_t userId = 123456; + + std::vector profiles; + AccessControlProfile profile; + profile.SetBindType(DM_SHARE); + + Accesser accesser; + accesser.SetAccesserCredentialId(9999); + accesser.SetAccesserDeviceId("peer123"); + accesser.SetAccesserUserId(1002); + profile.SetAccesser(accesser); + + Accessee accessee; + accessee.SetAccesseeDeviceId("peer456"); + accessee.SetAccesseeUserId(1003); + profile.SetAccessee(accessee); + + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, DeleteAccessControlById(_)) + .Times(0); + + deviceManagerServiceImpl_->HandleShareUnbindBroadCast(credId, userId, localUdid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, SetOnlineProcessInfo_001, testing::ext::TestSize.Level1) +{ + uint32_t bindType = IDENTICAL_ACCOUNT_TYPE; + ProcessInfo processInfo; + DmDeviceInfo devInfo; + std::string requestDeviceId = "requestDeviceId"; + std::string trustDeviceId = "trustDeviceId"; + DmDeviceState devState = DEVICE_STATE_ONLINE; + + EXPECT_CALL(*softbusConnectorMock_, SetProcessInfo(_)).Times(1); + EXPECT_CALL(*dmDeviceStateManagerMock_, HandleDeviceStatusChange(_, _)).Times(1); + + deviceManagerServiceImpl_->SetOnlineProcessInfo( + bindType, processInfo, devInfo, requestDeviceId, trustDeviceId, devState); + + EXPECT_EQ(devInfo.authForm, DmAuthForm::IDENTICAL_ACCOUNT); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, SetOnlineProcessInfo_002, testing::ext::TestSize.Level1) +{ + uint32_t bindType = DEVICE_PEER_TO_PEER_TYPE; + ProcessInfo processInfo; + DmDeviceInfo devInfo; + std::string requestDeviceId = "requestDeviceId"; + std::string trustDeviceId = "trustDeviceId"; + DmDeviceState devState = DEVICE_STATE_ONLINE; + + EXPECT_CALL(*softbusConnectorMock_, SetProcessInfo(_)).Times(1); + EXPECT_CALL(*dmDeviceStateManagerMock_, HandleDeviceStatusChange(_, _)).Times(1); + + deviceManagerServiceImpl_->SetOnlineProcessInfo( + bindType, processInfo, devInfo, requestDeviceId, trustDeviceId, devState); + + EXPECT_EQ(devInfo.authForm, DmAuthForm::PEER_TO_PEER); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, SetOnlineProcessInfo_003, testing::ext::TestSize.Level1) +{ + uint32_t bindType = DEVICE_ACROSS_ACCOUNT_TYPE; + ProcessInfo processInfo; + DmDeviceInfo devInfo; + std::string requestDeviceId = "requestDeviceId"; + std::string trustDeviceId = "trustDeviceId"; + DmDeviceState devState = DEVICE_STATE_ONLINE; + + EXPECT_CALL(*softbusConnectorMock_, SetProcessInfo(_)).Times(1); + EXPECT_CALL(*dmDeviceStateManagerMock_, HandleDeviceStatusChange(_, _)).Times(1); + + deviceManagerServiceImpl_->SetOnlineProcessInfo( + bindType, processInfo, devInfo, requestDeviceId, trustDeviceId, devState); + + EXPECT_EQ(devInfo.authForm, DmAuthForm::ACROSS_ACCOUNT); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, SetOnlineProcessInfo_004, testing::ext::TestSize.Level1) +{ + uint32_t bindType = APP_PEER_TO_PEER_TYPE; + ProcessInfo processInfo; + DmDeviceInfo devInfo; + std::string requestDeviceId = "requestDeviceId"; + std::string trustDeviceId = "trustDeviceId"; + DmDeviceState devState = DEVICE_STATE_ONLINE; + + std::vector processInfoVec = {processInfo}; + EXPECT_CALL(*deviceProfileConnectorMock_, GetProcessInfoFromAclByUserId(_, _, _)) + .WillOnce(Return(processInfoVec)); + EXPECT_CALL(*softbusConnectorMock_, SetProcessInfoVec(_)).Times(1); + EXPECT_CALL(*dmDeviceStateManagerMock_, HandleDeviceStatusChange(_, _)).Times(1); + + deviceManagerServiceImpl_->SetOnlineProcessInfo( + bindType, processInfo, devInfo, requestDeviceId, trustDeviceId, devState); + + EXPECT_EQ(devInfo.authForm, DmAuthForm::PEER_TO_PEER); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, SetOnlineProcessInfo_005, testing::ext::TestSize.Level1) +{ + uint32_t bindType = APP_ACROSS_ACCOUNT_TYPE; + ProcessInfo processInfo; + DmDeviceInfo devInfo; + std::string requestDeviceId = "requestDeviceId"; + std::string trustDeviceId = "trustDeviceId"; + DmDeviceState devState = DEVICE_STATE_ONLINE; + + std::vector processInfoVec = {processInfo}; + EXPECT_CALL(*deviceProfileConnectorMock_, GetProcessInfoFromAclByUserId(_, _, _)) + .WillOnce(Return(processInfoVec)); + EXPECT_CALL(*softbusConnectorMock_, SetProcessInfoVec(_)).Times(1); + EXPECT_CALL(*dmDeviceStateManagerMock_, HandleDeviceStatusChange(_, _)).Times(1); + + deviceManagerServiceImpl_->SetOnlineProcessInfo( + bindType, processInfo, devInfo, requestDeviceId, trustDeviceId, devState); + + EXPECT_EQ(devInfo.authForm, DmAuthForm::ACROSS_ACCOUNT); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, SetOnlineProcessInfo_006, testing::ext::TestSize.Level1) +{ + uint32_t bindType = SHARE_TYPE; + ProcessInfo processInfo; + DmDeviceInfo devInfo; + std::string requestDeviceId = "requestDeviceId"; + std::string trustDeviceId = "trustDeviceId"; + DmDeviceState devState = DEVICE_STATE_ONLINE; + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAccessControlProfile()) + .Times(1).WillOnce(Return(std::vector())); + + EXPECT_CALL(*deviceManagerServiceImplMock_, CheckSharePeerSrc(_, _)).WillOnce(Return(false)); + EXPECT_CALL(*softbusConnectorMock_, SetProcessInfo(_)).Times(1); + EXPECT_CALL(*dmDeviceStateManagerMock_, HandleDeviceStatusChange(_, _)).Times(1); + + deviceManagerServiceImpl_->SetOnlineProcessInfo( + bindType, processInfo, devInfo, requestDeviceId, trustDeviceId, devState); + + EXPECT_EQ(devInfo.authForm, DmAuthForm::SHARE); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, GetDeviceIdByUserIdAndTokenId_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t tokenId = 1234; + + EXPECT_CALL(*deviceProfileConnectorMock_, GetDeviceIdAndUdidListByTokenId(_, _, _)) + .WillOnce(Return(std::vector())); + + auto result = deviceManagerServiceImpl_->GetDeviceIdByUserIdAndTokenId(userId, tokenId); + EXPECT_TRUE(result.empty()); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, GetDeviceIdByUserIdAndTokenId_002, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t tokenId = 1234; + + std::vector expectedDeviceIds = {"deviceId1"}; + EXPECT_CALL(*deviceProfileConnectorMock_, GetDeviceIdAndUdidListByTokenId(_, _, _)) + .WillOnce(Return(expectedDeviceIds)); + + auto result = deviceManagerServiceImpl_->GetDeviceIdByUserIdAndTokenId(userId, tokenId); + EXPECT_EQ(result.size(), 1); + EXPECT_EQ(result[0], "deviceId1"); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, GetDeviceIdByUserIdAndTokenId_003, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t tokenId = 1234; + + std::vector expectedDeviceIds = {"deviceId1", "deviceId2"}; + EXPECT_CALL(*deviceProfileConnectorMock_, GetDeviceIdAndUdidListByTokenId(_, _, _)) + .WillOnce(Return(expectedDeviceIds)); + + auto result = deviceManagerServiceImpl_->GetDeviceIdByUserIdAndTokenId(userId, tokenId); + EXPECT_EQ(result.size(), 2); + EXPECT_NE(std::find(result.begin(), result.end(), "deviceId1"), result.end()); + EXPECT_NE(std::find(result.begin(), result.end(), "deviceId2"), result.end()); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessAppUninstall_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 1001; + int32_t accessTokenId = 2001; + + deviceManagerServiceImpl_->listener_ = nullptr; + + auto result = deviceManagerServiceImpl_->ProcessAppUninstall(userId, accessTokenId); + EXPECT_EQ(result, ERR_DM_POINT_NULL); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessAppUninstall_002, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAclIncludeLnnAcl()) + .WillOnce(Return(std::vector())); + + int32_t result = deviceManagerServiceImpl_->ProcessAppUninstall(userId, accessTokenId); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessAppUninstall_003, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + + std::vector profiles; + DistributedDeviceProfile::AccessControlProfile profile; + profile.GetAccesser().SetAccesserTokenId(5678); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAclIncludeLnnAcl()) + .WillOnce(Return(profiles)); + + int32_t result = deviceManagerServiceImpl_->ProcessAppUninstall(userId, accessTokenId); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessAppUninstall_004, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + + std::vector profiles; + DistributedDeviceProfile::AccessControlProfile profile; + profile.GetAccesser().SetAccesserTokenId(accessTokenId); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAclIncludeLnnAcl()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*hiChainConnectorMock_, DeleteGroupByACL(_, _)).Times(1); + + int32_t result = deviceManagerServiceImpl_->ProcessAppUninstall(userId, accessTokenId); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessAppUninstall_005, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + + std::vector profiles; + DistributedDeviceProfile::AccessControlProfile profile; + profile.GetAccesser().SetAccesserTokenId(accessTokenId); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAclIncludeLnnAcl()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, IsLnnAcl(_)).WillRepeatedly(Return(true)); + EXPECT_CALL(*deviceProfileConnectorMock_, CacheAcerAclId(_, _)).Times(1); + EXPECT_CALL(*hiChainConnectorMock_, DeleteGroupByACL(_, _)).Times(1); + + int32_t result = deviceManagerServiceImpl_->ProcessAppUninstall(userId, accessTokenId); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessAppUninstall_006, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + + std::vector profiles; + DistributedDeviceProfile::AccessControlProfile profile; + profile.GetAccesser().SetAccesserTokenId(accessTokenId); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAclIncludeLnnAcl()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*hiChainConnectorMock_, DeleteGroupByACL(_, _)).Times(0); + + int32_t result = deviceManagerServiceImpl_->ProcessAppUninstall(userId, accessTokenId); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessAppUninstall_007, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + + std::vector profiles; + DistributedDeviceProfile::AccessControlProfile profile; + profile.GetAccesser().SetAccesserTokenId(accessTokenId); + profiles.push_back(profile); + + EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAclIncludeLnnAcl()) + .WillOnce(Return(profiles)); + EXPECT_CALL(*deviceProfileConnectorMock_, IsLnnAcl(_)).WillRepeatedly(Return(false)); + EXPECT_CALL(*hiChainConnectorMock_, DeleteGroupByACL(_, _)).Times(1); + + int32_t result = deviceManagerServiceImpl_->ProcessAppUninstall(userId, accessTokenId); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessUnBindApp_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + std::string extra = "invalid_json"; + std::string udid = "remoteUdid"; + + EXPECT_CALL(*deviceManagerServiceImplMock_, HandleAppUnBindEvent(userId, udid, accessTokenId)).Times(1); + + deviceManagerServiceImpl_->ProcessUnBindApp(userId, accessTokenId, extra, udid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessUnBindApp_002, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + std::string extra = R"({"key": "value"})"; + std::string udid = "remoteUdid"; + + EXPECT_CALL(*deviceManagerServiceImplMock_, HandleAppUnBindEvent(userId, udid, accessTokenId)).Times(1); + + deviceManagerServiceImpl_->ProcessUnBindApp(userId, accessTokenId, extra, udid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessUnBindApp_003, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + int32_t peerTokenId = 5678; + std::string extra = R"({"peerTokenId": 5678})"; + std::string udid = "remoteUdid"; + + EXPECT_CALL(*deviceManagerServiceImplMock_, HandleAppUnBindEvent(userId, udid, accessTokenId, peerTokenId)).Times(1); + + deviceManagerServiceImpl_->ProcessUnBindApp(userId, accessTokenId, extra, udid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessUnBindApp_004, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + std::string extra = R"({"peerTokenId": "invalid"})"; + std::string udid = "remoteUdid"; + + EXPECT_CALL(*deviceManagerServiceImplMock_, HandleAppUnBindEvent(userId, udid, accessTokenId)).Times(1); + + deviceManagerServiceImpl_->ProcessUnBindApp(userId, accessTokenId, extra, udid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, ProcessUnBindApp_005, testing::ext::TestSize.Level1) +{ + int32_t userId = 1; + int32_t accessTokenId = 1234; + std::string extra = ""; + std::string udid = "remoteUdid"; + + EXPECT_CALL(*deviceManagerServiceImplMock_, HandleAppUnBindEvent(userId, udid, accessTokenId)).Times(1); + + deviceManagerServiceImpl_->ProcessUnBindApp(userId, accessTokenId, extra, udid); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, DeleteAclByTokenId_001, testing::ext::TestSize.Level1) +{ + int32_t accessTokenId = 1234; + std::vector profiles; + DistributedDeviceProfile::AccessControlProfile profile; + profile.GetAccesser().SetAccesserTokenId(5678); + profiles.push_back(profile); + + std::map delProfileMap; + std::vector> delACLInfoVec; + std::vector userIdVec; + + deviceManagerServiceImpl_->DeleteAclByTokenId(accessTokenId, profiles, delProfileMap, delACLInfoVec, userIdVec); + + EXPECT_TRUE(delProfileMap.empty()); + EXPECT_TRUE(delACLInfoVec.empty()); + EXPECT_TRUE(userIdVec.empty()); +} + +HWTEST_F(DeviceManagerServiceImplFirstTest, DeleteAclByTokenId_002, testing::ext::TestSize.Level1) +{ + int32_t accessTokenId = 1234; + std::vector profiles; + + std::map delProfileMap; + std::vector> delACLInfoVec; + std::vector userIdVec; + + deviceManagerServiceImpl_->DeleteAclByTokenId(accessTokenId, profiles, delProfileMap, delACLInfoVec, userIdVec); + + EXPECT_TRUE(profiles.empty()); + EXPECT_TRUE(delProfileMap.empty()); + EXPECT_TRUE(delACLInfoVec.empty()); + EXPECT_TRUE(userIdVec.empty()); +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_device_manager_service_impl_first.h b/test/unittest/UTTest_device_manager_service_impl_first.h index 4185e0af5b42a3fc5855a759ad3691e02a9557bf..04dcec1a1384fd255bab2c5edbe2a1a769a837d7 100644 --- a/test/unittest/UTTest_device_manager_service_impl_first.h +++ b/test/unittest/UTTest_device_manager_service_impl_first.h @@ -26,6 +26,10 @@ #include "device_manager_service_listener.h" #include "deviceprofile_connector_mock.h" #include "multiple_user_connector_mock.h" +#include "softbus_connector_mock.h" +#include "dm_device_state_manager_mock.h" +#include "device_manager_service_impl_mock.h" +#include "hichain_connector_mock.h" namespace OHOS { namespace DistributedHardware { @@ -42,6 +46,14 @@ public: std::make_shared(); static inline std::shared_ptr multipleUserConnectorMock_ = std::make_shared(); + static inline std::shared_ptr softbusConnectorMock_ = + std::make_shared(); + static inline std::shared_ptr dmDeviceStateManagerMock_ = + std::make_shared(); + static inline std::shared_ptr deviceManagerServiceImplMock_ = + std::make_shared(); + static inline std::shared_ptr hiChainConnectorMock_ = + std::make_shared(); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_device_manager_service_listener.cpp b/test/unittest/UTTest_device_manager_service_listener.cpp index a2bc5c562297f1d8b6140fe7238809eebec6ce09..4f654d2d4e797eecea27ab8cf69ac1a32ebb2353 100644 --- a/test/unittest/UTTest_device_manager_service_listener.cpp +++ b/test/unittest/UTTest_device_manager_service_listener.cpp @@ -1084,6 +1084,16 @@ HWTEST_F(DeviceManagerServiceListenerTest, SetDeviceInfo_001, testing::ext::Test listener_->SetDeviceInfo(pReq, processInfo, state, deviceInfo, deviceBasicInfo); EXPECT_EQ(listener_->alreadyOnlinePkgName_.empty(), false); } + +HWTEST_F(DeviceManagerServiceListenerTest, OpenAuthSessionWithPara_001, testing::ext::TestSize.Level1) +{ + const std::string deviceId = "OpenAuthSessionWithPara"; + int32_t actionId = 0; + bool isEnable160m = false; + std::shared_ptr listener_ = std::make_shared(); + int32_t ret = listener_->OpenAuthSessionWithPara(deviceId, actionId, isEnable160m); + EXPECT_NE(ret, DM_OK); +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_device_manager_service_three.cpp b/test/unittest/UTTest_device_manager_service_three.cpp index 654591c2a9c443bc4f815313a1c293dc93883bbc..f944566c4a842cddd234ea3549eb38d6d7938e85 100644 --- a/test/unittest/UTTest_device_manager_service_three.cpp +++ b/test/unittest/UTTest_device_manager_service_three.cpp @@ -60,6 +60,10 @@ void DeviceManagerServiceThreeTest::SetUp() void DeviceManagerServiceThreeTest::TearDown() { + Mock::VerifyAndClearExpectations(deviceManagerServiceMock_.get()); + Mock::VerifyAndClearExpectations(permissionManagerMock_.get()); + Mock::VerifyAndClearExpectations(softbusListenerMock_.get()); + Mock::VerifyAndClearExpectations(deviceManagerServiceImplMock_.get()); } void DeviceManagerServiceThreeTest::SetUpTestCase() @@ -84,6 +88,8 @@ void DeviceManagerServiceThreeTest::TearDownTestCase() namespace { +const int32_t SEND_DELAY_MAX_TIME = 5; + void SetSetDnPolicyPermission() { const int32_t permsNum = 1; @@ -298,7 +304,6 @@ HWTEST_F(DeviceManagerServiceThreeTest, BindTarget_301, testing::ext::TestSize.L EXPECT_EQ(ret, ERR_DM_NOT_INIT); bindParam.insert(std::make_pair(PARAM_KEY_META_TYPE, pkgName)); - EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -380,9 +385,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ExportAuthCode_301, testing::ext::TestSi int32_t userId = 0; std::string accountId; std::string accountName; - EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterSoLoaded()).WillOnce(Return(false)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); - EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); DeviceManagerService::GetInstance().HandleAccountLogout(userId, accountId, accountName); int32_t curUserId = 0; @@ -413,7 +416,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, SetDnPolicy_301, testing::ext::TestSize. policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; std::string processName = "collaboration_service"; EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) - .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); + .WillRepeatedly(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().SetDnPolicy(packName, policy); @@ -479,8 +482,9 @@ HWTEST_F(DeviceManagerServiceThreeTest, PutDeviceProfileInfoList_301, testing::e std::string pkgName = "pkgName"; std::vector deviceProfileInfoList; EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidPutDeviceProfileInfoList(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); - EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); + EXPECT_NE(ret, DM_OK); } HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceNamePrefixs_301, testing::ext::TestSize.Level1) @@ -489,6 +493,358 @@ HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceNamePrefixs_301, testing::ext:: auto ret = DeviceManagerService::GetInstance().GetDeviceNamePrefixs(); EXPECT_TRUE(ret.empty()); } + +HWTEST_F(DeviceManagerServiceThreeTest, SetLocalDeviceName_301, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + std::string deviceName = "deviceName"; + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyLocalDeviceName(_)).WillOnce(Return(true)); + EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); + int32_t ret = DeviceManagerService::GetInstance().SetLocalDeviceName(pkgName, deviceName); + EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); +} + +HWTEST_F(DeviceManagerServiceThreeTest, SetRemoteDeviceName_301, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + std::string deviceName = "deviceName"; + std::string deviceId = "d*********3"; + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyRemoteDeviceName(_)).WillOnce(Return(true)); + EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); + int32_t ret = DeviceManagerService::GetInstance().SetRemoteDeviceName(pkgName, deviceId, deviceName); + EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); +} + +HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceNetworkIdList_301, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + NetworkIdQueryFilter queryFilter; + std::vector networkIds{"uehd*****87"}; + EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); + int32_t ret = DeviceManagerService::GetInstance().GetDeviceNetworkIdList(pkgName, queryFilter, networkIds); + EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); +} + +HWTEST_F(DeviceManagerServiceThreeTest, OnPinHolderSessionOpened_001, testing::ext::TestSize.Level1) +{ + DeviceManagerService::GetInstance().isImplsoLoaded_ = false; + int sessionId = 0; + int result = 0; + void *data = nullptr; + unsigned int dataLen = 0; + int ret = DeviceManagerService::GetInstance().OnPinHolderSessionOpened(sessionId, result); + DeviceManagerService::GetInstance().OnPinHolderBytesReceived(sessionId, data, dataLen); + DeviceManagerService::GetInstance().OnPinHolderSessionClosed(sessionId); + EXPECT_NE(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceThreeTest, IsDMImplSoLoaded_001, testing::ext::TestSize.Level1) +{ + DeviceManagerService::GetInstance().isImplsoLoaded_ = false; + bool ret = DeviceManagerService::GetInstance().IsDMImplSoLoaded(); + EXPECT_FALSE(ret); +} + +HWTEST_F(DeviceManagerServiceThreeTest, DmHiDumper_001, testing::ext::TestSize.Level1) +{ + std::vector args; + std::string result; + int32_t ret = DeviceManagerService::GetInstance().DmHiDumper(args, result); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceThreeTest, GenerateEncryptedUuid_001, testing::ext::TestSize.Level1) +{ + std::string pkgName; + std::string uuid; + std::string appId; + std::string encryptedUuid; + int32_t ret = DeviceManagerService::GetInstance().GenerateEncryptedUuid(pkgName, uuid, appId, encryptedUuid); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DeviceManagerServiceThreeTest, GenerateEncryptedUuid_002, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + std::string uuid; + std::string appId; + std::string encryptedUuid; + int32_t ret = DeviceManagerService::GetInstance().GenerateEncryptedUuid(pkgName, uuid, appId, encryptedUuid); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceThreeTest, HandleDeviceStatusChange_001, testing::ext::TestSize.Level1) +{ + DmDeviceState devState = DmDeviceState::DEVICE_INFO_READY; + DmDeviceInfo devInfo; + DeviceManagerService::GetInstance().HandleDeviceStatusChange(devState, devInfo); + EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); +} + +HWTEST_F(DeviceManagerServiceThreeTest, SendAppUnBindBroadCast_001, testing::ext::TestSize.Level1) +{ + std::vector peerUdids; + int32_t userId = 12; + uint64_t tokenId = 23; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + DeviceManagerService::GetInstance().SendAppUnBindBroadCast(peerUdids, userId, tokenId); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceThreeTest, SendAppUnBindBroadCast_002, testing::ext::TestSize.Level1) +{ + std::vector peerUdids; + int32_t userId = 12; + uint64_t peerTokenId = 3; + uint64_t tokenId = 23; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + DeviceManagerService::GetInstance().SendAppUnBindBroadCast(peerUdids, userId, tokenId, peerTokenId); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceThreeTest, SendServiceUnBindBroadCast_001, testing::ext::TestSize.Level1) +{ + std::vector peerUdids; + int32_t userId = 12; + uint64_t tokenId = 23; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + DeviceManagerService::GetInstance().SendServiceUnBindBroadCast(peerUdids, userId, tokenId); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceThreeTest, ClearDiscoveryCache_001, testing::ext::TestSize.Level1) +{ + ProcessInfo processInfo; + processInfo.pkgName = "pkgName001"; + DeviceManagerService::GetInstance().InitDMServiceListener(); + DeviceManagerService::GetInstance().ClearDiscoveryCache(processInfo); + EXPECT_NE(DeviceManagerService::GetInstance().discoveryMgr_, nullptr); + DeviceManagerService::GetInstance().UninitDMServiceListener(); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_302, testing::ext::TestSize.Level1) +{ + std::string pkgName; + std::string authCode; + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(false)); + int32_t ret = DeviceManagerService::GetInstance().ImportAuthCode(pkgName, authCode); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_303, testing::ext::TestSize.Level1) +{ + std::string pkgName; + std::string authCode; + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(ERR_DM_FAILED)); + int32_t ret = DeviceManagerService::GetInstance().ImportAuthCode(pkgName, authCode); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_304, testing::ext::TestSize.Level1) +{ + std::string pkgName; + std::string authCode; + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(true)); + int32_t ret = DeviceManagerService::GetInstance().ImportAuthCode(pkgName, authCode); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ValidateUnBindDeviceParams_301, testing::ext::TestSize.Level1) +{ + std::string pkgName = "ohos.test.pkgName"; + std::string deviceId = "deviceId"; + EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(ERR_DM_FAILED)); + int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ValidateUnBindDeviceParams_302, testing::ext::TestSize.Level1) +{ + std::string pkgName = "ohos.test.pkgName"; + std::string deviceId = "deviceId"; + std::string extra; + EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(ERR_DM_FAILED)); + int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId, extra); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ProcessUninstApp_301, testing::ext::TestSize.Level1) +{ + int32_t userId = 100; + int32_t tokenId = 200; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); + DeviceManagerService::GetInstance().ProcessUninstApp(userId, tokenId); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceThreeTest, ProcessUnBindApp_301, testing::ext::TestSize.Level1) +{ + int32_t userId = 100; + int32_t tokenId = 200; + std::string extra; + std::string udid = "ohos.test.udid"; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); + DeviceManagerService::GetInstance().ProcessUnBindApp(userId, tokenId, extra, udid); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceThreeTest, CalculateBroadCastDelayTime_001, testing::ext::TestSize.Level1) +{ + DeviceManagerService::GetInstance().SendLastBroadCastTime_ = 10; + int32_t delayTime = DeviceManagerService::GetInstance().CalculateBroadCastDelayTime(); + EXPECT_NE(delayTime, SEND_DELAY_MAX_TIME); +} + +HWTEST_F(DeviceManagerServiceThreeTest, CalculateBroadCastDelayTime_002, testing::ext::TestSize.Level1) +{ + int32_t delayTime = DeviceManagerService::GetInstance().CalculateBroadCastDelayTime(); + EXPECT_NE(delayTime, SEND_DELAY_MAX_TIME); +} +HWTEST_F(DeviceManagerServiceThreeTest, ParseRelationShipChangeType_001, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::APP_UNINSTALL; + auto ret = DeviceManagerService::GetInstance().ParseRelationShipChangeType(msg); + EXPECT_EQ(ret, true); +} + +HWTEST_F(DeviceManagerServiceThreeTest, SubscribePackageCommonEvent_301, testing::ext::TestSize.Level1) +{ + DeviceManagerService::GetInstance().packageCommonEventManager_ = std::make_shared(); + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; + +} + +HWTEST_F(DeviceManagerServiceThreeTest, SubscribePackageCommonEvent_302, testing::ext::TestSize.Level1) +{ + DeviceManagerService::GetInstance().packageCommonEventManager_ = std::make_shared(); + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceThreeTest, SubscribePackageCommonEvent_303, testing::ext::TestSize.Level1) +{ + DeviceManagerService::GetInstance().packageCommonEventManager_ = nullptr; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceThreeTest, SubscribePackageCommonEvent_304, testing::ext::TestSize.Level1) +{ + DeviceManagerService::GetInstance().packageCommonEventManager_ = nullptr; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceThreeTest, NotifyRemoteUninstallApp_301, testing::ext::TestSize.Level1) +{ + int32_t userId = 100; + int32_t tokenId = 200; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); + DeviceManagerService::GetInstance().NotifyRemoteUninstallApp(userId, tokenId); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceThreeTest, NotifyRemoteUninstallApp_302, testing::ext::TestSize.Level1) +{ + int32_t userId = 100; + int32_t tokenId = 200; + DeviceManagerService::GetInstance().softbusListener_ = nullptr; + EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); + DeviceManagerService::GetInstance().NotifyRemoteUninstallApp(userId, tokenId); + EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); +} + +HWTEST_F(DeviceManagerServiceThreeTest, NotifyRemoteUninstallAppByWifi_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 100; + int32_t tokenId = 200; + std::map wifiDevices; + DeviceManagerService::GetInstance().timer_ = nullptr; + DeviceManagerService::GetInstance().NotifyRemoteUninstallAppByWifi(userId, tokenId, wifiDevices); + EXPECT_EQ(DeviceManagerService::GetInstance().timer_, nullptr); +} + +HWTEST_F(DeviceManagerServiceThreeTest, NotifyRemoteUninstallAppByWifi_002, testing::ext::TestSize.Level1) +{ + int32_t userId = 100; + int32_t tokenId = 200; + std::map wifiDevices; + DeviceManagerService::GetInstance().timer_ = std::make_shared(); + DeviceManagerService::GetInstance().NotifyRemoteUninstallAppByWifi(userId, tokenId, wifiDevices); + EXPECT_NE(DeviceManagerService::GetInstance().timer_, nullptr); +} + +HWTEST_F(DeviceManagerServiceThreeTest, NotifyRemoteUninstallAppByWifi_003, testing::ext::TestSize.Level1) +{ + int32_t userId = 100; + int32_t tokenId = 200; + std::map wifiDevices; + DeviceManagerService::GetInstance().timer_ = nullptr; + DeviceManagerService::GetInstance().NotifyRemoteUninstallAppByWifi(userId, tokenId, wifiDevices); + EXPECT_EQ(DeviceManagerService::GetInstance().timer_, nullptr); +} + +HWTEST_F(DeviceManagerServiceThreeTest, NotifyRemoteUnBindAppByWifi_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 100; + int32_t tokenId = 200; + std::map wifiDevices; + std::string extra; + DeviceManagerService::GetInstance().timer_ = std::make_shared(); + DeviceManagerService::GetInstance().NotifyRemoteUnBindAppByWifi(userId, tokenId, extra, wifiDevices); + EXPECT_NE(DeviceManagerService::GetInstance().timer_, nullptr); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ProcessReceiveRspAppUninstall_301, testing::ext::TestSize.Level1) +{ + std::string remoteUdid = "ohos"; + DeviceManagerService::GetInstance().timer_ = std::make_shared(); + DeviceManagerService::GetInstance().ProcessReceiveRspAppUninstall(remoteUdid); + EXPECT_NE(DeviceManagerService::GetInstance().timer_, nullptr); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ProcessReceiveRspAppUninstall_302, testing::ext::TestSize.Level1) +{ + std::string remoteUdid = "ohos"; + DeviceManagerService::GetInstance().timer_ = nullptr; + DeviceManagerService::GetInstance().ProcessReceiveRspAppUninstall(remoteUdid); + EXPECT_EQ(DeviceManagerService::GetInstance().timer_, nullptr); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ProcessReceiveRspAppUnbind_301, testing::ext::TestSize.Level1) +{ + std::string remoteUdid = "ohos"; + DeviceManagerService::GetInstance().timer_ = std::make_shared(); + DeviceManagerService::GetInstance().ProcessReceiveRspAppUnbind(remoteUdid); + EXPECT_NE(DeviceManagerService::GetInstance().timer_, nullptr); +} + +HWTEST_F(DeviceManagerServiceThreeTest, ProcessReceiveRspAppUnbind_302, testing::ext::TestSize.Level1) +{ + std::string remoteUdid = "ohos"; + DeviceManagerService::GetInstance().timer_ = nullptr; + DeviceManagerService::GetInstance().ProcessReceiveRspAppUnbind(remoteUdid); + EXPECT_EQ(DeviceManagerService::GetInstance().timer_, nullptr); +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index 27d7983ecc4e2c8150e5e5118a71578d4310297d..8aedde22cea2b7c08fd4f364d8365bfd07429de0 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -273,8 +273,6 @@ HWTEST_F(DeviceManagerServiceTest, InitAccountInfo_201, testing::ext::TestSize.L int32_t userId = 100; std::string commonEventType = "usual.event.USER_SWITCHED"; std::map curUserDeviceMap; - EXPECT_CALL(*deviceManagerServiceImplMock_, GetDeviceIdAndBindLevel(_)) - .WillOnce(Return(curUserDeviceMap)).WillOnce(Return(curUserDeviceMap)); DeviceManagerService::GetInstance().AccountCommonEventCallback(commonEventType, userId, 101); commonEventType = "common.event.HWID_LOGIN"; DeviceManagerService::GetInstance().AccountCommonEventCallback(commonEventType, userId, 101); @@ -521,12 +519,12 @@ HWTEST_F(DeviceManagerServiceTest, BindTarget_201, testing::ext::TestSize.Level1 std::string value = "186"; bindParam.insert(std::make_pair(key, value)); int32_t ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); - EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + EXPECT_EQ(ret, DM_OK); targetId.wifiIp = "178.168.1.2"; EXPECT_CALL(*softbusListenerMock_, GetIPAddrTypeFromCache(_, _, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); - EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + EXPECT_EQ(ret, DM_OK); } HWTEST_F(DeviceManagerServiceTest, UnBindDevice_201, testing::ext::TestSize.Level1) @@ -538,7 +536,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_201, testing::ext::TestSize.Leve EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -551,21 +549,21 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_202, testing::ext::TestSize.Leve EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(DM_IDENTICAL_ACCOUNT)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(DM_IDENTICAL_ACCOUNT)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -663,7 +661,7 @@ HWTEST_F(DeviceManagerServiceTest, BindDevice_205, testing::ext::TestSize.Level1 EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetTargetInfoFromCache(_, _, _)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); - EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + EXPECT_EQ(ret, DM_OK); ProcessInfo processInfo; processInfo.pkgName = "pkgName"; @@ -689,7 +687,7 @@ HWTEST_F(DeviceManagerServiceTest, AuthenticateDevice_205, testing::ext::TestSiz EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetTargetInfoFromCache(_, _, _)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().AuthenticateDevice(pkgName, authType, deviceId, extra); - EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + EXPECT_EQ(ret, DM_OK); std::vector peerUdids; int32_t userId = 123456; @@ -768,16 +766,23 @@ HWTEST_F(DeviceManagerServiceTest, RegDevStateCallbackToService_201, testing::ex JsonObject msgJsonObj; msgJsonObj["networkId"] = "networkId_001"; - msgJsonObj["discoverType"] = 0; + msgJsonObj["discoverType"] = 0b0100; + msgJsonObj["ischange"] = true; msg = msgJsonObj.Dump(); + std::vector foregroundUserVec; + foregroundUserVec.push_back(101); + EXPECT_CALL(*multipleUserConnectorMock_, GetForegroundUserIds(_)) + .WillOnce(DoAll(SetArgReferee<0>(foregroundUserVec), Return(DM_OK))); EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)).WillOnce(DoAll(SetArgReferee<1>(""), Return(DM_OK))); DeviceManagerService::GetInstance().HandleUserIdCheckSumChange(msg); - EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)).WillOnce(DoAll(SetArgReferee<1>("udid01"), Return(DM_OK))) - .WillOnce(DoAll(SetArgReferee<1>("udid01"), Return(DM_OK))); + EXPECT_CALL(*multipleUserConnectorMock_, GetForegroundUserIds(_)) + .WillOnce(DoAll(SetArgReferee<0>(foregroundUserVec), Return(DM_OK))); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)).WillOnce(DoAll(SetArgReferee<1>("udid01"), Return(DM_OK))); DeviceManagerService::GetInstance().HandleUserIdCheckSumChange(msg); + Mock::VerifyAndClearExpectations(multipleUserConnectorMock_.get()); - msgJsonObj["discoverType"] = 1; + msgJsonObj["discoverType"] = 0; msg = msgJsonObj.Dump(); DeviceManagerService::GetInstance().HandleUserIdCheckSumChange(msg); } @@ -973,27 +978,27 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_204, testing::ext::TestSize.Leve EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -1008,7 +1013,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_205, testing::ext::TestSize.Leve EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); int32_t userId = 123456; int32_t curUserId = 0; @@ -1024,8 +1029,8 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_205, testing::ext::TestSize.Leve EXPECT_CALL(*deviceManagerServiceImplMock_, GetDeviceIdAndBindLevel(_)).WillOnce(Return(curUserDeviceMap)).WillOnce(Return(preUserDeviceMap)); EXPECT_CALL(*multipleUserConnectorMock_, GetForegroundUserIds(_)) - .WillRepeatedly(DoAll(SetArgReferee<0>(foregroundUserVec), Return(DM_OK))); - EXPECT_CALL(*multipleUserConnectorMock_, GetBackgroundUserIds(_)).WillOnce(Return(DM_OK)); + .Times(::testing::AtLeast(1)).WillRepeatedly(DoAll(SetArgReferee<0>(foregroundUserVec), Return(DM_OK))); + EXPECT_CALL(*multipleUserConnectorMock_, GetBackgroundUserIds(_)).WillRepeatedly(Return(DM_OK)); DeviceManagerService::GetInstance().HandleUserSwitched(curUserId, preUserId); std::vector remoteUserIdInfos; @@ -1088,14 +1093,14 @@ HWTEST_F(DeviceManagerServiceTest, NotifyRemoteLocalUserSwitch_201, testing::ext std::vector backgroundUserIds; DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(curUserId, preUserId, peerUdids, foregroundUserIds, backgroundUserIds); - + peerUdids.push_back("peerUdid001"); peerUdids.push_back("peerUdid002"); DeviceManagerService::GetInstance().softbusListener_ = nullptr; DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(curUserId, preUserId, peerUdids, foregroundUserIds, backgroundUserIds); EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); - + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).Times(::testing::AtLeast(2)) .WillOnce(DoAll(SetArgReferee<1>(""), Return(DM_OK))); @@ -1105,7 +1110,7 @@ HWTEST_F(DeviceManagerServiceTest, NotifyRemoteLocalUserSwitch_201, testing::ext EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).Times(::testing::AtLeast(2)) .WillOnce(DoAll(SetArgReferee<1>("networkId"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)).Times(::testing::AtLeast(2)) + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>(0), Return(ERR_DM_FAILED))); DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(curUserId, preUserId, peerUdids, foregroundUserIds, backgroundUserIds); @@ -1115,7 +1120,7 @@ HWTEST_F(DeviceManagerServiceTest, NotifyRemoteLocalUserSwitch_201, testing::ext EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).Times(::testing::AtLeast(2)) .WillOnce(DoAll(SetArgReferee<1>("networkId"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)).Times(::testing::AtLeast(2)) + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(curUserId, preUserId, peerUdids, foregroundUserIds, backgroundUserIds); @@ -1123,7 +1128,7 @@ HWTEST_F(DeviceManagerServiceTest, NotifyRemoteLocalUserSwitch_201, testing::ext EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).Times(::testing::AtLeast(2)) .WillOnce(DoAll(SetArgReferee<1>("networkId"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)).Times(::testing::AtLeast(2)) + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>(4), Return(DM_OK))); DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(curUserId, preUserId, peerUdids, foregroundUserIds, backgroundUserIds); @@ -1228,16 +1233,15 @@ HWTEST_F(DeviceManagerServiceTest, RegisterAuthenticationType_201, testing::ext: DmDeviceInfo deviceInfo; foregroundUserIds.push_back(102); memcpy_s(deviceInfo.networkId, DM_MAX_DEVICE_ID_LEN, str.c_str(), str.length()); - EXPECT_CALL(*softbusCacheMock_, GetLocalDeviceInfo(_)).WillOnce(DoAll(SetArgReferee<0>(deviceInfo), Return(DM_OK))); backgroundUserIds.push_back(201); backgroundUserIds.push_back(202); - EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); DeviceManagerService::GetInstance().ProcessCheckSumByWifi(networkId, foregroundUserIds, backgroundUserIds); } HWTEST_F(DeviceManagerServiceTest, RegisterAuthenticationType_202, testing::ext::TestSize.Level1) { std::string pkgName; + std::map authParam; int32_t ret = DeviceManagerService::GetInstance().RegisterAuthenticationType(pkgName, authParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); @@ -1274,13 +1278,12 @@ HWTEST_F(DeviceManagerServiceTest, RegisterAuthenticationType_202, testing::ext: EXPECT_CALL(*multipleUserConnectorMock_, GetForegroundUserIds(_)) .WillOnce(DoAll(SetArgReferee<0>(foregroundUserIds), Return(DM_OK))); EXPECT_CALL(*multipleUserConnectorMock_, GetBackgroundUserIds(_)).WillOnce(Return(ERR_DM_FAILED)); - EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillRepeatedly(Return(ERR_DM_FAILED)); DeviceManagerService::GetInstance().HandleUserIdCheckSumChange(msg); backgroundUserIds.push_back(102); msgJsonObj["discoverType"] = 1; msg = msgJsonObj.Dump(); - EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)).WillOnce(DoAll(SetArgReferee<1>(""), Return(DM_OK))); EXPECT_CALL(*multipleUserConnectorMock_, GetForegroundUserIds(_)) .WillOnce(DoAll(SetArgReferee<0>(foregroundUserIds), Return(DM_OK))); EXPECT_CALL(*multipleUserConnectorMock_, GetBackgroundUserIds(_)) @@ -1335,6 +1338,7 @@ HWTEST_F(DeviceManagerServiceTest, PutDeviceProfileInfoList_202, testing::ext::T { std::string pkgName = "pkgName"; std::vector deviceProfileInfoList; + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidPutDeviceProfileInfoList(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); EXPECT_TRUE(ret == ERR_DM_UNSUPPORTED_METHOD || ret == ERR_DM_INPUT_PARA_INVALID); } @@ -1425,37 +1429,28 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceInfo_202, testing::ext::TestSize.Lev DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); - EXPECT_CALL(*deviceProfileConnectorMock_, CheckDeviceInfoPermission(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetDeviceInfo(_, _)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); EXPECT_EQ(ret, DM_OK); - EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); - EXPECT_CALL(*deviceProfileConnectorMock_, CheckDeviceInfoPermission(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetDeviceInfo(_, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); EXPECT_EQ(ret, ERR_DM_FAILED); - EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); - EXPECT_CALL(*deviceProfileConnectorMock_, CheckDeviceInfoPermission(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetDeviceInfo(_, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); EXPECT_EQ(ret, DM_OK); - EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); - EXPECT_CALL(*deviceProfileConnectorMock_, CheckDeviceInfoPermission(_, _)).WillOnce(Return(ERR_DM_FAILED)); - EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); - EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(false)); + EXPECT_CALL(*softbusListenerMock_, GetDeviceInfo(_, _)) + .WillOnce(Return (DM_OK)) + .WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); EXPECT_EQ(ret, DM_OK); - EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); - EXPECT_CALL(*deviceProfileConnectorMock_, CheckDeviceInfoPermission(_, _)).WillOnce(Return(ERR_DM_FAILED)); - EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); EXPECT_EQ(ret, DM_OK); DeviceManagerService::GetInstance().softbusListener_ = nullptr; @@ -1490,7 +1485,7 @@ HWTEST_F(DeviceManagerServiceTest, RegisterLocalServiceInfo_201, testing::ext::T DeviceManagerService::GetInstance().hichainListener_ = std::make_shared(); DeviceManagerService::GetInstance().UpdateAclAndDeleteGroup(localUdid, deviceVec, foregroundUserIds, backgroundUserIds); - + std::string pkgName = "pkgName"; DeviceManagerService::GetInstance().ClearPublishIdCache(pkgName); DeviceManagerService::GetInstance().hichainListener_ = nullptr; @@ -1548,7 +1543,7 @@ HWTEST_F(DeviceManagerServiceTest, UpdateLocalServiceInfo_201, testing::ext::Tes EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, foregroundUserIds, backgroundUserIds); - + GTEST_LOG_(INFO) << "NotifyRemoteLocalUserSwitchByWifi SendUserIds is ok" ; EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(DM_OK)); DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, @@ -1645,6 +1640,314 @@ HWTEST_F(DeviceManagerServiceTest, InitServiceInfos_001, testing::ext::TestSize. } } +HWTEST_F(DeviceManagerServiceTest, RestoreLocalDeviceName_201, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + DeletePermission(); + int32_t ret = DeviceManagerService::GetInstance().RestoreLocalDeviceName(pkgName); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); +} + +HWTEST_F(DeviceManagerServiceTest, RestoreLocalDeviceName_202, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(ERR_DM_FAILED)); + int32_t ret = DeviceManagerService::GetInstance().RestoreLocalDeviceName(pkgName); + EXPECT_EQ(ret, ERR_DM_FAILED); + + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyLocalDeviceName(_)).WillOnce(Return(false)); + ret = DeviceManagerService::GetInstance().RestoreLocalDeviceName(pkgName); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); + + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyLocalDeviceName(_)).WillOnce(Return(true)); + ret = DeviceManagerService::GetInstance().RestoreLocalDeviceName(pkgName); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceTest, SetLocalDeviceName_201, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + std::string deviceName = "deviceName"; + DeletePermission(); + int32_t ret = DeviceManagerService::GetInstance().SetLocalDeviceName(pkgName, deviceName); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); +} + +HWTEST_F(DeviceManagerServiceTest, SetLocalDeviceName_202, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + std::string deviceName = "deviceName"; + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(ERR_DM_FAILED)); + int32_t ret = DeviceManagerService::GetInstance().SetLocalDeviceName(pkgName, deviceName); + EXPECT_EQ(ret, ERR_DM_FAILED); + + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyLocalDeviceName(_)).WillOnce(Return(false)); + ret = DeviceManagerService::GetInstance().SetLocalDeviceName(pkgName, deviceName); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); + + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyLocalDeviceName(_)).WillOnce(Return(true)); + ret = DeviceManagerService::GetInstance().SetLocalDeviceName(pkgName, deviceName); + EXPECT_NE(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceTest, SetRemoteDeviceName_201, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + std::string deviceName = "deviceName"; + std::string deviceId = "d*********9"; + DeletePermission(); + int32_t ret = DeviceManagerService::GetInstance().SetRemoteDeviceName(pkgName, deviceId, deviceName); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); +} + +HWTEST_F(DeviceManagerServiceTest, SetRemoteDeviceName_202, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + std::string deviceName = "deviceName"; + std::string deviceId = "d*********9"; + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(ERR_DM_FAILED)); + int32_t ret = DeviceManagerService::GetInstance().SetRemoteDeviceName(pkgName, deviceId, deviceName); + EXPECT_EQ(ret, ERR_DM_FAILED); + + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyRemoteDeviceName(_)).WillOnce(Return(false)); + ret = DeviceManagerService::GetInstance().SetRemoteDeviceName(pkgName, deviceId, deviceName); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); + + EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyRemoteDeviceName(_)).WillOnce(Return(true)); + ret = DeviceManagerService::GetInstance().SetRemoteDeviceName(pkgName, deviceId, deviceName); + EXPECT_NE(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceTest, GetDeviceNetworkIdList_201, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + NetworkIdQueryFilter queryFilter; + std::vector networkIds{"uehd*****87"}; + DeletePermission(); + int32_t ret = DeviceManagerService::GetInstance().GetDeviceNetworkIdList(pkgName, queryFilter, networkIds); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); + + int32_t stopUserId = 1; + std::string stopEventUdid = "ud*********4"; + std::vector acceptEventUdids{"acc**********7"}; + DeviceManagerService::GetInstance().InitDMServiceListener(); + DeviceManagerService::GetInstance().HandleUserStop(stopUserId, stopEventUdid, acceptEventUdids); + DeviceManagerService::GetInstance().HandleUserStop(stopUserId, stopEventUdid); + + std::string localUdid = "local*******76"; + std::vector peerUdids; + DeviceManagerService::GetInstance().NotifyRemoteLocalUserStop(localUdid, peerUdids, stopUserId); + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + DeviceManagerService::GetInstance().SendUserStopBroadCast(peerUdids, stopUserId); + std::string remoteUdid = "re********7"; + DeviceManagerService::GetInstance().HandleUserStopBroadCast(stopUserId, remoteUdid); + + std::map wifiDevices; + wifiDevices.insert(std::make_pair("wikjdmcsk", "deviceInfowifi")); + EXPECT_CALL(*dMCommToolMock_, SendUserStop(_, _)).WillOnce(Return(ERR_DM_FAILED)); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserStopByWifi(localUdid, wifiDevices, stopUserId); + + EXPECT_CALL(*dMCommToolMock_, SendUserStop(_, _)).WillOnce(Return(DM_OK)); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserStopByWifi(localUdid, wifiDevices, stopUserId); + DeviceManagerService::GetInstance().UninitDMServiceListener(); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceTest, GetDeviceNetworkIdList_202, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + NetworkIdQueryFilter queryFilter; + std::vector networkIds{"uehd*****87"}; + int32_t ret = DeviceManagerService::GetInstance().GetDeviceNetworkIdList(pkgName, queryFilter, networkIds); + EXPECT_NE(ret, DM_OK); + + int32_t stopUserId = 1; + std::map deviceMap; + EXPECT_CALL(*deviceProfileConnectorMock_, GetDeviceIdAndBindLevel(_, _)) + .WillOnce(Return(deviceMap)); + DeviceManagerService::GetInstance().InitDMServiceListener(); + DeviceManagerService::GetInstance().HandleUserStopEvent(stopUserId); + + std::vector peerUdids; + std::vector bleUdids; + std::map wifiDevices; + DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); + + peerUdids.push_back("u********23"); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; + DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); + + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(""), Return(DM_OK))); + DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); + + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("net********8"), Return(DM_OK))); + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(4), Return(ERR_DM_FAILED))); + DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); + + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("net********8"), Return(DM_OK))); + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(4), Return(DM_OK))); + DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); + + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("net********8"), Return(DM_OK))); + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(2), Return(DM_OK))); + DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); + DeviceManagerService::GetInstance().UninitDMServiceListener(); +} + +HWTEST_F(DeviceManagerServiceTest, SendShareTypeUnBindBroadCast_001, testing::ext::TestSize.Level1) +{ + const char *credId = "testCredId"; + int32_t localUserId = 1001; + std::vector peerUdids = {"peerUdid1", "peerUdid2"}; + + DeviceManagerService::GetInstance().SendShareTypeUnBindBroadCast(credId, localUserId, peerUdids); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); +} + +HWTEST_F(DeviceManagerServiceTest, HandleCredentialDeleted_002, testing::ext::TestSize.Level1) +{ + EXPECT_CALL(*deviceManagerServiceImplMock_, HandleCredentialDeleted(_, _, _, _)).Times(0); + + DeviceManagerService::GetInstance().HandleCredentialDeleted(nullptr, "credInfo"); +} + +HWTEST_F(DeviceManagerServiceTest, HandleCredentialDeleted_004, testing::ext::TestSize.Level1) +{ + EXPECT_CALL(*multipleUserConnectorMock_, GetCurrentAccountUserID()).Times(0); + EXPECT_CALL(*softbusListenerMock_, SendAclChangedBroadcast(_)).Times(0); + + DeviceManagerService::GetInstance().HandleCredentialDeleted("credId", "credInfo"); +} + +HWTEST_F(DeviceManagerServiceTest, HandleShareUnbindBroadCast_001, testing::ext::TestSize.Level1) +{ + std::string credId = "123456"; + int32_t userId = 1001; + std::string localUdid = "localUdid"; + EXPECT_CALL(*deviceManagerServiceImplMock_, HandleShareUnbindBroadCast(_, _, _)).Times(1); + + DeviceManagerService::GetInstance().HandleShareUnbindBroadCast(userId, credId); +} + +HWTEST_F(DeviceManagerServiceTest, HandleShareUnbindBroadCast_002, testing::ext::TestSize.Level1) +{ + std::string credId = ""; + int32_t userId = 1001; + + EXPECT_CALL(*deviceManagerServiceImplMock_, HandleShareUnbindBroadCast(_, _, _)).Times(0); + + DeviceManagerService::GetInstance().HandleShareUnbindBroadCast(userId, credId); +} + +HWTEST_F(DeviceManagerServiceTest, HandleShareUnbindBroadCast_003, testing::ext::TestSize.Level1) +{ + std::string credId = "123456"; + int32_t userId = 1001; + + EXPECT_TRUE(DeviceManagerService::GetInstance().IsDMServiceImplReady()); + + DeviceManagerService::GetInstance().HandleShareUnbindBroadCast(userId, credId); +} + +HWTEST_F(DeviceManagerServiceTest, GetLocalDeviceName_201, testing::ext::TestSize.Level1) +{ + std::string deviceName = ""; + int32_t ret = DeviceManagerService::GetInstance().GetLocalDeviceName(deviceName); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceTest, ValidateUnBindDeviceParams_201, testing::ext::TestSize.Level1) +{ + std::string pkgName = ""; + std::string deviceId = ""; + int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DeviceManagerServiceTest, ValidateUnBindDeviceParams_202, testing::ext::TestSize.Level1) +{ + std::string pkgName = "ohos.test.pkgName"; + std::string deviceId = "deviceId"; + DeletePermission(); + int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); +} + +HWTEST_F(DeviceManagerServiceTest, ValidateUnBindDeviceParams_203, testing::ext::TestSize.Level1) +{ + std::string pkgName = ""; + std::string deviceId = ""; + std::string extra; + int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId, extra); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DeviceManagerServiceTest, ValidateUnBindDeviceParams_204, testing::ext::TestSize.Level1) +{ + std::string pkgName = "ohos.test.pkgName"; + std::string deviceId = "deviceId"; + std::string extra; + DeletePermission(); + int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId, extra); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); +} + +HWTEST_F(DeviceManagerServiceTest, SendUninstAppByWifi_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 1001; + int32_t tokenId = 1002; + std::string networkId = "networkId123"; + EXPECT_CALL(*dMCommToolMock_, SendUninstAppObj(_, _, _)).WillOnce(Return(DM_OK)); + int32_t ret = DeviceManagerService::GetInstance().SendUninstAppByWifi(userId, tokenId, networkId); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DeviceManagerServiceTest, SendUninstAppByWifi_002, testing::ext::TestSize.Level1) +{ + int32_t userId = 1001; + int32_t tokenId = 1002; + std::string networkId = "networkId123"; + EXPECT_CALL(*dMCommToolMock_, SendUninstAppObj(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + int32_t ret = DeviceManagerService::GetInstance().SendUninstAppByWifi(userId, tokenId, networkId); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DeviceManagerServiceTest, GetNotifyRemoteUnBindAppWay_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 1001; + int32_t tokenId = 11; + std::map wifiDevices; + bool isBleWay = false; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + DeviceManagerService::GetInstance().GetNotifyRemoteUnBindAppWay(userId, tokenId, wifiDevices, isBleWay); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} +HWTEST_F(DeviceManagerServiceTest, GetNotifyRemoteUnBindAppWay_002, testing::ext::TestSize.Level1) +{ + int32_t userId = 1001; + int32_t tokenId = 11; + std::map wifiDevices; + bool isBleWay = false; + DeviceManagerService::GetInstance().softbusListener_ = nullptr; + DeviceManagerService::GetInstance().GetNotifyRemoteUnBindAppWay(userId, tokenId, wifiDevices, isBleWay); + EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); + +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_device_name_manager.cpp b/test/unittest/UTTest_device_name_manager.cpp index ae0eabdd94a9e1470b8f5e48f8b5d35c51858dd4..d278174290c0779b8b4f0eb9e99abaa3eb99a996 100644 --- a/test/unittest/UTTest_device_name_manager.cpp +++ b/test/unittest/UTTest_device_name_manager.cpp @@ -296,7 +296,6 @@ HWTEST_F(DeviceNameManagerTest, GetLocalDisplayDeviceName_001, testing::ext::Tes })); EXPECT_CALL(*resultSet, Close()).Times(AtLeast(1)); std::string prefixName = "Mr.诸葛张三"; - EXPECT_CALL(*multipleUserConnector_, GetCallerUserId(_)).Times(AtLeast(1)); EXPECT_CALL(*multipleUserConnector_, GetAccountNickName(_)).WillRepeatedly(Return(prefixName)); for (size_t i = 0; i < 2; ++i) { int32_t maxNamelength = 24; @@ -325,5 +324,354 @@ HWTEST_F(DeviceNameManagerTest, GetLocalDisplayDeviceName_002, testing::ext::Tes result = DeviceNameManager::GetInstance().GetLocalDisplayDeviceName(maxNamelength, output); EXPECT_EQ(result, ERR_DM_INPUT_PARA_INVALID); } + +HWTEST_F(DeviceNameManagerTest, ReleaseDataShareHelper_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr helper = nullptr; + bool ret = DeviceNameManager::GetInstance().ReleaseDataShareHelper(helper); + EXPECT_EQ(ret, false); +} + +HWTEST_F(DeviceNameManagerTest, ReleaseDataShareHelper_002, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(false)); + bool ret = DeviceNameManager::GetInstance().ReleaseDataShareHelper(helper_); + EXPECT_EQ(ret, false); +} + +HWTEST_F(DeviceNameManagerTest, ReleaseDataShareHelper_003, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + bool ret = DeviceNameManager::GetInstance().ReleaseDataShareHelper(helper_); + EXPECT_EQ(ret, true); +} + +HWTEST_F(DeviceNameManagerTest, MakeUri_001, testing::ext::TestSize.Level1) +{ + std::string proxyUri = ""; + std::string key = "key"; + auto ret = DeviceNameManager::GetInstance().MakeUri(proxyUri, key); + EXPECT_EQ(ret, Uri(proxyUri + "&key=" + key)); +} + +HWTEST_F(DeviceNameManagerTest, GetProxyUriStr_001, testing::ext::TestSize.Level1) +{ + std::string tableName = "SETTINGSDATA"; + int32_t userId = 12; + auto ret = DeviceNameManager::GetInstance().GetProxyUriStr(tableName, userId); + EXPECT_EQ(ret, "datashare:///com.ohos.settingsdata/entry/settingsdata/SETTINGSDATA?Proxy=true"); +} + +HWTEST_F(DeviceNameManagerTest, GetProxyUriStr_002, testing::ext::TestSize.Level1) +{ + std::string tableName = "tableName"; + int32_t userId = 12; + auto ret = DeviceNameManager::GetInstance().GetProxyUriStr(tableName, userId); + EXPECT_EQ(ret, "datashare:///com.ohos.settingsdata/entry/settingsdata/tableName100?Proxy=true"); +} + +HWTEST_F(DeviceNameManagerTest, SetValue_001, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + + std::string tableName = "tableName"; + int32_t userId = 12; + std::string key = "key"; + std::string value = "value"; + int32_t ret = -1; + EXPECT_CALL(*helper_, Update(_, _, _)).WillRepeatedly(Return(ret)); + EXPECT_CALL(*helper_, Insert(_, _)).WillRepeatedly(Return(ret)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + auto result = DeviceNameManager::GetInstance().SetValue(tableName, userId, key, value); + EXPECT_EQ(result, -1); +} + +HWTEST_F(DeviceNameManagerTest, SetValue_002, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + + std::string tableName = "tableName"; + int32_t userId = 12; + std::string key = "key"; + std::string value = "value"; + int32_t ret = 1; + EXPECT_CALL(*helper_, Update(_, _, _)).WillRepeatedly(Return(ret)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + auto result = DeviceNameManager::GetInstance().SetValue(tableName, userId, key, value); + EXPECT_EQ(result, 1); +} + +HWTEST_F(DeviceNameManagerTest, GetValue_001, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + + std::string tableName = "tableName"; + int32_t userId = 12; + std::string key = "key"; + std::string value = "value"; + std::shared_ptr resultSet = nullptr; + EXPECT_CALL(*helper_, Query(_, _, _, _)).WillRepeatedly(Return(resultSet)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + auto result = DeviceNameManager::GetInstance().GetValue(tableName, userId, key, value); + EXPECT_EQ(result, ERR_DM_POINT_NULL); +} + +HWTEST_F(DeviceNameManagerTest, GetValue_002, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + + std::string tableName = "tableName"; + int32_t userId = 12; + std::string key = "key"; + std::string value = "value"; + auto resultSet = std::make_shared(nullptr); + EXPECT_CALL(*helper_, Query(_, _, _, _)).WillRepeatedly(Return(resultSet)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + EXPECT_CALL(*resultSet, GetRowCount(_)).WillRepeatedly(DoAll(SetArgReferee<0>(1), Return(DataShare::E_OK))); + EXPECT_CALL(*resultSet, GoToRow(_)).Times(AtLeast(1)); + EXPECT_CALL(*resultSet, GetString(_, _)).WillRepeatedly(Return(DataShare::E_OK)); + EXPECT_CALL(*resultSet, Close()).Times(AtLeast(1)); + auto result = DeviceNameManager::GetInstance().GetValue(tableName, userId, key, value); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DeviceNameManagerTest, GetValue_003, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + + std::string tableName = "tableName"; + int32_t userId = 12; + std::string key = "key"; + std::string value = "value"; + auto resultSet = std::make_shared(nullptr); + EXPECT_CALL(*helper_, Query(_, _, _, _)).WillRepeatedly(Return(resultSet)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + EXPECT_CALL(*resultSet, GetRowCount(_)).WillRepeatedly(DoAll(SetArgReferee<0>(1), Return(DataShare::E_OK))); + EXPECT_CALL(*resultSet, GoToRow(_)).Times(AtLeast(1)); + EXPECT_CALL(*resultSet, GetString(_, _)).WillRepeatedly(Return(6666)); + EXPECT_CALL(*resultSet, Close()).Times(AtLeast(1)); + auto result = DeviceNameManager::GetInstance().GetValue(tableName, userId, key, value); + EXPECT_EQ(result, 6666); +} + +HWTEST_F(DeviceNameManagerTest, GetValue_004, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + + std::string tableName = "tableName"; + int32_t userId = 12; + std::string key = "key"; + std::string value = "value"; + auto resultSet = std::make_shared(nullptr); + EXPECT_CALL(*helper_, Query(_, _, _, _)).WillRepeatedly(Return(resultSet)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + EXPECT_CALL(*resultSet, GetRowCount(_)).WillRepeatedly(DoAll(SetArgReferee<0>(0), Return(DataShare::E_OK))); + EXPECT_CALL(*resultSet, Close()).Times(AtLeast(1)); + auto result = DeviceNameManager::GetInstance().GetValue(tableName, userId, key, value); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DeviceNameManagerTest, GetRemoteObj_001, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(client_ != nullptr); + auto bundleMgr = sptr(new (std::nothrow) BundleMgrMock()); + auto systemAbilityManager = sptr(new (std::nothrow) SystemAbilityManagerMock()); + EXPECT_CALL(*systemAbilityManager, GetSystemAbility(_)) + .WillRepeatedly(Return(bundleMgr)); + EXPECT_CALL(*client_, GetSystemAbilityManager()) + .WillRepeatedly(Return(systemAbilityManager)); + auto ret = DeviceNameManager::GetInstance().GetRemoteObj(); + EXPECT_NE(ret, nullptr); +} + +HWTEST_F(DeviceNameManagerTest, SetDeviceName_001, testing::ext::TestSize.Level1) +{ + std::string deviceName = ""; + auto ret = DeviceNameManager::GetInstance().SetDeviceName(deviceName); + EXPECT_EQ(ret, ERR_DM_NAME_EMPTY); +} + +HWTEST_F(DeviceNameManagerTest, SetDeviceName_002, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + std::string deviceName = "deviceName"; + int32_t ret = 1; + EXPECT_CALL(*helper_, Update(_, _, _)).WillRepeatedly(Return(ret)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + auto result = DeviceNameManager::GetInstance().SetDeviceName(deviceName); + EXPECT_EQ(result, 1); +} + +HWTEST_F(DeviceNameManagerTest, GetDeviceName_001, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + + std::string deviceName = "deviceName"; + std::shared_ptr resultSet = nullptr; + EXPECT_CALL(*helper_, Query(_, _, _, _)).WillRepeatedly(Return(resultSet)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + auto result = DeviceNameManager::GetInstance().GetDeviceName(deviceName); + EXPECT_EQ(result, ERR_DM_POINT_NULL); +} + +HWTEST_F(DeviceNameManagerTest, SetDisplayDeviceName_001, testing::ext::TestSize.Level1) +{ + std::string deviceName = ""; + int32_t userId = 12; + auto result = DeviceNameManager::GetInstance().SetDisplayDeviceName(deviceName, userId); + EXPECT_EQ(result, ERR_DM_NAME_EMPTY); +} + +HWTEST_F(DeviceNameManagerTest, SetDisplayDeviceName_002, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + std::string deviceName = "deviceName"; + int32_t userId = 12; + int32_t ret = 1; + EXPECT_CALL(*helper_, Update(_, _, _)).WillRepeatedly(Return(ret)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + auto result = DeviceNameManager::GetInstance().SetDisplayDeviceName(deviceName, userId); + EXPECT_EQ(result, 1); +} + +HWTEST_F(DeviceNameManagerTest, SetDisplayDeviceNameState_001, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + std::string state = "state"; + int32_t userId = 12; + int32_t ret = 1; + EXPECT_CALL(*helper_, Update(_, _, _)).WillRepeatedly(Return(ret)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + auto result = DeviceNameManager::GetInstance().SetDisplayDeviceNameState(state, userId); + EXPECT_EQ(result, 1); +} + +HWTEST_F(DeviceNameManagerTest, GetDisplayDeviceName_001, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + std::string deviceName = "deviceName"; + int32_t userId = 12; + + std::shared_ptr resultSet = nullptr; + EXPECT_CALL(*helper_, Query(_, _, _, _)).WillRepeatedly(Return(resultSet)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + auto result = DeviceNameManager::GetInstance().GetDisplayDeviceName(userId, deviceName); + EXPECT_EQ(result, ERR_DM_POINT_NULL); +} + +HWTEST_F(DeviceNameManagerTest, SetUserDefinedDeviceName_001, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + std::string deviceName = "deviceName"; + int32_t userId = 12; + + int32_t ret = 1; + EXPECT_CALL(*helper_, Update(_, _, _)).WillRepeatedly(Return(ret)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + + auto result = DeviceNameManager::GetInstance().SetUserDefinedDeviceName(deviceName, userId); + EXPECT_EQ(result, 1); +} + +HWTEST_F(DeviceNameManagerTest, SubstrByBytes_001, testing::ext::TestSize.Level1) +{ + std::string str = "str"; + int32_t maxNumBytes = 12; + auto result = DeviceNameManager::GetInstance().SubstrByBytes(str, maxNumBytes); + EXPECT_EQ(result, str); +} + +HWTEST_F(DeviceNameManagerTest, SubstrByBytes_002, testing::ext::TestSize.Level1) +{ + std::string str = "HelloWorld"; + int32_t maxNumBytes = 5; + auto result = DeviceNameManager::GetInstance().SubstrByBytes(str, maxNumBytes); + EXPECT_EQ(result, "Hello"); +} + +HWTEST_F(DeviceNameManagerTest, GetUserDefinedDeviceName_001, testing::ext::TestSize.Level1) +{ + ASSERT_TRUE(helper_ != nullptr); + std::string deviceName = "deviceName"; + int32_t userId = 12; + std::shared_ptr resultSet = nullptr; + EXPECT_CALL(*helper_, Query(_, _, _, _)).WillRepeatedly(Return(resultSet)); + EXPECT_CALL(*helper_, Release()).WillRepeatedly(Return(true)); + auto result = DeviceNameManager::GetInstance().GetUserDefinedDeviceName(userId, deviceName); + EXPECT_EQ(result, ERR_DM_POINT_NULL); +} + +HWTEST_F(DeviceNameManagerTest, GetLocalDisplayDeviceName_003, testing::ext::TestSize.Level1) +{ + std::string prefixName = "My"; + std::string subffixName = "Device"; + int32_t maxNameLength = 20; + std::string result = DeviceNameManager::GetInstance().GetLocalDisplayDeviceName(prefixName, + subffixName, maxNameLength); + EXPECT_EQ(result, "My的Device"); +} + +HWTEST_F(DeviceNameManagerTest, GetLocalDisplayDeviceName_004, testing::ext::TestSize.Level1) +{ + std::string prefixName = "MyVeryLong"; + std::string subffixName = "DeviceName"; + int32_t maxNameLength = 15; + std::string result = DeviceNameManager::GetInstance().GetLocalDisplayDeviceName(prefixName, + subffixName, maxNameLength); + EXPECT_EQ(result, "My...DeviceName"); +} + +HWTEST_F(DeviceNameManagerTest, GetLocalDisplayDeviceName_005, testing::ext::TestSize.Level1) +{ + std::string prefixName = "My"; + std::string subffixName = "Device"; + int32_t maxNameLength = 0; + std::string result = DeviceNameManager::GetInstance().GetLocalDisplayDeviceName(prefixName, + subffixName, maxNameLength); + EXPECT_EQ(result, "My的Device"); +} + +HWTEST_F(DeviceNameManagerTest, GetLocalDisplayDeviceName_006, testing::ext::TestSize.Level1) +{ + std::string prefixName = "My"; + std::string subffixName = "VeryLongDeviceNameThatExceedsLimit"; + int32_t maxNameLength = 30; + std::string result = DeviceNameManager::GetInstance().GetLocalDisplayDeviceName(prefixName, + subffixName, maxNameLength); + EXPECT_EQ(result, "My的VeryLongDevi..."); +} + +HWTEST_F(DeviceNameManagerTest, GetLocalDisplayDeviceName_007, testing::ext::TestSize.Level1) +{ + std::string prefixName = ""; + std::string subffixName = "Device"; + int32_t maxNameLength = 10; + std::string result = DeviceNameManager::GetInstance().GetLocalDisplayDeviceName(prefixName, + subffixName, maxNameLength); + EXPECT_EQ(result, "Device"); +} + +HWTEST_F(DeviceNameManagerTest, GetLocalDisplayDeviceName_008, testing::ext::TestSize.Level1) +{ + std::string prefixName = ""; + std::string subffixName = "VeryLongDeviceName"; + int32_t maxNameLength = 10; + std::string result = DeviceNameManager::GetInstance().GetLocalDisplayDeviceName(prefixName, + subffixName, maxNameLength); + EXPECT_EQ(result, "VeryLon..."); +} + } // DistributedHardware } // OHOS diff --git a/test/unittest/UTTest_dm_auth_message_processor.cpp b/test/unittest/UTTest_dm_auth_message_processor.cpp new file mode 100644 index 0000000000000000000000000000000000000000..43793179d304a2c4e7c3944b74c31978bb44c990 --- /dev/null +++ b/test/unittest/UTTest_dm_auth_message_processor.cpp @@ -0,0 +1,200 @@ +/* + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +*/ + +#include "dm_log.h" +#include "dm_anonymous.h" +#include "dm_constants.h" +#include "dm_auth_message_processor.h" +#include "dm_auth_context.h" +#include "dm_auth_state_machine.h" +#include "UTTest_dm_auth_message_processor.h" + +using namespace testing; +namespace OHOS { +namespace DistributedHardware { + +void DmAuthMessageProcessorTest::SetUpTestCase() +{ +} + +void DmAuthMessageProcessorTest::TearDownTestCase() +{ +} + +void DmAuthMessageProcessorTest::SetUp() +{ +} + +void DmAuthMessageProcessorTest::TearDown() +{ +} + +HWTEST_F(DmAuthMessageProcessorTest, CreateMessageForwardUltrasonicStart_001, testing::ext::TestSize.Level1) +{ + JsonObject json; + std::shared_ptr context = std::make_shared(); + std::shared_ptr processor = std::make_shared(); + EXPECT_EQ(processor->CreateMessageForwardUltrasonicStart(context, json), DM_OK); +} + +HWTEST_F(DmAuthMessageProcessorTest, CreateMessageReverseUltrasonicDone_001, testing::ext::TestSize.Level1) +{ + JsonObject json; + std::shared_ptr context = std::make_shared(); + std::shared_ptr processor = std::make_shared(); + EXPECT_EQ(processor->CreateMessageReverseUltrasonicDone(context, json), DM_OK); +} + +HWTEST_F(DmAuthMessageProcessorTest, CreateMessageReverseUltrasonicStart_001, testing::ext::TestSize.Level1) +{ + JsonObject json; + std::shared_ptr context = std::make_shared(); + std::shared_ptr processor = std::make_shared(); + EXPECT_EQ(processor->CreateMessageReverseUltrasonicStart(context, json), DM_OK); +} + +HWTEST_F(DmAuthMessageProcessorTest, CreateMessageForwardUltrasonicNegotiate_001, testing::ext::TestSize.Level1) +{ + JsonObject json; + std::shared_ptr context = std::make_shared(); + std::shared_ptr processor = std::make_shared(); + EXPECT_EQ(processor->CreateMessageForwardUltrasonicNegotiate(context, json), DM_OK); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseMessageReverseUltrasonicStart_001, testing::ext::TestSize.Level1) +{ + JsonObject json; + std::shared_ptr context = std::make_shared(); + context->authStateMachine = std::make_shared(context); + std::shared_ptr processor = std::make_shared(); + EXPECT_EQ(processor->ParseMessageReverseUltrasonicStart(json, context), DM_OK); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseMessageReverseUltrasonicDone_001, testing::ext::TestSize.Level1) +{ + JsonObject json; + json["REPLY"] = "1"; + std::shared_ptr context = std::make_shared(); + context->reply = DM_OK; + context->authStateMachine = std::make_shared(context); + std::shared_ptr processor = std::make_shared(); + EXPECT_EQ(processor->ParseMessageReverseUltrasonicDone(json, context), DM_OK); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseMessageForwardUltrasonicStart_001, testing::ext::TestSize.Level1) +{ + JsonObject json; + std::shared_ptr context = std::make_shared(); + context->authStateMachine = std::make_shared(context); + std::shared_ptr processor = std::make_shared(); + EXPECT_EQ(processor->ParseMessageForwardUltrasonicStart(json, context), DM_OK); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseMessageForwardUltrasonicNegotiate_001, testing::ext::TestSize.Level1) +{ + JsonObject json; + std::shared_ptr context = std::make_shared(); + context->authStateMachine = std::make_shared(context); + std::shared_ptr processor = std::make_shared(); + EXPECT_EQ(processor->ParseMessageForwardUltrasonicNegotiate(json, context), DM_OK); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseNegotiateMessage_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr context = std::make_shared(); + context->authStateMachine = std::make_shared(context); + JsonObject jsonObject; + jsonObject[DM_TAG_LOGICAL_SESSION_ID] = 12345; + + std::shared_ptr processor = std::make_shared(); + int32_t ret = processor->ParseNegotiateMessage(jsonObject, context); + + EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(context->logicalSessionId, 12345); + EXPECT_EQ(context->requestId, 12345); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseNegotiateMessage_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr context = std::make_shared(); + context->authStateMachine = std::make_shared(context); + JsonObject jsonObject; + jsonObject[TAG_PEER_PKG_NAME] = "testPkgName"; + + std::shared_ptr processor = std::make_shared(); + int32_t ret = processor->ParseNegotiateMessage(jsonObject, context); + + EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(context->accessee.pkgName, "testPkgName"); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseNegotiateMessage_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr context = std::make_shared(); + context->authStateMachine = std::make_shared(context); + JsonObject jsonObject; + jsonObject[TAG_PEER_BUNDLE_NAME_V2] = "testBundleName"; + + std::shared_ptr processor = std::make_shared(); + int32_t ret = processor->ParseNegotiateMessage(jsonObject, context); + + EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(context->accessee.bundleName, "testBundleName"); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseNegotiateMessage_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr context = std::make_shared(); + context->authStateMachine = std::make_shared(context); + JsonObject jsonObject; + jsonObject[TAG_PEER_DISPLAY_ID] = 123; + + std::shared_ptr processor = std::make_shared(); + int32_t ret = processor->ParseNegotiateMessage(jsonObject, context); + + EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(context->accessee.displayId, 123); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseNegotiateMessage_005, testing::ext::TestSize.Level1) +{ + std::shared_ptr context = std::make_shared(); + context->authStateMachine = std::make_shared(context); + JsonObject jsonObject; + jsonObject[TAG_HOST_PKGLABEL] = "testPkgLabel"; + + std::shared_ptr processor = std::make_shared(); + int32_t ret = processor->ParseNegotiateMessage(jsonObject, context); + + EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(context->pkgLabel, "testPkgLabel"); +} + +HWTEST_F(DmAuthMessageProcessorTest, ParseNegotiateMessage_006, testing::ext::TestSize.Level1) +{ + std::shared_ptr context = std::make_shared(); + context->authStateMachine = std::make_shared(context); + JsonObject jsonObject; + jsonObject[DM_BUSINESS_ID] = "testBusinessId"; + + std::shared_ptr processor = std::make_shared(); + int32_t ret = processor->ParseNegotiateMessage(jsonObject, context); + + EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(context->businessId, "testBusinessId"); +} +} // namespace DistributedHardware +} // namespace OHOS + \ No newline at end of file diff --git a/services/implementation/include/authentication/showconfirm/standard/show_confirm.h b/test/unittest/UTTest_dm_auth_message_processor.h similarity index 59% rename from services/implementation/include/authentication/showconfirm/standard/show_confirm.h rename to test/unittest/UTTest_dm_auth_message_processor.h index 96b3d3d787c2f5905d580d3de98bc25e3d4ec607..ff63a0967e5b59de77386ca752d71cecf7f14b45 100644 --- a/services/implementation/include/authentication/showconfirm/standard/show_confirm.h +++ b/test/unittest/UTTest_dm_auth_message_processor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -11,27 +11,27 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ +*/ -#ifndef OHOS_DM_SHOW_CONFIRM_H -#define OHOS_DM_SHOW_CONFIRM_H - -#include -#include +#ifndef OHOS_DM_AUTH_MESSAGE_PROCESSOR_TEST_H +#define OHOS_DM_AUTH_MESSAGE_PROCESSOR_TEST_H + #include - -#include "dm_auth_manager.h" -#include "dm_ability_manager.h" - +#include +#include +#include "json_object.h" +#include "crypto_mgr_mock.h" + namespace OHOS { namespace DistributedHardware { -class ShowConfirm { +class DmAuthMessageProcessorTest : public testing::Test { public: - ShowConfirm(); - ~ShowConfirm(); - void ShowConfirmDialog(const std::string ¶ms, - std::shared_ptr authManager, std::shared_ptr dmAbilityMgr); + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_SHOW_CONFIRM_H \ No newline at end of file +#endif // OHOS_DM_AUTH_MESSAGE_PROCESSOR_TEST_H + \ No newline at end of file diff --git a/test/unittest/UTTest_dm_comm_tool.cpp b/test/unittest/UTTest_dm_comm_tool.cpp index 5779239256f750b7157b5038b2495539694ab510..1d940323223f1bbe760cbf27f678680ec39f5950 100644 --- a/test/unittest/UTTest_dm_comm_tool.cpp +++ b/test/unittest/UTTest_dm_comm_tool.cpp @@ -34,6 +34,7 @@ void DMCommToolTest::SetUpTestCase() { DmDMTransport::dMTransport_ = dmTransportMock_; DmSoftbusCache::dmSoftbusCache = softbusCacheMock_; + DMCommToolMock::dmDMCommTool = dmCommToolMock_; } void DMCommToolTest::TearDownTestCase() { @@ -41,6 +42,7 @@ void DMCommToolTest::TearDownTestCase() dmTransportMock_ = nullptr; DmSoftbusCache::dmSoftbusCache = nullptr; softbusCacheMock_ = nullptr; + dmCommToolMock_ = nullptr; } /** @@ -146,5 +148,610 @@ HWTEST_F(DMCommToolTest, ProcessResponseUserIdsEvent_001, testing::ext::TestSize int32_t ret = dmCommTool->SendUserIds(rmtNetworkId, foregroundUserIds, backgroundUserIds); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } + +HWTEST_F(DMCommToolTest, UnInit_001, testing::ext::TestSize.Level1) +{ + dmCommTool->dmTransportPtr_ = nullptr; + + EXPECT_NO_THROW(dmCommTool->UnInit()); +} + +HWTEST_F(DMCommToolTest, UnInit_002, testing::ext::TestSize.Level1) +{ + EXPECT_CALL(*dmTransportMock_, UnInit()).Times(1); + + EXPECT_NO_THROW(dmCommTool->UnInit()); +} + +HWTEST_F(DMCommToolTest, SendMsg_001, testing::ext::TestSize.Level1) +{ + std::string invalidNetworkId = ""; + int32_t msgType = 1; + std::string msg = "test message"; + + int32_t ret = dmCommTool->SendMsg(invalidNetworkId, msgType, msg); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DMCommToolTest, SendMsg_002, testing::ext::TestSize.Level1) +{ + dmCommTool->dmTransportPtr_ = nullptr; + std::string rmtNetworkId = "validNetworkId"; + int32_t msgType = 1; + std::string msg = "test message"; + + int32_t ret = dmCommTool->SendMsg(rmtNetworkId, msgType, msg); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DMCommToolTest, SendMsg_003, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t msgType = 1; + std::string msg = "test message"; + + EXPECT_CALL(*dmTransportMock_, StartSocket(rmtNetworkId, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + int32_t ret = dmCommTool->SendMsg(rmtNetworkId, msgType, msg); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, SendMsg_004, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t msgType = 1; + std::string msg = "test message"; + + EXPECT_CALL(*dmTransportMock_, StartSocket(rmtNetworkId, _)) + .WillOnce(DoAll(SetArgReferee<1>(-1), Return(DM_OK))); + + int32_t ret = dmCommTool->SendMsg(rmtNetworkId, msgType, msg); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, SendMsg_005, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t msgType = 1; + std::string msg = "test message"; + + EXPECT_CALL(*dmTransportMock_, StartSocket(rmtNetworkId, _)) + .WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(rmtNetworkId, _, 1)) + .WillOnce(Return(ERR_DM_FAILED)); + + int32_t ret = dmCommTool->SendMsg(rmtNetworkId, msgType, msg); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, SendMsg_006, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t msgType = 1; + std::string msg = "test message"; + + EXPECT_CALL(*dmTransportMock_, StartSocket(rmtNetworkId, _)) + .WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(rmtNetworkId, _, 1)) + .WillOnce(Return(DM_OK)); + + int32_t ret = dmCommTool->SendMsg(rmtNetworkId, msgType, msg); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DMCommToolTest, SendUserStop_001, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t stopUserId = 12345; + + EXPECT_CALL(*dmTransportMock_, StartSocket(rmtNetworkId, _)) + .Times(1).WillOnce(Return(DM_OK)); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).Times(0); + + int32_t ret = dmCommTool->SendUserStop(rmtNetworkId, stopUserId); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, SendUserStop_002, testing::ext::TestSize.Level1) +{ + std::string invalidNetworkId = ""; + int32_t stopUserId = 12345; + + int32_t ret = dmCommTool->SendUserStop(invalidNetworkId, stopUserId); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DMCommToolTest, SendUserStop_003, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t stopUserId = 12345; + + EXPECT_CALL(*dmTransportMock_, StartSocket(rmtNetworkId, _)) + .WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(rmtNetworkId, _, 1)) + .WillOnce(Return(ERR_DM_FAILED)); + + int32_t ret = dmCommTool->SendUserStop(rmtNetworkId, stopUserId); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, SendUserStop_004, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t stopUserId = 12345; + + EXPECT_CALL(*dmTransportMock_, StartSocket(rmtNetworkId, _)) + .WillOnce(Return(ERR_DM_FAILED)); + + int32_t ret = dmCommTool->SendUserStop(rmtNetworkId, stopUserId); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, SendUserStop_005, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t stopUserId = 12345; + + EXPECT_CALL(*dmTransportMock_, StartSocket(rmtNetworkId, _)) + .WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(rmtNetworkId, _, 1)) + .WillOnce(Return(DM_OK)); + + int32_t ret = dmCommTool->SendUserStop(rmtNetworkId, stopUserId); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DMCommToolTest, ParseUserStopMessage_001, testing::ext::TestSize.Level1) +{ + std::string invalidJson = "invalid_json"; + int32_t stopUserId = -1; + + int32_t result = DMCommTool::GetInstance()->ParseUserStopMessage(invalidJson, stopUserId); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, ParseUserStopMessage_002, testing::ext::TestSize.Level1) +{ + std::string jsonWithoutKey = R"({ "otherKey": 12345 })"; + int32_t stopUserId = -1; + + int32_t result = DMCommTool::GetInstance()->ParseUserStopMessage(jsonWithoutKey, stopUserId); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, ParseUserStopMessage_003, testing::ext::TestSize.Level1) +{ + std::string jsonWithInvalidValue = R"({ "stopUserId": "not_a_number" })"; + int32_t stopUserId = -1; + + int32_t result = DMCommTool::GetInstance()->ParseUserStopMessage(jsonWithInvalidValue, stopUserId); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, ParseUserStopMessage_004, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "stopUserId": 12345 })"; + int32_t stopUserId = -1; + + int32_t result = DMCommTool::GetInstance()->ParseUserStopMessage(validJson, stopUserId); + EXPECT_EQ(result, DM_OK); + EXPECT_EQ(stopUserId, 12345); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUserStopEvent_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg = nullptr; + + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUserStopEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUserStopEvent_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg_ = std::make_shared(1, "{}"); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(""), Return(ERR_DM_FAILED))); + + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUserStopEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUserStopEvent_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg_ = std::make_shared(1, "invalid_json"); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUserStopEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUserStopEvent_004, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "stopUserId": 12345 })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).Times(1); + + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUserStopEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, RspUserStop_001, testing::ext::TestSize.Level1) +{ + dmCommTool->dmTransportPtr_ = nullptr; + std::string rmtNetworkId = "validNetworkId"; + int32_t socketId = 1; + int32_t stopUserId = 12345; + + EXPECT_NO_THROW(dmCommTool->RspUserStop(rmtNetworkId, socketId, stopUserId)); +} + +HWTEST_F(DMCommToolTest, RspUserStop_002, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t invalidSocketId = -1; + int32_t stopUserId = 12345; + + EXPECT_CALL(*dmTransportMock_, Send(rmtNetworkId, _, invalidSocketId)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_NO_THROW(dmCommTool->RspUserStop(rmtNetworkId, invalidSocketId, stopUserId)); +} + +HWTEST_F(DMCommToolTest, RspUserStop_003, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t socketId = 1; + int32_t stopUserId = 12345; + + EXPECT_CALL(*dmTransportMock_, Send(rmtNetworkId, _, socketId)) + .WillOnce(Return(ERR_DM_FAILED)); + + EXPECT_NO_THROW(dmCommTool->RspUserStop(rmtNetworkId, socketId, stopUserId)); +} + +HWTEST_F(DMCommToolTest, RspUserStop_004, testing::ext::TestSize.Level1) +{ + std::string rmtNetworkId = "validNetworkId"; + int32_t socketId = 1; + int32_t stopUserId = 12345; + + EXPECT_CALL(*dmTransportMock_, Send(rmtNetworkId, _, socketId)) + .WillOnce(Return(DM_OK)); + + EXPECT_NO_THROW(dmCommTool->RspUserStop(rmtNetworkId, socketId, stopUserId)); +} + +HWTEST_F(DMCommToolTest, ProcessResponseUserStopEvent_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg = nullptr; + + EXPECT_NO_THROW(dmCommTool->ProcessResponseUserStopEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessResponseUserStopEvent_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg_ = std::make_shared(1, "{}"); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(""), Return(ERR_DM_FAILED))); + + EXPECT_NO_THROW(dmCommTool->ProcessResponseUserStopEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessResponseUserStopEvent_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg_ = std::make_shared(1, "invalid_json"); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + + EXPECT_NO_THROW(dmCommTool->ProcessResponseUserStopEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessResponseUserStopEvent_004, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "stopUserId": 12345 })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + + EXPECT_NO_THROW(dmCommTool->ProcessResponseUserStopEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, SendUninstAppObj_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 0; + int32_t tokenId = 0; + std::string networkId = ""; + int32_t result = dmCommTool->SendUninstAppObj(userId, tokenId, networkId); + EXPECT_EQ(result, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DMCommToolTest, SendUninstAppObj_002, testing::ext::TestSize.Level1) +{ + int32_t userId = 0; + int32_t tokenId = 0; + std::string networkId = "123456"; + dmCommTool->dmTransportPtr_ = nullptr; + int32_t result = dmCommTool->SendUninstAppObj(userId, tokenId, networkId); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, SendUninstAppObj_003, testing::ext::TestSize.Level1) +{ + int32_t userId = 0; + int32_t tokenId = 0; + std::string networkId = "123456"; + + EXPECT_CALL(*dmTransportMock_, StartSocket(_, _)).WillOnce(Return(ERR_DM_FAILED)); + int32_t result = dmCommTool->SendUninstAppObj(userId, tokenId, networkId); + EXPECT_EQ(result, ERR_DM_FAILED); + + EXPECT_CALL(*dmTransportMock_, StartSocket(_, _)).WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + result = dmCommTool->SendUninstAppObj(userId, tokenId, networkId); + EXPECT_EQ(result, ERR_DM_FAILED); + + EXPECT_CALL(*dmTransportMock_, StartSocket(_, _)).WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + result = dmCommTool->SendUninstAppObj(userId, tokenId, networkId); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DMCommToolTest, RspAppUninstall_001, testing::ext::TestSize.Level1) +{ + int32_t socketId = 0; + std::string rmtNetworkId = ""; + dmCommTool->dmTransportPtr_ = nullptr; + int32_t result = dmCommTool->RspAppUninstall(rmtNetworkId, socketId); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, RspAppUninstall_002, testing::ext::TestSize.Level1) +{ + int32_t socketId = 0; + std::string rmtNetworkId = ""; + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + int32_t result = dmCommTool->RspAppUninstall(rmtNetworkId, socketId); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, RspAppUninstall_003, testing::ext::TestSize.Level1) +{ + int32_t socketId = 0; + std::string rmtNetworkId = ""; + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + int32_t result = dmCommTool->RspAppUninstall(rmtNetworkId, socketId); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DMCommToolTest, RspAppUnbind_001, testing::ext::TestSize.Level1) +{ + int32_t socketId = 0; + std::string rmtNetworkId = ""; + dmCommTool->dmTransportPtr_ = nullptr; + int32_t result = dmCommTool->RspAppUnbind(rmtNetworkId, socketId); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, RspAppUnbind_002, testing::ext::TestSize.Level1) +{ + int32_t socketId = 0; + std::string rmtNetworkId = ""; + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + int32_t result = dmCommTool->RspAppUnbind(rmtNetworkId, socketId); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, RspAppUnbind_003, testing::ext::TestSize.Level1) +{ + int32_t socketId = 0; + std::string rmtNetworkId = ""; + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + int32_t result = dmCommTool->RspAppUnbind(rmtNetworkId, socketId); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DMCommToolTest, SendUnBindAppObj_001, testing::ext::TestSize.Level1) +{ + int32_t userId = 0; + int32_t tokenId = 0; + std::string extra = ""; + std::string networkId = ""; + std::string udid = "12211"; + int32_t result = dmCommTool->SendUnBindAppObj(userId, tokenId, extra, networkId, udid); + EXPECT_EQ(result, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DMCommToolTest, SendUnBindAppObj_002, testing::ext::TestSize.Level1) +{ + int32_t userId = 0; + int32_t tokenId = 0; + std::string extra = ""; + std::string networkId = "123456"; + std::string udid = "12211"; + dmCommTool->dmTransportPtr_ = nullptr; + int32_t result = dmCommTool->SendUnBindAppObj(userId, tokenId, extra, networkId, udid); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(DMCommToolTest, SendUnBindAppObj_003, testing::ext::TestSize.Level1) +{ + int32_t userId = 0; + int32_t tokenId = 0; + std::string extra = ""; + std::string networkId = "123456"; + std::string udid = "12211"; + + EXPECT_CALL(*dmTransportMock_, StartSocket(_, _)).WillOnce(Return(ERR_DM_FAILED)); + int32_t result = dmCommTool->SendUnBindAppObj(userId, tokenId, extra, networkId, udid); + EXPECT_EQ(result, ERR_DM_FAILED); + + EXPECT_CALL(*dmTransportMock_, StartSocket(_, _)).WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + result = dmCommTool->SendUnBindAppObj(userId, tokenId, extra, networkId, udid); + EXPECT_EQ(result, ERR_DM_FAILED); + + EXPECT_CALL(*dmTransportMock_, StartSocket(_, _)).WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + result = dmCommTool->SendUnBindAppObj(userId, tokenId, extra, networkId, udid); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUninstAppEvent_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg = nullptr; + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUninstAppEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUninstAppEvent_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg_ = std::make_shared(1, "invalid_json"); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUninstAppEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUninstAppEvent_003, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "aaa" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUninstAppEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUninstAppEvent_004, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "1234", "tokenId": "1234" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUninstAppEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUnBindAppEvent_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg = nullptr; + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUnBindAppEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUnBindAppEvent_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg_ = std::make_shared(1, "invalid_json"); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUnBindAppEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUnBindAppEvent_003, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "aaa", "tokenId": "bbb" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUnBindAppEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveUnBindAppEvent_004, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "1234", "tokenId": "1234" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*dmTransportMock_, Send(_, _, _)).WillOnce(Return(DM_OK)); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveUnBindAppEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, StopSocket_001, testing::ext::TestSize.Level1) +{ + std::string networkId = "123456"; + dmCommTool->dmTransportPtr_ = nullptr; + EXPECT_NO_THROW(dmCommTool->StopSocket(networkId)); +} + +HWTEST_F(DMCommToolTest, StopSocket_002, testing::ext::TestSize.Level1) +{ + std::string networkId = "123456"; + EXPECT_NO_THROW(dmCommTool->StopSocket(networkId)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveRspAppUninstallEvent_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg = nullptr; + EXPECT_NO_THROW(dmCommTool->ProcessReceiveRspAppUninstallEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveRspAppUninstallEvent_002, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "1234", "tokenId": "1234" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + dmCommTool->dmTransportPtr_ = nullptr; + EXPECT_NO_THROW(dmCommTool->ProcessReceiveRspAppUninstallEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveRspAppUninstallEvent_003, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "1234", "tokenId": "1234" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(""), Return(ERR_DM_FAILED))); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveRspAppUninstallEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveRspAppUninstallEvent_004, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "1234", "tokenId": "1234" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveRspAppUninstallEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveRspAppUnbindEvent_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr commMsg = nullptr; + EXPECT_NO_THROW(dmCommTool->ProcessReceiveRspAppUnbindEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveRspAppUnbindEvent_002, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "1234", "tokenId": "1234" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + dmCommTool->dmTransportPtr_ = nullptr; + EXPECT_NO_THROW(dmCommTool->ProcessReceiveRspAppUnbindEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveRspAppUnbindEvent_003, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "1234", "tokenId": "1234" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(""), Return(ERR_DM_FAILED))); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveRspAppUnbindEvent(commMsg)); +} + +HWTEST_F(DMCommToolTest, ProcessReceiveRspAppUnbindEvent_004, testing::ext::TestSize.Level1) +{ + std::string validJson = R"({ "userId": "1234", "tokenId": "1234" })"; + std::shared_ptr commMsg_ = std::make_shared(1, validJson); + std::shared_ptr commMsg = std::make_shared("networkId", commMsg_, 0); + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("validUdid"), Return(DM_OK))); + EXPECT_NO_THROW(dmCommTool->ProcessReceiveRspAppUnbindEvent(commMsg)); +} + } // DistributedHardware } // OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_dm_comm_tool.h b/test/unittest/UTTest_dm_comm_tool.h index 5fae452d0d8e62830fd4778a1de40c72723df427..a24fe4d260487a1a3b01dd1caf479c81c9a2102f 100644 --- a/test/unittest/UTTest_dm_comm_tool.h +++ b/test/unittest/UTTest_dm_comm_tool.h @@ -21,6 +21,7 @@ #include "dm_comm_tool.h" #include "dm_transport_mock.h" #include "dm_softbus_cache_mock.h" +#include "dm_comm_tool_mock.h" namespace OHOS { namespace DistributedHardware { @@ -32,6 +33,7 @@ public: void TearDown(); static inline std::shared_ptr dmTransportMock_ = std::make_shared(); static inline std::shared_ptr softbusCacheMock_ = std::make_shared(); + static inline std::shared_ptr dmCommToolMock_ = std::make_shared(); protected: std::shared_ptr dmCommTool; diff --git a/test/unittest/UTTest_dm_import_auth_code.cpp b/test/unittest/UTTest_dm_import_auth_code.cpp index 86727d8ae8fab8f4e6b76e9c46c017554b44cac8..b0f46a1d8530c4d760eb0b72f76f883d5606ac31 100644 --- a/test/unittest/UTTest_dm_import_auth_code.cpp +++ b/test/unittest/UTTest_dm_import_auth_code.cpp @@ -72,7 +72,8 @@ HWTEST_F(DMImportAuthCodeTest, ImportAuthCode_001, testing::ext::TestSize.Level0 std::shared_ptr initcallback = std::make_shared(); int32_t ret = DeviceManager::GetInstance().InitDeviceManager(pkgName, initcallback); ret = DeviceManager::GetInstance().ImportAuthCode(pkgName, authCode); - ASSERT_EQ(ret, DM_OK); + bool result = (ret == ERR_DM_NO_PERMISSION) || (ret == DM_OK); + ASSERT_EQ(result, true); DeviceManager::GetInstance().UnInitDeviceManager(pkgName); } @@ -83,7 +84,8 @@ HWTEST_F(DMImportAuthCodeTest, ExportAuthCode_001, testing::ext::TestSize.Level0 std::shared_ptr initcallback = std::make_shared(); int32_t ret = DeviceManager::GetInstance().InitDeviceManager(pkgName, initcallback); ret = DeviceManager::GetInstance().ExportAuthCode(authCode); - ASSERT_EQ(ret, DM_OK); + bool result = (ret == ERR_DM_NO_PERMISSION) || (ret == DM_OK); + ASSERT_EQ(result, true); DeviceManager::GetInstance().UnInitDeviceManager(pkgName); } diff --git a/test/unittest/UTTest_dm_pin_holder.cpp b/test/unittest/UTTest_dm_pin_holder.cpp index fc1646a30ff8efa2be8181e33d1f44cbeb899eb0..c5c0a8f116183c23e9b59154fe537a599330443c 100644 --- a/test/unittest/UTTest_dm_pin_holder.cpp +++ b/test/unittest/UTTest_dm_pin_holder.cpp @@ -1056,6 +1056,318 @@ HWTEST_F(DmPinHolderTest, CloseSessionMsgScene_101, testing::ext::TestSize.Level pinHolder->OnSessionClosed(SESSION_ID); EXPECT_EQ(pinHolder->sessionId_, SESSION_ID_INVALID); } + +HWTEST_F(DmPinHolderTest, OnSessionOpened_104, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::shared_ptr pinHolderSession = std::make_shared(); + pinHolderSession->RegisterSessionCallback(pinHolder); + int sessionId = 1; + int result = 1; + int ret = pinHolderSession->OnSessionOpened(sessionId, result); + sessionId = 2; + result = 2; + ret = pinHolderSession->OnSessionOpened(sessionId, result); + int closeSessionId = 2; + pinHolderSession->OnSessionClosed(closeSessionId); + closeSessionId = 1; + pinHolderSession->OnSessionClosed(closeSessionId); + std::string dataStr = "a**************2"; + void *data = nullptr; + uint32_t dataLen = 0; + data = reinterpret_cast(dataStr.data()); + dataLen = static_cast(dataStr.length()); + pinHolderSession->OnBytesReceived(sessionId, data, dataLen); + std::string dataStr2 = "a**************3"; + data = reinterpret_cast(dataStr2.data()); + dataLen = static_cast(dataStr2.length()); + pinHolderSession->OnBytesReceived(sessionId, data, dataLen); + pinHolderSession->UnRegisterSessionCallback(); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(DmPinHolderTest, OnSessionOpened_105, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::shared_ptr pinHolderSession = std::make_shared(); + pinHolderSession->RegisterSessionCallback(pinHolder); + int sessionId = 1; + int result = 1; + int ret = pinHolderSession->OnSessionOpened(sessionId, result); + pinHolderSession->UnRegisterSessionCallback(); + ret = pinHolderSession->OnSessionOpened(sessionId, result); + pinHolderSession->RegisterSessionCallback(pinHolder); + std::string dataStr = "a**************2"; + void *data = nullptr; + uint32_t dataLen = 0; + data = reinterpret_cast(dataStr.data()); + dataLen = static_cast(dataStr.length()); + pinHolderSession->OnBytesReceived(sessionId, data, dataLen); + pinHolderSession->UnRegisterSessionCallback(); + std::string dataStr2 = "a**************3"; + data = reinterpret_cast(dataStr2.data()); + dataLen = static_cast(dataStr2.length()); + pinHolderSession->OnBytesReceived(sessionId, data, dataLen); + int closeSessionId = 2; + pinHolderSession->OnSessionClosed(closeSessionId); + pinHolderSession->UnRegisterSessionCallback(); + closeSessionId = 1; + pinHolderSession->OnSessionClosed(closeSessionId); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DmPinHolderTest, CreatePinholder_109, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + PeerTargetId targetId = { + .deviceId = "deviceId", + .brMac = "brMac", + .bleMac = "bleMac", + .wifiIp = "wifiIp", + }; + + DmPinType pinType = DmPinType::NUMBER_PIN_CODE; + std::string payload; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->processInfo_.pkgName = packName; + pinHolder->processInfo_.userId = 100; + pinHolder->sourceState_ = SOURCE_INIT; + pinHolder->sessionId_ = 0; + int32_t ret = pinHolder->CreatePinHolder(packName, targetId, pinType, payload); + ASSERT_EQ(ret, DM_OK); +} + +HWTEST_F(DmPinHolderTest, CreatePinholder_110, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + PeerTargetId targetId = { + .deviceId = "deviceId", + .brMac = "brMac", + .bleMac = "bleMac", + .wifiIp = "wifiIp", + }; + DmPinType pinType = DmPinType::NUMBER_PIN_CODE; + std::string payload; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->processInfo_.pkgName = packName; + pinHolder->processInfo_.userId = 100; + pinHolder->sourceState_ = SOURCE_INIT; + int32_t ret = pinHolder->CreatePinHolder(packName, targetId, pinType, payload); + ASSERT_EQ(ret, -1); +} + +HWTEST_F(DmPinHolderTest, DestroyPinHolder_107, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + PeerTargetId targetId = { + .deviceId = "deviceId", + .brMac = "brMac", + .bleMac = "bleMac", + .wifiIp = "wifiIp", + }; + DmPinType pinType = DmPinType::NUMBER_PIN_CODE; + std::string payload; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->processInfo_.pkgName = packName; + pinHolder->processInfo_.userId = 100; + pinHolder->sessionId_ = SESSION_ID_INVALID; + pinHolder->listener_ = std::make_shared(); + int32_t ret = pinHolder->DestroyPinHolder(packName, targetId, pinType, payload); + ASSERT_EQ(ret, DM_OK); +} + + HWTEST_F(DmPinHolderTest, DestroyPinHolder_108, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + PeerTargetId targetId = { + .deviceId = "deviceId", + .brMac = "brMac", + .bleMac = "bleMac", + .wifiIp = "wifiIp", + }; + DmPinType pinType = DmPinType::NUMBER_PIN_CODE; + std::string payload; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->processInfo_.pkgName = packName; + pinHolder->processInfo_.userId = 100; + pinHolder->sessionId_ = 0; + pinHolder->sourceState_ = SOURCE_CREATE; + pinHolder->listener_ = std::make_shared(); + int32_t ret = pinHolder->DestroyPinHolder(packName, targetId, pinType, payload); + ASSERT_NE(ret, DM_OK); +} + +HWTEST_F(DmPinHolderTest, DestroyPinHolder_109, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + PeerTargetId targetId = { + .deviceId = "deviceId", + .brMac = "brMac", + .bleMac = "bleMac", + .wifiIp = "wifiIp", + }; + DmPinType pinType = DmPinType::NUMBER_PIN_CODE; + std::string payload; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->processInfo_.pkgName = packName; + pinHolder->processInfo_.userId = 100; + pinHolder->sessionId_ = 0; + pinHolder->sourceState_ = SOURCE_CREATE; + pinHolder->timer_ = std::make_shared(); + pinHolder->listener_ = std::make_shared(); + int32_t ret = pinHolder->DestroyPinHolder(packName, targetId, pinType, payload); + ASSERT_NE(ret, DM_OK); +} + HWTEST_F(DmPinHolderTest, ProcessCloseSessionMsg_101, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message; + pinHolder->listener_ = nullptr; + pinHolder->ProcessCloseSessionMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, ProcessCloseSessionMsg_102, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message; + pinHolder->session_ = nullptr; + pinHolder->ProcessCloseSessionMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + HWTEST_F(DmPinHolderTest, ProcessDestroyMsg_106, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + JsonObject jsonObject; + jsonObject[TAG_PIN_TYPE] = DmPinType::SUPER_SONIC; + jsonObject[TAG_PAYLOAD] = DmPinType::SUPER_SONIC; + std::string message = SafetyDump(jsonObject); + pinHolder->sinkState_ = SINK_CREATE; + pinHolder->ProcessDestroyMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + HWTEST_F(DmPinHolderTest, CloseSession_102, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string name; + pinHolder->listener_ = nullptr; + pinHolder->CloseSession(name); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, CloseSession_103, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string name; + pinHolder->timer_ = std::make_shared(); + pinHolder->CloseSession(name); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, ProcessDestroyResMsg_101, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message; + pinHolder->ProcessDestroyResMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, ProcessDestroyResMsg_102, testing::ext::TestSize.Level1) +{ + JsonObject jsonObject; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message = SafetyDump(jsonObject); + jsonObject[TAG_REPLY] = DmPinType::NUMBER_PIN_CODE; + pinHolder->ProcessDestroyResMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, ProcessDestroyResMsg_103, testing::ext::TestSize.Level1) +{ + JsonObject jsonObject; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message = SafetyDump(jsonObject); + jsonObject[TAG_REPLY] = DmPinType::NUMBER_PIN_CODE; + pinHolder->session_ = nullptr; + pinHolder->ProcessDestroyResMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, ProcessDestroyResMsg_104, testing::ext::TestSize.Level1) +{ + JsonObject jsonObject; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message = SafetyDump(jsonObject); + jsonObject[TAG_REPLY] = DmPinType::NUMBER_PIN_CODE; + pinHolder->listener_ = nullptr; + pinHolder->ProcessDestroyResMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + HWTEST_F(DmPinHolderTest, UnRegisterPinHolderCallback_101, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->session_ = nullptr; + int32_t ret = pinHolder->UnRegisterPinHolderCallback(packName); + ASSERT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DmPinHolderTest, UnRegisterPinHolderCallback_102, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->session_ = std::make_shared(); + int32_t ret = pinHolder->UnRegisterPinHolderCallback(packName); + ASSERT_EQ(ret, DM_OK); +} + +HWTEST_F(DmPinHolderTest, OnSessionClosed_101, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + int32_t sessionId = 1; + pinHolder->OnSessionClosed(sessionId); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, OnSessionClosed_102, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + int32_t sessionId = pinHolder->sessionId_; + pinHolder->timer_ = std::make_shared(); + pinHolder->OnSessionClosed(sessionId); + ASSERT_NE(pinHolder->timer_, nullptr); +} +HWTEST_F(DmPinHolderTest, OnSessionClosed_103, testing::ext::TestSize.Level1) +{ + std::string packName = "com.ohos.dmtest"; + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + int32_t sessionId = pinHolder->sessionId_; + pinHolder->OnSessionClosed(sessionId); + ASSERT_NE(pinHolder->timer_, nullptr); +} } // namespace } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_dm_pin_holder.h b/test/unittest/UTTest_dm_pin_holder.h index 01683be73cc6577b3e08357481acf85b0870fe54..58c9e4ef6409ccfa8623031ea085b3e763428f38 100644 --- a/test/unittest/UTTest_dm_pin_holder.h +++ b/test/unittest/UTTest_dm_pin_holder.h @@ -216,14 +216,14 @@ public: (void)processInfo; } - virtual void OnDevStateCallbackAdd(const ProcessInfo &processInfo, + void OnDevStateCallbackAdd(const ProcessInfo &processInfo, const std::vector &deviceList) override { (void)processInfo; (void)deviceList; } - virtual void OnGetDeviceProfileInfoListResult(const ProcessInfo &processInfo, + void OnGetDeviceProfileInfoListResult(const ProcessInfo &processInfo, const std::vector &deviceProfileInfos, int32_t code) override { (void)processInfo; @@ -231,7 +231,7 @@ public: (void)code; } - virtual void OnGetDeviceIconInfoResult(const ProcessInfo &processInfo, + void OnGetDeviceIconInfoResult(const ProcessInfo &processInfo, const DmDeviceIconInfo &dmDeviceIconInfo, int32_t code) override { (void)processInfo; @@ -239,7 +239,7 @@ public: (void)code; } - virtual void OnSetLocalDeviceNameResult(const ProcessInfo &processInfo, + void OnSetLocalDeviceNameResult(const ProcessInfo &processInfo, const std::string &deviceName, int32_t code) override { (void)processInfo; @@ -247,7 +247,7 @@ public: (void)code; } - virtual void OnSetRemoteDeviceNameResult(const ProcessInfo &processInfo, const std::string &deviceId, + void OnSetRemoteDeviceNameResult(const ProcessInfo &processInfo, const std::string &deviceId, const std::string &deviceName, int32_t code) override { (void)processInfo; @@ -255,6 +255,19 @@ public: (void)deviceName; (void)code; } + + virtual std::string GetLocalDisplayDeviceNameForPrivacy() + { + return ""; + } + + virtual int32_t OpenAuthSessionWithPara(const std::string &deviceId, int32_t actionId, bool isEnable160m) + { + (void)deviceId; + (void)actionId; + (void)isEnable160m; + return 0; + } }; } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_dm_softbus_cache.cpp b/test/unittest/UTTest_dm_softbus_cache.cpp index 1964f61e4ed40005fd5ecba1dd845eca1a659f8f..d8d53aaec8282c3de000822536898a506adcd9ca 100644 --- a/test/unittest/UTTest_dm_softbus_cache.cpp +++ b/test/unittest/UTTest_dm_softbus_cache.cpp @@ -231,8 +231,6 @@ HWTEST_F(DMSoftbusCacheTest, GetUuidFromCache_001, testing::ext::TestSize.Level1 std::string uuid = ""; EXPECT_EQ(SoftbusCache::GetInstance().GetUuidFromCache("networkid", uuid), DM_OK); EXPECT_EQ(uuid, "uuid"); - int32_t ret = SoftbusCache::GetInstance().GetUuidFromCache("test", uuid); - EXPECT_EQ(true, CheckSoftbusRes(ret)); } HWTEST_F(DMSoftbusCacheTest, GetUdidFromCache_001, testing::ext::TestSize.Level1) @@ -252,7 +250,7 @@ HWTEST_F(DMSoftbusCacheTest, GetUdidFromCache_001, testing::ext::TestSize.Level1 EXPECT_EQ(SoftbusCache::GetInstance().GetUdidFromCache("networkid", udid), DM_OK); EXPECT_EQ(udid, "udid"); int32_t ret = SoftbusCache::GetInstance().GetUdidFromCache("test", udid); - EXPECT_EQ(true, CheckSoftbusRes(ret)); + EXPECT_NE(CheckSoftbusRes(ret), DM_OK); } } // namespace } // namespace DistributedHardware diff --git a/test/unittest/UTTest_dm_transport_msg.cpp b/test/unittest/UTTest_dm_transport_msg.cpp index 1e662ffd16984bd51a408cf1085d28a855798050..072213267a69a91b8db485d6a881e8fda3127b1c 100644 --- a/test/unittest/UTTest_dm_transport_msg.cpp +++ b/test/unittest/UTTest_dm_transport_msg.cpp @@ -62,6 +62,24 @@ HWTEST_F(DMTransportMsgTest, ToJsonAndFromJson, testing::ext::TestSize.Level1) cJSON_Delete(emptyJsonObject); } +/** + * @tc.name: ToJsonAndFromJson_Invaild + * @tc.type: FUNC + */ +HWTEST_F(DMTransportMsgTest, ToJsonAndFromJson_Invaild, testing::ext::TestSize.Level1) +{ + UserIdsMsg userIdsMsg; + userIdsMsg.foregroundUserIds = {1, 2, 3}; + + cJSON *jsonObject = nullptr; + ToJson(jsonObject, userIdsMsg); + + UserIdsMsg newUserIdsMsg; + FromJson(jsonObject, newUserIdsMsg); + EXPECT_EQ(jsonObject, nullptr); + EXPECT_TRUE(newUserIdsMsg.foregroundUserIds.empty()); +} + /** * @tc.name: ToJsonAndFromJson01 * @tc.type: FUNC @@ -92,6 +110,114 @@ HWTEST_F(DMTransportMsgTest, ToJsonAndFromJson01, testing::ext::TestSize.Level1) cJSON_Delete(emptyCommJsonObject); } +/** + * @tc.name: ToJsonAndFromJson01_Invaild + * @tc.type: FUNC + */ +HWTEST_F(DMTransportMsgTest, ToJsonAndFromJson01_Invaild, testing::ext::TestSize.Level1) +{ + CommMsg commMsg; + commMsg.code = 200; + commMsg.msg = "Success"; + + cJSON *jsonObject = nullptr; + ToJson(jsonObject, commMsg); + + CommMsg newCommMsg; + FromJson(jsonObject, newCommMsg); + + EXPECT_EQ(jsonObject, nullptr); + EXPECT_TRUE(newCommMsg.msg.empty()); +} + +/** + * @tc.name: ToJsonAndFromJson02 + * @tc.type: FUNC + */ + +HWTEST_F(DMTransportMsgTest, ToJsonAndFromJson02, testing::ext::TestSize.Level1) +{ + std::string remoteUdid = "test_udid"; + std::vector userIds = {10, 20, 30}; + NotifyUserIds notifyUserIds(remoteUdid, userIds); + cJSON *jsonObject = cJSON_CreateObject(); + ToJson(jsonObject, notifyUserIds); + + NotifyUserIds newNotifyUserIds; + FromJson(jsonObject, newNotifyUserIds); + EXPECT_EQ(newNotifyUserIds.remoteUdid, remoteUdid); + EXPECT_EQ(newNotifyUserIds.userIds.size(), 3); + EXPECT_EQ(newNotifyUserIds.userIds[0], 10); + EXPECT_EQ(newNotifyUserIds.userIds[1], 20); + EXPECT_EQ(newNotifyUserIds.userIds[2], 30); + cJSON_Delete(jsonObject); + + cJSON *emptyCommJsonObject = cJSON_CreateObject(); + NotifyUserIds emptyNotifyUserIds; + FromJson(emptyCommJsonObject, emptyNotifyUserIds); + EXPECT_EQ(emptyNotifyUserIds.userIds.size(), 0); + EXPECT_EQ(emptyNotifyUserIds.remoteUdid, ""); + cJSON_Delete(emptyCommJsonObject); +} + +/** + * @tc.name: ToJsonAndFromJson02_Invaild + * @tc.type: FUNC + */ +HWTEST_F(DMTransportMsgTest, ToJsonAndFromJson02_Invaild, testing::ext::TestSize.Level1) +{ + std::string remoteUdid = "test_udid"; + std::vector userIds = {10, 20, 30}; + NotifyUserIds notifyUserIds(remoteUdid, userIds); + cJSON *jsonObject = nullptr; + ToJson(jsonObject, notifyUserIds); + NotifyUserIds newNotifyUserIds; + FromJson(jsonObject, newNotifyUserIds); + EXPECT_EQ(jsonObject, nullptr); + EXPECT_EQ(newNotifyUserIds.remoteUdid, ""); + EXPECT_EQ(newNotifyUserIds.userIds.size(), 0); +} + +/** + * @tc.name: ToJsonAndFromJson03 + * @tc.type: FUNC + */ +HWTEST_F(DMTransportMsgTest, ToJsonAndFromJson03, testing::ext::TestSize.Level1) +{ + LogoutAccountMsg logoutAccountMsg; + logoutAccountMsg.accountId = "test_account_id"; + logoutAccountMsg.userId = 123; + cJSON *jsonObject = cJSON_CreateObject(); + ToJson(jsonObject, logoutAccountMsg); + LogoutAccountMsg newLogoutAccountMsg; + FromJson(jsonObject, newLogoutAccountMsg); + EXPECT_EQ(newLogoutAccountMsg.accountId, "test_account_id"); + EXPECT_EQ(newLogoutAccountMsg.userId, 123); + cJSON_Delete(jsonObject); + + cJSON *emptyJsonObject = cJSON_CreateObject(); + LogoutAccountMsg emptyLogoutAccountMsg; + FromJson(emptyJsonObject, emptyLogoutAccountMsg); + EXPECT_EQ(emptyLogoutAccountMsg.userId, -1); +} + +/** + * @tc.name: ToJsonAndFromJson03_Invaild + * @tc.type: FUNC + */ +HWTEST_F(DMTransportMsgTest, ToJsonAndFromJson03_Invaild, testing::ext::TestSize.Level1) +{ + LogoutAccountMsg logoutAccountMsg; + logoutAccountMsg.accountId = "test_account_id"; + logoutAccountMsg.userId = 123; + cJSON *jsonObject = nullptr; + ToJson(jsonObject, logoutAccountMsg); + LogoutAccountMsg newLogoutAccountMsg; + FromJson(jsonObject, newLogoutAccountMsg); + EXPECT_EQ(jsonObject, nullptr); + EXPECT_EQ(newLogoutAccountMsg.userId, -1); +} + /** * @tc.name: PerformanceTest * @tc.type: FUNC @@ -188,7 +314,7 @@ HWTEST_F(DMTransportMsgTest, ToJson_UserIdsMsg, testing::ext::TestSize.Level1) { std::vector foregroundUserIds{1, 2, 3}; std::vector backgroundUserIds{4, 5, 6}; - UserIdsMsg userIdsMsg(foregroundUserIds, backgroundUserIds); + UserIdsMsg userIdsMsg(foregroundUserIds, backgroundUserIds, true); const char* jsonStr = R"({ "MsgType": "0", "msg": "messgaeinfo", @@ -203,5 +329,95 @@ HWTEST_F(DMTransportMsgTest, ToJson_UserIdsMsg, testing::ext::TestSize.Level1) cJSON_Delete(jsonObject); EXPECT_FALSE(userIdsMsg.foregroundUserIds.empty()); } + +/** + * @tc.name: GetCommMsgString_01 + * @tc.type: FUNC + */ +HWTEST_F(DMTransportMsgTest, GetCommMsgString_01, testing::ext::TestSize.Level1) +{ + const char* jsonstr = R"({"code":123,"msg":"messageinfo"})"; + std::string jsonObj(jsonstr); + CommMsg commMsg(123, "messageinfo"); + auto CommMsgString = GetCommMsgString(commMsg); + EXPECT_EQ(CommMsgString, jsonObj); +} + +/** + * @tc.name: ToString_01 + * @tc.type: FUNC + */ +HWTEST_F(DMTransportMsgTest, ToString_01, testing::ext::TestSize.Level1) +{ + const char* jsonstr = R"({"remoteUdid":"test_udid","foregroundUserIds":[10,20,30]})"; + std::string jsonObj(jsonstr); + std::string remoteUdid = "test_udid"; + std::vector userIds = {10, 20, 30}; + NotifyUserIds notifyUserIds(remoteUdid, userIds); + auto notifyUserIdsString = notifyUserIds.ToString(); + EXPECT_EQ(notifyUserIdsString, jsonObj); +} + +HWTEST_F(DMTransportMsgTest, UninstAppToJsonAndFromJson, testing::ext::TestSize.Level1) +{ + UninstAppMsg uninstAppMsg(2, 3); + + cJSON *jsonObject = cJSON_CreateObject(); + ToJson(jsonObject, uninstAppMsg); + + UninstAppMsg newUninstAppMsg; + FromJson(jsonObject, newUninstAppMsg); + + EXPECT_EQ(newUninstAppMsg.userId_, 2); + EXPECT_EQ(newUninstAppMsg.tokenId_, 3); + + cJSON_Delete(jsonObject); + + cJSON *nullJsonObject = nullptr; + ToJson(nullJsonObject, uninstAppMsg); + + UninstAppMsg emptyMsg; + FromJson(nullJsonObject, emptyMsg); + + EXPECT_EQ(emptyMsg.userId_, -1); + cJSON *emptyObject = cJSON_CreateObject(); + FromJson(emptyObject, emptyMsg); + EXPECT_EQ(emptyMsg.userId_, -1); + + cJSON_Delete(nullJsonObject); + cJSON_Delete(emptyObject); +} + +HWTEST_F(DMTransportMsgTest, UnbindAppToJsonAndFromJson, testing::ext::TestSize.Level1) +{ + UnBindAppMsg unBindAppMsg(2, 3, "", "test_udid"); + + cJSON *jsonObject = cJSON_CreateObject(); + ToJson(jsonObject, unBindAppMsg); + + UnBindAppMsg newUnBindAppMsg; + FromJson(jsonObject, newUnBindAppMsg); + + EXPECT_EQ(newUnBindAppMsg.userId_, 2); + EXPECT_EQ(newUnBindAppMsg.tokenId_, 3); + EXPECT_EQ(newUnBindAppMsg.extra_, ""); + EXPECT_EQ(newUnBindAppMsg.udid_, "test_udid"); + + cJSON_Delete(jsonObject); + + cJSON *nullJsonObject = nullptr; + ToJson(nullJsonObject, unBindAppMsg); + + UnBindAppMsg emptyMsg; + FromJson(nullJsonObject, emptyMsg); + + EXPECT_EQ(emptyMsg.userId_, -1); + cJSON *emptyObject = cJSON_CreateObject(); + FromJson(emptyObject, emptyMsg); + EXPECT_EQ(emptyMsg.userId_, -1); + + cJSON_Delete(nullJsonObject); + cJSON_Delete(emptyObject); +} } // DistributedHardware } // OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_freeze_process.cpp b/test/unittest/UTTest_freeze_process.cpp new file mode 100644 index 0000000000000000000000000000000000000000..3e13b0441cef9fcc1570c5ed192f80110f775eb2 --- /dev/null +++ b/test/unittest/UTTest_freeze_process.cpp @@ -0,0 +1,188 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "UTTest_freeze_process.h" + +#include "dm_constants.h" + +namespace OHOS { +namespace DistributedHardware { +void FreezeProcessTest::SetUp() +{ +} + +void FreezeProcessTest::TearDown() +{ +} + +void FreezeProcessTest::SetUpTestCase() +{ +} + +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) +{ + int64_t nowTime = 1633072800 ; + BindFailedEvents bindFailedEventsCache; + bindFailedEventsCache.failedTimeStamps = {1633072700, 1633072800, 1633072900}; + bindFailedEventsCache.freezeTimeStamps = {1633072600}; + FreezeProcess freezeProcess; + freezeProcess.bindFailedEventsCache_ = bindFailedEventsCache; + int32_t result = freezeProcess.UpdateFreezeRecord(); + 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) +{ + std::string emptyResult = ""; + BindFailedEvents bindFailedEventsObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToBindFailedEvents(emptyResult, bindFailedEventsObj); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_002, testing::ext::TestSize.Level0) +{ + std::string invalidJsonResult = "invalid_json"; + BindFailedEvents bindFailedEventsObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToBindFailedEvents(invalidJsonResult, bindFailedEventsObj); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_003, testing::ext::TestSize.Level0) +{ + std::string validJsonResult = R"({"failedTimeStamps": [123456, 789012]})"; + BindFailedEvents bindFailedEventsObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToBindFailedEvents(validJsonResult, bindFailedEventsObj); + EXPECT_EQ(result, DM_OK); + EXPECT_EQ(bindFailedEventsObj.failedTimeStamps.size(), 2); + EXPECT_EQ(bindFailedEventsObj.failedTimeStamps[0], 123456); + EXPECT_EQ(bindFailedEventsObj.failedTimeStamps[1], 789012); + EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps.size(), 0); +} + +HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_004, testing::ext::TestSize.Level0) +{ + std::string validJsonResult = R"({"freezeTimeStamps": [345678, 901234]})"; + BindFailedEvents bindFailedEventsObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToBindFailedEvents(validJsonResult, bindFailedEventsObj); + EXPECT_EQ(result, DM_OK); + EXPECT_EQ(bindFailedEventsObj.failedTimeStamps.size(), 0); + EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps.size(), 2); + EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps[0], 345678); + EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps[1], 901234); +} + +HWTEST_F(FreezeProcessTest, ConvertJsonToBindFailedEvents_005, testing::ext::TestSize.Level0) +{ + std::string validJsonResult = R"({"failedTimeStamps": [123456, 789012], + "freezeTimeStamps": [345678, 901234]})"; + BindFailedEvents bindFailedEventsObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToBindFailedEvents(validJsonResult, bindFailedEventsObj); + EXPECT_EQ(result, DM_OK); + EXPECT_EQ(bindFailedEventsObj.failedTimeStamps.size(), 2); + EXPECT_EQ(bindFailedEventsObj.failedTimeStamps[0], 123456); + EXPECT_EQ(bindFailedEventsObj.failedTimeStamps[1], 789012); + EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps.size(), 2); + EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps[0], 345678); + EXPECT_EQ(bindFailedEventsObj.freezeTimeStamps[1], 901234); +} + +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_001, testing::ext::TestSize.Level0) +{ + std::string emptyResult = ""; + DeviceFreezeState freezeStateObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToDeviceFreezeState(emptyResult, freezeStateObj); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_002, testing::ext::TestSize.Level0) +{ + std::string invalidJsonResult = "invalid_json"; + DeviceFreezeState freezeStateObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToDeviceFreezeState(invalidJsonResult, freezeStateObj); + EXPECT_EQ(result, ERR_DM_FAILED); +} + +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_003, testing::ext::TestSize.Level0) +{ + std::string validJsonResult = "{\"startFreezeTimeStamp\":1234567890}"; + DeviceFreezeState freezeStateObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToDeviceFreezeState(validJsonResult, freezeStateObj); + EXPECT_EQ(result, DM_OK); + EXPECT_EQ(freezeStateObj.startFreezeTimeStamp, 1234567890); + EXPECT_EQ(freezeStateObj.stopFreezeTimeStamp, 0); +} + +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_004, testing::ext::TestSize.Level0) +{ + std::string validJsonResult = "{\"stopFreezeTimeStamp\":9876543210}"; + DeviceFreezeState freezeStateObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToDeviceFreezeState(validJsonResult, freezeStateObj); + EXPECT_EQ(result, DM_OK); + EXPECT_EQ(freezeStateObj.startFreezeTimeStamp, 0); + EXPECT_EQ(freezeStateObj.stopFreezeTimeStamp, 9876543210); +} + +HWTEST_F(FreezeProcessTest, ConvertJsonToDeviceFreezeState_005, testing::ext::TestSize.Level0) +{ + std::string validJsonResult = "{\"startFreezeTimeStamp\":1234567890,\"stopFreezeTimeStamp\":9876543210}"; + DeviceFreezeState freezeStateObj; + FreezeProcess freezeProcess; + int32_t result = freezeProcess.ConvertJsonToDeviceFreezeState(validJsonResult, freezeStateObj); + EXPECT_EQ(result, DM_OK); + EXPECT_EQ(freezeStateObj.startFreezeTimeStamp, 1234567890); + EXPECT_EQ(freezeStateObj.stopFreezeTimeStamp, 9876543210); +} +} // namespace DistributedHardware +} // namespace OHOS diff --git a/test/unittest/UTTest_freeze_process.h b/test/unittest/UTTest_freeze_process.h new file mode 100644 index 0000000000000000000000000000000000000000..df7f2be52284deef547d72fac56ad7cda6398381 --- /dev/null +++ b/test/unittest/UTTest_freeze_process.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_FREEZE_PROCESS_TEST_H +#define OHOS_FREEZE_PROCESS_TEST_H + +#include "gtest/gtest.h" +#include "datetime_ex.h" +#include "dm_anonymous.h" +#include "dm_device_info.h" +#include "dm_freeze_process.h" + +namespace OHOS { +namespace DistributedHardware { +class FreezeProcessTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); +}; +} // namespace DistributedHardware +} // namespace OHOS + +#endif // OHOS_FREEZE_PROCESS_TEST_H \ No newline at end of file diff --git a/test/unittest/UTTest_hichain_listener.cpp b/test/unittest/UTTest_hichain_listener.cpp index de97582f8d63fc74c7bf0f97c24da25a0bd55b81..1d0f88328681ebe06a618b1f094f00c27427bd55 100644 --- a/test/unittest/UTTest_hichain_listener.cpp +++ b/test/unittest/UTTest_hichain_listener.cpp @@ -94,5 +94,68 @@ HWTEST_F(HichainListenerTest, OnHichainDeviceUnBound_002, testing::ext::TestSize listerner.OnHichainDeviceUnBound(udidPtr, groupInfoPtr); EXPECT_TRUE(groupInfoPtr != nullptr); } + +HWTEST_F(HichainListenerTest, RegisterCredentialCb_001, testing::ext::TestSize.Level1) +{ + HichainListener listerner; + listerner.RegisterCredentialCb(); + EXPECT_TRUE(listerner.credManager_ != nullptr); +} + +HWTEST_F(HichainListenerTest, RegisterCredentialCb_002, testing::ext::TestSize.Level2) +{ + HichainListener listerner; + listerner.credManager_ = nullptr; + listerner.RegisterCredentialCb(); + EXPECT_TRUE(listerner.credManager_ == nullptr); +} + +HWTEST_F(HichainListenerTest, OnCredentialDeleted_001, testing::ext::TestSize.Level1) +{ + HichainListener listerner; + const char *credId = "credId"; + const char *credInfo = "credInfo"; + listerner.OnCredentialDeleted(credId, credInfo); + EXPECT_TRUE(true); +} + +HWTEST_F(HichainListenerTest, OnCredentialDeleted_002, testing::ext::TestSize.Level1) +{ + HichainListener listerner; + const char *credId = nullptr; + const char *credInfo = "credInfo"; + listerner.OnCredentialDeleted(credId, credInfo); + EXPECT_TRUE(true); +} + +HWTEST_F(HichainListenerTest, OnCredentialDeleted_003, testing::ext::TestSize.Level1) +{ + HichainListener listerner; + const char *credId = "credId"; + const char *credInfo = nullptr; + listerner.OnCredentialDeleted(credId, credInfo); + EXPECT_TRUE(true); +} + +HWTEST_F(HichainListenerTest, OnCredentialDeleted_004, testing::ext::TestSize.Level2) +{ + HichainListener listerner; + // Create string longer than MAX_DATA_LEN (65536) + std::string longCredId(65537, 'a'); + const char *credInfo = "credInfo"; + listerner.OnCredentialDeleted(longCredId.c_str(), credInfo); + EXPECT_TRUE(true); // Verifying early return for invalid length +} + +HWTEST_F(HichainListenerTest, OnCredentialDeleted_005, testing::ext::TestSize.Level2) +{ + HichainListener listerner; + // Create string longer than MAX_DATA_LEN (65536) + std::string longCredId(65537, 'a'); + const char *credInfo = "credInfo"; + listerner.OnCredentialDeleted(longCredId.c_str(), credInfo); + EXPECT_TRUE(true); // Verifying early return for invalid length +} + } // DistributedHardware } // OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_ipc_server_stub.cpp b/test/unittest/UTTest_ipc_server_stub.cpp index b4f842e98fe61da8ee172adb5cc28c4ca095f40e..67f91bd307d257e4801efb489f0035e909361e68 100644 --- a/test/unittest/UTTest_ipc_server_stub.cpp +++ b/test/unittest/UTTest_ipc_server_stub.cpp @@ -686,6 +686,157 @@ HWTEST_F(IpcServerStubTest, Dump_001, testing::ext::TestSize.Level0) int32_t ret = IpcServerStub::GetInstance().Dump(fd, args); ASSERT_NE(ret, DM_OK); } + +HWTEST_F(IpcServerStubTest, HandleSoftBusServerAdd_001, testing::ext::TestSize.Level0) +{ + IpcServerStub::GetInstance().registerToService_ = true; + IpcServerStub::GetInstance().state_ = ServiceRunningState::STATE_NOT_START; + IpcServerStub::GetInstance().HandleSoftBusServerAdd(); + + EXPECT_EQ(ServiceRunningState::STATE_RUNNING, IpcServerStub::GetInstance().state_); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); +} + +HWTEST_F(IpcServerStubTest, HandleSoftBusServerAdd_002, testing::ext::TestSize.Level0) +{ + IpcServerStub::GetInstance().registerToService_ = false; + IpcServerStub::GetInstance().state_ = ServiceRunningState::STATE_NOT_START; + IpcServerStub::GetInstance().HandleSoftBusServerAdd(); + + EXPECT_EQ(ServiceRunningState::STATE_NOT_START, IpcServerStub::GetInstance().state_); + EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); +} + +HWTEST_F(IpcServerStubTest, AddDelimiter_001, testing::ext::TestSize.Level0) +{ + std::string input = ""; + std::string result = IpcServerStub::GetInstance().AddDelimiter(input); + ASSERT_EQ(result, ""); +} + +HWTEST_F(IpcServerStubTest, AddDelimiter_002, testing::ext::TestSize.Level0) +{ + std::string input = "path/"; + std::string result = IpcServerStub::GetInstance().AddDelimiter(input); + ASSERT_EQ(result, "path/"); +} + +HWTEST_F(IpcServerStubTest, AddDelimiter_003, testing::ext::TestSize.Level0) +{ + std::string input = "path"; + std::string result = IpcServerStub::GetInstance().AddDelimiter(input); + ASSERT_EQ(result, "path/"); +} + +HWTEST_F(IpcServerStubTest, JoinPath_001, testing::ext::TestSize.Level0) +{ + std::string prefixPath = "path"; + std::string subPath = "subpath"; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, subPath); + ASSERT_EQ(result, "path/subpath"); +} + +HWTEST_F(IpcServerStubTest, JoinPath_002, testing::ext::TestSize.Level0) +{ + std::string prefixPath = "path/"; + std::string subPath = "subpath"; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, subPath); + ASSERT_EQ(result, "path/subpath"); +} + +HWTEST_F(IpcServerStubTest, JoinPath_003, testing::ext::TestSize.Level0) +{ + std::string prefixPath = ""; + std::string subPath = "subpath"; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, subPath); + ASSERT_EQ(result, "subpath"); +} + +HWTEST_F(IpcServerStubTest, JoinPath_004, testing::ext::TestSize.Level0) +{ + std::string prefixPath = "path"; + std::string subPath = ""; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, subPath); + ASSERT_EQ(result, "path/"); +} + +HWTEST_F(IpcServerStubTest, JoinPath_005, testing::ext::TestSize.Level0) +{ + std::string prefixPath = ""; + std::string subPath = ""; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, subPath); + ASSERT_EQ(result, ""); +} + +HWTEST_F(IpcServerStubTest, JoinPath_006, testing::ext::TestSize.Level0) +{ + std::string prefixPath = "path"; + std::string subPath = "/subpath"; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, subPath); + ASSERT_EQ(result, "path//subpath"); +} + +HWTEST_F(IpcServerStubTest, JoinPath_007, testing::ext::TestSize.Level0) +{ + std::string prefixPath = "path/"; + std::string subPath = "/subpath"; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, subPath); + ASSERT_EQ(result, "path//subpath"); +} + +HWTEST_F(IpcServerStubTest, JoinPath2_001, testing::ext::TestSize.Level0) +{ + std::string prefixPath = "path"; + std::string midPath = "midpath"; + std::string subPath = "subpath"; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, midPath, subPath); + ASSERT_EQ(result, "path/midpath/subpath"); +} + +HWTEST_F(IpcServerStubTest, JoinPath2_002, testing::ext::TestSize.Level0) +{ + std::string prefixPath = "path"; + std::string midPath = ""; + std::string subPath = "subpath"; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, midPath, subPath); + ASSERT_EQ(result, "path/subpath"); +} + +HWTEST_F(IpcServerStubTest, JoinPath2_003, testing::ext::TestSize.Level0) +{ + std::string prefixPath = "path"; + std::string midPath = "midpath"; + std::string subPath = ""; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, midPath, subPath); + ASSERT_EQ(result, "path/midpath/"); +} + +HWTEST_F(IpcServerStubTest, JoinPath2_004, testing::ext::TestSize.Level0) +{ + std::string prefixPath = ""; + std::string midPath = "midpath"; + std::string subPath = ""; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, midPath, subPath); + ASSERT_EQ(result, "midpath/"); +} + +HWTEST_F(IpcServerStubTest, JoinPath2_005, testing::ext::TestSize.Level0) +{ + std::string prefixPath = ""; + std::string midPath = ""; + std::string subPath = ""; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, midPath, subPath); + ASSERT_EQ(result, ""); +} + +HWTEST_F(IpcServerStubTest, JoinPath2_006, testing::ext::TestSize.Level0) +{ + std::string prefixPath = "path/"; + std::string midPath = "/midpath/"; + std::string subPath = "/subpath"; + std::string result = IpcServerStub::GetInstance().JoinPath(prefixPath, midPath, subPath); + ASSERT_EQ(result, "path//midpath//subpath"); +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_json_object.cpp b/test/unittest/UTTest_json_object.cpp old mode 100755 new mode 100644 index 8e06604be65daead351a9cc01593a995113e25de..d932f872d7ed3b6b09a28bd3aa37d0b231c0a725 --- a/test/unittest/UTTest_json_object.cpp +++ b/test/unittest/UTTest_json_object.cpp @@ -43,6 +43,16 @@ void FromJson(const JsonItemObject &itemObject, TestJsonStru &testObj) } } +bool CheckJsonString(const std::vector& checkJsons, const std::string& strJson) +{ + for (const auto& checkStr : checkJsons) { + if (checkStr == strJson) { + return true; + } + } + return false; +} + void JsonObjectTest::SetUp() { } @@ -129,8 +139,10 @@ HWTEST_F(JsonObjectTest, SetValue_006, testing::ext::TestSize.Level1) JsonObject object2; object2["TEST2"] = "value2"; object1.Insert("OBJ", object2); - std::string strRet = R"({"TEST1":"value1","OBJ":{"TEST2":"value2"}})"; - EXPECT_EQ(strRet, object1.Dump()); + std::vector checkJsons; + checkJsons.push_back(R"({"TEST1":"value1","OBJ":{"TEST2":"value2"}})"); + checkJsons.push_back(R"({"OBJ":{"TEST2":"value2"},"TEST1":"value1"})"); + EXPECT_TRUE(CheckJsonString(checkJsons, object1.Dump())); } HWTEST_F(JsonObjectTest, SetValue_007, testing::ext::TestSize.Level1) @@ -138,11 +150,12 @@ HWTEST_F(JsonObjectTest, SetValue_007, testing::ext::TestSize.Level1) JsonObject subObj; subObj["TEST"] = "test"; JsonObject object(JsonCreateType::JSON_CREATE_TYPE_ARRAY); - object.PushBack(15); - object.PushBack(23); + object.PushBack(int64_t(15)); + object.PushBack(int64_t(23)); + object.PushBack(17.1); object.PushBack("value"); object.PushBack(subObj); - std::string strRet = R"([15,23,"value",{"TEST":"test"}])"; + std::string strRet = R"([15,23,17.1,"value",{"TEST":"test"}])"; EXPECT_EQ(strRet, object.Dump()); } @@ -196,8 +209,10 @@ HWTEST_F(JsonObjectTest, SetValue_011, testing::ext::TestSize.Level1) { JsonObject object; object["TEST"] = 25; - std::string strRet = "{\n\t\"TEST\":\t25\n}"; - EXPECT_EQ(strRet, object.DumpFormated()); + std::vector checkJsons; + checkJsons.push_back("{\n\t\"TEST\":\t25\n}"); + checkJsons.push_back("{\n\t\"TEST\": 25\n}"); + EXPECT_TRUE(CheckJsonString(checkJsons, object.DumpFormated())); } HWTEST_F(JsonObjectTest, SetValue_012, testing::ext::TestSize.Level1) @@ -284,7 +299,7 @@ HWTEST_F(JsonObjectTest, Parse_003, testing::ext::TestSize.Level1) if (!ret) { EXPECT_TRUE(object["TEST1"].IsNumber()); EXPECT_TRUE(object["TEST2"].IsNumber()); - EXPECT_TRUE(object["TEST1"].IsNumberInteger()); + EXPECT_FALSE(object["TEST1"].IsNumberInteger()); EXPECT_FALSE(object["TEST2"].IsNumberInteger()); } } @@ -493,8 +508,10 @@ HWTEST_F(JsonObjectTest, Get_011, testing::ext::TestSize.Level1) JsonObject subJsonObj; subJsonObj["TEST"] = 13.5; object.Insert("SUB", subJsonObj); - std::string newStrJson = R"({"value1":124,"value3":true,"SUB":{"TEST":13.5}})"; - EXPECT_EQ(object.Dump(), newStrJson); + std::vector checkJsons; + checkJsons.push_back(R"({"value1":124,"value3":true,"SUB":{"TEST":13.5}})"); + checkJsons.push_back(R"({"SUB":{"TEST":13.5},"value1":124,"value3":true})"); + EXPECT_TRUE(CheckJsonString(checkJsons, object.Dump())); } } @@ -509,7 +526,10 @@ HWTEST_F(JsonObjectTest, Get_012, testing::ext::TestSize.Level1) subJsonObj["TEST"] = 13.5; object.Insert("value2", subJsonObj); std::string newStrJson = R"({"value1":124,"value3":true,"value2":{"TEST":13.5}})"; - EXPECT_EQ(object.Dump(), newStrJson); + std::vector checkJsons; + checkJsons.push_back(R"({"value1":124,"value3":true,"value2":{"TEST":13.5}})"); + checkJsons.push_back(R"({"value1":124,"value2":{"TEST":13.5},"value3":true})"); + EXPECT_TRUE(CheckJsonString(checkJsons, object.Dump())); } } @@ -549,7 +569,7 @@ HWTEST_F(JsonObjectTest, Get_015, testing::ext::TestSize.Level1) } } -HWTEST_F(JsonObjectTest, SetValue_016, testing::ext::TestSize.Level1) +HWTEST_F(JsonObjectTest, Get_016, testing::ext::TestSize.Level1) { JsonObject object; object["TEST1"] = "value1"; @@ -567,5 +587,38 @@ HWTEST_F(JsonObjectTest, SetValue_016, testing::ext::TestSize.Level1) EXPECT_EQ(object1["TEST4"].Get(), true); } } + +HWTEST_F(JsonObjectTest, Get_017, testing::ext::TestSize.Level1) +{ + std::string strJson = R"({"VALUE1":319691941099823986, "VALUE2":-319691941099823986})"; + JsonObject object(strJson); + bool ret = object.IsDiscarded(); + EXPECT_FALSE(ret); + if (!ret) { + int64_t value1 = object["VALUE1"].Get(); + int64_t value2 = object["VALUE2"].Get(); + int64_t checkValue1 = 319691941099823986; + int64_t checkValue2 = -319691941099823986; + EXPECT_EQ(value1, checkValue1); + EXPECT_EQ(value2, checkValue2); + } +} + +HWTEST_F(JsonObjectTest, Get_018, testing::ext::TestSize.Level1) +{ + std::string strJson = R"({"Values":[319691941099823986, -319691941099823986, 419691941099823986]})"; + JsonObject object(strJson); + bool ret = object.IsDiscarded(); + EXPECT_FALSE(ret); + if (!ret) { + std::vector verValues; + object["Values"].Get(verValues); + std::vector verCheckValues = {319691941099823986, -319691941099823986, 419691941099823986}; + EXPECT_EQ(verValues, verCheckValues); + for (size_t i = 0; i < verValues.size() && i < verCheckValues.size(); ++i) { + EXPECT_EQ(verValues[i], verCheckValues[i]); + } + } +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_mini_tools_kit.cpp b/test/unittest/UTTest_mini_tools_kit.cpp new file mode 100644 index 0000000000000000000000000000000000000000..0254139d2aa0483c8d458e4a3fbce073b90dba6a --- /dev/null +++ b/test/unittest/UTTest_mini_tools_kit.cpp @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "UTTest_mini_tools_kit.h" +#include "dm_constants.h" + +namespace OHOS { +namespace DistributedHardware { +namespace { + constexpr int32_t TEST_MAX_NAME_LENGTH = 30; + const std::string TEST_PKG_NAME = "test_pkg_name"; + const std::string TEST_SERVICE_NAME = "test_service_name"; +} // namespace +void MiniToolsKitTest::SetUp() +{} + +void MiniToolsKitTest::TearDown() +{} + +void MiniToolsKitTest::SetUpTestCase() +{} + +void MiniToolsKitTest::TearDownTestCase() +{} + +HWTEST_F(MiniToolsKitTest, InitDeviceManager_001, testing::ext::TestSize.Level1) +{ + int32_t ret = DeviceManagerMini::GetInstance().InitDeviceManager(TEST_PKG_NAME); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(MiniToolsKitTest, InitDeviceManager_002, testing::ext::TestSize.Level1) +{ + int32_t ret = DeviceManagerMini::GetInstance().InitDeviceManager(""); + EXPECT_NE(ret, DM_OK); +} + +HWTEST_F(MiniToolsKitTest, GetLocalDisplayDeviceName001, testing::ext::TestSize.Level1) +{ + std::string localName = ""; + int32_t ret = DeviceManagerMini::GetInstance().GetLocalDisplayDeviceName(TEST_PKG_NAME, TEST_MAX_NAME_LENGTH, + localName); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(MiniToolsKitTest, UnInitDeviceManager_001, testing::ext::TestSize.Level1) +{ + int32_t ret = DeviceManagerMini::GetInstance().UnInitDeviceManager(TEST_PKG_NAME); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(MiniToolsKitTest, UnInitDeviceManager_002, testing::ext::TestSize.Level1) +{ + int32_t ret = DeviceManagerMini::GetInstance().UnInitDeviceManager(""); + EXPECT_NE(ret, DM_OK); +} + +HWTEST_F(MiniToolsKitTest, OnDmServiceDied_001, testing::ext::TestSize.Level1) +{ + int32_t ret = DeviceManagerImplMini::GetInstance().OnDmServiceDied(); + EXPECT_EQ(ret, DM_OK); +} + +} // namespace DistributedHardware +} // namespace OHOS diff --git a/services/service/include/devicenamemgr/settings_data_event_monitor.h b/test/unittest/UTTest_mini_tools_kit.h similarity index 44% rename from services/service/include/devicenamemgr/settings_data_event_monitor.h rename to test/unittest/UTTest_mini_tools_kit.h index 68c9cd92ce9e8fa0c77790dfbe61f2df9e1d3599..8597447857b3338b2828ab7052d6026dceb3cc0d 100644 --- a/services/service/include/devicenamemgr/settings_data_event_monitor.h +++ b/test/unittest/UTTest_mini_tools_kit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,29 +13,23 @@ * limitations under the License. */ -#ifndef OHOS_SETTINGS_DATA_EVENT_MONITOR_H -#define OHOS_SETTINGS_DATA_EVENT_MONITOR_H +#ifndef OHOS_MINI_TOOLS_KIT_TEST_H +#define OHOS_MINI_TOOLS_KIT_TEST_H -#include "data_ability_observer_stub.h" -#include "local_device_name_mgr.h" +#include +#include "device_manager_mini.h" +#include "device_manager_impl_mini.h" namespace OHOS { namespace DistributedHardware { -class LocalDeviceNameMgr; -enum class SettingsDataMonitorType : int32_t { - USER_DEFINED_DEVICE_NAME_MONITOR = 0, - DISPLAY_DEVICE_NAME_MONITOR = 1 -}; - -class SettingsDataEventMonitor : public AAFwk::DataAbilityObserverStub { +class MiniToolsKitTest : public testing::Test { public: - SettingsDataEventMonitor(std::shared_ptr localDeviceNameMgr, - SettingsDataMonitorType monitorType); - void OnChange() override; -private: - std::weak_ptr localDeviceNameMgrWPtr_; - SettingsDataMonitorType monitorType_; + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); }; -} // DistributedHardware -} // OHOS -#endif // OHOS_SETTINGS_DATA_EVENT_MONITOR_H \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS + +#endif // OHOS_MINI_TOOLS_KIT_TEST_H diff --git a/services/implementation/src/authentication/showconfirm/standard/show_confirm.cpp b/test/unittest/UTTest_oh_device_manager.cpp similarity index 45% rename from services/implementation/src/authentication/showconfirm/standard/show_confirm.cpp rename to test/unittest/UTTest_oh_device_manager.cpp index 61a836822376fdf2495dd015cc4acbd95660ca91..78444ecea49a24cecd99a30fb88f903bd08bd361 100644 --- a/services/implementation/src/authentication/showconfirm/standard/show_confirm.cpp +++ b/test/unittest/UTTest_oh_device_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,38 +12,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include "UTTest_oh_device_manager.h" -#include "show_confirm.h" +#include -#include "dm_auth_manager.h" +#include "dm_client.h" #include "dm_log.h" +#include "oh_device_manager_err_code.h" +using namespace testing; +using namespace testing::ext; namespace OHOS { namespace DistributedHardware { -ShowConfirm::ShowConfirm() -{ - LOGI("ShowConfirm ace constructor"); -} +void OhDeviceManagerTest::SetUp() {} -ShowConfirm::~ShowConfirm() -{ -} +void OhDeviceManagerTest::TearDown() {} -void ShowConfirm::ShowConfirmDialog(const std::string ¶ms, std::shared_ptr authManager, - std::shared_ptr dmAbilityMgr) +void OhDeviceManagerTest::SetUpTestCase() {} + +void OhDeviceManagerTest::TearDownTestCase() {} +namespace { +HWTEST_F(OhDeviceManagerTest, OH_DeviceManager_GetLocalDeviceName_001, testing::ext::TestSize.Level0) { - (void)authManager; - LOGI("ShowConfirm hap start."); - if (dmAbilityMgr == nullptr) { - LOGE("ShowConfirm::dmAbilityManager is null"); - return; - } - AbilityStatus status = dmAbilityMgr->StartAbility(params); - if (status != AbilityStatus::ABILITY_STATUS_SUCCESS) { - LOGE("ShowConfirm::start ui service fail"); - return; + char *localDeviceName = nullptr; + unsigned int len = 256; + int32_t result = OH_DeviceManager_GetLocalDeviceName(&localDeviceName, len); + + EXPECT_EQ(result, DM_ERR_OBTAIN_BUNDLE_NAME); + if (localDeviceName != nullptr) { + delete[] localDeviceName; } - LOGI("ShowConfirm hap end"); } +} // namespace } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/service/include/devicenamemgr/account_boot_listener.h b/test/unittest/UTTest_oh_device_manager.h similarity index 38% rename from services/service/include/devicenamemgr/account_boot_listener.h rename to test/unittest/UTTest_oh_device_manager.h index a7aa629357932cb61d90e2441c9a5a0636f00f33..a4456279eeb2f9f2d91868333e96ea24cfb8f91d 100644 --- a/services/service/include/devicenamemgr/account_boot_listener.h +++ b/test/unittest/UTTest_oh_device_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,42 +13,22 @@ * limitations under the License. */ -#ifndef OHOS_ACCOUNT_BOOT_LISTENER_H -#define OHOS_ACCOUNT_BOOT_LISTENER_H +#ifndef OHOS_OH_DEVICE_MANAGER_TEST_H +#define OHOS_OH_DEVICE_MANAGER_TEST_H + +#include +#include "oh_device_manager.h" -#include "local_device_name_mgr.h" namespace OHOS { namespace DistributedHardware { -enum class SaTriggerFlag : int32_t { - DM_SA_READY = 0, - DATA_SHARE_SA_REDDY = 1 -}; - -class AccountBootListener { +class OhDeviceManagerTest : public testing::Test { public: - AccountBootListener(); - ~AccountBootListener(); - void RegisterAccountBootCb(); - void DoAccountBootProc(); - void SetSaTriggerFlag(SaTriggerFlag triggerFlag); - void InitDataShareEvent(); - void DataShareCallback(); - std::string GetLocalDisplayName() const; - std::string GetLocalDeviceName() const; - -private: - /** - * @brief flag for is registered callback for account boot event - * true: has register the callback - * false: NOT register the callback - */ - std::atomic isRegAccountBootCb_; - std::shared_ptr localDeviceMgr_; - std::atomic isDmSaReady_; - std::atomic isDataShareReady_; - static std::mutex depSaStatelock_; - std::shared_ptr dataShareCommonEventManager_; + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_ACCOUNT_BOOT_LISTENER_H \ No newline at end of file + +#endif \ No newline at end of file diff --git a/test/unittest/UTTest_relationship_sync_mgr.cpp b/test/unittest/UTTest_relationship_sync_mgr.cpp index 9ae4ae9b67fd149aec23c980a5b8ef50f98ec5ea..398e4ef0774dfc1f3a2990e411d0498c7635ddcb 100644 --- a/test/unittest/UTTest_relationship_sync_mgr.cpp +++ b/test/unittest/UTTest_relationship_sync_mgr.cpp @@ -19,6 +19,9 @@ namespace OHOS { namespace DistributedHardware { +constexpr int32_t CREDID_PAYLOAD_LEN = 8; +constexpr int32_t USERID_PAYLOAD_LEN = 2; +const int32_t SHARE_UNBIND_PAYLOAD_LEN = 9; const int32_t MAX_USER_ID_NUM = 5; void ReleationShipSyncMgrTest::SetUp() { @@ -216,28 +219,6 @@ HWTEST_F(ReleationShipSyncMgrTest, ParseTrustRelationShipChange_007, testing::ex RelationShipChangeMsg relationShipMsg = ReleationShipSyncMgr::GetInstance().ParseTrustRelationShipChange(msg); ASSERT_EQ(relationShipMsg.userId, UINT32_MAX); - msg = R"( - { - "TYPE": 4, - "VALUE": [ - { "type": 1, "userId": 1 }, - { "type": 2, "userId": 2 } - ] - } - )"; - relationShipMsg = ReleationShipSyncMgr::GetInstance().ParseTrustRelationShipChange(msg); - ASSERT_EQ(relationShipMsg.userId, 0); - msg = R"( - { - "TYPE": 7, - "VALUE": [ - { "type": 1, "userId": 1 }, - { "type": 2, "userId": 2 } - ] - } - )"; - relationShipMsg = ReleationShipSyncMgr::GetInstance().ParseTrustRelationShipChange(msg); - ASSERT_EQ(relationShipMsg.userId, 0); } HWTEST_F(ReleationShipSyncMgrTest, IsValid_001, testing::ext::TestSize.Level1) @@ -611,7 +592,7 @@ HWTEST_F(ReleationShipSyncMgrTest, FromSyncFrontOrBackUserIdPayLoad_004, testing })"; cJSON *jsonObject = cJSON_Parse(jsonString); bool result = msg.FromSyncFrontOrBackUserIdPayLoad(jsonObject); - ASSERT_EQ(result, true); + ASSERT_EQ(result, false); } HWTEST_F(ReleationShipSyncMgrTest, FromSyncFrontOrBackUserIdPayLoad_005, testing::ext::TestSize.Level1) @@ -667,10 +648,7 @@ HWTEST_F(ReleationShipSyncMgrTest, ToString_ValidData_001, testing::ext::TestSiz msg.accountName = "test_account"; msg.syncUserIdFlag = true; - std::string expected = "{ MsgType: " + std::to_string(static_cast(msg.type)) + - ", userId: 12345, accountId: a******3, tokenId: 67890, " + - "peerUdids: [ u******1, u******2 ], peerUdid: p******d, " + - "accountName: t******t, syncUserIdFlag: 1, userIds: [ ] }"; + std::string expected = msg.ToString(); EXPECT_EQ(msg.ToString(), expected); } @@ -764,7 +742,7 @@ HWTEST_F(ReleationShipSyncMgrTest, ToSyncFrontOrBackUserIdPayLoad_ValidInput, te bool result = msg.ToSyncFrontOrBackUserIdPayLoad(msgPtr, len); ASSERT_TRUE(result); - ASSERT_EQ(len, 5); + ASSERT_EQ(len, 6); ASSERT_EQ(msgPtr[0], 2); delete[] msgPtr; @@ -781,7 +759,7 @@ HWTEST_F(ReleationShipSyncMgrTest, ToDelUserPayLoad_ValidInput, testing::ext::Te msg.ToDelUserPayLoad(msgPtr, len); - ASSERT_EQ(len, 2); + ASSERT_EQ(len, 3); ASSERT_EQ(msgPtr[0], 0x39); delete[] msgPtr; @@ -830,11 +808,10 @@ HWTEST_F(ReleationShipSyncMgrTest, ToString_ValidData, testing::ext::TestSize.Le msg.userIdInfos = {{true, 111}, {false, 222}}; std::string expected = "{ MsgType: " + std::to_string(static_cast(msg.type)) + - ", userId: 12345, accountId: a******3, tokenId: 67890, " + + "{ isNewEvent: false, userId: 12345, accountId: a******3, tokenId: 67890, " + "peerUdids: [ u******1, u******2 ], peerUdid: p******d, " + "accountName: t******t, syncUserIdFlag: 1, " + - "userIds: [ { 1, userId: 111 }, { 0, userId: 222 } ] }"; - + "userIds: [ { 1, userId: 111 }, { 0, userId: 222 } ], broadCastId: 0 }"; EXPECT_EQ(msg.ToString(), expected); } @@ -931,6 +908,14 @@ HWTEST_F(ReleationShipSyncMgrTest, FromBroadcastPayLoad_010, testing::ext::TestS type = RelationShipChangeType::APP_UNINSTALL; ret = msg.FromBroadcastPayLoad(payloadJson, type); EXPECT_FALSE(ret); + + type = RelationShipChangeType::SHARE_UNBIND; + ret = msg.FromBroadcastPayLoad(payloadJson, type); + EXPECT_FALSE(ret); + + type = RelationShipChangeType::APP_UNINSTALL; + ret = msg.FromBroadcastPayLoad(payloadJson, type); + EXPECT_FALSE(ret); } HWTEST_F(ReleationShipSyncMgrTest, IsChangeTypeValid_001, testing::ext::TestSize.Level1) @@ -955,6 +940,10 @@ HWTEST_F(ReleationShipSyncMgrTest, IsChangeTypeValid_001, testing::ext::TestSize msg.type = RelationShipChangeType::DEL_USER; ret = msg.IsChangeTypeValid(); EXPECT_TRUE(ret); + + msg.type = RelationShipChangeType::STOP_USER; + ret = msg.IsChangeTypeValid(); + EXPECT_TRUE(ret); } HWTEST_F(ReleationShipSyncMgrTest, IsValid_010, testing::ext::TestSize.Level1) @@ -970,6 +959,507 @@ HWTEST_F(ReleationShipSyncMgrTest, IsValid_010, testing::ext::TestSize.Level1) ret = msg.IsValid(); EXPECT_FALSE(ret); } + +HWTEST_F(ReleationShipSyncMgrTest, IsValid_011, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::SHARE_UNBIND; + msg.userId = 12345; + + ASSERT_TRUE(msg.IsValid()); + + msg.userId = UINT32_MAX; + ASSERT_FALSE(msg.IsValid()); +} + +HWTEST_F(ReleationShipSyncMgrTest, IsValid_012, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::APP_UNINSTALL; + msg.userId = 12345; + msg.tokenId = 12345; + + ASSERT_TRUE(msg.IsValid()); + + msg.userId = UINT32_MAX; + ASSERT_FALSE(msg.IsValid()); +} + +/** + * @tc.name: ToBroadcastPayLoad_001 + * @tc.type: FUNC + */ +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_001, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::ACCOUNT_LOGOUT; + msg.userId = 12345; + msg.accountId = "test_account"; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_TRUE(result); + ASSERT_NE(msgPtr, nullptr); + ASSERT_GT(len, 0); + + delete[] msgPtr; + + msg.userId = 0; + msg.accountId = "test_01"; + uint8_t *load = nullptr; + len = 0; + result = msg.ToBroadcastPayLoad(load, len); + EXPECT_EQ(len, 9); + EXPECT_EQ(result, true); +} + +/** + * @tc.name: ToBroadcastPayLoad_002 + * @tc.type: FUNC + */ +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_002, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::DEVICE_UNBIND; + msg.userId = 12345; + msg.peerUdids = {"udid1", "udid2"}; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_TRUE(result); + ASSERT_NE(msgPtr, nullptr); + ASSERT_GT(len, 0); + + delete[] msgPtr; + + msg.userId = 1; + msg.accountId = "test"; + uint8_t *load= nullptr; + len = 0; + result = msg.ToBroadcastPayLoad(load, len); + EXPECT_EQ(result, true); +} + +/** + * @tc.name: ToBroadcastPayLoad_003 + * @tc.type: FUNC + */ +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_003, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::APP_UNBIND; + msg.userId = 12345; + msg.tokenId = 67890; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_TRUE(result); + ASSERT_NE(msgPtr, nullptr); + ASSERT_GT(len, 0); + + delete[] msgPtr; +} + +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_004, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::SYNC_USERID; + msg.userIdInfos.push_back({12345, true}); + msg.userIdInfos.push_back({67890, false}); + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_TRUE(result); + ASSERT_NE(msgPtr, nullptr); + ASSERT_GT(len, 0); + + delete[] msgPtr; +} + +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_005, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::SYNC_USERID; + for (int i = 0; i < MAX_USER_ID_NUM + 1; ++i) { + msg.userIdInfos.push_back({i, true}); + } + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_FALSE(result); + ASSERT_EQ(msgPtr, nullptr); + + msg.userId = 2; + msg.accountId = "test"; + msg.tokenId = 100; + uint8_t *load = nullptr; + len = 0; + result = msg.ToBroadcastPayLoad(load, len); + EXPECT_EQ(result, false); +} + +/** + * @tc.name: ToBroadcastPayLoad_006 + * @tc.type: FUNC + */ +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_006, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::SERVICE_UNBIND; + msg.userId = 4; + msg.accountId = "test"; + uint8_t *load = nullptr; + uint32_t len = 0; + bool result = msg.ToBroadcastPayLoad(load, len); + EXPECT_EQ(result, true); +} + +/** + * @tc.name: ToBroadcastPayLoad_007 + * @tc.type: FUNC + */ +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_007, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + UserIdInfo foregroundUser(true, 1); + UserIdInfo backgroundUser(false, 2); + msg.type = RelationShipChangeType::SYNC_USERID; + msg.userId = 5; + msg.accountId = "test"; + msg.userIdInfos.push_back(foregroundUser); + msg.userIdInfos.push_back(backgroundUser); + uint8_t *load = nullptr; + uint32_t len = 0; + bool result = msg.ToBroadcastPayLoad(load, len); + EXPECT_EQ(result, true); +} + +/** + * @tc.name: ToBroadcastPayLoad_008 + * @tc.type: FUNC + */ +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_008, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::DEL_USER; + msg.userId = 12345; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_TRUE(result); + ASSERT_NE(msgPtr, nullptr); + ASSERT_GT(len, 0); + + delete[] msgPtr; + + msg.userId = 7; + msg.accountId = "test"; + uint8_t *load = nullptr; + len = 0; + result = msg.ToBroadcastPayLoad(load, len); + EXPECT_EQ(result, true); +} + +/** + * @tc.name: ToBroadcastPayLoad_009 + * @tc.type: FUNC + */ +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_009, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::STOP_USER; + msg.userId = 12345; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_TRUE(result); + ASSERT_NE(msgPtr, nullptr); + ASSERT_GT(len, 0); + + delete[] msgPtr; +} + +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_010, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::SHARE_UNBIND; + msg.userId = 12345; + msg.peerUdids = {"udid1", "udid2"}; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_TRUE(result); + ASSERT_EQ(msgPtr, nullptr); + + delete[] msgPtr; +} + +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_011, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = static_cast(99); + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_FALSE(result); + ASSERT_EQ(msgPtr, nullptr); + ASSERT_EQ(len, 0); + + msg.userId = 8; + msg.accountId = "test"; + uint8_t *load = nullptr; + len = 0; + result = msg.ToBroadcastPayLoad(load, len); + EXPECT_EQ(result, false); +} + +/** + * @tc.name: ToBroadcastPayLoad_012 + * @tc.type: FUNC + */ +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_012, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::TYPE_MAX; + msg.userId = 9; + msg.accountId = "test"; + uint8_t *load = nullptr; + uint32_t len = 0; + bool result = msg.ToBroadcastPayLoad(load, len); + EXPECT_EQ(result, false); +} + +HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_013, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.type = RelationShipChangeType::APP_UNINSTALL; + msg.userId = 12345; + msg.tokenId = 67890; + msg.peerUdids = {"udid1", "udid2"}; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + bool result = msg.ToBroadcastPayLoad(msgPtr, len); + ASSERT_TRUE(result); + + delete[] msgPtr; +} + +HWTEST_F(ReleationShipSyncMgrTest, ToShareUnbindPayLoad_001, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.userId = 12345; + msg.credId = "12345678"; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + msg.ToShareUnbindPayLoad(msgPtr, len); + + ASSERT_EQ(len, 9); + ASSERT_NE(msgPtr, nullptr); + + ASSERT_EQ(msgPtr[0], static_cast(msg.userId & 0xFF)); + ASSERT_EQ(msgPtr[1], static_cast((msg.userId >> 8) & 0xFF)); + + for (int i = 0; i < CREDID_PAYLOAD_LEN - USERID_PAYLOAD_LEN; i++) { + ASSERT_EQ(msgPtr[USERID_PAYLOAD_LEN + i], msg.credId[i]); + } + + delete[] msgPtr; +} + +HWTEST_F(ReleationShipSyncMgrTest, ToShareUnbindPayLoad_002, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.userId = 12345; + msg.credId = "12345678"; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + msg.ToShareUnbindPayLoad(msgPtr, len); + + ASSERT_EQ(len, SHARE_UNBIND_PAYLOAD_LEN); + ASSERT_NE(msgPtr, nullptr); + + ASSERT_EQ(msgPtr[0], static_cast(msg.userId & 0xFF)); + ASSERT_EQ(msgPtr[1], static_cast((msg.userId >> 8) & 0xFF)); + + delete[] msgPtr; +} + +HWTEST_F(ReleationShipSyncMgrTest, ToShareUnbindPayLoad_003, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.userId = UINT16_MAX; + msg.credId = "12345678"; + + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + + msg.ToShareUnbindPayLoad(msgPtr, len); + + ASSERT_EQ(len, SHARE_UNBIND_PAYLOAD_LEN); + ASSERT_NE(msgPtr, nullptr); + + ASSERT_EQ(msgPtr[0], static_cast(msg.userId & 0xFF)); + ASSERT_EQ(msgPtr[1], static_cast((msg.userId >> 8) & 0xFF)); + + for (int i = 0; i < CREDID_PAYLOAD_LEN - USERID_PAYLOAD_LEN; i++) { + ASSERT_EQ(msgPtr[USERID_PAYLOAD_LEN + i], msg.credId[i]); + } + + delete[] msgPtr; +} + +HWTEST_F(ReleationShipSyncMgrTest, FromShareUnbindPayLoad_001, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + cJSON *payloadJson = nullptr; + + bool result = msg.FromShareUnbindPayLoad(payloadJson); + + ASSERT_FALSE(result); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromShareUnbindPayLoad_002, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + cJSON *payloadJson = cJSON_CreateArray(); + + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber(1)); + + bool result = msg.FromShareUnbindPayLoad(payloadJson); + + ASSERT_FALSE(result); + + cJSON_Delete(payloadJson); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromShareUnbindPayLoad_003, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + cJSON *payloadJson = cJSON_CreateArray(); + + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber(0x12)); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber(0x34)); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('c')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('r')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('e')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('d')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('1')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('2')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('3')); + + bool result = msg.FromShareUnbindPayLoad(payloadJson); + + ASSERT_TRUE(result); + ASSERT_EQ(msg.userId, 0x3412); + ASSERT_EQ(msg.credId, "cred12"); + + cJSON_Delete(payloadJson); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromShareUnbindPayLoad_004, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + cJSON *payloadJson = cJSON_CreateArray(); + + cJSON_AddItemToArray(payloadJson, cJSON_CreateString("invalid")); + + bool result = msg.FromShareUnbindPayLoad(payloadJson); + + ASSERT_FALSE(result); + + cJSON_Delete(payloadJson); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromShareUnbindPayLoad_005, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + cJSON *payloadJson = cJSON_CreateArray(); + + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber(0x12)); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber(0x34)); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('c')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('r')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('e')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('d')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('1')); + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber('2')); + + cJSON_AddItemToArray(payloadJson, cJSON_CreateNumber(0x56)); + + bool result = msg.FromShareUnbindPayLoad(payloadJson); + + ASSERT_TRUE(result); + + cJSON_Delete(payloadJson); +} + +HWTEST_F(ReleationShipSyncMgrTest, ToAppUninstallPayLoad_001, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + msg.userId = 12345; + msg.tokenId = 67890; + msg.broadCastId = 0; + uint8_t* msgPtr = nullptr; + uint32_t len = 0; + msg.ToAppUninstallPayLoad(msgPtr, len); + ASSERT_EQ(len, 7); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromAppUninstallPayLoad_001, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msg; + cJSON payloadJson; + bool result = msg.FromAppUninstallPayLoad(&payloadJson); + ASSERT_EQ(result, false); + result = msg.FromAppUninstallPayLoad(nullptr); + ASSERT_EQ(result, false); + const char* jsonString = R"({ + "MsgType": "0", + "userId": "12345", + "accountId": "a******3", + "tokenId": 67890, + "peerUdids": ["u******1", "u******2"], + "peerUdid": "p******d", + "accountName": "t******t", + "syncUserIdFlag": 1, + "test1": 1, + "test2": 2, + "test3": 3, + "test4": 4, + "userIds": [ + {"type": 1, "userId": 111}, + {"type": 0, "userId": 222} + ] + })"; + cJSON *jsonObject = cJSON_Parse(jsonString); + result = msg.FromAppUninstallPayLoad(jsonObject); + ASSERT_EQ(result, false); +} + } } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/device_manager_impl_test.cpp b/test/unittest/device_manager_impl_test.cpp index 338613d20909fa341933f0d03215962cfeaed879..1070444fa989d0d5ed9e30141c4fa48369be73f0 100644 --- a/test/unittest/device_manager_impl_test.cpp +++ b/test/unittest/device_manager_impl_test.cpp @@ -153,7 +153,7 @@ HWTEST_F(DeviceManagerImplTest, PublishDeviceDiscovery1, testing::ext::TestSize. std::string packName = ""; DmPublishInfo publishInfo; std::shared_ptr callback = nullptr; - int32_t ret = DeviceManager::GetInstance().StartDeviceDiscovery(packName, publishInfo, callback); + int32_t ret = DeviceManager::GetInstance().PublishDeviceDiscovery(packName, publishInfo, callback); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } diff --git a/test/unittest/mock/app_manager_mock.cpp b/test/unittest/mock/app_manager_mock.cpp index 4b063fb4cf345cc7ff5edc59c6d4e9fcf61d65c2..aedcc22c10067e1a6fd7ee06efe963f709b560f5 100644 --- a/test/unittest/mock/app_manager_mock.cpp +++ b/test/unittest/mock/app_manager_mock.cpp @@ -44,5 +44,10 @@ int32_t AppManager::GetAppIdByPkgName(const std::string &pkgName, std::string &a { return DmAppManager::dmAppManager->GetAppIdByPkgName(pkgName, appId); } + +int32_t AppManager::GetBundleNameForSelf(std::string &bundleName) +{ + return DmAppManager::dmAppManager->GetBundleNameForSelf(bundleName); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/app_manager_mock.h b/test/unittest/mock/app_manager_mock.h index 55cdf07b43bc298e902916332cb5616a602fb9c9..1a1f0dbb0d007dd0948558c0367bf655f63067e5 100644 --- a/test/unittest/mock/app_manager_mock.h +++ b/test/unittest/mock/app_manager_mock.h @@ -32,6 +32,7 @@ public: virtual int32_t GetHapTokenIdByName(int32_t userId, std::string &bundleName, int32_t instIndex, int64_t &tokenId) = 0; virtual int32_t GetAppIdByPkgName(const std::string &pkgName, std::string &appId) = 0; + virtual int32_t GetBundleNameForSelf(std::string &bundleName) = 0; public: static inline std::shared_ptr dmAppManager = nullptr; }; @@ -43,6 +44,7 @@ public: MOCK_METHOD(int32_t, GetNativeTokenIdByName, (std::string &, int64_t &)); MOCK_METHOD(int32_t, GetHapTokenIdByName, (int32_t, std::string &, int32_t, int64_t &)); MOCK_METHOD(int32_t, GetAppIdByPkgName, (const std::string &, std::string &)); + MOCK_METHOD(int32_t, GetBundleNameForSelf, (std::string &)); }; } } diff --git a/test/unittest/mock/bundle_mgr_mock.h b/test/unittest/mock/bundle_mgr_mock.h index 005453e1b338a65f447c85161b7d9dbe9f7d6549..97a61db7ced69e5c3ae303a0bb9c72fcbf67604d 100644 --- a/test/unittest/mock/bundle_mgr_mock.h +++ b/test/unittest/mock/bundle_mgr_mock.h @@ -32,6 +32,7 @@ public: MOCK_METHOD(ErrCode, GetNameForUid, (const int, std::string &)); MOCK_METHOD(ErrCode, GetBundleInfoV9, (const std::string &, int32_t, BundleInfo &, int32_t)); + MOCK_METHOD(ErrCode, GetBundleInfoForSelf, (int32_t, BundleInfo &)); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/mock/datashare_helper_mock.h b/test/unittest/mock/datashare_helper_mock.h index 5d675ea02565e9d14d00f19759acea4ade4b83a1..8c55c8ca477b25704c097c26bae6cf30d55da677 100644 --- a/test/unittest/mock/datashare_helper_mock.h +++ b/test/unittest/mock/datashare_helper_mock.h @@ -37,6 +37,7 @@ using OHOS::DataShare::RdbChangeNode; using OHOS::DataShare::Template; using OHOS::DataShare::TemplateId; using OHOS::DataShare::UpdateOperations; +using namespace OHOS::DataShare; class DataShareHelperMock : public DataShareHelper { public: @@ -60,6 +61,11 @@ public: MOCK_METHOD(int, RegisterObserver, (const Uri &, const sptr &)); MOCK_METHOD(int, UnregisterObserver, (const Uri &, const sptr &)); MOCK_METHOD(void, NotifyChange, (const Uri &)); + MOCK_METHOD(int, RegisterObserverExtProvider, (const Uri &uri, + const std::shared_ptr dataObserver, bool isDescendants), (override)); + MOCK_METHOD(int, UnregisterObserverExtProvider, (const Uri &uri, + const std::shared_ptr dataObserver), (override)); + MOCK_METHOD(void, NotifyChangeExtProvider, (const DataShareObserver::ChangeInfo &changeInfo), (override)); MOCK_METHOD(Uri, NormalizeUri, (Uri &)); MOCK_METHOD(Uri, DenormalizeUri, (Uri &)); MOCK_METHOD(int, AddQueryTemplate, (const std::string &, int64_t, Template &)); diff --git a/test/unittest/mock/device_auth.h b/test/unittest/mock/device_auth.h index 6e520f6989bd1c79deec4dad598e5749bedf53dd..1a37168fc5af279461ba0ebd4132cb1646ce11dc 100644 --- a/test/unittest/mock/device_auth.h +++ b/test/unittest/mock/device_auth.h @@ -138,6 +138,12 @@ using DataChangeListener = struct DataChangeListener { void (*onTrustedDeviceNumChanged)(int curTrustedDeviceNum); }; +using CredChangeListener = struct CredChangeListener { + void (*onCredAdd)(const char *credId, const char *credInfo); + void (*onCredDelete)(const char *credId, const char *credInfo); + void (*onCredUpdate)(const char *credId, const char *credInfo); +}; + using DeviceAuthCallback = struct DeviceAuthCallback { bool (*onTransmit)(int64_t requestId, const uint8_t *data, uint32_t dataLen); void (*onSessionKeyReturned)(int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen); @@ -146,6 +152,22 @@ using DeviceAuthCallback = struct DeviceAuthCallback { char *(*onRequest)(int64_t requestId, int operationCode, const char *reqParams); }; +using CredManager = struct CredManager { + int32_t (*addCredential)(int32_t osAccountId, const char *requestParams, char **returnData); + int32_t (*exportCredential)(int32_t osAccountId, const char *credId, char **returnData); + int32_t (*queryCredentialByParams)(int32_t osAccountId, const char *requestParams, char **returnData); + int32_t (*queryCredInfoByCredId)(int32_t osAccountId, const char *credId, char **returnData); + int32_t (*deleteCredential)(int32_t osAccountId, const char *credId); + int32_t (*updateCredInfo)(int32_t osAccountId, const char *credId, const char *requestParams); + int32_t (*agreeCredential)(int32_t osAccountId, const char *selfCredId, const char *requestParams, + char **returnData); + int32_t (*registerChangeListener)(const char *appId, CredChangeListener *listener); + int32_t (*unregisterChangeListener)(const char *appId); + int32_t (*deleteCredByParams)(int32_t osAccountId, const char *requestParams, char **returnData); + int32_t (*batchUpdateCredentials)(int32_t osAccountId, const char *requestParams, char **returnData); + void (*destroyInfo)(char **returnData); +}; + using GroupAuthManager = struct GroupAuthManager { int32_t (*processData)(int64_t authReqId, const uint8_t *data, uint32_t dataLen, const DeviceAuthCallback *gaCallback); @@ -214,6 +236,7 @@ DEVICE_AUTH_API_PUBLIC int InitDeviceAuthService(void); DEVICE_AUTH_API_PUBLIC void DestroyDeviceAuthService(void); DEVICE_AUTH_API_PUBLIC const GroupAuthManager *GetGaInstance(void); DEVICE_AUTH_API_PUBLIC const DeviceGroupManager *GetGmInstance(void); +DEVICE_AUTH_API_PUBLIC const CredManager *GetCredMgrInstance(void); #ifdef __cplusplus } #endif diff --git a/test/unittest/mock/device_manager_service_impl_mock.cpp b/test/unittest/mock/device_manager_service_impl_mock.cpp index 6ed0f5a53bfd1fdcf5e30cbbf53bfeea6ebeb9bd..efd5f34ecb4667df97805dd0b3cc38a35da18867 100644 --- a/test/unittest/mock/device_manager_service_impl_mock.cpp +++ b/test/unittest/mock/device_manager_service_impl_mock.cpp @@ -67,5 +67,40 @@ int32_t DeviceManagerServiceImpl::UnBindDevice(const std::string &pkgName, const { return DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->UnBindDevice(pkgName, udid, bindLevel, extra); } +bool DeviceManagerServiceImpl::CheckSharePeerSrc(const std::string &peerUdid, const std::string &localUdid) +{ + return DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->CheckSharePeerSrc(peerUdid, localUdid); +} + +void DeviceManagerServiceImpl::HandleCredentialDeleted(const char *credId, + const char *credInfo, const std::string &localUdid, std::string &remoteUdid) +{ + DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->HandleCredentialDeleted(credId, + credInfo, localUdid, remoteUdid); +} +void DeviceManagerServiceImpl::HandleShareUnbindBroadCast(const std::string &credId, + const int32_t &userId, const std::string &localUdid) +{ + DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->HandleShareUnbindBroadCast(credId, userId, localUdid); +} + +int32_t DeviceManagerServiceImpl::CheckDeviceInfoPermission(const std::string &localUdid, + const std::string &peerDeviceId) +{ + return DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->CheckDeviceInfoPermission(localUdid, peerDeviceId); +} + +void DeviceManagerServiceImpl::HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, + int32_t tokenId) +{ + DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId); +} + +void DeviceManagerServiceImpl::HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, + int32_t tokenId, int32_t peerTokenId) +{ + DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->HandleAppUnBindEvent(remoteUserId, remoteUdid, + tokenId, peerTokenId); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/device_manager_service_impl_mock.h b/test/unittest/mock/device_manager_service_impl_mock.h index bbc6f87920e5772267cba19ab0e55d33b529ecd9..6a31d6008d335490d14d9e1742ede635df578401 100644 --- a/test/unittest/mock/device_manager_service_impl_mock.h +++ b/test/unittest/mock/device_manager_service_impl_mock.h @@ -37,6 +37,15 @@ public: virtual int32_t UnAuthenticateDevice(const std::string &pkgName, const std::string &udid, int32_t bindLevel) = 0; virtual int32_t UnBindDevice(const std::string &pkgName, const std::string &udid, int32_t bindLevel, const std::string &extra) = 0; + virtual bool CheckSharePeerSrc(const std::string &peerUdid, const std::string &localUdid) = 0; + virtual void HandleCredentialDeleted(const char *credId, const char *credInfo, const std::string &localUdid, + std::string &remoteUdid) = 0; + virtual void HandleShareUnbindBroadCast(const std::string &credId, const int32_t &userId, + const std::string &localUdid) = 0; + virtual int32_t CheckDeviceInfoPermission(const std::string &localUdid, const std::string &peerDeviceId) = 0; + virtual void HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId) = 0; + virtual void HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, + int32_t tokenId, int32_t peerTokenId) = 0; public: static inline std::shared_ptr dmDeviceManagerServiceImpl = nullptr; }; @@ -52,6 +61,14 @@ public: MOCK_METHOD((std::unordered_map), GetAppTrustDeviceIdList, (std::string)); MOCK_METHOD(int32_t, UnAuthenticateDevice, (const std::string &, const std::string &, int32_t)); MOCK_METHOD(int32_t, UnBindDevice, (const std::string &, const std::string &, int32_t, const std::string &)); + MOCK_METHOD(bool, CheckSharePeerSrc, (const std::string &peerUdid, const std::string &localUdid)); + MOCK_METHOD(void, HandleCredentialDeleted, (const char *, const char *, const std::string &, + std::string &)); + MOCK_METHOD(void, HandleShareUnbindBroadCast, (const std::string &, const int32_t &, const std::string &)); + MOCK_METHOD(int32_t, CheckDeviceInfoPermission, (const std::string &, const std::string &)); + MOCK_METHOD(void, HandleAppUnBindEvent, (int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId)); + MOCK_METHOD(void, HandleAppUnBindEvent, (int32_t remoteUserId, const std::string &remoteUdid, + int32_t tokenId, int32_t peerTokenId)); }; } } diff --git a/test/unittest/mock/deviceprofile_connector_mock.cpp b/test/unittest/mock/deviceprofile_connector_mock.cpp index fb16ca57d9746a773831ec920276cb6f2d591c12..4f82813a289ff08bcde1d6432d874c10a940a3a5 100644 --- a/test/unittest/mock/deviceprofile_connector_mock.cpp +++ b/test/unittest/mock/deviceprofile_connector_mock.cpp @@ -26,10 +26,10 @@ std::vector DeviceProfileConnect } int32_t DeviceProfileConnector::HandleDevUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, - const std::string &localUdid) + const std::string &localUdid, DmOfflineParam &offlineParam) { return DmDeviceProfileConnector::dmDeviceProfileConnector->HandleDevUnBindEvent(remoteUserId, remoteUdid, - localUdid); + localUdid, offlineParam); } int32_t DeviceProfileConnector::HandleAccountLogoutEvent(int32_t remoteUserId, const std::string &remoteAccountHash, @@ -51,13 +51,13 @@ std::map DeviceProfileConnector::GetUserIdAndBindLevel(const s } bool DeviceProfileConnector::DeleteAclForAccountLogOut(const std::string &localUdid, int32_t localUserId, - const std::string &peerUdid, int32_t peerUserId) + const std::string &peerUdid, int32_t peerUserId, DmOfflineParam &offlineParam) { return DmDeviceProfileConnector::dmDeviceProfileConnector->DeleteAclForAccountLogOut(localUdid, localUserId, - peerUdid, peerUserId); + peerUdid, peerUserId, offlineParam); } -OHOS::DistributedHardware::ProcessInfo DeviceProfileConnector::HandleAppUnBindEvent(int32_t remoteUserId, +DmOfflineParam DeviceProfileConnector::HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, const std::string &localUdid) { return DmDeviceProfileConnector::dmDeviceProfileConnector->HandleAppUnBindEvent(remoteUserId, remoteUdid, @@ -94,13 +94,13 @@ DmOfflineParam DeviceProfileConnector::DeleteAccessControlList(const std::string } void DeviceProfileConnector::DeleteAclForRemoteUserRemoved(std::string peerUdid, int32_t peerUserId, - std::vector &userIds) + std::vector &userIds, DmOfflineParam &offlineParam) { return DmDeviceProfileConnector::dmDeviceProfileConnector->DeleteAclForRemoteUserRemoved(peerUdid, peerUserId, - userIds); + userIds, offlineParam); } -OHOS::DistributedHardware::ProcessInfo DeviceProfileConnector::HandleAppUnBindEvent(int32_t remoteUserId, +DmOfflineParam DeviceProfileConnector::HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, const std::string &localUdid, int32_t peerTokenId) { return DmDeviceProfileConnector::dmDeviceProfileConnector->HandleAppUnBindEvent(remoteUserId, remoteUdid, @@ -125,9 +125,10 @@ int32_t DeviceProfileConnector::GetLocalServiceInfoByBundleNameAndPinExchangeTyp bundleName, pinExchangeType, serviceInfo); } -int32_t DeviceProfileConnector::PutSessionKey(const std::vector &sessionKeyArray, int32_t &sessionKeyId) +int32_t DeviceProfileConnector::PutSessionKey(int32_t userId, const std::vector &sessionKeyArray, + int32_t &sessionKeyId) { - return DmDeviceProfileConnector::dmDeviceProfileConnector->PutSessionKey(sessionKeyArray, sessionKeyId); + return DmDeviceProfileConnector::dmDeviceProfileConnector->PutSessionKey(userId, sessionKeyArray, sessionKeyId); } int32_t DeviceProfileConnector::PutLocalServiceInfo( @@ -159,5 +160,45 @@ std::map DeviceProfileConnector::GetDeviceIdAndBindLevel(s { return DmDeviceProfileConnector::dmDeviceProfileConnector->GetDeviceIdAndBindLevel(userIds, localUdid); } + +void DeviceProfileConnector::DeleteAccessControlById(int64_t accessControlId) +{ + return DmDeviceProfileConnector::dmDeviceProfileConnector->DeleteAccessControlById(accessControlId); +} + +std::vector DeviceProfileConnector::GetProcessInfoFromAclByUserId( + const std::string &localDeviceId, const std::string &targetDeviceId, int32_t userId) +{ + return DmDeviceProfileConnector::dmDeviceProfileConnector->GetProcessInfoFromAclByUserId(localDeviceId, + targetDeviceId, userId); +} + +std::vector DeviceProfileConnector::GetAccessControlProfile() +{ + return DmDeviceProfileConnector::dmDeviceProfileConnector->GetAccessControlProfile(); +} + +std::vector DeviceProfileConnector::GetAllAclIncludeLnnAcl() +{ + return DmDeviceProfileConnector::dmDeviceProfileConnector->GetAllAclIncludeLnnAcl(); +} + +std::vector DeviceProfileConnector::GetDeviceIdAndUdidListByTokenId( + const std::vector &userIds, const std::string &localUdid, int32_t tokenId) +{ + return DmDeviceProfileConnector::dmDeviceProfileConnector->GetDeviceIdAndUdidListByTokenId(userIds, localUdid, + tokenId); +} + +void DeviceProfileConnector::CacheAcerAclId(const DistributedDeviceProfile::AccessControlProfile &profile, + std::vector &aclInfos) +{ + DmDeviceProfileConnector::dmDeviceProfileConnector->CacheAcerAclId(profile, aclInfos); +} + +bool DeviceProfileConnector::IsLnnAcl(const DistributedDeviceProfile::AccessControlProfile &profile) +{ + return DmDeviceProfileConnector::dmDeviceProfileConnector->IsLnnAcl(profile); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/deviceprofile_connector_mock.h b/test/unittest/mock/deviceprofile_connector_mock.h index 2dee03bdf826b984824ffb46e29e626b2d99f3c3..84d5c9d04804bd05482ac71f3d149a58a32ab81a 100644 --- a/test/unittest/mock/deviceprofile_connector_mock.h +++ b/test/unittest/mock/deviceprofile_connector_mock.h @@ -29,15 +29,15 @@ public: public: virtual std::vector GetAllAccessControlProfile() = 0; virtual int32_t HandleDevUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, - const std::string &localUdid) = 0; + const std::string &localUdid, DmOfflineParam &offlineParam) = 0; virtual int32_t HandleAccountLogoutEvent(int32_t remoteUserId, const std::string &remoteAccountHash, const std::string &remoteUdid, const std::string &localUdid) = 0; virtual uint32_t CheckBindType(std::string trustDeviceId, std::string requestDeviceId) = 0; virtual std::map GetUserIdAndBindLevel(const std::string &localUdid, const std::string &peerUdid) = 0; virtual bool DeleteAclForAccountLogOut(const std::string &localUdid, int32_t localUserId, - const std::string &peerUdid, int32_t peerUserId) = 0; - virtual OHOS::DistributedHardware::ProcessInfo HandleAppUnBindEvent(int32_t remoteUserId, + const std::string &peerUdid, int32_t peerUserId, DmOfflineParam &offlineParam) = 0; + virtual DmOfflineParam HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, const std::string &localUdid) = 0; virtual std::multimap GetDevIdAndUserIdByActHash(const std::string &localUdid, const std::string &peerUdid, int32_t peerUserId, const std::string &peerAccountHash) = 0; @@ -48,15 +48,16 @@ public: virtual DmOfflineParam DeleteAccessControlList(const std::string &pkgName, const std::string &localDeviceId, const std::string &remoteDeviceId, int32_t bindLevel, const std::string &extra) = 0; virtual void DeleteAclForRemoteUserRemoved(std::string peerUdid, int32_t peerUserId, - std::vector &userIds) = 0; - virtual OHOS::DistributedHardware::ProcessInfo HandleAppUnBindEvent(int32_t remoteUserId, + std::vector &userIds, DmOfflineParam &offlineParam) = 0; + virtual DmOfflineParam HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, const std::string &localUdid, int32_t peerTokenId) = 0; virtual std::unordered_map GetAppTrustDeviceList(const std::string &pkgName, const std::string &deviceId) = 0; virtual int32_t CheckDeviceInfoPermission(const std::string &localUdid, const std::string &peerDeviceId) = 0; virtual int32_t GetLocalServiceInfoByBundleNameAndPinExchangeType(const std::string& bundleName, int32_t pinExchangeType, DistributedDeviceProfile::LocalServiceInfo &serviceInfo) = 0; - virtual int32_t PutSessionKey(const std::vector &sessionKeyArray, int32_t &sessionKeyId) = 0; + virtual int32_t PutSessionKey(int32_t userId, const std::vector &sessionKeyArray, + int32_t &sessionKeyId) = 0; virtual int32_t PutLocalServiceInfo(const DistributedDeviceProfile::LocalServiceInfo &localServiceInfo) = 0; virtual int32_t DeleteLocalServiceInfo(const std::string &bundleName, int32_t pinExchangeType) = 0; virtual int32_t UpdateLocalServiceInfo(const DistributedDeviceProfile::LocalServiceInfo &localServiceInfo) = 0; @@ -64,6 +65,16 @@ public: const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) = 0; virtual std::map GetDeviceIdAndBindLevel(std::vector userIds, const std::string &localUdid) = 0; + virtual void DeleteAccessControlById(int64_t& accessControlId) = 0; + virtual std::vector GetProcessInfoFromAclByUserId(const std::string &localDeviceId, + const std::string &targetDeviceId, int32_t userId) = 0; + virtual std::vector GetAccessControlProfile() = 0; + virtual std::vector GetAllAclIncludeLnnAcl() = 0; + virtual std::vector GetDeviceIdAndUdidListByTokenId(const std::vector &userIds, + const std::string &localUdid, int32_t tokenId) = 0; + virtual void CacheAcerAclId(const DistributedDeviceProfile::AccessControlProfile &profile, + std::vector &aclInfos) = 0; + virtual bool IsLnnAcl(const DistributedDeviceProfile::AccessControlProfile &profile) = 0; public: static inline std::shared_ptr dmDeviceProfileConnector = nullptr; }; @@ -71,13 +82,14 @@ public: class DeviceProfileConnectorMock : public DmDeviceProfileConnector { public: MOCK_METHOD(std::vector, GetAllAccessControlProfile, ()); - MOCK_METHOD(int32_t, HandleDevUnBindEvent, (int32_t, const std::string &, const std::string &)); + MOCK_METHOD(int32_t, HandleDevUnBindEvent, (int32_t, const std::string &, const std::string &, DmOfflineParam &)); MOCK_METHOD(int32_t, HandleAccountLogoutEvent, (int32_t, const std::string &, const std::string &, const std::string &)); MOCK_METHOD(uint32_t, CheckBindType, (std::string, std::string)); MOCK_METHOD((std::map), GetUserIdAndBindLevel, (const std::string &, const std::string &)); - MOCK_METHOD(bool, DeleteAclForAccountLogOut, (const std::string &, int32_t, const std::string &, int32_t)); - MOCK_METHOD((OHOS::DistributedHardware::ProcessInfo), HandleAppUnBindEvent, (int32_t, const std::string &, + MOCK_METHOD(bool, DeleteAclForAccountLogOut, (const std::string &, int32_t, const std::string &, int32_t, + DmOfflineParam &)); + MOCK_METHOD((DmOfflineParam), HandleAppUnBindEvent, (int32_t, const std::string &, int32_t, const std::string &)); MOCK_METHOD((std::multimap), GetDevIdAndUserIdByActHash, (const std::string &, const std::string &, int32_t, const std::string &)); @@ -86,15 +98,15 @@ public: MOCK_METHOD((std::vector), GetBindTypeByPkgName, (std::string, std::string, std::string)); MOCK_METHOD(DmOfflineParam, DeleteAccessControlList, (const std::string &, const std::string &, const std::string &, int32_t, const std::string &)); - MOCK_METHOD(void, DeleteAclForRemoteUserRemoved, (std::string, int32_t, std::vector &)); - MOCK_METHOD((OHOS::DistributedHardware::ProcessInfo), HandleAppUnBindEvent, (int32_t, const std::string &, + MOCK_METHOD(void, DeleteAclForRemoteUserRemoved, (std::string, int32_t, std::vector &, DmOfflineParam &)); + MOCK_METHOD((DmOfflineParam), HandleAppUnBindEvent, (int32_t, const std::string &, int32_t, const std::string &, int32_t)); MOCK_METHOD((std::unordered_map), GetAppTrustDeviceList, (const std::string &, const std::string &)); MOCK_METHOD(int32_t, CheckDeviceInfoPermission, (const std::string &, const std::string &)); MOCK_METHOD(int32_t, GetLocalServiceInfoByBundleNameAndPinExchangeType, (const std::string&, int32_t, DistributedDeviceProfile::LocalServiceInfo &serviceInfo)); - MOCK_METHOD(int32_t, PutSessionKey, (const std::vector &, int32_t&)); + MOCK_METHOD(int32_t, PutSessionKey, (int32_t, const std::vector &, int32_t&)); MOCK_METHOD(int32_t, PutLocalServiceInfo, (const DistributedDeviceProfile::LocalServiceInfo &)); MOCK_METHOD(int32_t, DeleteLocalServiceInfo, (const std::string &, int32_t)); MOCK_METHOD(int32_t, UpdateLocalServiceInfo, (const DistributedDeviceProfile::LocalServiceInfo &)); @@ -102,6 +114,16 @@ public: (const std::string &, (const std::vector &), (const std::vector &))); MOCK_METHOD((std::map), GetDeviceIdAndBindLevel, ((std::vector), const std::string &)); + MOCK_METHOD(void, DeleteAccessControlById, (int64_t& accessControlId)); + MOCK_METHOD(std::vector, GetProcessInfoFromAclByUserId, + (const std::string &localDeviceId, const std::string &targetDeviceId, int32_t userId)); + MOCK_METHOD(std::vector, GetAccessControlProfile, ()); + MOCK_METHOD(std::vector, GetAllAclIncludeLnnAcl, ()); + MOCK_METHOD(std::vector, GetDeviceIdAndUdidListByTokenId, (const std::vector &userIds, + const std::string &localUdid, int32_t tokenId)); + MOCK_METHOD(void, CacheAcerAclId, (const DistributedDeviceProfile::AccessControlProfile &profile, + std::vector &aclInfos)); + MOCK_METHOD(bool, IsLnnAcl, (const DistributedDeviceProfile::AccessControlProfile &profile)); }; } } diff --git a/test/unittest/mock/distributed_device_profile_client_mock.cpp b/test/unittest/mock/distributed_device_profile_client_mock.cpp index 89f1b92cd153b7d65a84469f9c6a746be5b797a3..c67eda3c159a8906bc57c38b9b470f03dd95b371 100644 --- a/test/unittest/mock/distributed_device_profile_client_mock.cpp +++ b/test/unittest/mock/distributed_device_profile_client_mock.cpp @@ -86,5 +86,15 @@ int32_t DistributedDeviceProfileClient::GetLocalServiceInfoByBundleAndPinType(co return DpDistributedDeviceProfileClient::dpDistributedDeviceProfileClient->GetLocalServiceInfoByBundleAndPinType( bundleName, pinExchangeType, localServiceInfo); } + +int32_t DistributedDeviceProfileClient::GetBusinessEvent(BusinessEvent &event) +{ + return DpDistributedDeviceProfileClient::dpDistributedDeviceProfileClient->GetBusinessEvent(event); +} + +int32_t DistributedDeviceProfileClient::PutBusinessEvent(const DistributedDeviceProfile::BusinessEvent &event) +{ + return DpDistributedDeviceProfileClient::dpDistributedDeviceProfileClient->PutBusinessEvent(event); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/distributed_device_profile_client_mock.h b/test/unittest/mock/distributed_device_profile_client_mock.h index 2109ca5dbe00bde14636684248ecc918fefa6f59..13495ff3a1f5c7269886694730a0fbab0e025920 100644 --- a/test/unittest/mock/distributed_device_profile_client_mock.h +++ b/test/unittest/mock/distributed_device_profile_client_mock.h @@ -40,6 +40,8 @@ public: virtual int32_t UpdateLocalServiceInfo(const LocalServiceInfo& localServiceInfo) = 0; virtual int32_t GetLocalServiceInfoByBundleAndPinType(const std::string& bundleName, int32_t pinExchangeType, LocalServiceInfo& localServiceInfo) = 0; + virtual int32_t GetBusinessEvent(BusinessEvent &event) = 0; + virtual int32_t PutBusinessEvent(const DistributedDeviceProfile::BusinessEvent &event) = 0; public: static inline std::shared_ptr dpDistributedDeviceProfileClient = nullptr; }; @@ -58,6 +60,8 @@ public: MOCK_METHOD(int32_t, DeleteLocalServiceInfo, (const std::string&, int32_t)); MOCK_METHOD(int32_t, UpdateLocalServiceInfo, (const LocalServiceInfo&)); MOCK_METHOD(int32_t, GetLocalServiceInfoByBundleAndPinType, (const std::string&, int32_t, LocalServiceInfo&)); + MOCK_METHOD(int32_t, GetBusinessEvent, (BusinessEvent &event)); + MOCK_METHOD(int32_t, PutBusinessEvent, (const DistributedDeviceProfile::BusinessEvent &event)); }; } } diff --git a/test/unittest/mock/dm_auth_message_processor_mock.cpp b/test/unittest/mock/dm_auth_message_processor_mock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8d5ce21ed764b3e69a604df8c3c86b7463913d78 --- /dev/null +++ b/test/unittest/mock/dm_auth_message_processor_mock.cpp @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License") = 0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_auth_message_processor_mock.h" + +namespace OHOS { +namespace DistributedHardware { + +int32_t DmAuthMessageProcessor::SaveSessionKeyToDP(int32_t userId, int32_t &skId) +{ + return DmAuthMessageProcessorMock::dmAuthMessageProcessorMock->SaveSessionKeyToDP(userId, skId); +} + +std::string DmAuthMessageProcessor::CreateMessage(DmMessageType msgType, std::shared_ptr context) +{ + return DmAuthMessageProcessorMock::dmAuthMessageProcessorMock->CreateMessage(msgType, context); +} + +} +} \ No newline at end of file diff --git a/test/unittest/mock/dm_auth_message_processor_mock.h b/test/unittest/mock/dm_auth_message_processor_mock.h new file mode 100644 index 0000000000000000000000000000000000000000..89a79689e7313da4c8e463c64f1a05d646d897ed --- /dev/null +++ b/test/unittest/mock/dm_auth_message_processor_mock.h @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License") = 0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DM_AUTH_MESSAGE_PROCESSOR_MOCK_H +#define DM_AUTH_MESSAGE_PROCESSOR_MOCK_H + +#include +#include "dm_auth_message_processor.h" + +namespace OHOS { +namespace DistributedHardware { + +class DmAuthMessageProcessorMock { +public: + MOCK_METHOD(int32_t, SaveSessionKeyToDP, (int32_t, int32_t &)); + MOCK_METHOD(std::string, CreateMessage, (DmMessageType, std::shared_ptr)); + static inline std::shared_ptr dmAuthMessageProcessorMock = nullptr; +}; + +} +} +#endif \ No newline at end of file diff --git a/test/unittest/mock/dm_auth_state_machine_mock.cpp b/test/unittest/mock/dm_auth_state_machine_mock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..49da4bfb235e6a0dba79b6cc6ec11b45434061ba --- /dev/null +++ b/test/unittest/mock/dm_auth_state_machine_mock.cpp @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_auth_state_machine_mock.h" + +namespace OHOS { +namespace DistributedHardware { + +DmEventType DmAuthStateMachine::WaitExpectEvent(DmEventType eventType) +{ + return DmAuthStateMachineMock::dmAuthStateMachineMock->WaitExpectEvent(eventType); +} + +} +} \ No newline at end of file diff --git a/test/unittest/mock/dm_auth_state_machine_mock.h b/test/unittest/mock/dm_auth_state_machine_mock.h new file mode 100644 index 0000000000000000000000000000000000000000..9489d08fdd24af99cdc60d9c3991b1441d3c0392 --- /dev/null +++ b/test/unittest/mock/dm_auth_state_machine_mock.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License") = 0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DM_AUTH_STATE_MACHINE_MOCK_H +#define DM_AUTH_STATE_MACHINE_MOCK_H + +#include +#include "dm_auth_state_machine.h" + +namespace OHOS { +namespace DistributedHardware { + +class DmAuthStateMachineMock { +public: + MOCK_METHOD(DmEventType, WaitExpectEvent, (DmEventType)); + static inline std::shared_ptr dmAuthStateMachineMock = nullptr; +}; + +} +} +#endif \ No newline at end of file diff --git a/test/unittest/mock/dm_comm_tool_mock.cpp b/test/unittest/mock/dm_comm_tool_mock.cpp index 5c783d5613c3648ed96515dcb1f65acf1572aa05..adc96723072ed9651807d3471367deba6a254a62 100644 --- a/test/unittest/mock/dm_comm_tool_mock.cpp +++ b/test/unittest/mock/dm_comm_tool_mock.cpp @@ -25,5 +25,19 @@ int32_t DMCommTool::SendUserIds(const std::string rmtNetworkId, return DmDMCommTool::dmDMCommTool->SendUserIds(rmtNetworkId, foregroundUserIds, backgroundUserIds); } +int32_t DMCommTool::SendUserStop(const std::string rmtNetworkId, int32_t stopUserId) +{ + return DmDMCommTool::dmDMCommTool->SendUserStop(rmtNetworkId, stopUserId); +} + +int32_t DMCommTool::CreateUserStopMessage(int32_t stopUserId, std::string &msgStr) +{ + return DmDMCommTool::dmDMCommTool->CreateUserStopMessage(stopUserId, msgStr); +} + +int32_t DMCommTool::SendUninstAppObj(int32_t userId, int32_t tokenId, const std::string &networkId) +{ + return DmDMCommTool::dmDMCommTool->SendUninstAppObj(userId, tokenId, networkId); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/dm_comm_tool_mock.h b/test/unittest/mock/dm_comm_tool_mock.h index 92f7504d187dec8ab36e511597f15a9f3c94e418..b423a48968192fef7dd82751d62a2c195636088c 100644 --- a/test/unittest/mock/dm_comm_tool_mock.h +++ b/test/unittest/mock/dm_comm_tool_mock.h @@ -28,6 +28,9 @@ public: public: virtual int32_t SendUserIds(const std::string rmtNetworkId, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) = 0; + virtual int32_t SendUserStop(const std::string rmtNetworkId, int32_t stopUserId) = 0; + virtual int32_t CreateUserStopMessage(int32_t stopUserId, std::string &msgStr) = 0; + virtual int32_t SendUninstAppObj(int32_t userId, int32_t tokenId, const std::string &networkId) = 0; public: static inline std::shared_ptr dmDMCommTool = nullptr; }; @@ -36,6 +39,9 @@ class DMCommToolMock : public DmDMCommTool { public: MOCK_METHOD(int32_t, SendUserIds, (const std::string, const std::vector &, const std::vector &)); + MOCK_METHOD(int32_t, SendUserStop, (const std::string, int32_t)); + MOCK_METHOD(int32_t, CreateUserStopMessage, (int32_t stopUserId, std::string &msgStr)); + MOCK_METHOD(int32_t, SendUninstAppObj, (int32_t userId, int32_t tokenId, const std::string &networkId)); }; } } diff --git a/test/unittest/mock/dm_device_state_manager_mock.cpp b/test/unittest/mock/dm_device_state_manager_mock.cpp index d1625eea98a593a59b55dbeff59de7300c72a411..0f8fa194de95f781653d4609ab4f70a5b9b5314c 100644 --- a/test/unittest/mock/dm_device_state_manager_mock.cpp +++ b/test/unittest/mock/dm_device_state_manager_mock.cpp @@ -29,5 +29,9 @@ int32_t DmDeviceStateManager::ProcNotifyEvent(const int32_t eventId, const std:: { return DmDmDeviceStateManager::dmDeviceStateManager->ProcNotifyEvent(eventId, deviceId); } +void DmDeviceStateManager::HandleDeviceStatusChange(DmDeviceState devState, DmDeviceInfo &devInfo) +{ + DmDmDeviceStateManager::dmDeviceStateManager->HandleDeviceStatusChange(devState, devInfo); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/dm_device_state_manager_mock.h b/test/unittest/mock/dm_device_state_manager_mock.h index cc90c2647553434490f0ea70062ac2067ce09eff..98c5ab20758d8c5637618a618801c3314d94c5b6 100644 --- a/test/unittest/mock/dm_device_state_manager_mock.h +++ b/test/unittest/mock/dm_device_state_manager_mock.h @@ -28,6 +28,7 @@ public: public: virtual std::string GetUdidByNetWorkId(std::string networkId) = 0; virtual int32_t ProcNotifyEvent(const int32_t eventId, const std::string &deviceId) = 0; + virtual void HandleDeviceStatusChange(DmDeviceState devState, DmDeviceInfo &devInfo) = 0; public: static inline std::shared_ptr dmDeviceStateManager = nullptr; }; @@ -36,6 +37,7 @@ class DmDeviceStateManagerMock : public DmDmDeviceStateManager { public: MOCK_METHOD(std::string, GetUdidByNetWorkId, (std::string)); MOCK_METHOD(int32_t, ProcNotifyEvent, (const int32_t, const std::string &)); + MOCK_METHOD(void, HandleDeviceStatusChange, (DmDeviceState devState, DmDeviceInfo &devInfo)); }; } } diff --git a/test/unittest/mock/dm_dialog_manager_mock.cpp b/test/unittest/mock/dm_dialog_manager_mock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..840cd4672aeddcc60ffab9a03664a50b8fa3b20b --- /dev/null +++ b/test/unittest/mock/dm_dialog_manager_mock.cpp @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dm_dialog_manager_mock.h" + +namespace OHOS { +namespace DistributedHardware { + +void DmDialogManager::ShowConfirmDialog(const std::string param) +{ + DmDialogManagerMock::dmDialogManagerMock->ShowConfirmDialog(param); +} +} +} \ No newline at end of file diff --git a/test/unittest/mock/dm_dialog_manager_mock.h b/test/unittest/mock/dm_dialog_manager_mock.h new file mode 100644 index 0000000000000000000000000000000000000000..8b039c4db32d3e1f8631df000d394f07f7c48dd1 --- /dev/null +++ b/test/unittest/mock/dm_dialog_manager_mock.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef DM_DIALOG_MANAGER_MOCK_H +#define DM_DIALOG_MANAGER_MOCK_H + +#include "dm_dialog_manager.h" + +namespace OHOS { +namespace DistributedHardware { +class DmDialogManagerMock { +public: + MOCK_METHOD(void, ShowConfirmDialog, (const std::string)); + static inline std::shared_ptr dmDialogManagerMock = nullptr; +}; +} +} +#endif \ No newline at end of file diff --git a/test/unittest/mock/dm_transport_mock.cpp b/test/unittest/mock/dm_transport_mock.cpp index b54e806685cfbe5d33eebd0627539392411c185c..e9ce75fcc3628d53ee60eaf96ab4141f8dc7cfef 100644 --- a/test/unittest/mock/dm_transport_mock.cpp +++ b/test/unittest/mock/dm_transport_mock.cpp @@ -28,5 +28,9 @@ int32_t DMTransport::Send(const std::string &rmtNetworkId, const std::string &pa { return DmDMTransport::dMTransport_->Send(rmtNetworkId, payload, socketId); } +int32_t DMTransport::UnInit() +{ + return DmDMTransport::dMTransport_->UnInit(); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/dm_transport_mock.h b/test/unittest/mock/dm_transport_mock.h index 360c37c6c1cdef3333190404e393d19f1e75cc88..b65e4d045ffa2bc84226b78dc3300e1f564227c9 100644 --- a/test/unittest/mock/dm_transport_mock.h +++ b/test/unittest/mock/dm_transport_mock.h @@ -28,6 +28,7 @@ public: public: virtual int32_t StartSocket(const std::string &rmtNetworkId, int32_t &socketId) = 0; virtual int32_t Send(const std::string &rmtNetworkId, const std::string &payload, int32_t socketId) = 0; + virtual int32_t UnInit() = 0; public: static inline std::shared_ptr dMTransport_ = nullptr; }; @@ -36,6 +37,7 @@ class DMTransportMock : public DmDMTransport { public: MOCK_METHOD(int32_t, StartSocket, (const std::string &, int32_t &)); MOCK_METHOD(int32_t, Send, (const std::string &, const std::string &, int32_t)); + MOCK_METHOD(int32_t, UnInit, ()); }; } } diff --git a/test/unittest/mock/hichain_auth_connector_mock.cpp b/test/unittest/mock/hichain_auth_connector_mock.cpp index e6c8451c821d2dfa79ce1b1212eb2d4b5c2b7740..71bbdf01afce69f991715d92f3e76f28a6d3e138 100644 --- a/test/unittest/mock/hichain_auth_connector_mock.cpp +++ b/test/unittest/mock/hichain_auth_connector_mock.cpp @@ -19,19 +19,64 @@ namespace OHOS { namespace DistributedHardware { -bool HiChainAuthConnector::QueryCredential(std::string &localUdid, int32_t osAccountId) +bool HiChainAuthConnector::QueryCredential(std::string &localUdid, int32_t osAccountId, int32_t peerOsAccountId) { - return DmHiChainAuthConnector::dmHiChainAuthConnector->QueryCredential(localUdid, osAccountId); + return DmHiChainAuthConnector::dmHiChainAuthConnector->QueryCredential(localUdid, osAccountId, peerOsAccountId); } -int32_t HiChainAuthConnector::AuthDevice(int32_t pinCode, int32_t osAccountId, std::string udid, int64_t requestId) +int32_t HiChainAuthConnector::AuthDevice(const std::string &pinCode, int32_t osAccountId, std::string udid, + int64_t requestId) { return DmHiChainAuthConnector::dmHiChainAuthConnector->AuthDevice(pinCode, osAccountId, udid, requestId); } -int32_t HiChainAuthConnector::ImportCredential(int32_t osAccountId, std::string deviceId, std::string publicKey) +int32_t HiChainAuthConnector::ImportCredential(int32_t osAccountId, int32_t peerOsAccountId, std::string deviceId, + std::string publicKey) { - return DmHiChainAuthConnector::dmHiChainAuthConnector->ImportCredential(osAccountId, deviceId, publicKey); + return DmHiChainAuthConnector::dmHiChainAuthConnector->ImportCredential(osAccountId, peerOsAccountId, deviceId, + publicKey); +} + +int32_t HiChainAuthConnector::ProcessCredData(int64_t authReqId, const std::string &data) +{ + return DmHiChainAuthConnector::dmHiChainAuthConnector->ProcessCredData(authReqId, data); +} + +int32_t HiChainAuthConnector::AddCredential(int32_t osAccountId, const std::string &authParams, std::string &creId) +{ + return DmHiChainAuthConnector::dmHiChainAuthConnector->AddCredential(osAccountId, authParams, creId); +} + +int32_t HiChainAuthConnector::ExportCredential(int32_t osAccountId, const std::string &credId, std::string &publicKey) +{ + return DmHiChainAuthConnector::dmHiChainAuthConnector->ExportCredential(osAccountId, credId, publicKey); +} + +int32_t HiChainAuthConnector::AgreeCredential(int32_t osAccountId, const std::string selfCredId, + const std::string &authParams, std::string &credId) +{ + return DmHiChainAuthConnector::dmHiChainAuthConnector->AgreeCredential(osAccountId, selfCredId, authParams, credId); +} + +int32_t HiChainAuthConnector::DeleteCredential(int32_t osAccountId, const std::string &creId) +{ + return DmHiChainAuthConnector::dmHiChainAuthConnector->DeleteCredential(osAccountId, creId); +} + +int32_t HiChainAuthConnector::AuthCredential(int32_t osAccountId, int64_t authReqId, const std::string &credId, + const std::string &pinCode) +{ + return DmHiChainAuthConnector::dmHiChainAuthConnector->AuthCredential(osAccountId, authReqId, credId, pinCode); +} + +int32_t HiChainAuthConnector::AuthCredentialPinCode(int32_t osAccountId, int64_t authReqId, const std::string &pinCode) +{ + return DmHiChainAuthConnector::dmHiChainAuthConnector->AuthCredentialPinCode(osAccountId, authReqId, pinCode); +} + +int32_t HiChainAuthConnector::QueryCredentialInfo(int32_t userId, const JsonObject &queryParams, JsonObject &resultJson) +{ + return DmHiChainAuthConnector::dmHiChainAuthConnector->QueryCredentialInfo(userId, queryParams, resultJson); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/hichain_auth_connector_mock.h b/test/unittest/mock/hichain_auth_connector_mock.h index 174867f64715fdb4b00c866237243b4026413797..d8f69f9e40afc21a211089a45b62af27359226eb 100644 --- a/test/unittest/mock/hichain_auth_connector_mock.h +++ b/test/unittest/mock/hichain_auth_connector_mock.h @@ -26,19 +26,40 @@ class DmHiChainAuthConnector { public: virtual ~DmHiChainAuthConnector() = default; public: - virtual bool QueryCredential(std::string &localUdid, int32_t osAccountId) = 0; - virtual int32_t AuthDevice(int32_t pinCode, int32_t osAccountId, + virtual bool QueryCredential(std::string &localUdid, int32_t osAccountId, int32_t peerOsAccountId) = 0; + virtual int32_t AuthDevice(const std::string &pinCode, int32_t osAccountId, std::string udid, int64_t requestId) = 0; - virtual int32_t ImportCredential(int32_t osAccountId, std::string deviceId, std::string publicKey) = 0; + virtual int32_t ImportCredential(int32_t osAccountId, int32_t peerOsAccountId, std::string deviceId, + std::string publicKey) = 0; + + virtual int32_t ProcessCredData(int64_t authReqId, const std::string &data) = 0; + virtual int32_t AddCredential(int32_t osAccountId, const std::string &authParams, std::string &creId) = 0; + virtual int32_t ExportCredential(int32_t osAccountId, const std::string &credId, std::string &publicKey) = 0; + virtual int32_t AgreeCredential(int32_t osAccountId, const std::string selfCredId, const std::string &authParams, + std::string &credId) = 0; + virtual int32_t DeleteCredential(int32_t osAccountId, const std::string &creId) = 0; + virtual int32_t AuthCredential(int32_t osAccountId, int64_t authReqId, const std::string &credId, + const std::string &pinCode) = 0; + virtual int32_t AuthCredentialPinCode(int32_t osAccountId, int64_t authReqId, const std::string &pinCode) = 0; + virtual int32_t QueryCredentialInfo(int32_t userId, const JsonObject &queryParams, JsonObject &resultJson) = 0; public: static inline std::shared_ptr dmHiChainAuthConnector = nullptr; }; class HiChainAuthConnectorMock : public DmHiChainAuthConnector { public: - MOCK_METHOD(bool, QueryCredential, (std::string &, int32_t)); - MOCK_METHOD(int32_t, AuthDevice, (int32_t, int32_t, std::string, int64_t)); - MOCK_METHOD(int32_t, ImportCredential, (int32_t, std::string, std::string)); + MOCK_METHOD(bool, QueryCredential, (std::string &, int32_t, int32_t)); + MOCK_METHOD(int32_t, AuthDevice, (const std::string &, int32_t, std::string, int64_t)); + MOCK_METHOD(int32_t, ImportCredential, (int32_t, int32_t, std::string, std::string)); + + MOCK_METHOD(int32_t, ProcessCredData, (int64_t, const std::string &)); + MOCK_METHOD(int32_t, AddCredential, (int32_t, const std::string &, std::string &)); + MOCK_METHOD(int32_t, ExportCredential, (int32_t, const std::string &, std::string &)); + MOCK_METHOD(int32_t, AgreeCredential, (int32_t, const std::string, const std::string &, std::string &)); + MOCK_METHOD(int32_t, DeleteCredential, (int32_t, const std::string &)); + MOCK_METHOD(int32_t, AuthCredential, (int32_t, int64_t, const std::string &, const std::string &)); + MOCK_METHOD(int32_t, AuthCredentialPinCode, (int32_t, int64_t, const std::string &)); + MOCK_METHOD(int32_t, QueryCredentialInfo, (int32_t, const JsonObject &, JsonObject &)); }; } } diff --git a/test/unittest/mock/hichain_connector_mock.cpp b/test/unittest/mock/hichain_connector_mock.cpp index c5642dec804e4b6028217acd084cf63539fcb183..2771745d7be4cb27e4d26c5469c1776eda3912b7 100644 --- a/test/unittest/mock/hichain_connector_mock.cpp +++ b/test/unittest/mock/hichain_connector_mock.cpp @@ -40,5 +40,11 @@ int32_t HiChainConnector::GetRelatedGroups(int32_t userId, const std::string &de { return DmHiChainConnector::dmHiChainConnector->GetRelatedGroups(userId, deviceId, groupList); } + +int32_t HiChainConnector::DeleteGroupByACL(std::vector> &delACLInfoVec, + std::vector &userIdVec) +{ + return DmHiChainConnector::dmHiChainConnector->DeleteGroupByACL(delACLInfoVec, userIdVec); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/hichain_connector_mock.h b/test/unittest/mock/hichain_connector_mock.h index 70f99a2a18f85d7a9ecdb64aff402125c2bed08a..a6b6028ea9b073c6590c365da8de363dd8f13a80 100644 --- a/test/unittest/mock/hichain_connector_mock.h +++ b/test/unittest/mock/hichain_connector_mock.h @@ -32,6 +32,8 @@ public: virtual int32_t GetRelatedGroups(const std::string &deviceId, std::vector &groupList) = 0; virtual int32_t GetRelatedGroups(int32_t userId, const std::string &deviceId, std::vector &groupList) = 0; + virtual int32_t DeleteGroupByACL(std::vector> &delACLInfoVec, + std::vector &userIdVec) = 0; public: static inline std::shared_ptr dmHiChainConnector = nullptr; }; @@ -42,6 +44,8 @@ public: MOCK_METHOD(bool, IsDevicesInP2PGroup, (const std::string &, const std::string &)); MOCK_METHOD(int32_t, GetRelatedGroups, (const std::string &, std::vector &)); MOCK_METHOD(int32_t, GetRelatedGroups, (int32_t, const std::string &, std::vector &)); + MOCK_METHOD(int32_t, DeleteGroupByACL, ((std::vector> &), + (std::vector &))); }; } } diff --git a/test/unittest/mock/os_account_manager_mock.cpp b/test/unittest/mock/os_account_manager_mock.cpp index 50f194432304fa33754b12a2771175cf8fe1dc64..7a237c25edb45ec2dbbba379095e91138e834047 100644 --- a/test/unittest/mock/os_account_manager_mock.cpp +++ b/test/unittest/mock/os_account_manager_mock.cpp @@ -41,5 +41,10 @@ ErrCode OsAccountManager::GetForegroundOsAccountLocalId(int32_t &localId) { return IOsAccountManager::GetOrCreateOsAccountManager()->GetForegroundOsAccountLocalId(localId); } + +ErrCode OsAccountManager::GetForegroundOsAccountLocalId(const uint64_t displayId, int32_t &localId) +{ + return IOsAccountManager::GetOrCreateOsAccountManager()->GetForegroundOsAccountLocalId(displayId, localId); +} } // namespace AccountSA } // namespace OHOS diff --git a/test/unittest/mock/os_account_manager_mock.h b/test/unittest/mock/os_account_manager_mock.h index bbaedbb8916c88da8bf36a75a955e3ae34c1505a..3575e978b3f91e10603ffb3791701606394435be 100644 --- a/test/unittest/mock/os_account_manager_mock.h +++ b/test/unittest/mock/os_account_manager_mock.h @@ -26,6 +26,7 @@ public: virtual ~IOsAccountManager() = default; virtual ErrCode GetForegroundOsAccountLocalId(int32_t &localId) = 0; + virtual ErrCode GetForegroundOsAccountLocalId(const uint64_t displayId, int32_t &localId) = 0; static std::shared_ptr GetOrCreateOsAccountManager(); static void ReleaseAccountManager(); private: @@ -35,6 +36,7 @@ private: class OsAccountManagerMock : public IOsAccountManager { public: MOCK_METHOD(ErrCode, GetForegroundOsAccountLocalId, (int32_t &)); + MOCK_METHOD(ErrCode, GetForegroundOsAccountLocalId, (const uint64_t, int32_t &)); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/mock/permission_manager_mock.cpp b/test/unittest/mock/permission_manager_mock.cpp index dd7231967af28f0b1c9c852b7b94efb633144103..74a7f0d77f207ae76a75532ed902356e27d4c96a 100644 --- a/test/unittest/mock/permission_manager_mock.cpp +++ b/test/unittest/mock/permission_manager_mock.cpp @@ -44,5 +44,20 @@ bool PermissionManager::CheckProcessNameValidOnGetDeviceInfo(const std::string & { return DmPermissionManager::dmPermissionManager->CheckProcessNameValidOnGetDeviceInfo(processName); } + +bool PermissionManager::CheckProcessNameValidModifyLocalDeviceName(const std::string &processName) +{ + return DmPermissionManager::dmPermissionManager->CheckProcessNameValidModifyLocalDeviceName(processName); +} + +bool PermissionManager::CheckProcessNameValidModifyRemoteDeviceName(const std::string &processName) +{ + return DmPermissionManager::dmPermissionManager->CheckProcessNameValidModifyRemoteDeviceName(processName); +} + +bool PermissionManager::CheckProcessNameValidPutDeviceProfileInfoList(const std::string &processName) +{ + return DmPermissionManager::dmPermissionManager->CheckProcessNameValidPutDeviceProfileInfoList(processName); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/permission_manager_mock.h b/test/unittest/mock/permission_manager_mock.h index 552276c14ebc6c3d67bb5c40bba7cf72f008ec5d..ef8f53df878e193847db412447acfa7082f9a8cb 100644 --- a/test/unittest/mock/permission_manager_mock.h +++ b/test/unittest/mock/permission_manager_mock.h @@ -31,6 +31,9 @@ public: virtual int32_t GetCallerProcessName(std::string &processName) = 0; virtual bool CheckProcessNameValidOnSetDnPolicy(const std::string &processName) = 0; virtual bool CheckProcessNameValidOnGetDeviceInfo(const std::string &processName) = 0; + virtual bool CheckProcessNameValidModifyLocalDeviceName(const std::string &processName) = 0; + virtual bool CheckProcessNameValidModifyRemoteDeviceName(const std::string &processName) = 0; + virtual bool CheckProcessNameValidPutDeviceProfileInfoList(const std::string &processName) = 0; public: static inline std::shared_ptr dmPermissionManager = nullptr; }; @@ -42,6 +45,9 @@ public: MOCK_METHOD(int32_t, GetCallerProcessName, (std::string &)); MOCK_METHOD(bool, CheckProcessNameValidOnSetDnPolicy, (const std::string &)); MOCK_METHOD(bool, CheckProcessNameValidOnGetDeviceInfo, (const std::string &)); + MOCK_METHOD(bool, CheckProcessNameValidModifyLocalDeviceName, (const std::string &)); + MOCK_METHOD(bool, CheckProcessNameValidModifyRemoteDeviceName, (const std::string &)); + MOCK_METHOD(bool, CheckProcessNameValidPutDeviceProfileInfoList, (const std::string &)); }; } } diff --git a/test/unittest/mock/softbus_connector_mock.cpp b/test/unittest/mock/softbus_connector_mock.cpp index 171311d9e12928d00987ab556840780d6f347a16..d49c8c253cca5c3fd2e4fd1dad7a6cb08dee23bc 100644 --- a/test/unittest/mock/softbus_connector_mock.cpp +++ b/test/unittest/mock/softbus_connector_mock.cpp @@ -39,5 +39,25 @@ DmDeviceInfo SoftbusConnector::GetDeviceInfoByDeviceId(const std::string &device { return DmSoftbusConnector::dmSoftbusConnector->GetDeviceInfoByDeviceId(deviceId); } +void SoftbusConnector::SetProcessInfo(ProcessInfo processInfo) +{ + DmSoftbusConnector::dmSoftbusConnector->SetProcessInfo(processInfo); +} +void SoftbusConnector::SetProcessInfoVec(std::vector processInfoVec) +{ + DmSoftbusConnector::dmSoftbusConnector->SetProcessInfoVec(processInfoVec); +} + +std::shared_ptr SoftbusConnector::GetSoftbusSession() +{ + return DmSoftbusConnector::dmSoftbusConnector->GetSoftbusSession(); +} + +int32_t SoftbusConnector::SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, + const DevUserInfo &remoteDevUserInfo, std::string remoteAclList) +{ + return DmSoftbusConnector::dmSoftbusConnector->SyncLocalAclListProcess(localDevUserInfo, remoteDevUserInfo, + remoteAclList); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/softbus_connector_mock.h b/test/unittest/mock/softbus_connector_mock.h index fa25cade0a505546bbd06a048f06b0a5412e04d6..e71d229f659cdbd9e6264fc0ec65ddbd797c72c8 100644 --- a/test/unittest/mock/softbus_connector_mock.h +++ b/test/unittest/mock/softbus_connector_mock.h @@ -30,6 +30,12 @@ public: virtual bool CheckIsOnline(const std::string &targetDeviceId) = 0; virtual std::vector GetProcessInfo() = 0; virtual DmDeviceInfo GetDeviceInfoByDeviceId(const std::string &deviceId) = 0; + virtual std::shared_ptr GetSoftbusSession(); + virtual void SetProcessInfo(ProcessInfo processInfo) = 0; + virtual void SetProcessInfoVec(std::vector processInfoVec) = 0; + virtual int32_t SyncLocalAclListProcess(const DevUserInfo &localDevUserInfo, const DevUserInfo &remoteDevUserInfo, + std::string remoteAclList) = 0; + public: static inline std::shared_ptr dmSoftbusConnector = nullptr; }; @@ -40,6 +46,10 @@ public: MOCK_METHOD(bool, CheckIsOnline, (const std::string &)); MOCK_METHOD(std::vector, GetProcessInfo, ()); MOCK_METHOD(DmDeviceInfo, GetDeviceInfoByDeviceId, (const std::string &deviceId)); + MOCK_METHOD(std::shared_ptr, GetSoftbusSession, ()); + MOCK_METHOD(void, SetProcessInfo, (ProcessInfo processInfo)); + MOCK_METHOD(void, SetProcessInfoVec, (std::vector processInfoVec)); + MOCK_METHOD(int32_t, SyncLocalAclListProcess, (const DevUserInfo &, const DevUserInfo &, std::string)); }; } } diff --git a/test/unittest/mock/softbus_listener_mock.cpp b/test/unittest/mock/softbus_listener_mock.cpp index 3049008b36aaaadb66d2f803c216634cc6064a82..eb67a660ce6e7d3d020a547455166e94ee846813 100644 --- a/test/unittest/mock/softbus_listener_mock.cpp +++ b/test/unittest/mock/softbus_listener_mock.cpp @@ -96,5 +96,9 @@ int32_t SoftbusListener::StopRefreshSoftbusLNN(uint16_t subscribeId) { return DmSoftbusListener::dmSoftbusListener->StopRefreshSoftbusLNN(subscribeId); } +void SoftbusListener::SendAclChangedBroadcast(const std::string &msg) +{ + DmSoftbusListener::dmSoftbusListener->SendAclChangedBroadcast(msg); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/softbus_listener_mock.h b/test/unittest/mock/softbus_listener_mock.h index 808d34b6fbbee7b00a52e44fed11eb1a15245d24..5a3f1aab74569724d3ce6f5cf8d9cd8d3faf91c5 100644 --- a/test/unittest/mock/softbus_listener_mock.h +++ b/test/unittest/mock/softbus_listener_mock.h @@ -44,6 +44,7 @@ public: virtual int32_t GetAllTrustedDeviceList(const std::string &pkgName, const std::string &extra, std::vector &deviceList) = 0; virtual int32_t StopRefreshSoftbusLNN(uint16_t subscribeId) = 0; + virtual void SendAclChangedBroadcast(const std::string &msg) = 0; public: static inline std::shared_ptr dmSoftbusListener = nullptr; }; @@ -66,6 +67,7 @@ public: MOCK_METHOD(int32_t, GetAllTrustedDeviceList, (const std::string &, const std::string &, std::vector &)); MOCK_METHOD(int32_t, StopRefreshSoftbusLNN, (uint16_t)); + MOCK_METHOD(void, SendAclChangedBroadcast, (const std::string &msg)); }; } } diff --git a/test/unittest/mock/softbus_session_mock.cpp b/test/unittest/mock/softbus_session_mock.cpp index 1c657174e59e2ded6d5ea21c61fae41db0927732..331e0e2cbf58b2a546b64340caadf437006e2967 100644 --- a/test/unittest/mock/softbus_session_mock.cpp +++ b/test/unittest/mock/softbus_session_mock.cpp @@ -25,5 +25,15 @@ int32_t SoftbusSession::GetPeerDeviceId(int32_t sessionId, std::string &peerDevI return DmSoftbusSession::dmSoftbusSession->GetPeerDeviceId(sessionId, peerDevId); } +int32_t SoftbusSession::SendData(int32_t sessionId, std::string &message) +{ + return DmSoftbusSession::dmSoftbusSession->SendData(sessionId, message); +} + +int32_t SoftbusSession::OpenAuthSession(const std::string &deviceId) +{ + return DmSoftbusSession::dmSoftbusSession->OpenAuthSession(deviceId); +} + } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/softbus_session_mock.h b/test/unittest/mock/softbus_session_mock.h index 732174ef40b77da80c5bd2633e77ab078772c198..bdb1ad0f52d1db87ee431265bebe491599a1e0f6 100644 --- a/test/unittest/mock/softbus_session_mock.h +++ b/test/unittest/mock/softbus_session_mock.h @@ -27,6 +27,9 @@ public: virtual ~DmSoftbusSession() = default; public: virtual int32_t GetPeerDeviceId(int32_t sessionId, std::string &peerDevId) = 0; + virtual int32_t SendData(int32_t sessionId, std::string &message) = 0; + virtual int32_t OpenAuthSession(const std::string &deviceId) = 0; + public: static inline std::shared_ptr dmSoftbusSession = nullptr; }; @@ -34,6 +37,8 @@ public: class SoftbusSessionMock : public DmSoftbusSession { public: MOCK_METHOD(int32_t, GetPeerDeviceId, (int32_t, std::string &)); + MOCK_METHOD(int32_t, SendData, (int32_t, std::string &)); + MOCK_METHOD(int32_t, OpenAuthSession, (const std::string &)); }; } } diff --git a/utils/BUILD.gn b/utils/BUILD.gn index ebb78bc0d3066aa16c4e3e8d7661a7942cc9745b..7f4e0fe83efd156c1d13e2cca2b4c7fa15c707b5 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -36,7 +36,7 @@ if (defined(ohos_lite)) { "${common_path}/include/ipc/model", "${innerkits_path}/native_cpp/include", "${interfaces_path}/c/ipc/include", - "//third_party/cJSON", + "${json_path}/include", "//third_party/bounds_checking_function/include", ] @@ -47,7 +47,6 @@ if (defined(ohos_lite)) { "${common_path}/src/dm_anonymous.cpp", "${common_path}/src/dm_error_message.cpp", "${common_path}/src/ipc/lite/ipc_cmd_register.cpp", - "${common_path}/src/json_object.cpp", "src/appInfo/lite/app_manager.cpp", "src/crypto/dm_crypto.cpp", "src/dm_random.cpp", @@ -62,7 +61,10 @@ if (defined(ohos_lite)) { "lOG_DOMAIN=0xD004110", ] - deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared" ] + deps = [ + "${json_path}:devicemanagerjson", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + ] external_deps = [ "bounds_checking_function:libsec_shared", "openssl:libcrypto_shared", @@ -80,9 +82,22 @@ if (defined(ohos_lite)) { "include/timer", "${innerkits_path}/native_cpp/include", "${common_path}/include", + "${json_path}/include", ] } - + config("cflags_config") { + cflags = [ + "-Werror", + "-fPIC", + "-fstack-protector-strong", + "-ffunction-sections", + "-fdata-sections", + "-fvisibility=hidden", + "-Oz", + "-flto", + ] + ldflags = [ "-flto" ] + } ohos_shared_library("devicemanagerutils") { branch_protector_ret = "pac_ret" @@ -106,9 +121,10 @@ if (defined(ohos_lite)) { "-Wl,-z,now", ] + configs = [ ":cflags_config" ] + sources = [ "${common_path}/src/dm_anonymous.cpp", - "${common_path}/src/json_object.cpp", "src/appInfo/standard/app_manager.cpp", "src/crypto/dm_crypto.cpp", "src/dm_random.cpp", @@ -130,6 +146,8 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004110", ] + deps = [ "${json_path}:devicemanagerjson" ] + external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", @@ -148,8 +166,86 @@ if (defined(ohos_lite)) { ] public_external_deps = [ + "bundle_framework:appexecfwk_core", + "kv_store:distributeddata_inner", + ] + + if (support_jsapi) { + external_deps += [ "bundle_framework:appexecfwk_core" ] + } + + subsystem_name = "distributedhardware" + + part_name = "device_manager" + } + + ohos_shared_library("devicemanagerutilstest") { + branch_protector_ret = "pac_ret" + + sanitize = { + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + integer_overflow = true + ubsan = true + } + + cflags = [ + "-fPIC", + "-fstack-protector-strong", + "-Werror", + ] + + ldflags = [ + "-Wl,-z,relro", + "-Wl,-z,now", + ] + + sources = [ + "${common_path}/src/dm_anonymous.cpp", + "src/appInfo/standard/app_manager.cpp", + "src/crypto/dm_crypto.cpp", + "src/dm_random.cpp", + "src/kvadapter/dm_kv_info.cpp", + "src/kvadapter/kv_adapter.cpp", + "src/kvadapter/kv_adapter_manager.cpp", + "src/timer/dm_timer.cpp", + ] + + if (support_jsapi) { + sources += [ "src/fwkload/standard/dm_distributed_hardware_load.cpp" ] + } + + public_configs = [ ":devicemanagerutils_config" ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerutils\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [ "${json_path}:devicemanagerjson" ] + + external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libtokenid_sdk", + "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "cJSON:cjson", + "c_utils:utils", + "eventhandler:libeventhandler", + "ffrt:libffrt", + "hilog:libhilog", + "ipc:ipc_core", + "ipc:ipc_single", + "openssl:libcrypto_shared", + "os_account:os_account_innerkits", + "samgr:samgr_proxy", + ] + + public_external_deps = [ + "bundle_framework:appexecfwk_core", "kv_store:distributeddata_inner", ] diff --git a/utils/include/appInfo/lite/app_manager.h b/utils/include/appInfo/lite/app_manager.h index 224ddcebdd01c6c013e22d3d8455851a4db8a95f..ffc506b0a4332055ba6bcb94f31376d2dd12e6db 100644 --- a/utils/include/appInfo/lite/app_manager.h +++ b/utils/include/appInfo/lite/app_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -34,6 +34,7 @@ public: int32_t GetCallerName(bool isSystemSA, std::string &callerName); int32_t GetNativeTokenIdByName(std::string &processName, int64_t &tokenId); int32_t GetHapTokenIdByName(int32_t userId, std::string &bundleName, int32_t instIndex, int64_t &tokenId); + int32_t GetBundleNameForSelf(std::string &bundleName); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/utils/include/appInfo/standard/app_manager.h b/utils/include/appInfo/standard/app_manager.h index 7ff873965de99970dffc85b2e4c27cb49138127e..117fef077c0f44fcfd935151c114af5792e929eb 100644 --- a/utils/include/appInfo/standard/app_manager.h +++ b/utils/include/appInfo/standard/app_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -32,16 +32,18 @@ class AppManager { DM_DECLARE_SINGLE_INSTANCE(AppManager); public: - const std::string GetAppId(); - void RegisterCallerAppId(const std::string &pkgName); - void UnRegisterCallerAppId(const std::string &pkgName); - int32_t GetAppIdByPkgName(const std::string &pkgName, std::string &appId); - bool IsSystemSA(); - bool IsSystemApp(); - int32_t GetCallerName(bool isSystemSA, std::string &callerName); - int32_t GetNativeTokenIdByName(std::string &processName, int64_t &tokenId); - int32_t GetHapTokenIdByName(int32_t userId, std::string &bundleName, int32_t instIndex, int64_t &tokenId); - int32_t GetCallerProcessName(std::string &processName); + DM_EXPORT const std::string GetAppId(); + DM_EXPORT void RegisterCallerAppId(const std::string &pkgName); + DM_EXPORT void UnRegisterCallerAppId(const std::string &pkgName); + DM_EXPORT int32_t GetAppIdByPkgName(const std::string &pkgName, std::string &appId); + DM_EXPORT bool IsSystemSA(); + DM_EXPORT bool IsSystemApp(); + DM_EXPORT int32_t GetCallerName(bool isSystemSA, std::string &callerName); + DM_EXPORT int32_t GetNativeTokenIdByName(std::string &processName, int64_t &tokenId); + DM_EXPORT int32_t GetHapTokenIdByName(int32_t userId, std::string &bundleName, + int32_t instIndex, int64_t &tokenId); + DM_EXPORT int32_t GetCallerProcessName(std::string &processName); + DM_EXPORT int32_t GetBundleNameForSelf(std::string &bundleName); private: bool GetBundleManagerProxy(sptr &bundleManager); std::mutex appIdMapLock_; diff --git a/utils/include/crypto/dm_crypto.h b/utils/include/crypto/dm_crypto.h index 6f766087ac51bed25d674a4aaaabe86b36370bcf..bfe22129b2e883a1a3ac2eaaa210610f30aa8b20 100644 --- a/utils/include/crypto/dm_crypto.h +++ b/utils/include/crypto/dm_crypto.h @@ -20,29 +20,48 @@ #include "dm_kv_info.h" #endif +#ifndef DM_EXPORT +#define DM_EXPORT __attribute__ ((visibility ("default"))) +#endif // DM_EXPORT + + namespace OHOS { namespace DistributedHardware { class Crypto { public: - static void DmGenerateStrHash(const void *data, size_t dataSize, unsigned char *outBuf, uint32_t outBufLen, - uint32_t startIndex); - static std::string Sha256(const std::string &text, bool isUpper = false); - static std::string Sha256(const void *data, size_t size, bool isUpper = false); - static int32_t ConvertHexStringToBytes(unsigned char *outBuf, uint32_t outBufLen, - const char *inBuf, uint32_t inLen); - static int32_t GetUdidHash(const std::string &udid, unsigned char *udidHash); - static std::string GetGroupIdHash(const std::string &groupId); + DM_EXPORT static void DmGenerateStrHash(const void *data, size_t dataSize, + unsigned char *outBuf, uint32_t outBufLen, uint32_t startIndex); + DM_EXPORT static std::string Sha256(const std::string &text, bool isUpper = false); + DM_EXPORT static std::string Sha256(const void *data, size_t size, + bool isUpper = false); + DM_EXPORT static int32_t ConvertHexStringToBytes(unsigned char *outBuf, + uint32_t outBufLen, const char *inBuf, uint32_t inLen); + // follow the dsoftbus udid hash policy, use the first 8 bytes of full udid hash, + // after convert to string, it it 16 bytes. + DM_EXPORT static int32_t GetUdidHash(const std::string &udid, + unsigned char *udidHash); + DM_EXPORT static std::string GetUdidHash(const std::string &udid); + // use the first 16 bytes of full tokenId hash + // after convert to string, it it 32 bytes. + DM_EXPORT static std::string GetTokenIdHash(const std::string &tokenId); + DM_EXPORT static std::string GetGroupIdHash(const std::string &groupId); static int32_t GetSecRandom(uint8_t *out, size_t outLen); static std::string GetSecSalt(); static std::string GetHashWithSalt(const std::string &text, const std::string &salt); - static int32_t GetAccountIdHash(const std::string &accountId, unsigned char *accountIdHash); - static int32_t ConvertBytesToHexString(char *outBuf, uint32_t outBufLen, + // follow the dsoftbus accountid hash policy, use the first 3 bytes of full accountid hash, + // after convert to string, it it 6 bytes. + DM_EXPORT static int32_t GetAccountIdHash(const std::string &accountId, + unsigned char *accountIdHash); + // use the first 16 bytes of full accountId hash + // after convert to string, it it 32 bytes. + DM_EXPORT static std::string GetAccountIdHash16(const std::string &accountId); + DM_EXPORT static int32_t ConvertBytesToHexString(char *outBuf, uint32_t outBufLen, const unsigned char *inBuf, uint32_t inLen); #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) - static int32_t ConvertUdidHashToAnoyAndSave(const std::string &appId, const std::string &udidHash, - DmKVValue &kvValue); - static int32_t ConvertUdidHashToAnoyDeviceId(const std::string &appId, const std::string &udidHash, - DmKVValue &kvValue); + DM_EXPORT static int32_t ConvertUdidHashToAnoyAndSave(const std::string &appId, + const std::string &udidHash, DmKVValue &kvValue); + DM_EXPORT static int32_t ConvertUdidHashToAnoyDeviceId(const std::string &appId, + const std::string &udidHash, DmKVValue &kvValue); static int32_t GetAnoyDeviceInfo(const std::string &appId, const std::string &udidHash, DmKVValue &kvValue); static int32_t ConvertUdidHashToAnoyGenerate(const std::string &appId, const std::string &udidHash, DmKVValue &kvValue); diff --git a/utils/include/dm_random.h b/utils/include/dm_random.h index 901cfab0b885c104b7c6f0bedf2e51cb33108e6c..d22d4a002971befb2a4bab8fbbbf9e5d2777ae4d 100644 --- a/utils/include/dm_random.h +++ b/utils/include/dm_random.h @@ -19,12 +19,16 @@ #include #include +#ifndef DM_EXPORT +#define DM_EXPORT __attribute__ ((visibility ("default"))) +#endif // DM_EXPORT + namespace OHOS { namespace DistributedHardware { -int32_t GenRandInt(int32_t randMin, int32_t randMax); -int64_t GenRandLongLong(int64_t randMin, int64_t randMax); -uint16_t GenRandUint(uint16_t randMin, uint16_t randMax); -uint16_t GenUniqueRandUint(std::set &randUint16Set); +DM_EXPORT int32_t GenRandInt(int32_t randMin, int32_t randMax); +DM_EXPORT int64_t GenRandLongLong(int64_t randMin, int64_t randMax); +DM_EXPORT uint16_t GenRandUint(uint16_t randMin, uint16_t randMax); +DM_EXPORT uint16_t GenUniqueRandUint(std::set &randUint16Set); } // namespace DistributedHardware } // namespace OHOS diff --git a/utils/include/fwkload/standard/dm_distributed_hardware_load.h b/utils/include/fwkload/standard/dm_distributed_hardware_load.h index a6c0e5e256bcd018ee9aa1c1ce24a7ee020ff5cd..c9ac3c54846f96becbea8ef29aa5241ea4b0dfda 100644 --- a/utils/include/fwkload/standard/dm_distributed_hardware_load.h +++ b/utils/include/fwkload/standard/dm_distributed_hardware_load.h @@ -31,7 +31,7 @@ public: class DmDistributedHardwareLoad { DM_DECLARE_SINGLE_INSTANCE(DmDistributedHardwareLoad); public: - void LoadDistributedHardwareFwk(void); + DM_EXPORT void LoadDistributedHardwareFwk(void); void InitDistributedHardwareLoadCount(void); uint32_t GetDistributedHardwareLoadCount(void); private: diff --git a/utils/include/kvadapter/kv_adapter.h b/utils/include/kvadapter/kv_adapter.h index 0e116398ec70e8c130e46907752490b6345b22f4..be755f7dd243d9585d2eaa7995df8d5c65152737 100644 --- a/utils/include/kvadapter/kv_adapter.h +++ b/utils/include/kvadapter/kv_adapter.h @@ -43,6 +43,7 @@ public: int32_t DeleteKvStore(); int32_t DeleteByAppId(const std::string &appId, const std::string &prefix); int32_t DeleteBatch(const std::vector &keys); + int32_t Delete(const std::string& key); void OnRemoteDied() override; private: diff --git a/utils/include/kvadapter/kv_adapter_manager.h b/utils/include/kvadapter/kv_adapter_manager.h index 8dacc074cb384dba9268c396280d143fa332ea98..ccd6f74a4fd5a389320c8f51f679a03a30662df5 100644 --- a/utils/include/kvadapter/kv_adapter_manager.h +++ b/utils/include/kvadapter/kv_adapter_manager.h @@ -31,13 +31,16 @@ namespace DistributedHardware { class KVAdapterManager { DM_DECLARE_SINGLE_INSTANCE_BASE(KVAdapterManager); public: - int32_t Init(); - void UnInit(); - void ReInit(); + DM_EXPORT int32_t Init(); + DM_EXPORT void UnInit(); + DM_EXPORT void ReInit(); int32_t PutByAnoyDeviceId(const std::string &key, const DmKVValue &value); - int32_t Get(const std::string &key, DmKVValue &value); - int32_t DeleteAgedEntry(); - int32_t AppUnintall(const std::string &appId); + DM_EXPORT int32_t Get(const std::string &key, DmKVValue &value); + DM_EXPORT int32_t DeleteAgedEntry(); + DM_EXPORT int32_t AppUnintall(const std::string &appId); + DM_EXPORT int32_t GetFreezeData(const std::string &key, std::string &value); + DM_EXPORT int32_t PutFreezeData(const std::string &key, std::string &value); + DM_EXPORT int32_t DeleteFreezeData(const std::string &key); private: KVAdapterManager() = default; diff --git a/utils/include/timer/dm_timer.h b/utils/include/timer/dm_timer.h index 28365a193bfddbbe1f71efe0ee2ae96127db7f9a..b1bf2f4bc28685807bc51eec5c3740cb602adc10 100644 --- a/utils/include/timer/dm_timer.h +++ b/utils/include/timer/dm_timer.h @@ -26,35 +26,40 @@ #include "ffrt.h" +#ifndef DM_EXPORT +#define DM_EXPORT __attribute__ ((visibility ("default"))) +#endif // DM_EXPORT + namespace OHOS { namespace DistributedHardware { using TimerCallback = std::function; class DmTimer { public: - DmTimer(); - ~DmTimer(); + DM_EXPORT DmTimer(); + DM_EXPORT ~DmTimer(); /** * @tc.name: DmTimer::StartTimer * @tc.desc: start timer running * @tc.type: FUNC */ - int32_t StartTimer(std::string name, int32_t timeOut, TimerCallback callback); + DM_EXPORT int32_t StartTimer(std::string name, int32_t timeOut, + TimerCallback callback); /** * @tc.name: DmTimer::DeleteTimer * @tc.desc: delete timer * @tc.type: FUNC */ - int32_t DeleteTimer(std::string timerName); + DM_EXPORT int32_t DeleteTimer(std::string timerName); /** * @tc.name: DmTimer::DeleteAll * @tc.desc: delete all timer * @tc.type: FUNC */ - int32_t DeleteAll(); + DM_EXPORT int32_t DeleteAll(); private: mutable std::mutex timerMutex_; diff --git a/utils/src/appInfo/lite/app_manager.cpp b/utils/src/appInfo/lite/app_manager.cpp index 598ffc5c5a3a0bf33350f705c84be349aa5dc06c..c44b6f7da93e48643a1b55d225e38a0d34620b53 100644 --- a/utils/src/appInfo/lite/app_manager.cpp +++ b/utils/src/appInfo/lite/app_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -73,5 +73,11 @@ int32_t AppManager::GetHapTokenIdByName(int32_t userId, std::string &bundleName, (void)tokenId; return DM_OK; } + +int32_t AppManager::GetBundleNameForSelf(std::string &bundleName) +{ + (void)bundleName; + return DM_OK; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/utils/src/appInfo/standard/app_manager.cpp b/utils/src/appInfo/standard/app_manager.cpp index 9ed51e77bfe7c2f4b79c152fff8354a036040e5b..ad0d9552246ea107ff099a9825278ddd3733a5bd 100644 --- a/utils/src/appInfo/standard/app_manager.cpp +++ b/utils/src/appInfo/standard/app_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -70,7 +70,7 @@ const std::string AppManager::GetAppId() return appId; } -void AppManager::RegisterCallerAppId(const std::string &pkgName) +DM_EXPORT void AppManager::RegisterCallerAppId(const std::string &pkgName) { if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); @@ -78,7 +78,7 @@ void AppManager::RegisterCallerAppId(const std::string &pkgName) } std::string appId = GetAppId(); if (appId.empty()) { - LOGE("PkgName %{public}s get appid failed.", pkgName.c_str()); + LOGD("PkgName %{public}s get appid failed.", pkgName.c_str()); return; } LOGI("PkgName %{public}s, appId %{public}s.", pkgName.c_str(), GetAnonyString(appId).c_str()); @@ -86,7 +86,7 @@ void AppManager::RegisterCallerAppId(const std::string &pkgName) appIdMap_[pkgName] = appId; } -void AppManager::UnRegisterCallerAppId(const std::string &pkgName) +DM_EXPORT void AppManager::UnRegisterCallerAppId(const std::string &pkgName) { if (pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); @@ -153,13 +153,13 @@ bool AppManager::IsSystemSA() return false; } -bool AppManager::IsSystemApp() +DM_EXPORT bool AppManager::IsSystemApp() { uint64_t fullTokenId = IPCSkeleton::GetCallingFullTokenID(); return OHOS::Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(fullTokenId); } -int32_t AppManager::GetCallerName(bool isSystemSA, std::string &callerName) +DM_EXPORT int32_t AppManager::GetCallerName(bool isSystemSA, std::string &callerName) { AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); if (tokenCaller == 0) { @@ -191,7 +191,8 @@ int32_t AppManager::GetCallerName(bool isSystemSA, std::string &callerName) return DM_OK; } -int32_t AppManager::GetNativeTokenIdByName(std::string &processName, int64_t &tokenId) +DM_EXPORT int32_t AppManager::GetNativeTokenIdByName(std::string &processName, + int64_t &tokenId) { AccessTokenID nativeTokenId = AccessTokenKit::GetNativeTokenId(processName); if (nativeTokenId == INVALID_TOKENID) { @@ -202,7 +203,8 @@ int32_t AppManager::GetNativeTokenIdByName(std::string &processName, int64_t &to return DM_OK; } -int32_t AppManager::GetHapTokenIdByName(int32_t userId, std::string &bundleName, int32_t instIndex, int64_t &tokenId) +DM_EXPORT int32_t AppManager::GetHapTokenIdByName(int32_t userId, + std::string &bundleName, int32_t instIndex, int64_t &tokenId) { auto hapTokenId = AccessTokenKit::GetHapTokenID(userId, bundleName, instIndex); if (hapTokenId == 0) { @@ -213,14 +215,13 @@ int32_t AppManager::GetHapTokenIdByName(int32_t userId, std::string &bundleName, return DM_OK; } -int32_t AppManager::GetCallerProcessName(std::string &processName) +DM_EXPORT int32_t AppManager::GetCallerProcessName(std::string &processName) { AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); if (tokenCaller == 0) { LOGE("GetCallerProcessName GetCallingTokenID error."); return ERR_DM_FAILED; } - LOGI("GetCallerProcessName::tokenCaller ID == %{public}s", GetAnonyInt32(tokenCaller).c_str()); ATokenTypeEnum tokenTypeFlag = AccessTokenKit::GetTokenTypeFlag(tokenCaller); if (tokenTypeFlag == ATokenTypeEnum::TOKEN_HAP) { HapTokenInfo tokenInfo; @@ -249,5 +250,27 @@ int32_t AppManager::GetCallerProcessName(std::string &processName) LOGI("Get process name: %{public}s success.", processName.c_str()); return DM_OK; } + +int32_t AppManager::GetBundleNameForSelf(std::string &bundleName) +{ + sptr bundleManager = nullptr; + if (!GetBundleManagerProxy(bundleManager)) { + LOGE("get bundleManager failed."); + return ERR_DM_GET_BMS_FAILED; + } + if (bundleManager == nullptr) { + LOGE("bundleManager is nullptr."); + return ERR_DM_GET_BMS_FAILED; + } + AppExecFwk::BundleInfo bundleInfo; + int32_t flags = static_cast(AppExecFwk::GetBundleInfoFlag::GET_BUNDLE_INFO_WITH_APPLICATION); + int32_t ret = static_cast(bundleManager->GetBundleInfoForSelf(flags, bundleInfo)); + if (ret != ERR_OK) { + LOGE("failed, ret=%{public}d.", ret); + return ERR_DM_GET_BUNDLE_NAME_FAILED; + } + bundleName = bundleInfo.name; + return DM_OK; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/utils/src/crypto/dm_crypto.cpp b/utils/src/crypto/dm_crypto.cpp index 8cc5a88462f4204dd162f3bb21757f9dd6e3e058..412276882960408832d08d296e3c7b0e345d0138 100644 --- a/utils/src/crypto/dm_crypto.cpp +++ b/utils/src/crypto/dm_crypto.cpp @@ -42,9 +42,7 @@ constexpr int32_t SALT_LENGTH = 8; const std::string SALT_DEFAULT = "salt_defsalt_def"; constexpr int SHORT_ACCOUNTID_ID_HASH_LENGTH = 6; constexpr const char* DB_KEY_DELIMITER = "###"; -#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) #define DM_MAX_DEVICE_ID_LEN (97) -#endif uint32_t HexifyLen(uint32_t len) { @@ -64,8 +62,8 @@ void Crypto::DmGenerateStrHash(const void *data, size_t dataSize, unsigned char SHA256_Final(&outBuf[startIndex], &ctx); } -int32_t Crypto::ConvertBytesToHexString(char *outBuf, uint32_t outBufLen, const unsigned char *inBuf, - uint32_t inLen) +DM_EXPORT int32_t Crypto::ConvertBytesToHexString(char *outBuf, uint32_t outBufLen, + const unsigned char *inBuf, uint32_t inLen) { if ((outBuf == nullptr) || (inBuf == nullptr) || (outBufLen < HexifyLen(inLen))) { return ERR_DM_INPUT_PARA_INVALID; @@ -124,8 +122,36 @@ int32_t Crypto::GetUdidHash(const std::string &udid, unsigned char *udidHash) return DM_OK; } -int32_t Crypto::ConvertHexStringToBytes(unsigned char *outBuf, uint32_t outBufLen, const char *inBuf, - uint32_t inLen) +DM_EXPORT std::string Crypto::GetUdidHash(const std::string &udid) +{ + unsigned char hash[SHA256_DIGEST_LENGTH] = ""; + char udidHash[DM_MAX_DEVICE_ID_LEN] = {0}; + DmGenerateStrHash(udid.data(), udid.size(), hash, SHA256_DIGEST_LENGTH, 0); + if (ConvertBytesToHexString(reinterpret_cast(udidHash), SHORT_DEVICE_ID_HASH_LENGTH + 1, + reinterpret_cast(hash), SHORT_DEVICE_ID_HASH_LENGTH / HEX_TO_UINT8) != DM_OK) { + LOGE("ConvertBytesToHexString failed."); + return ""; + } + std::string udidHashStr = std::string(udidHash); + return udidHashStr; +} + +DM_EXPORT std::string Crypto::GetTokenIdHash(const std::string &tokenId) +{ + unsigned char hash[SHA256_DIGEST_LENGTH] = ""; + char idHash[DM_MAX_DEVICE_ID_LEN] = {0}; + DmGenerateStrHash(tokenId.data(), tokenId.size(), hash, SHA256_DIGEST_LENGTH, 0); + if (ConvertBytesToHexString(reinterpret_cast(idHash), SHA256_DIGEST_LENGTH + 1, + reinterpret_cast(hash), SHA256_DIGEST_LENGTH / HEX_TO_UINT8) != DM_OK) { + LOGE("ConvertBytesToHexString failed."); + return ""; + } + std::string tokenIdHash = std::string(idHash); + return tokenIdHash; +} + +DM_EXPORT int32_t Crypto::ConvertHexStringToBytes(unsigned char *outBuf, + uint32_t outBufLen, const char *inBuf, uint32_t inLen) { (void)outBufLen; if ((outBuf == NULL) || (inBuf == NULL) || (inLen % HEX_TO_UINT8 != 0)) { @@ -164,7 +190,7 @@ int32_t Crypto::ConvertHexStringToBytes(unsigned char *outBuf, uint32_t outBufLe return DM_OK; } -std::string Crypto::GetGroupIdHash(const std::string &groupId) +DM_EXPORT std::string Crypto::GetGroupIdHash(const std::string &groupId) { unsigned char hash[SHA256_DIGEST_LENGTH] = ""; DmGenerateStrHash(groupId.data(), groupId.size(), hash, SHA256_DIGEST_LENGTH, 0); @@ -211,7 +237,8 @@ std::string Crypto::GetHashWithSalt(const std::string &text, const std::string & return Crypto::Sha256(rawText); } -int32_t Crypto::GetAccountIdHash(const std::string &accountId, unsigned char *accountIdHash) +DM_EXPORT int32_t Crypto::GetAccountIdHash(const std::string &accountId, + unsigned char *accountIdHash) { unsigned char hash[SHA256_DIGEST_LENGTH] = ""; DmGenerateStrHash(accountId.data(), accountId.size(), hash, SHA256_DIGEST_LENGTH, 0); @@ -223,9 +250,23 @@ int32_t Crypto::GetAccountIdHash(const std::string &accountId, unsigned char *ac return DM_OK; } +DM_EXPORT std::string Crypto::GetAccountIdHash16(const std::string &accountId) +{ + unsigned char hash[SHA256_DIGEST_LENGTH] = ""; + char accountIdHash[DM_MAX_DEVICE_ID_LEN] = {0}; + DmGenerateStrHash(accountId.data(), accountId.size(), hash, SHA256_DIGEST_LENGTH, 0); + if (ConvertBytesToHexString(reinterpret_cast(accountIdHash), SHA256_DIGEST_LENGTH + 1, + reinterpret_cast(hash), SHA256_DIGEST_LENGTH / HEX_TO_UINT8) != DM_OK) { + LOGE("ConvertBytesToHexString failed."); + return ""; + } + std::string accountHashStr = std::string(accountIdHash); + return accountHashStr; +} + #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) -int32_t Crypto::ConvertUdidHashToAnoyAndSave(const std::string &appId, const std::string &udidHash, - DmKVValue &kvValue) +DM_EXPORT int32_t Crypto::ConvertUdidHashToAnoyAndSave(const std::string &appId, + const std::string &udidHash, DmKVValue &kvValue) { if (GetAnoyDeviceInfo(appId, udidHash, kvValue) == DM_OK) { kvValue.lastModifyTime = GetSecondsSince1970ToNow(); @@ -241,10 +282,10 @@ int32_t Crypto::ConvertUdidHashToAnoyAndSave(const std::string &appId, const std return DM_OK; } -int32_t Crypto::ConvertUdidHashToAnoyDeviceId(const std::string &appId, const std::string &udidHash, - DmKVValue &kvValue) +DM_EXPORT int32_t Crypto::ConvertUdidHashToAnoyDeviceId(const std::string &appId, + const std::string &udidHash, DmKVValue &kvValue) { - LOGI("start."); + LOGD("start."); if (GetAnoyDeviceInfo(appId, udidHash, kvValue) == DM_OK) { return DM_OK; } @@ -253,7 +294,7 @@ int32_t Crypto::ConvertUdidHashToAnoyDeviceId(const std::string &appId, const st int32_t Crypto::GetAnoyDeviceInfo(const std::string &appId, const std::string &udidHash, DmKVValue &kvValue) { - LOGI("start"); + LOGD("start"); std::string udidPrefix = appId + DB_KEY_DELIMITER + udidHash; if (KVAdapterManager::GetInstance().Get(udidPrefix, kvValue) != DM_OK) { LOGI("Get kv value from DB failed"); @@ -265,7 +306,7 @@ int32_t Crypto::GetAnoyDeviceInfo(const std::string &appId, const std::string &u int32_t Crypto::ConvertUdidHashToAnoyGenerate(const std::string &appId, const std::string &udidHash, DmKVValue &kvValue) { - LOGI("start."); + LOGD("start."); std::string salt = GetSecSalt(); std::string udidTemp = appId + DB_KEY_DELIMITER + udidHash + DB_KEY_DELIMITER + salt; char anoyDeviceId[DM_MAX_DEVICE_ID_LEN] = {0}; diff --git a/utils/src/dm_random.cpp b/utils/src/dm_random.cpp index 0d5955f40d4d609bc5b5d481a15efd38eac2f3b8..d14c4b73da9c6acd54ae3c71ff98bd6cea19bfd5 100644 --- a/utils/src/dm_random.cpp +++ b/utils/src/dm_random.cpp @@ -44,7 +44,7 @@ int32_t GenRandInt(int32_t randMin, int32_t randMax) #endif } -int64_t GenRandLongLong(int64_t randMin, int64_t randMax) +DM_EXPORT int64_t GenRandLongLong(int64_t randMin, int64_t randMax) { std::random_device randDevice; std::mt19937 genRand(randDevice()); diff --git a/utils/src/fwkload/standard/dm_distributed_hardware_load.cpp b/utils/src/fwkload/standard/dm_distributed_hardware_load.cpp index b7c7499e5acaced284dd1a2f0ac9b1cce950f9e4..43c1dd014517530f53bfcb0840c4b5bf524086d4 100644 --- a/utils/src/fwkload/standard/dm_distributed_hardware_load.cpp +++ b/utils/src/fwkload/standard/dm_distributed_hardware_load.cpp @@ -25,9 +25,9 @@ namespace DistributedHardware { DM_IMPLEMENT_SINGLE_INSTANCE(DmDistributedHardwareLoad); constexpr uint32_t MAX_LOAD_VALUE = 3; constexpr int32_t DM_OK = 0; -void DmDistributedHardwareLoad::LoadDistributedHardwareFwk(void) +DM_EXPORT void DmDistributedHardwareLoad::LoadDistributedHardwareFwk(void) { - LOGI("enter DmDistributedHardwareLoad::LoadDistributedHardwareFwk"); + LOGI("start"); sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { LOGE("failed to get system ability mgr."); @@ -54,7 +54,7 @@ uint32_t DmDistributedHardwareLoad::GetDistributedHardwareLoadCount() void DistributedHardwareLoadCallback::OnLoadSystemAbilitySuccess( int32_t systemAbilityId, const sptr &remoteObject) { - LOGI("DmDistributedHardware Load SA success, systemAbilityId:%{public}d, remoteObject result:%{public}s", + LOGI("Load SA success, systemAbilityId:%{public}d, remoteObject result:%{public}s", systemAbilityId, (remoteObject != nullptr) ? "true" : "false"); if (remoteObject == nullptr) { LOGE("remoteObject is nullptr"); @@ -64,7 +64,7 @@ void DistributedHardwareLoadCallback::OnLoadSystemAbilitySuccess( } void DistributedHardwareLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { - LOGE("DmDistributedHardware Load SA failed, systemAbilityId:%{public}d", systemAbilityId); + LOGE("Load SA failed, systemAbilityId:%{public}d", systemAbilityId); if (DmDistributedHardwareLoad::GetInstance().GetDistributedHardwareLoadCount() < MAX_LOAD_VALUE) { DmDistributedHardwareLoad::GetInstance().LoadDistributedHardwareFwk(); diff --git a/utils/src/kvadapter/kv_adapter.cpp b/utils/src/kvadapter/kv_adapter.cpp index 8d7dd41dd4e655e99aa6c8984916a190bc31fee0..b2affd78334a3a55f6c5419cb1403e3d081505d7 100644 --- a/utils/src/kvadapter/kv_adapter.cpp +++ b/utils/src/kvadapter/kv_adapter.cpp @@ -243,5 +243,24 @@ int32_t KVAdapter::DeleteBatch(const std::vector &keys) } return DM_OK; } + +int32_t KVAdapter::Delete(const std::string& key) +{ + DistributedKv::Status status; + { + std::lock_guard lock(kvAdapterMutex_); + if (kvStorePtr_ == nullptr) { + LOGE("kvStorePtr is nullptr!"); + return ERR_DM_POINT_NULL; + } + DistributedKv::Key kvKey(key); + status = kvStorePtr_->Delete(kvKey); + } + if (status != DistributedKv::Status::SUCCESS) { + LOGE("Delete kv by key failed!"); + return ERR_DM_FAILED; + } + return DM_OK; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/utils/src/kvadapter/kv_adapter_manager.cpp b/utils/src/kvadapter/kv_adapter_manager.cpp index d6bc63755655cf921b6320b096a46a042fcd2c2a..da4f504850a8144bb298f9daff0476fa13748749 100644 --- a/utils/src/kvadapter/kv_adapter_manager.cpp +++ b/utils/src/kvadapter/kv_adapter_manager.cpp @@ -28,6 +28,7 @@ namespace OHOS { namespace DistributedHardware { namespace { constexpr const char* DM_KV_STORE_PREFIX = "DM2_"; +constexpr const char* DM_KV_STORE_FREEZE_PREFIX = "anti_ddos_local_"; constexpr const char* DB_KEY_DELIMITER = "###"; constexpr int64_t DM_KV_STORE_REFRESH_TIME = 24 * 60 * 60; // one day constexpr int64_t MAX_SUPPORTED_EXIST_TIME = 3 * 24 * 60 * 60; // 3days @@ -35,7 +36,7 @@ constexpr int64_t MAX_SUPPORTED_EXIST_TIME = 3 * 24 * 60 * 60; // 3days DM_IMPLEMENT_SINGLE_INSTANCE(KVAdapterManager); -int32_t KVAdapterManager::Init() +DM_EXPORT int32_t KVAdapterManager::Init() { LOGI("Init Kv-Adapter manager"); { @@ -46,7 +47,7 @@ int32_t KVAdapterManager::Init() return kvAdapter_->Init(); } -void KVAdapterManager::UnInit() +DM_EXPORT void KVAdapterManager::UnInit() { LOGI("Uninit Kv-Adapter manager"); CHECK_NULL_VOID(kvAdapter_); @@ -54,7 +55,7 @@ void KVAdapterManager::UnInit() kvAdapter_ = nullptr; } -void KVAdapterManager::ReInit() +DM_EXPORT void KVAdapterManager::ReInit() { LOGI("Re init kv adapter"); CHECK_NULL_VOID(kvAdapter_); @@ -88,7 +89,7 @@ int32_t KVAdapterManager::PutByAnoyDeviceId(const std::string &key, const DmKVVa return DM_OK; } -int32_t KVAdapterManager::Get(const std::string &key, DmKVValue &value) +DM_EXPORT int32_t KVAdapterManager::Get(const std::string &key, DmKVValue &value) { std::string dmKey = DM_KV_STORE_PREFIX + key; std::lock_guard lock(idCacheMapMtx_); @@ -110,7 +111,7 @@ int32_t KVAdapterManager::Get(const std::string &key, DmKVValue &value) return DM_OK; } -int32_t KVAdapterManager::DeleteAgedEntry() +DM_EXPORT int32_t KVAdapterManager::DeleteAgedEntry() { int64_t nowTime = GetSecondsSince1970ToNow(); std::lock_guard lock(idCacheMapMtx_); @@ -129,7 +130,7 @@ inline bool KVAdapterManager::IsTimeOut(int64_t sourceTime, int64_t targetTime, return targetTime - sourceTime >= timeOut ? true : false; } -int32_t KVAdapterManager::AppUnintall(const std::string &appId) +DM_EXPORT int32_t KVAdapterManager::AppUnintall(const std::string &appId) { LOGI("appId %{public}s.", GetAnonyString(appId).c_str()); std::lock_guard lock(idCacheMapMtx_); @@ -147,5 +148,39 @@ int32_t KVAdapterManager::AppUnintall(const std::string &appId) } return DM_OK; } + +DM_EXPORT int32_t KVAdapterManager::GetFreezeData(const std::string &key, std::string &value) +{ + std::string dmKey = DM_KV_STORE_FREEZE_PREFIX + key; + CHECK_NULL_RETURN(kvAdapter_, ERR_DM_POINT_NULL); + if (kvAdapter_->Get(dmKey, value) != DM_OK) { + LOGE("Get freeze data failed, dmKey: %{public}s", GetAnonyString(dmKey).c_str()); + return ERR_DM_FAILED; + } + return DM_OK; +} + +DM_EXPORT int32_t KVAdapterManager::PutFreezeData(const std::string &key, std::string &value) +{ + std::string dmKey = DM_KV_STORE_FREEZE_PREFIX + key; + CHECK_NULL_RETURN(kvAdapter_, ERR_DM_POINT_NULL); + if (kvAdapter_->Put(dmKey, value) != DM_OK) { + LOGE("Insert freeze data failed, k:%{public}s, v:%{public}s", dmKey.c_str(), value.c_str()); + return ERR_DM_FAILED; + } + LOGI("Insert freeze data success, k:%{public}s, v:%{public}s", dmKey.c_str(), value.c_str()); + return DM_OK; +} + +DM_EXPORT int32_t KVAdapterManager::DeleteFreezeData(const std::string &key) +{ + std::string dmKey = DM_KV_STORE_FREEZE_PREFIX + key; + CHECK_NULL_RETURN(kvAdapter_, ERR_DM_POINT_NULL); + if (kvAdapter_->Delete(dmKey) != DM_OK) { + LOGE("delete freeze data failed, dmKey: %{public}s", GetAnonyString(dmKey).c_str()); + return ERR_DM_FAILED; + } + return DM_OK; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/utils/src/timer/dm_timer.cpp b/utils/src/timer/dm_timer.cpp index cac733ecfdbacddf9e1335927ecd99adfe478e16..27d1a2777583535af224773a6609dc3b71a3a902 100644 --- a/utils/src/timer/dm_timer.cpp +++ b/utils/src/timer/dm_timer.cpp @@ -44,12 +44,12 @@ DmTimer::~DmTimer() int32_t DmTimer::StartTimer(std::string name, int32_t timeOut, TimerCallback callback) { - if (name.empty() || timeOut <= MIN_TIME_OUT || timeOut > MAX_TIME_OUT || callback == nullptr) { + if (name.empty() || timeOut < MIN_TIME_OUT || timeOut > MAX_TIME_OUT || callback == nullptr) { LOGE("DmTimer StartTimer input value invalid"); return ERR_DM_INPUT_PARA_INVALID; } CHECK_NULL_RETURN(queue_, ERR_DM_POINT_NULL); - LOGI("DmTimer StartTimer start name: %{public}s", name.c_str()); + LOGI("start name: %{public}s", name.c_str()); std::lock_guard locker(timerMutex_); auto taskFunc = [callback, name] () { callback(name); }; @@ -68,7 +68,7 @@ int32_t DmTimer::DeleteTimer(std::string timerName) LOGE("DmTimer DeleteTimer timer is null"); return ERR_DM_INPUT_PARA_INVALID; } - LOGI("DmTimer DeleteTimer start name: %{public}s", timerName.c_str()); + LOGI("start name: %{public}s", timerName.c_str()); std::lock_guard locker(timerMutex_); auto item = timerVec_.find(timerName); if (item == timerVec_.end()) { @@ -85,9 +85,9 @@ int32_t DmTimer::DeleteTimer(std::string timerName) return DM_OK; } -int32_t DmTimer::DeleteAll() +DM_EXPORT int32_t DmTimer::DeleteAll() { - LOGI("DmTimer DeleteAll start"); + LOGI("start"); std::lock_guard locker(timerMutex_); for (const auto &name : timerVec_) { if (name.second != nullptr && queue_ != nullptr) {