From d6abc26c70ad1fef962d950806a8e562a269e9ad Mon Sep 17 00:00:00 2001 From: sunjiakun Date: Mon, 1 Jul 2024 19:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81Ad=20Hoc=E5=8F=91=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunjiakun --- .../innerkits/appverify/include/provision/provision_info.h | 1 + .../innerkits/appverify/src/provision/provision_verify.cpp | 7 +++++-- .../innerkits/appverify/src/verify/hap_verify_v2.cpp | 1 + interfaces/innerkits/appverify_lite/src/app_provision.c | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/interfaces/innerkits/appverify/include/provision/provision_info.h b/interfaces/innerkits/appverify/include/provision/provision_info.h index a11b1b7..f33232a 100644 --- a/interfaces/innerkits/appverify/include/provision/provision_info.h +++ b/interfaces/innerkits/appverify/include/provision/provision_info.h @@ -36,6 +36,7 @@ enum AppDistType { CROWDTESTING = 4, ENTERPRISE_NORMAL = 5, ENTERPRISE_MDM = 6, + INTERNALTESTING = 7, }; struct BundleInfo { diff --git a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp index 2f4a20f..cc497c8 100644 --- a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp +++ b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp @@ -62,6 +62,7 @@ const string VALUE_DIST_TYPE_APP_GALLERY = "app_gallery"; const string VALUE_DIST_TYPE_ENTERPRISE = "enterprise"; const string VALUE_DIST_TYPE_ENTERPRISE_NORMAL = "enterprise_normal"; const string VALUE_DIST_TYPE_ENTERPRISE_MDM = "enterprise_mdm"; +const string VALUR_DIST_TYPE_INTERNALTESTING = "internaltesting"; const string VALUE_DIST_TYPE_OS_INTEGRATION = "os_integration"; const string VALUE_DIST_TYPE_CROWDTESTING = "crowdtesting"; const string VALUE_DEVICE_ID_TYPE_UDID = "udid"; @@ -126,7 +127,8 @@ const std::map distTypeMap = { {VALUE_DIST_TYPE_ENTERPRISE_NORMAL, AppDistType::ENTERPRISE_NORMAL}, {VALUE_DIST_TYPE_ENTERPRISE_MDM, AppDistType::ENTERPRISE_MDM}, {VALUE_DIST_TYPE_OS_INTEGRATION, AppDistType::OS_INTEGRATION}, - {VALUE_DIST_TYPE_CROWDTESTING, AppDistType::CROWDTESTING} + {VALUE_DIST_TYPE_CROWDTESTING, AppDistType::CROWDTESTING}, + {VALUR_DIST_TYPE_INTERNALTESTING, AppDistType::INTERNALTESTING} }; static bool g_isRdDevice = false; @@ -351,7 +353,8 @@ AppProvisionVerifyResult ParseAndVerify(const string& appProvision, ProvisionInf } #ifndef X86_EMULATOR_MODE HAPVERIFY_LOG_DEBUG("rd device status is %{public}d", g_isRdDevice); - if (info.type == ProvisionType::DEBUG && !g_isRdDevice) { + if ((info.type == ProvisionType::DEBUG && !g_isRdDevice) + || info.distributionType == Security::Verify::AppDistType::INTERNALTESTING) { ret = CheckDeviceID(info); if (ret != PROVISION_OK) { return ret; diff --git a/interfaces/innerkits/appverify/src/verify/hap_verify_v2.cpp b/interfaces/innerkits/appverify/src/verify/hap_verify_v2.cpp index 6910834..953cadd 100644 --- a/interfaces/innerkits/appverify/src/verify/hap_verify_v2.cpp +++ b/interfaces/innerkits/appverify/src/verify/hap_verify_v2.cpp @@ -322,6 +322,7 @@ bool HapVerifyV2::IsAppDistributedTypeAllowInstall(const AppDistType& type, cons case AppDistType::ENTERPRISE_MDM: case AppDistType::OS_INTEGRATION: case AppDistType::CROWDTESTING: + case AppDistType::INTERNALTESTING: return true; default: return false; diff --git a/interfaces/innerkits/appverify_lite/src/app_provision.c b/interfaces/innerkits/appverify_lite/src/app_provision.c index 92f63a2..598f5d9 100644 --- a/interfaces/innerkits/appverify_lite/src/app_provision.c +++ b/interfaces/innerkits/appverify_lite/src/app_provision.c @@ -26,6 +26,7 @@ const char ENTERPRISE[] = "enterprise"; const char ENTERPRISE_NORMAL[] = "enterprise_normal"; const char ENTERPRISE_MDM[] = "enterprise_mdm"; const char OS_INTEGRATION[] = "os_integration"; +const char INTERNALTESTING[] = "internaltesting"; static void ProfInit(ProfileProf *pf) { @@ -348,7 +349,7 @@ static int32_t VerifyAppTypeAndDistribution(const ProfileProf *pf) if (strcmp(pf->type, RELEASE_TYPE) == 0) { if ((strcmp(pf->appDistType, APP_GALLERY) != 0) && (strcmp(pf->appDistType, ENTERPRISE) != 0) && (strcmp(pf->appDistType, ENTERPRISE_NORMAL) != 0) && (strcmp(pf->appDistType, ENTERPRISE_MDM) != 0) && - (strcmp(pf->appDistType, OS_INTEGRATION) != 0)) { + (strcmp(pf->appDistType, INTERNALTESTING) != 0) && (strcmp(pf->appDistType, OS_INTEGRATION) != 0)) { LOG_PRINT_STR("invalid app dis type: %s", pf->appDistType); return V_ERR; } -- Gitee