From 90f37f80cc1fcb76f2c85bc974d80acd3fa17b72 Mon Sep 17 00:00:00 2001 From: h30034439 Date: Wed, 13 Mar 2024 14:30:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=AD=96=E7=95=A5=E5=92=8C?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E6=B7=BB=E5=8A=A0=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: h30034439 --- common/native/include/security_report.h | 2 +- common/native/src/security_report.cpp | 3 ++- .../include/enterprise_device_mgr_ability.h | 3 ++- .../edm/src/enterprise_device_mgr_ability.cpp | 21 ++++++------------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/common/native/include/security_report.h b/common/native/include/security_report.h index d56ffa5b4..ac44952d8 100644 --- a/common/native/include/security_report.h +++ b/common/native/include/security_report.h @@ -23,7 +23,7 @@ namespace EDM { class SecurityReport { public: static void ReportSecurityInfo(const std::string &bundleName, const std::string &abilityName, - const std::string &policyName); + const std::string &policyName, const std::string &outcome); }; } // namespace EDM } // namespace OHOS diff --git a/common/native/src/security_report.cpp b/common/native/src/security_report.cpp index 56942bb84..351af1d1e 100644 --- a/common/native/src/security_report.cpp +++ b/common/native/src/security_report.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace EDM { void SecurityReport::ReportSecurityInfo(const std::string &bundleName, const std::string &abilityName, - const std::string &policyName) + const std::string &policyName, const std::string &outcome) { #ifdef SECURITY_GUARDE_ENABLE const int64_t EVENT_ID = 1011015013; // 1011015013: report event id @@ -39,6 +39,7 @@ void SecurityReport::ReportSecurityInfo(const std::string &bundleName, const std jsonResult["subType"] = 0; // default jsonResult["caller"] = callPkgJson; jsonResult["objectInfo"] = policyName; + jsonResult["outcome"] = outcome; std::shared_ptr eventInfo = std::make_shared(EVENT_ID, "1.0", jsonResult.dump()); int32_t ret = OHOS::Security::SecurityGuard::NativeDataCollectKit::ReportSecurityInfo(eventInfo); if (ret != ERR_OK) { diff --git a/services/edm/include/enterprise_device_mgr_ability.h b/services/edm/include/enterprise_device_mgr_ability.h index c9758b426..09e620cfa 100644 --- a/services/edm/include/enterprise_device_mgr_ability.h +++ b/services/edm/include/enterprise_device_mgr_ability.h @@ -106,7 +106,8 @@ private: void OnAppManagerServiceStart(int32_t systemAbilityId, const std::string &deviceId); void OnAbilityManagerServiceStart(int32_t systemAbilityId, const std::string &deviceId); void OnCommonEventServiceStart(int32_t systemAbilityId, const std::string &deviceId); - void CreateSecurityContent(std::shared_ptr deviceAdmin, std::shared_ptr plugin); + void CreateSecurityContent(std::shared_ptr deviceAdmin, std::shared_ptr plugin, + const std::string &outcome); void InitAllPolices(); void RemoveAllDebugAdmin(); void ConnectAbilityOnSystemUpdate(const UpdateInfo &updateInfo); diff --git a/services/edm/src/enterprise_device_mgr_ability.cpp b/services/edm/src/enterprise_device_mgr_ability.cpp index 409d9041d..005b9e5de 100644 --- a/services/edm/src/enterprise_device_mgr_ability.cpp +++ b/services/edm/src/enterprise_device_mgr_ability.cpp @@ -57,13 +57,6 @@ const std::string FIRMWARE_EVENT_INFO_TYPE = "packageType"; const std::string FIRMWARE_EVENT_INFO_CHECK_TIME = "firstReceivedTime"; const std::string DEVELOP_MODE_STATE = "const.security.developermode.state"; -const std::vector codeList = { - EdmInterfaceCode::RESET_FACTORY, - EdmInterfaceCode::DISABLED_PRINTER, - EdmInterfaceCode::DISABLED_HDC, - EdmInterfaceCode::NTP_SERVER, -}; - std::mutex EnterpriseDeviceMgrAbility::mutexLock_; sptr EnterpriseDeviceMgrAbility::instance_; @@ -922,22 +915,20 @@ ErrCode EnterpriseDeviceMgrAbility::HandleDevicePolicy(uint32_t code, AppExecFwk EDMLOGW("HandleDevicePolicy: VerifyCallingPermission failed"); return EdmReturnErrCode::PERMISSION_DENIED; } - CreateSecurityContent(deviceAdmin, plugin); + CreateSecurityContent(deviceAdmin, plugin, "NA"); + ErrCode ret = UpdateDevicePolicy(code, admin, data, reply, userId); + CreateSecurityContent(deviceAdmin, plugin, std::to_string(ret)); + return ret; #endif - return UpdateDevicePolicy(code, admin, data, reply, userId); } void EnterpriseDeviceMgrAbility::CreateSecurityContent(std::shared_ptr deviceAdmin, - std::shared_ptr plugin) + std::shared_ptr plugin, const std::string &outcome) { - if (std::find(codeList.begin(), codeList.end(), plugin->GetCode()) == codeList.end()) { - EDMLOGE("EnterpriseDeviceMgrAbility::CreateSecurityContent code not in list: %{public}d", plugin->GetCode()); - return; - } std::string bundleName = deviceAdmin->adminInfo_.packageName_; std::string abilityName = deviceAdmin->adminInfo_.className_; std::string policyName = plugin->GetPolicyName(); - SecurityReport::ReportSecurityInfo(bundleName, abilityName, policyName); + SecurityReport::ReportSecurityInfo(bundleName, abilityName, policyName, outcome); } ErrCode EnterpriseDeviceMgrAbility::GetDevicePolicy(uint32_t code, MessageParcel &data, MessageParcel &reply, -- Gitee