From 45b94f7f8d759cbb54db708a868bb22976f7502a Mon Sep 17 00:00:00 2001 From: fuzikun Date: Sun, 12 Nov 2023 19:48:13 +0800 Subject: [PATCH] add bind log Signed-off-by: fuzikun --- .../inc/group_operation_common.h | 3 ++- .../group_operation/group_operation_common.c | 26 ++++++------------- .../compatible_bind_sub_session.c | 6 ++--- .../source/group_operation_common_test.cpp | 6 ++--- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/services/group_manager/inc/group_operation_common.h b/services/group_manager/inc/group_operation_common.h index 82e29837..72e3ecf9 100644 --- a/services/group_manager/inc/group_operation_common.h +++ b/services/group_manager/inc/group_operation_common.h @@ -75,7 +75,8 @@ int32_t AddDeviceToDatabaseByJson(int32_t osAccountId, int32_t (*generateDevPara int32_t DelGroupFromDb(int32_t osAccountId, const char *groupId); int32_t ConvertGroupIdToJsonStr(const char *groupId, char **returnJsonStr); -int32_t GenerateBindSuccessData(const char *peerAuthId, const char *groupId, char **returnDataStr); +int32_t GenerateBindSuccessData(const char *peerAuthId, const char *peerUdid, const char *groupId, + char **returnDataStr); int32_t GenerateUnbindSuccessData(const char *peerAuthId, const char *groupId, char **returnDataStr); int32_t GetCurDeviceNumByGroupId(int32_t osAccountId, const char *groupId); diff --git a/services/group_manager/src/group_operation/group_operation_common.c b/services/group_manager/src/group_operation/group_operation_common.c index 9a92adb7..ec976a34 100644 --- a/services/group_manager/src/group_operation/group_operation_common.c +++ b/services/group_manager/src/group_operation/group_operation_common.c @@ -982,20 +982,16 @@ int32_t ConvertGroupIdToJsonStr(const char *groupId, char **returnJsonStr) return HC_SUCCESS; } -int32_t GenerateBindSuccessData(const char *peerAuthId, const char *groupId, char **returnDataStr) +int32_t GenerateBindSuccessData(const char *peerAuthId, const char *peerUdid, + const char *groupId, char **returnDataStr) { - if ((peerAuthId == NULL) || (groupId == NULL) || (returnDataStr == NULL)) { + if ((peerAuthId == NULL) || (peerUdid == NULL) || (groupId == NULL) || (returnDataStr == NULL)) { LOGE("The input params contains NULL value!"); return HC_ERR_NULL_PTR; } - LOGI("Bind successfully! [GroupId]: %c%c%c%c****", groupId[DEV_AUTH_ZERO], groupId[DEV_AUTH_ONE], - groupId[DEV_AUTH_TWO], groupId[DEV_AUTH_THREE]); - if (HcStrlen(peerAuthId) >= DESENSITIZATION_LEN) { - LOGI("Bind successfully! [PeerAuthId]: %c%c%c%c****", peerAuthId[DEV_AUTH_ZERO], peerAuthId[DEV_AUTH_ONE], - peerAuthId[DEV_AUTH_TWO], peerAuthId[DEV_AUTH_THREE]); - } else { - LOGI("Bind successfully! [PeerAuthId]: too short"); - } + PRINT_SENSITIVE_DATA("GroupId", groupId); + PRINT_SENSITIVE_DATA("PeerAuthId", peerAuthId); + PRINT_SENSITIVE_DATA("PeerUdid", peerUdid); CJson *jsonData = CreateJson(); if (jsonData == NULL) { LOGE("Failed to allocate jsonData memory!"); @@ -1027,14 +1023,8 @@ int32_t GenerateUnbindSuccessData(const char *peerAuthId, const char *groupId, c LOGE("The input params contains NULL value!"); return HC_ERR_NULL_PTR; } - LOGI("Unbind successfully! [GroupId]: %c%c%c%c****", groupId[DEV_AUTH_ZERO], groupId[DEV_AUTH_ONE], - groupId[DEV_AUTH_TWO], groupId[DEV_AUTH_THREE]); - if (HcStrlen(peerAuthId) >= DESENSITIZATION_LEN) { - LOGI("Unbind successfully! [PeerAuthId]: %c%c%c%c****", peerAuthId[DEV_AUTH_ZERO], peerAuthId[DEV_AUTH_ONE], - peerAuthId[DEV_AUTH_TWO], peerAuthId[DEV_AUTH_THREE]); - } else { - LOGI("Unbind successfully! [PeerAuthId]: too short"); - } + PRINT_SENSITIVE_DATA("GroupId", groupId); + PRINT_SENSITIVE_DATA("PeerAuthId", peerAuthId); CJson *jsonData = CreateJson(); if (jsonData == NULL) { LOGE("Failed to allocate jsonData memory!"); diff --git a/services/session_manager/src/session/v1/compatible_bind_sub_session/compatible_bind_sub_session.c b/services/session_manager/src/session/v1/compatible_bind_sub_session/compatible_bind_sub_session.c index 9ff79366..ac72e003 100644 --- a/services/session_manager/src/session/v1/compatible_bind_sub_session/compatible_bind_sub_session.c +++ b/services/session_manager/src/session/v1/compatible_bind_sub_session/compatible_bind_sub_session.c @@ -257,7 +257,7 @@ static int32_t SendBindDataToPeer(CompatibleBindSubSession *session, CJson *out) return result; } -static int32_t InformSelfBindSuccess(const char *peerAuthId, const char *groupId, +static int32_t InformSelfBindSuccess(const char *peerAuthId, const char *peerUdid, const char *groupId, const CompatibleBindSubSession *session, CJson *out) { uint8_t sessionKey[DEFAULT_RETURN_KEY_LENGTH] = { 0 }; @@ -268,7 +268,7 @@ static int32_t InformSelfBindSuccess(const char *peerAuthId, const char *groupId } char *jsonDataStr = NULL; - int32_t result = GenerateBindSuccessData(peerAuthId, groupId, &jsonDataStr); + int32_t result = GenerateBindSuccessData(peerAuthId, peerUdid, groupId, &jsonDataStr); if (result != HC_SUCCESS) { LOGE("Failed to generate the data to be sent to the service!"); return result; @@ -471,7 +471,7 @@ static int32_t HandleBindSuccess(const char *peerAuthId, const char *peerUdid, c if (result != HC_SUCCESS) { return result; } - return InformSelfBindSuccess(peerAuthId, groupId, session, out); + return InformSelfBindSuccess(peerAuthId, peerUdid, groupId, session, out); } static int32_t OnBindFinish(const CompatibleBindSubSession *session, const CJson *jsonParams, CJson *out) diff --git a/test/unittest/deviceauth/source/group_operation_common_test.cpp b/test/unittest/deviceauth/source/group_operation_common_test.cpp index 54357de1..005abe06 100644 --- a/test/unittest/deviceauth/source/group_operation_common_test.cpp +++ b/test/unittest/deviceauth/source/group_operation_common_test.cpp @@ -307,20 +307,20 @@ HWTEST_F(GroupOperationTest, GroupOperationTest036, TestSize.Level0) HWTEST_F(GroupOperationTest, GroupOperationTest037, TestSize.Level0) { char *returnJsonStr = nullptr; - int32_t ret = GenerateBindSuccessData(nullptr, g_normalStr, &returnJsonStr); + int32_t ret = GenerateBindSuccessData(nullptr, g_normalStr, g_normalStr, &returnJsonStr); ASSERT_NE(ret, HC_SUCCESS); } HWTEST_F(GroupOperationTest, GroupOperationTest038, TestSize.Level0) { char *returnJsonStr = nullptr; - int32_t ret = GenerateBindSuccessData(g_normalStr, nullptr, &returnJsonStr); + int32_t ret = GenerateBindSuccessData(g_normalStr, nullptr, g_normalStr, &returnJsonStr); ASSERT_NE(ret, HC_SUCCESS); } HWTEST_F(GroupOperationTest, GroupOperationTest039, TestSize.Level0) { - int32_t ret = GenerateBindSuccessData(g_normalStr, g_normalStr, nullptr); + int32_t ret = GenerateBindSuccessData(g_normalStr, g_normalStr, g_normalStr, nullptr); ASSERT_NE(ret, HC_SUCCESS); } -- Gitee