From 6c0d1c64243ac5bd2d469495985c3c031758bf90 Mon Sep 17 00:00:00 2001 From: tan-qingliu Date: Thu, 17 Apr 2025 19:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A0=81=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=80=A7=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tan-qingliu Change-Id: I70834ffbf78266b8e9adfe96c36b7179544cf421 --- interfaces/kits/napi/include/cm_napi_common.h | 3 +++ interfaces/kits/napi/src/cm_napi_common.cpp | 1 - interfaces/kits/napi/src/cm_napi_get_cert_store_path.cpp | 4 ++-- interfaces/kits/napi/src/cm_napi_grant.cpp | 8 ++++---- interfaces/kits/napi/src/cm_napi_sign_verify.cpp | 4 ++-- interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp | 3 ++- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/interfaces/kits/napi/include/cm_napi_common.h b/interfaces/kits/napi/include/cm_napi_common.h index 015722c..eaae94d 100644 --- a/interfaces/kits/napi/include/cm_napi_common.h +++ b/interfaces/kits/napi/include/cm_napi_common.h @@ -57,6 +57,9 @@ static const std::string CM_RESULT_PRPPERTY_CREDENTIAL = "credential"; static const std::string CM_CERT_SCOPE_STR = "certScope"; static const std::string CM_CERT_TYPE_STR = "certType"; +static const std::string GENERIC_MSG = "There is an internal error. Possible causes: " + "1.IPC communication failed. 2.Memory operation error."; + static const int32_t RESULT_NUMBER = 2; static const uint32_t APPLICATION_CERTIFICATE_STORE = 0; static const uint32_t APPLICATION_PRIVATE_CERTIFICATE_STORE = 3; diff --git a/interfaces/kits/napi/src/cm_napi_common.cpp b/interfaces/kits/napi/src/cm_napi_common.cpp index 4823daa..1439382 100644 --- a/interfaces/kits/napi/src/cm_napi_common.cpp +++ b/interfaces/kits/napi/src/cm_napi_common.cpp @@ -28,7 +28,6 @@ constexpr int CM_MAX_DATA_LEN = 0x6400000; // The maximum length is 100M static const std::string NO_PERMISSION_MSG = "the caller has no permission"; static const std::string NOT_SYSTEM_APP_MSG = "the caller is not a system application"; static const std::string INVALID_PARAMS_MSG = "the input parameters is invalid"; -static const std::string GENERIC_MSG = "there is an internal error"; static const std::string NO_FOUND_MSG = "the certificate do not exist"; static const std::string INCORRECT_FORMAT_MSG = "the input cert data is invalid"; static const std::string MAX_CERT_COUNT_REACHED_MSG = "the count of certificates or credentials reach the max"; diff --git a/interfaces/kits/napi/src/cm_napi_get_cert_store_path.cpp b/interfaces/kits/napi/src/cm_napi_get_cert_store_path.cpp index 66b074e..0677bc2 100644 --- a/interfaces/kits/napi/src/cm_napi_get_cert_store_path.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_cert_store_path.cpp @@ -92,7 +92,7 @@ static napi_value GetCertStorePath(napi_env env, const enum CmCertType certType, int32_t ret = GetUserCaStorePath(certScope, path); if (ret != CM_SUCCESS) { CM_LOG_E("Failed to get user ca path."); - ThrowError(env, INNER_FAILURE, "there is an internal error"); + ThrowError(env, INNER_FAILURE, GENERIC_MSG); return nullptr; } } @@ -101,7 +101,7 @@ static napi_value GetCertStorePath(napi_env env, const enum CmCertType certType, napi_status status = napi_create_string_utf8(env, path.c_str(), path.length(), &result); if (status != napi_ok) { CM_LOG_E("Failed to creat string out."); - ThrowError(env, INNER_FAILURE, "there is an internal error"); + ThrowError(env, INNER_FAILURE, GENERIC_MSG); return nullptr; } return result; diff --git a/interfaces/kits/napi/src/cm_napi_grant.cpp b/interfaces/kits/napi/src/cm_napi_grant.cpp index cfa5854..9eb949e 100644 --- a/interfaces/kits/napi/src/cm_napi_grant.cpp +++ b/interfaces/kits/napi/src/cm_napi_grant.cpp @@ -354,7 +354,7 @@ static napi_value GrantUidAsyncWork(napi_env env, GrantAsyncContext context) napi_status status = napi_queue_async_work(env, context->asyncWork); if (status != napi_ok) { - ThrowError(env, INNER_FAILURE, "queue asyncWork error"); + ThrowError(env, INNER_FAILURE, GENERIC_MSG); CM_LOG_E("get async work failed when granting uid"); return nullptr; } @@ -378,7 +378,7 @@ static napi_value RemoveUidAsyncWork(napi_env env, GrantAsyncContext context) napi_status status = napi_queue_async_work(env, context->asyncWork); if (status != napi_ok) { - ThrowError(env, INNER_FAILURE, "queue asyncWork error"); + ThrowError(env, INNER_FAILURE, GENERIC_MSG); CM_LOG_E("queue async work failed when removing uid"); return nullptr; } @@ -402,7 +402,7 @@ static napi_value IsAuthedAsyncWork(napi_env env, GrantAsyncContext context) napi_status status = napi_queue_async_work(env, context->asyncWork); if (status != napi_ok) { - ThrowError(env, INNER_FAILURE, "queue asyncWork error"); + ThrowError(env, INNER_FAILURE, GENERIC_MSG); CM_LOG_E("queue async work failed when using isAuthed"); return nullptr; } @@ -426,7 +426,7 @@ static napi_value GetUidListAsyncWork(napi_env env, GrantAsyncContext context) napi_status status = napi_queue_async_work(env, context->asyncWork); if (status != napi_ok) { - ThrowError(env, INNER_FAILURE, "queue asyncWork error"); + ThrowError(env, INNER_FAILURE, GENERIC_MSG); CM_LOG_E("queue async work failed when getting authed uid list"); return nullptr; } diff --git a/interfaces/kits/napi/src/cm_napi_sign_verify.cpp b/interfaces/kits/napi/src/cm_napi_sign_verify.cpp index a583e82..39ccfa9 100644 --- a/interfaces/kits/napi/src/cm_napi_sign_verify.cpp +++ b/interfaces/kits/napi/src/cm_napi_sign_verify.cpp @@ -357,7 +357,7 @@ static napi_value MallocFinishOutData(napi_env env, SignVerifyAsyncContext conte context->signature = static_cast(CmMalloc(sizeof(CmBlob))); if (context->signature == nullptr) { /* signature will free after all process */ CM_LOG_E("malloc outData failed when process sign finish"); - ThrowError(env, INNER_FAILURE, "malloc failed"); + ThrowError(env, INNER_FAILURE, GENERIC_MSG); return nullptr; } (void)memset_s(context->signature, sizeof(CmBlob), 0, sizeof(CmBlob)); @@ -365,7 +365,7 @@ static napi_value MallocFinishOutData(napi_env env, SignVerifyAsyncContext conte uint8_t *data = static_cast(CmMalloc(OUT_SIGNATURE_SIZE)); if (data == nullptr) { CM_LOG_E("malloc outData.data failed when process sign finish"); - ThrowError(env, INNER_FAILURE, "malloc failed"); + ThrowError(env, INNER_FAILURE, GENERIC_MSG); return nullptr; } (void)memset_s(data, OUT_SIGNATURE_SIZE, 0, OUT_SIGNATURE_SIZE); diff --git a/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp b/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp index 2635285..5379a16 100644 --- a/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp +++ b/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp @@ -48,7 +48,8 @@ constexpr int CM_MAX_DATA_LEN = 0x6400000; // The maximum length is 100M static const std::string DIALOG_NO_PERMISSION_MSG = "the caller has no permission"; static const std::string DIALOG_INVALID_PARAMS_MSG = "the input parameters is invalid"; -static const std::string DIALOG_GENERIC_MSG = "there is an internal error"; +static const std::string DIALOG_GENERIC_MSG = "There is an internal error. Possible causes: " + "1.IPC communication failed. 2.Memory operation error."; static const std::string DIALOG_OPERATION_CANCELS_MSG = "the user cancels the installation operation"; static const std::string DIALOG_INSTALL_FAILED_MSG = "the user install certificate failed" " in the certificate manager dialog"; -- Gitee