From 96aa311bfc3ff541d1c4f4acb269b032d819a368 Mon Sep 17 00:00:00 2001 From: xujie Date: Tue, 19 Mar 2024 12:48:33 +0800 Subject: [PATCH 1/2] update 0319 Signed-off-by: xujie --- .../cert_manager_standard/main/include/cm_type.h | 1 + interfaces/kits/napi/include/cm_napi_common.h | 1 + .../kits/napi/include/cm_napi_get_app_cert_info.h | 2 +- .../kits/napi/include/cm_napi_get_app_cert_list.h | 2 +- .../napi/include/cm_napi_get_system_cert_list.h | 2 +- interfaces/kits/napi/include/cm_napi_grant.h | 4 ++-- .../kits/napi/include/cm_napi_install_app_cert.h | 2 +- .../napi/include/cm_napi_uninstall_app_cert.h | 2 +- interfaces/kits/napi/src/cm_napi.cpp | 15 ++++++++------- interfaces/kits/napi/src/cm_napi_common.cpp | 3 +++ .../kits/napi/src/cm_napi_get_app_cert_info.cpp | 2 +- .../kits/napi/src/cm_napi_get_app_cert_list.cpp | 2 +- .../napi/src/cm_napi_get_system_cert_list.cpp | 2 +- interfaces/kits/napi/src/cm_napi_grant.cpp | 4 ++-- .../kits/napi/src/cm_napi_install_app_cert.cpp | 2 +- .../kits/napi/src/cm_napi_uninstall_app_cert.cpp | 2 +- .../main/core/src/cert_manager_service.c | 1 - test/unittest/src/cm_user_cert_test.cpp | 6 +++--- 18 files changed, 30 insertions(+), 25 deletions(-) diff --git a/interfaces/innerkits/cert_manager_standard/main/include/cm_type.h b/interfaces/innerkits/cert_manager_standard/main/include/cm_type.h index c026d9b..caae9eb 100644 --- a/interfaces/innerkits/cert_manager_standard/main/include/cm_type.h +++ b/interfaces/innerkits/cert_manager_standard/main/include/cm_type.h @@ -132,6 +132,7 @@ enum CmErrorCode { CMR_ERROR_AUTH_CHECK_FAILED = -24, CMR_ERROR_KEY_OPERATION_FAILED = -25, CMR_ERROR_NOT_SYSTEMP_APP = -26, + CMR_ERROR_MAX_QUANTITY_REACHED = -27, }; enum CMErrorCode { /* temp use */ diff --git a/interfaces/kits/napi/include/cm_napi_common.h b/interfaces/kits/napi/include/cm_napi_common.h index 64e6d7c..0e187ae 100644 --- a/interfaces/kits/napi/include/cm_napi_common.h +++ b/interfaces/kits/napi/include/cm_napi_common.h @@ -155,6 +155,7 @@ enum ErrorCode { INNER_FAILURE = 17500001, NOT_FOUND = 17500002, INVALID_CERT_FORMAT = 17500003, + MAX_QUANTITY_REACHED = 17500004, }; enum CmJSKeyDigest { diff --git a/interfaces/kits/napi/include/cm_napi_get_app_cert_info.h b/interfaces/kits/napi/include/cm_napi_get_app_cert_info.h index 153881e..0b297ec 100644 --- a/interfaces/kits/napi/include/cm_napi_get_app_cert_info.h +++ b/interfaces/kits/napi/include/cm_napi_get_app_cert_info.h @@ -20,7 +20,7 @@ #include "napi/native_node_api.h" namespace CMNapi { -napi_value CMNapiGetAppCertInfo(napi_env env, napi_callback_info info); +napi_value CMNapiGetPublicCertInfo(napi_env env, napi_callback_info info); napi_value CMNapiGetPrivateAppCertInfo(napi_env env, napi_callback_info info); } // namespace CertManagerNapi diff --git a/interfaces/kits/napi/include/cm_napi_get_app_cert_list.h b/interfaces/kits/napi/include/cm_napi_get_app_cert_list.h index 83ba2f5..31a9f0f 100644 --- a/interfaces/kits/napi/include/cm_napi_get_app_cert_list.h +++ b/interfaces/kits/napi/include/cm_napi_get_app_cert_list.h @@ -20,7 +20,7 @@ #include "napi/native_node_api.h" namespace CMNapi { -napi_value CMNapiGetAppCertList(napi_env env, napi_callback_info info); +napi_value CMNapiGetAllPublicCertList(napi_env env, napi_callback_info info); napi_value CMNapiGetPrivateAppCertList(napi_env env, napi_callback_info info); } // namespace CertManagerNapi diff --git a/interfaces/kits/napi/include/cm_napi_get_system_cert_list.h b/interfaces/kits/napi/include/cm_napi_get_system_cert_list.h index 6acbd97..67d5b5c 100644 --- a/interfaces/kits/napi/include/cm_napi_get_system_cert_list.h +++ b/interfaces/kits/napi/include/cm_napi_get_system_cert_list.h @@ -22,7 +22,7 @@ namespace CMNapi { napi_value CMNapiGetSystemCertList(napi_env env, napi_callback_info info); -napi_value CMNapiGetUserTrustedCertList(napi_env env, napi_callback_info info); +napi_value CMNapiGetAllUserTrustedCertList(napi_env env, napi_callback_info info); } // namespace CertManagerNapi #endif // CM_NAPI_GET_CERTIFICATE_LIST_H \ No newline at end of file diff --git a/interfaces/kits/napi/include/cm_napi_grant.h b/interfaces/kits/napi/include/cm_napi_grant.h index e69b8d2..9a14721 100755 --- a/interfaces/kits/napi/include/cm_napi_grant.h +++ b/interfaces/kits/napi/include/cm_napi_grant.h @@ -20,10 +20,10 @@ #include "napi/native_node_api.h" namespace CMNapi { - napi_value CMNapiGrantAppCertificate(napi_env env, napi_callback_info info); + napi_value CMNapiGrantPublicCertificate(napi_env env, napi_callback_info info); napi_value CMNapiIsAuthorizedApp(napi_env env, napi_callback_info info); napi_value CMNapiGetAuthorizedAppList(napi_env env, napi_callback_info info); - napi_value CMNapiRemoveGrantedApp(napi_env env, napi_callback_info info); + napi_value CMNapiRemoveGrantedPublic(napi_env env, napi_callback_info info); } // namespace CMNapi #endif /* CM_NAPI_GRANT_H */ diff --git a/interfaces/kits/napi/include/cm_napi_install_app_cert.h b/interfaces/kits/napi/include/cm_napi_install_app_cert.h index 67aa60e..64cda4e 100644 --- a/interfaces/kits/napi/include/cm_napi_install_app_cert.h +++ b/interfaces/kits/napi/include/cm_napi_install_app_cert.h @@ -20,7 +20,7 @@ #include "napi/native_node_api.h" namespace CMNapi { -napi_value CMNapiInstallAppCert(napi_env env, napi_callback_info info); +napi_value CMNapiInstallPublicCert(napi_env env, napi_callback_info info); napi_value CMNapiInstallPrivateAppCert(napi_env env, napi_callback_info info); } // namespace CertManagerNapi diff --git a/interfaces/kits/napi/include/cm_napi_uninstall_app_cert.h b/interfaces/kits/napi/include/cm_napi_uninstall_app_cert.h index f434a91..cb13fda 100644 --- a/interfaces/kits/napi/include/cm_napi_uninstall_app_cert.h +++ b/interfaces/kits/napi/include/cm_napi_uninstall_app_cert.h @@ -20,7 +20,7 @@ #include "napi/native_node_api.h" namespace CMNapi { -napi_value CMNapiUninstallAppCert(napi_env env, napi_callback_info info); +napi_value CMNapiUninstallPublicCert(napi_env env, napi_callback_info info); napi_value CMNapiUninstallPrivateAppCert(napi_env env, napi_callback_info info); } // namespace CertManagerNapi diff --git a/interfaces/kits/napi/src/cm_napi.cpp b/interfaces/kits/napi/src/cm_napi.cpp index bea9393..d879472 100644 --- a/interfaces/kits/napi/src/cm_napi.cpp +++ b/interfaces/kits/napi/src/cm_napi.cpp @@ -46,6 +46,7 @@ namespace CMNapi { AddInt32Property(env, errorCode, "CM_ERROR_GENERIC", INNER_FAILURE); AddInt32Property(env, errorCode, "CM_ERROR_NO_FOUND", NOT_FOUND); AddInt32Property(env, errorCode, "CM_ERROR_INCORRECT_FORMAT", INVALID_CERT_FORMAT); + AddInt32Property(env, errorCode, "CM_ERROR_MAX_QUANTITY_REACHED", MAX_QUANTITY_REACHED); } static napi_value CreateCMErrorCode(napi_env env) @@ -110,26 +111,26 @@ extern "C" { DECLARE_NAPI_FUNCTION("getSystemTrustedCertificateList", CMNapiGetSystemCertList), DECLARE_NAPI_FUNCTION("getSystemTrustedCertificate", CMNapiGetSystemCertInfo), DECLARE_NAPI_FUNCTION("setCertificateStatus", CMNapiSetCertStatus), - DECLARE_NAPI_FUNCTION("installAppCertificate", CMNapiInstallAppCert), + DECLARE_NAPI_FUNCTION("installPublicCertificate", CMNapiInstallPublicCert), DECLARE_NAPI_FUNCTION("uninstallAllAppCertificate", CMNapiUninstallAllAppCert), - DECLARE_NAPI_FUNCTION("uninstallAppCertificate", CMNapiUninstallAppCert), - DECLARE_NAPI_FUNCTION("getAppCertificateList", CMNapiGetAppCertList), - DECLARE_NAPI_FUNCTION("getAppCertificate", CMNapiGetAppCertInfo), + DECLARE_NAPI_FUNCTION("uninstallPublicCertificate", CMNapiUninstallPublicCert), + DECLARE_NAPI_FUNCTION("getAllPublicCertificates", CMNapiGetAllPublicCertList), + DECLARE_NAPI_FUNCTION("getPublicCertificate", CMNapiGetPublicCertInfo), DECLARE_NAPI_FUNCTION("installUserTrustedCertificate", CMNapiInstallUserTrustedCert), DECLARE_NAPI_FUNCTION("uninstallAllUserTrustedCertificate", CMNapiUninstallAllUserTrustedCert), DECLARE_NAPI_FUNCTION("uninstallUserTrustedCertificate", CMNapiUninstallUserTrustedCert), - DECLARE_NAPI_FUNCTION("getUserTrustedCertificateList", CMNapiGetUserTrustedCertList), + DECLARE_NAPI_FUNCTION("getAllUserTrustedCertificates", CMNapiGetAllUserTrustedCertList), DECLARE_NAPI_FUNCTION("getUserTrustedCertificate", CMNapiGetUserTrustedCertInfo), DECLARE_NAPI_FUNCTION("installPrivateCertificate", CMNapiInstallPrivateAppCert), DECLARE_NAPI_FUNCTION("uninstallPrivateCertificate", CMNapiUninstallPrivateAppCert), DECLARE_NAPI_FUNCTION("getPrivateCertificateList", CMNapiGetPrivateAppCertList), DECLARE_NAPI_FUNCTION("getAllAppPrivateCertificates", CMNapiGetPrivateAppCertList), DECLARE_NAPI_FUNCTION("getPrivateCertificate", CMNapiGetPrivateAppCertInfo), - DECLARE_NAPI_FUNCTION("grantAppCertificate", CMNapiGrantAppCertificate), + DECLARE_NAPI_FUNCTION("grantPublicCertificate", CMNapiGrantPublicCertificate), DECLARE_NAPI_FUNCTION("isAuthorizedApp", CMNapiIsAuthorizedApp), DECLARE_NAPI_FUNCTION("getAuthorizedAppList", CMNapiGetAuthorizedAppList), - DECLARE_NAPI_FUNCTION("removeGrantedAppCertificate", CMNapiRemoveGrantedApp), + DECLARE_NAPI_FUNCTION("removeGrantedPublicCertificate", CMNapiRemoveGrantedPublic), DECLARE_NAPI_FUNCTION("init", CMNapiInit), DECLARE_NAPI_FUNCTION("update", CMNapiUpdate), DECLARE_NAPI_FUNCTION("finish", CMNapiFinish), diff --git a/interfaces/kits/napi/src/cm_napi_common.cpp b/interfaces/kits/napi/src/cm_napi_common.cpp index 6c237e6..6cada6e 100644 --- a/interfaces/kits/napi/src/cm_napi_common.cpp +++ b/interfaces/kits/napi/src/cm_napi_common.cpp @@ -349,6 +349,9 @@ int32_t TranformErrorCode(int32_t errorCode) if (errorCode == CMR_ERROR_INVALID_ARGUMENT) { return PARAM_ERROR; } + if (errorCode == CMR_ERROR_MAX_QUANTITY_REACHED) { + return MAX_QUANTITY_REACHED; + } return INNER_FAILURE; } diff --git a/interfaces/kits/napi/src/cm_napi_get_app_cert_info.cpp b/interfaces/kits/napi/src/cm_napi_get_app_cert_info.cpp index fdbc134..1a0418c 100644 --- a/interfaces/kits/napi/src/cm_napi_get_app_cert_info.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_app_cert_info.cpp @@ -19,7 +19,7 @@ #include "cm_log.h" namespace CMNapi { -napi_value CMNapiGetAppCertInfo(napi_env env, napi_callback_info info) +napi_value CMNapiGetPublicCertInfo(napi_env env, napi_callback_info info) { return CMNapiGetAppCertInfoCommon(env, info, APPLICATION_CERTIFICATE_STORE); } diff --git a/interfaces/kits/napi/src/cm_napi_get_app_cert_list.cpp b/interfaces/kits/napi/src/cm_napi_get_app_cert_list.cpp index fbc4610..e55e8a8 100644 --- a/interfaces/kits/napi/src/cm_napi_get_app_cert_list.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_app_cert_list.cpp @@ -19,7 +19,7 @@ #include "cm_log.h" namespace CMNapi { -napi_value CMNapiGetAppCertList(napi_env env, napi_callback_info info) +napi_value CMNapiGetAllPublicCertList(napi_env env, napi_callback_info info) { return CMNapiGetAppCertListCommon(env, info, APPLICATION_CERTIFICATE_STORE); } diff --git a/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp b/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp index 35a6076..aec2c5f 100644 --- a/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp @@ -208,7 +208,7 @@ napi_value CMNapiGetSystemCertList(napi_env env, napi_callback_info info) return result; } -napi_value CMNapiGetUserTrustedCertList(napi_env env, napi_callback_info info) +napi_value CMNapiGetAllUserTrustedCertList(napi_env env, napi_callback_info info) { GetCertListAsyncContext context = CreateGetCertListAsyncContext(); if (context == nullptr) { diff --git a/interfaces/kits/napi/src/cm_napi_grant.cpp b/interfaces/kits/napi/src/cm_napi_grant.cpp index 65cad06..8177cb3 100644 --- a/interfaces/kits/napi/src/cm_napi_grant.cpp +++ b/interfaces/kits/napi/src/cm_napi_grant.cpp @@ -428,7 +428,7 @@ static napi_value GetUidListAsyncWork(napi_env env, GrantAsyncContext context) return promise; } -napi_value CMNapiGrantAppCertificate(napi_env env, napi_callback_info info) +napi_value CMNapiGrantPublicCertificate(napi_env env, napi_callback_info info) { GrantAsyncContext context = InitGrantAsyncContext(); if (context == nullptr) { @@ -503,7 +503,7 @@ napi_value CMNapiGetAuthorizedAppList(napi_env env, napi_callback_info info) return result; } -napi_value CMNapiRemoveGrantedApp(napi_env env, napi_callback_info info) +napi_value CMNapiRemoveGrantedPublic(napi_env env, napi_callback_info info) { GrantAsyncContext context = InitGrantAsyncContext(); if (context == nullptr) { diff --git a/interfaces/kits/napi/src/cm_napi_install_app_cert.cpp b/interfaces/kits/napi/src/cm_napi_install_app_cert.cpp index ee0a2e0..01bc43c 100644 --- a/interfaces/kits/napi/src/cm_napi_install_app_cert.cpp +++ b/interfaces/kits/napi/src/cm_napi_install_app_cert.cpp @@ -19,7 +19,7 @@ #include "cm_log.h" namespace CMNapi { -napi_value CMNapiInstallAppCert(napi_env env, napi_callback_info info) +napi_value CMNapiInstallPublicCert(napi_env env, napi_callback_info info) { return CMNapiInstallAppCertCommon(env, info, APPLICATION_CERTIFICATE_STORE); } diff --git a/interfaces/kits/napi/src/cm_napi_uninstall_app_cert.cpp b/interfaces/kits/napi/src/cm_napi_uninstall_app_cert.cpp index e855e4a..6fdecb5 100644 --- a/interfaces/kits/napi/src/cm_napi_uninstall_app_cert.cpp +++ b/interfaces/kits/napi/src/cm_napi_uninstall_app_cert.cpp @@ -19,7 +19,7 @@ #include "cm_log.h" namespace CMNapi { -napi_value CMNapiUninstallAppCert(napi_env env, napi_callback_info info) +napi_value CMNapiUninstallPublicCert(napi_env env, napi_callback_info info) { return CMNapiUninstallAppCertCommon(env, info, APPLICATION_CERTIFICATE_STORE); } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_service.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_service.c index 1405fdb..f3ea59f 100755 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_service.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_service.c @@ -533,7 +533,6 @@ int32_t CmInstallUserCert(const struct CmContext *context, const struct CmBlob * ret = CmWriteUserCert(context, &pathBlob, userCert, certAlias, certUri); if (ret != CM_SUCCESS) { CM_LOG_E("CertManagerWriteUserCert fail"); - ret = CM_FAILURE; break; } diff --git a/test/unittest/src/cm_user_cert_test.cpp b/test/unittest/src/cm_user_cert_test.cpp index 5835fb8..114f141 100755 --- a/test/unittest/src/cm_user_cert_test.cpp +++ b/test/unittest/src/cm_user_cert_test.cpp @@ -683,7 +683,7 @@ HWTEST_F(CmUserCertTest, InstallUserCertTest007, TestSize.Level0) struct CmBlob certUri257 = { sizeof(certUriBuf257), certUriBuf257 }; ret = CmInstallUserTrustedCert(&userCertTest, &certAlias257, &certUri257); - EXPECT_EQ(ret, CM_FAILURE) << "Normal user cert Install test failed, recode:" << ret; + EXPECT_EQ(ret, CMR_ERROR_MAX_QUANTITY_REACHED) << "Normal user cert Install test failed, recode:" << ret; uint8_t certAliasBuf000[] = "alias0"; /* update 001th user cert */ uint8_t certUriBuf000[MAX_URI_LEN] = {0}; @@ -735,7 +735,7 @@ HWTEST_F(CmUserCertTest, InstallUserCertTest009, TestSize.Level0) struct CmBlob certUriTemp = { sizeof(certUriBuf), certUriBuf }; ret = CmInstallUserTrustedCert(&userCertTemp, &largeAlias, &certUriTemp); - EXPECT_EQ(ret, CM_FAILURE) << "Normal user cert Install test failed, recode:" << ret; + EXPECT_EQ(ret, CMR_ERROR_INVALID_ARGUMENT) << "Normal user cert Install test failed, recode:" << ret; } /** @@ -775,7 +775,7 @@ HWTEST_F(CmUserCertTest, InstallUserCertTest011, TestSize.Level0) struct CmBlob largeUri = { sizeof(largeUriBuf), largeUriBuf }; ret = CmInstallUserTrustedCert(&userCertTemp, &edgeAlias, &largeUri); - EXPECT_EQ(ret, CM_FAILURE) << "Normal user cert Install test failed, recode:" << ret; + EXPECT_EQ(ret, CMR_ERROR_INVALID_ARGUMENT) << "Normal user cert Install test failed, recode:" << ret; } /** -- Gitee From 72a281c62bf4c9fe33dc3219ed9206352d3e2687 Mon Sep 17 00:00:00 2001 From: xujie Date: Tue, 19 Mar 2024 15:11:51 +0800 Subject: [PATCH 2/2] update 0319_2 Signed-off-by: xujie --- .../cert_manager_engine/main/core/src/cert_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c index dea5696..11c61e4 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c @@ -488,7 +488,7 @@ int32_t CmWriteUserCert(const struct CmContext *context, struct CmMutableBlob *p ret = CherkCertCountBeyondMax((char*)pathBlob->data, (char *)certUri->data); if (ret != CM_SUCCESS) { CM_LOG_E("cert count beyond maxcount, can't install"); - ret = CMR_ERROR_INVALID_ARGUMENT; + ret = CMR_ERROR_MAX_QUANTITY_REACHED; break; } -- Gitee