diff --git a/services/implementation/src/ability/standard/dm_dialog_manager.cpp b/services/implementation/src/ability/standard/dm_dialog_manager.cpp index d7efde57bebf458a6469d54234899e69b9b5e9c7..5b93c3a29a30c57db82778bfe7faf09024997572 100644 --- a/services/implementation/src/ability/standard/dm_dialog_manager.cpp +++ b/services/implementation/src/ability/standard/dm_dialog_manager.cpp @@ -22,6 +22,7 @@ #include "auth_message_processor.h" #include "dm_anonymous.h" #include "dm_log.h" +#include "dm_crypto.h" #include "json_object.h" #include "parameter.h" #include "dm_single_instance.h" @@ -202,7 +203,8 @@ void DmDialogManager::DialogAbilityConnection::OnAbilityConnectDone( if (DmDialogManager::GetAbilityName() == INPUT_ABILITY_NAME) { param["sysDialogZOrder"] = WINDOW_LEVEL_UPPER; } - LOGI("pinCode: %{public}s", GetAnonyString(DmDialogManager::GetPinCode()).c_str()); + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(DmDialogManager::GetPinCode())); + LOGI("OnAbilityConnectDone pinCodeHash: %{public}s", pinCodeHash.c_str()); param["isProxyBind"] = DmDialogManager::GetIsProxyBind(); param["appUserData"] = DmDialogManager::GetAppUserData(); param["pinCode"] = DmDialogManager::GetPinCode(); diff --git a/services/implementation/src/authentication/dm_auth_manager.cpp b/services/implementation/src/authentication/dm_auth_manager.cpp index 60f51ac5c5fbb4c002aa89d88b9a37292d12b74d..775b9873fb2dbdded1dbdd74c471b47a42d86867 100644 --- a/services/implementation/src/authentication/dm_auth_manager.cpp +++ b/services/implementation/src/authentication/dm_auth_manager.cpp @@ -2577,7 +2577,8 @@ char *DmAuthManager::AuthDeviceRequest(int64_t requestId, int operationCode, con jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_ACCEPTED; jsonObj[FIELD_PIN_CODE] = pinCode; } - LOGI("pinCode: %{public}s", GetAnonyString(pinCode).c_str()); + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(pinCode)); + LOGI("AuthDeviceRequest pinCodeHash: %{public}s", pinCodeHash.c_str()); std::string deviceId = ""; GetRemoteDeviceId(deviceId); jsonObj[FIELD_PEER_CONN_DEVICE_ID] = deviceId; diff --git a/services/implementation/src/authentication_v2/auth_manager.cpp b/services/implementation/src/authentication_v2/auth_manager.cpp index c6cf3ff0ba2f314da1cc349e1a1af81a39b4fd3a..48ad12084315d3e17c82aeff7bfaeba74c81d11f 100644 --- a/services/implementation/src/authentication_v2/auth_manager.cpp +++ b/services/implementation/src/authentication_v2/auth_manager.cpp @@ -990,7 +990,8 @@ char *AuthSinkManager::AuthDeviceRequest(int64_t requestId, int operationCode, c jsonObj[FIELD_CONFIRMATION] = RequestResponse::REQUEST_ACCEPTED; jsonObj[FIELD_PIN_CODE] = pinCode; } - LOGI("pinCode: %{public}s", GetAnonyString(pinCode).c_str()); + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(pinCode)); + LOGI("AuthDeviceRequest pinCodeHash: %{public}s", pinCodeHash.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; @@ -1015,7 +1016,8 @@ int32_t AuthManager::GetPinCode(std::string &code) LOGE("AuthManager failed to GetPinCode because context_ is nullptr"); return ERR_DM_FAILED; } - LOGI("GetPinCode called, pinCode: %{public}s", GetAnonyString(context_->pinCode).c_str()); + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(context_->pinCode)); + LOGI("GetPinCode pinCodeHash: %{public}s", pinCodeHash.c_str()); code = context_->pinCode; return DM_OK; } 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 index be3e377eac8a0cd5f067aafc25b6690c95b383b5..815401fec0984013512150d2fa030216dc913212 100644 --- a/services/implementation/src/authentication_v2/auth_stages/auth_pin_auth.cpp +++ b/services/implementation/src/authentication_v2/auth_stages/auth_pin_auth.cpp @@ -21,6 +21,7 @@ #include "dm_auth_state_machine.h" #include "dm_auth_state.h" #include "dm_auth_state_machine.h" +#include "dm_crypto.h" #include "dm_dialog_manager.h" #include "dm_log.h" #include "dm_negotiate_process.h" @@ -54,6 +55,8 @@ int32_t AuthSinkStatePinAuthComm::ShowAuthInfoDialog(std::shared_ptrpinCode); + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(context->pinCode)); + LOGI("ShowAuthInfoDialog pinCodeHash: %{public}s", pinCodeHash.c_str()); context->timer->StartTimer(std::string(SESSION_HEARTBEAT_TIMEOUT_TASK), DmAuthState::GetTaskTimeout(context, SESSION_HEARTBEAT_TIMEOUT_TASK, SESSION_HEARTBEAT_TIMEOUT), [context] (std::string name) { @@ -125,6 +128,8 @@ void AuthSinkStatePinAuthComm::GeneratePincode(std::shared_ptr co { int32_t pinCode = GenRandInt(MIN_PIN_CODE, MAX_PIN_CODE); context->pinCode = std::to_string(pinCode); + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(context->pinCode)); + LOGI("GeneratePincode pinCodeHash: %{public}s", pinCodeHash.c_str()); } DmAuthStateType AuthSrcPinAuthStartState::GetStateType() @@ -181,6 +186,8 @@ int32_t AuthSinkPinAuthStartState::Action(std::shared_ptr context LOGE("AuthSinkPinAuthStartState::Action invalid parameter."); return ERR_DM_INPUT_PARA_INVALID; } + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(context->pinCode)); + LOGI("AuthSinkPinAuthStartState pinCodeHash: %{public}s", pinCodeHash.c_str()); // process pincode auth auto ret = context->hiChainAuthConnector->ProcessCredData(context->requestId, context->transmitData); if (ret != DM_OK) { diff --git a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp index b659af1ad6bbbb4a698c506b6583ff02aeb21386..6f0f8a7632184574c4bd5f3e57104628da7e7e78 100644 --- a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp +++ b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp @@ -19,6 +19,7 @@ #include "dm_log.h" #include "dm_anonymous.h" #include "dm_constants.h" +#include "dm_crypto.h" #include "hichain_connector_callback.h" #include "parameter.h" #include "cJSON.h" @@ -114,7 +115,8 @@ std::shared_ptr HiChainAuthConnector::GetDeviceAuthCallba int32_t HiChainAuthConnector::AuthDevice(const std::string &pinCode, int32_t osAccountId, std::string udid, int64_t requestId) { - LOGI("start, pinCode: %{public}s", GetAnonyString(pinCode).c_str()); + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(pinCode)); + LOGI("AuthDevice pinCodeHash: %{public}s", pinCodeHash.c_str()); JsonObject authParamJson; authParamJson["osAccountId"] = osAccountId; authParamJson["pinCode"] = pinCode; @@ -255,7 +257,8 @@ int32_t HiChainAuthConnector::AuthCredential(int32_t osAccountId, int64_t authRe int32_t HiChainAuthConnector::AuthCredentialPinCode(int32_t osAccountId, int64_t authReqId, const std::string &pinCode) { - LOGI("start, pinCode: %{public}s", GetAnonyString(pinCode).c_str()); + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(pinCode)); + LOGI("AuthCredentialPinCode pinCodeHash: %{public}s", pinCodeHash.c_str()); if (pinCode.size() < MIN_PINCODE_SIZE) { LOGE("HiChainAuthConnector::AuthCredentialPinCode failed, pinCode size is %{public}zu.", pinCode.size()); return ERR_DM_FAILED; diff --git a/services/implementation/src/dependency/hichain/hichain_connector.cpp b/services/implementation/src/dependency/hichain/hichain_connector.cpp index cebe420eb38a067bdeef036f53fa7f53ed1e0554..5cb929ffe1b6e7d89e2d468f4a4a20098c6d5354 100644 --- a/services/implementation/src/dependency/hichain/hichain_connector.cpp +++ b/services/implementation/src/dependency/hichain/hichain_connector.cpp @@ -22,6 +22,7 @@ #include "dm_anonymous.h" #include "dm_constants.h" +#include "dm_crypto.h" #include "dm_dfx_constants.h" #include "dm_hisysevent.h" #include "dm_log.h" @@ -347,7 +348,8 @@ int32_t HiChainConnector::AddMember(const std::string &deviceId, const std::stri std::string pinCode = jsonObject[PIN_CODE_KEY].Get(); std::string groupId = jsonObject[TAG_GROUP_ID].Get(); - LOGI("pinCode: %{public}s", GetAnonyString(pinCode).c_str()); + std::string pinCodeHash = GetAnonyString(Crypto::Sha256(pinCode)); + LOGI("AddMember pinCodeHash: %{public}s", pinCodeHash.c_str()); JsonObject jsonObj; jsonObj[FIELD_GROUP_ID] = groupId; jsonObj[FIELD_GROUP_TYPE] = GROUP_TYPE_PEER_TO_PEER_GROUP;