openharmony/security_security_component_manager
1
0
Fork 0
mirror of https://github.com/openharmony/security_security_component_manager.git synced 2026-08-24 22:51:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

!200 挑单

Browse Source 
Merge pull request !200 from 乔克叔叔/OpenHarmony-5.0.1-Release
This commit is contained in:
openharmony_ci
2024-09-27 03:58:08 +00:00
committed by Gitee
parent 42b3217c81 24533b8396
commit ebecb415be
19 changed files with 268 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/common/src/sec_comp_tool.cpp
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -35,7 +35,7 @@ static constexpr double TWO_HUNDREDS_FORTY_ANGLE = 240.0;
static constexpr double THREE_HUNDREDS_SIXTY_ANGLE = 360.0;
static constexpr double DEFAULT_R = 100.0;
static const uint8_t MAX_ALPHA = 0xFF;
static const double MIN_CONTRACST_ALPHA = 0.5;
static const double MIN_CONTRAST_ALPHA = 0.5;
constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_SECURITY_COMPONENT, "SecCompTool"};
}
@@ -129,7 +129,7 @@ static bool IsColorAplhaSimilar(const SecCompColor& fgColor, const SecCompColor&
double bgAlpha = static_cast<double>(bgColor.argb.alpha) / MAX_ALPHA;
double mixAlpha = fgAlpha + bgAlpha - fgAlpha * bgAlpha;
if (GreatNotEqual(bgAlpha / mixAlpha, MIN_CONTRACST_ALPHA)) {
if (GreatNotEqual(bgAlpha / mixAlpha, MIN_CONTRAST_ALPHA)) {
SC_LOG_ERROR(LABEL, "FgAlpha=%{public}x BgAlpha=%{public}x is similar, check failed",
fgColor.argb.alpha, bgColor.argb.alpha);
return true;
frameworks/enhance_adapter/src/sec_comp_enhance_adapter.cpp
+3 -11
View File
@@ -30,17 +30,9 @@ namespace {
static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {
LOG_CORE, SECURITY_DOMAIN_SECURITY_COMPONENT, "SecCompEnhanceAdapter"};
#if defined(__LP64__)
static const std::string LIB_PATH = "/system/lib64/";
#else
static const std::string LIB_PATH = "/system/lib/";
#endif
static const std::string INNER_PATH = "platformsdk/";
static const std::string ENHANCE_INPUT_INTERFACE_LIB =
LIB_PATH + INNER_PATH + "libsecurity_component_client_enhance.z.so";
static const std::string ENHANCE_SRV_INTERFACE_LIB = LIB_PATH + "libsecurity_component_service_enhance.z.so";
static const std::string ENHANCE_CLIENT_INTERFACE_LIB =
LIB_PATH + INNER_PATH + "libsecurity_component_client_enhance.z.so";
static const std::string ENHANCE_INPUT_INTERFACE_LIB = "libsecurity_component_client_enhance.z.so";
static const std::string ENHANCE_SRV_INTERFACE_LIB = "libsecurity_component_service_enhance.z.so";
static const std::string ENHANCE_CLIENT_INTERFACE_LIB = "libsecurity_component_client_enhance.z.so";
}
SecCompInputEnhanceInterface* SecCompEnhanceAdapter::inputHandler = nullptr;
hisysevent.yaml
+10
View File
@@ -17,6 +17,7 @@ CALLBACK_FAILED:
__BASE: {type: SECURITY, level: CRITICAL, desc: Failed to execute the callback}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_UID: {type: INT32, desc: caller uid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
CALL_SCENE: {type: STRING, desc: call scene}
REASON: {type: STRING, desc: callback execution failure cause}
SC_ID: {type: INT32, desc: security component id}
@@ -26,12 +27,14 @@ CALLER_CHECK_FAILED:
__BASE: {type: SECURITY, level: CRITICAL, desc: Illegal invocation}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_UID: {type: INT32, desc: caller uid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
CALL_SCENE: {type: STRING, desc: call scene}
CHALLENGE_CHECK_FAILED:
__BASE: {type: SECURITY, level: CRITICAL, desc: Challenge value verification failed}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_UID: {type: INT32, desc: caller uid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
CALL_SCENE: {type: STRING, desc: call scene}
SC_ID: {type: INT32, desc: security component id}
SC_TYPE: {type: STRING, desc: security component type}
@@ -40,6 +43,7 @@ CLICK_INFO_CHECK_FAILED:
__BASE: {type: SECURITY, level: CRITICAL, desc: Failed to verify the click event}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_UID: {type: INT32, desc: caller uid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
SC_ID: {type: INT32, desc: security component id}
SC_TYPE: {type: STRING, desc: security component type}
@@ -47,6 +51,7 @@ COMPONENT_INFO_CHECK_FAILED:
__BASE: {type: SECURITY, level: CRITICAL, desc: Failed to verify the component information}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_UID: {type: INT32, desc: caller uid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
CALL_SCENE: {type: STRING, desc: call scene}
SC_ID: {type: INT32, desc: security component id}
SC_TYPE: {type: STRING, desc: security component type}
@@ -55,6 +60,7 @@ INIT_FAILED:
__BASE: {type: FAULT, level: CRITICAL, desc: Failed to initialize the security component environment}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_UID: {type: INT32, desc: caller uid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
REASON: {type: STRING, desc: callback execution failure cause}
REGISTER_SUCCESS:
@@ -79,6 +85,7 @@ TEMP_GRANT_FAILED:
__BASE: {type: FAULT, level: CRITICAL, desc: Security component authorization failed}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_UID: {type: INT32, desc: caller uid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
SC_ID: {type: INT32, desc: security component id}
SC_TYPE: {type: STRING, desc: security component type}
@@ -98,6 +105,7 @@ UNREGISTER_SUCCESS:
SESSION_INFO_CHECK_FAILED:
__BASE: {type: BEHAVIOR, level: MINOR, desc: Failed to verify session information}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
CLIENT_SESSION_ID: {type: INT32, desc: session id stored in client}
CLIENT_SEQ_NUM: {type: INT32, desc: sequence number stored in client}
SERVICE_SESSION_ID: {type: INT32, desc: session id stored in server}
@@ -106,6 +114,7 @@ SESSION_INFO_CHECK_FAILED:
CALLBACK_INFO_CHECK_FAILED:
__BASE: {type: BEHAVIOR, level: MINOR, desc: Failed to verify session information}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
CLIENT_SESSION_ID: {type: INT32, desc: session id stored in client}
CLIENT_SEQ_NUM: {type: INT32, desc: sequence number stored in client}
SERVICE_SESSION_ID: {type: INT32, desc: session id stored in server}
@@ -115,5 +124,6 @@ PREPROCESS_MESSAGE_FAILED:
__BASE: {type: BEHAVIOR, level: MINOR, desc: Failed to verify session information}
PREPROCESS_TYPE: {type: INT32, desc: preprocess type}
CALLER_PID: {type: INT32, desc: caller pid}
CALLER_BUNDLE_NAME: {type: STRING, desc: caller bundle name}
CLIENT_SESSION_ID: {type: INT32, desc: session id stored in client}
CLIENT_SEQ_NUM: {type: INT32, desc: sequence number stored in client}
interfaces/inner_api/enhance_kits/test/unittest/src/sec_comp_enhance_test.cpp
+9 -11
View File
@@ -13,6 +13,7 @@
* limitations under the License.
*/
#include "sec_comp_enhance_test.h"
#include <dlfcn.h>
#include <unistd.h>
#include "sec_comp_err.h"
#include "sec_comp_log.h"
@@ -27,27 +28,24 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {
static bool g_inputEnhanceExist = false;
static bool g_srvEnhanceExist = false;
static constexpr uint32_t SEC_COMP_ENHANCE_CFG_SIZE = 76;
#if defined(__LP64__)
static const std::string LIB_PATH = "/system/lib64/";
#else
static const std::string LIB_PATH = "/system/lib/";
#endif
static const std::string INNER_PATH = "platformsdk/";
static const std::string ENHANCE_INPUT_INTERFACE_LIB =
LIB_PATH + INNER_PATH + "libsecurity_component_client_enhance.z.so";
static const std::string ENHANCE_SRV_INTERFACE_LIB = LIB_PATH + "libsecurity_component_service_enhance.z.so";
static const std::string ENHANCE_INPUT_INTERFACE_LIB = "libsecurity_component_client_enhance.z.so";
static const std::string ENHANCE_SRV_INTERFACE_LIB = "libsecurity_component_service_enhance.z.so";
static constexpr uint32_t MAX_HMAC_SIZE = 64;
} // namespace
void SecCompEnhanceTest::SetUpTestCase()
{
if (access(ENHANCE_INPUT_INTERFACE_LIB.c_str(), F_OK) == 0) {
void *handle = dlopen(ENHANCE_INPUT_INTERFACE_LIB.c_str(), RTLD_LAZY);
if (handle != nullptr) {
g_inputEnhanceExist = true;
}
dlclose(handle);
if (access(ENHANCE_SRV_INTERFACE_LIB.c_str(), F_OK) == 0) {
handle = dlopen(ENHANCE_SRV_INTERFACE_LIB.c_str(), RTLD_LAZY);
if (handle != nullptr) {
g_srvEnhanceExist = true;
}
dlclose(handle);
system("kill -9 `pidof security_component_service`");
SC_LOG_INFO(LABEL, "SetUpTestCase.");
}
interfaces/inner_api/security_component/BUILD.gn
+2
View File
@@ -63,6 +63,8 @@ ohos_shared_library("libsecurity_component_sdk") {
external_deps = [
"access_token:libaccesstoken_sdk",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"hilog:libhilog",
"hisysevent:libhisysevent",
interfaces/inner_api/security_component/src/sec_comp_kit.cpp
+16 -3
View File
@@ -14,6 +14,7 @@
*/
#include "sec_comp_kit.h"
#include "bundle_mgr_client.h"
#include "hisysevent.h"
#include "ipc_skeleton.h"
#include "sec_comp_caller_authorization.h"
@@ -35,8 +36,12 @@ int32_t SecCompKit::RegisterSecurityComponent(SecCompType type,
if (!SecCompCallerAuthorization::GetInstance().IsKitCaller(
reinterpret_cast<uintptr_t>(__builtin_return_address(0)))) {
SC_LOG_ERROR(LABEL, "register security component fail, caller invalid");
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "CALLER_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingRealPid(), "CALL_SCENE", "REGITSTER");
return SC_SERVICE_ERROR_CALLER_INVALID;
}
@@ -60,8 +65,12 @@ int32_t SecCompKit::UpdateSecurityComponent(int32_t scId, std::string& component
if (!SecCompCallerAuthorization::GetInstance().IsKitCaller(
reinterpret_cast<uintptr_t>(__builtin_return_address(0)))) {
SC_LOG_ERROR(LABEL, "update security component fail, caller invalid");
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "CALLER_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingRealPid(), "CALL_SCENE", "UPDATE");
return SC_SERVICE_ERROR_CALLER_INVALID;
}
@@ -99,8 +108,12 @@ int32_t SecCompKit::ReportSecurityComponentClickEvent(int32_t scId,
if (!SecCompCallerAuthorization::GetInstance().IsKitCaller(
reinterpret_cast<uintptr_t>(__builtin_return_address(0)))) {
SC_LOG_ERROR(LABEL, "report click event fail, caller invalid");
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "CALLER_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingRealPid(), "CALL_SCENE", "CLICK");
return SC_SERVICE_ERROR_CALLER_INVALID;
}
interfaces/inner_api/security_component/src/sec_comp_proxy.cpp
+2 -17
View File
@@ -283,25 +283,17 @@ int32_t SecCompProxy::ReportSecurityComponentClickEvent(int32_t scId,
bool SecCompProxy::VerifySavePermission(AccessToken::AccessTokenID tokenId)
{
std::lock_guard<std::mutex> lock(useIPCMutex_);
MessageParcel rawData;
MessageParcel data;
if (!data.WriteInterfaceToken(SecCompProxy::GetDescriptor())) {
SC_LOG_ERROR(LABEL, "Verify write descriptor failed.");
return false;
}
if (!rawData.WriteUint32(tokenId)) {
if (!data.WriteUint32(tokenId)) {
SC_LOG_ERROR(LABEL, "Verify write tokenId failed.");
return false;
}
if (!SecCompEnhanceAdapter::EnhanceClientSerialize(rawData, data)) {
SC_LOG_ERROR(LABEL, "Verify serialize session info failed.");
return false;
}
MessageParcel reply;
MessageParcel deserializedReply;
MessageOption option(MessageOption::TF_SYNC);
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
@@ -311,19 +303,12 @@ bool SecCompProxy::VerifySavePermission(AccessToken::AccessTokenID tokenId)
int32_t requestResult = remote->SendRequest(
static_cast<uint32_t>(SecurityComponentServiceInterfaceCode::VERIFY_TEMP_SAVE_PERMISSION),
data, reply, option);
if (!SecCompEnhanceAdapter::EnhanceClientDeserialize(reply, deserializedReply)) {
SC_LOG_ERROR(LABEL, "Verify deserialize session info failed.");
return false;
}
if (requestResult != SC_OK) {
SC_LOG_ERROR(LABEL, "Verify request failed, result: %{public}d.", requestResult);
return false;
}
bool res;
if (!deserializedReply.ReadBool(res)) {
if (!reply.ReadBool(res)) {
SC_LOG_ERROR(LABEL, "Verify read res failed.");
return false;
}
interfaces/inner_api/security_component/test/BUILD.gn
+4
View File
@@ -58,6 +58,8 @@ ohos_unittest("sec_comp_sdk_test") {
external_deps = [
"access_token:libaccesstoken_sdk",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"hilog:libhilog",
"hisysevent:libhisysevent",
@@ -96,6 +98,8 @@ ohos_unittest("sec_comp_register_callback_test") {
external_deps = [
"access_token:libaccesstoken_sdk",
"access_token:libtoken_setproc",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils",
"hilog:libhilog",
"hisysevent:libhisysevent",
services/security_component_service/sa/sa_main/first_use_dialog.cpp
+5 -1
View File
@@ -21,6 +21,7 @@
#include <unistd.h>
#include "ability_manager_client.h"
#include "accesstoken_kit.h"
#include "bundle_mgr_client.h"
#include "hisysevent.h"
#include "sec_comp_dialog_callback_proxy.h"
#include "sec_comp_err.h"
@@ -270,8 +271,11 @@ int32_t FirstUseDialog::GrantDialogWaitEntity(int32_t scId)
}
int32_t res = sc->GrantTempPermission();
if (res != SC_OK) {
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(sc->uid_, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "TEMP_GRANT_FAILED",
HiviewDFX::HiSysEvent::EventType::FAULT, "CALLER_UID", sc->uid_,
HiviewDFX::HiSysEvent::EventType::FAULT, "CALLER_UID", sc->uid_, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", sc->pid_, "SC_ID", scId, "SC_TYPE", sc->GetType());
} else {
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "TEMP_GRANT_SUCCESS",
services/security_component_service/sa/sa_main/sec_comp_entity.cpp
+6 -1
View File
@@ -15,6 +15,7 @@
#include "sec_comp_entity.h"
#include <chrono>
#include "bundle_mgr_client.h"
#include "datashare_helper.h"
#include "hisysevent.h"
#include "ipc_skeleton.h"
@@ -122,8 +123,12 @@ int32_t SecCompEntity::CheckClickInfo(const SecCompClickEvent& clickInfo) const
if ((res != SC_OK) && (res != SC_ENHANCE_ERROR_NOT_EXIST_ENHANCE)) {
SC_LOG_ERROR(LABEL, "HMAC checkout failed");
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "CLICK_INFO_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_ID", scId_, "SC_TYPE", componentInfo_->type_);
return SC_ENHANCE_ERROR_CLICK_EXTRA_CHECK_FAIL;
}
services/security_component_service/sa/sa_main/sec_comp_info_helper.cpp
+1 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -34,7 +34,6 @@ namespace {
constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_SECURITY_COMPONENT, "SecCompInfoHelper"};
static constexpr double MAX_RECT_PERCENT = 0.1F; // 10%
static constexpr double ZERO_OFFSET = 0.0F;
static std::mutex g_renderLock;
}
void SecCompInfoHelper::AdjustSecCompRect(SecCompBase* comp, float scale)
services/security_component_service/sa/sa_main/sec_comp_manager.cpp
+44 -12
View File
@@ -14,6 +14,7 @@
*/
#include "sec_comp_manager.h"
#include "bundle_mgr_client.h"
#include "delay_exit_task.h"
#include "hisysevent.h"
#include "i_sec_comp_service.h"
@@ -21,6 +22,7 @@
#include "iservice_registry.h"
#include "sec_comp_enhance_adapter.h"
#include "sec_comp_err.h"
#include "sec_comp_info.h"
#include "sec_comp_info_helper.h"
#include "sec_comp_log.h"
@@ -296,14 +298,18 @@ void SecCompManager::ExitWhenAppMgrDied()
void SecCompManager::SendCheckInfoEnhanceSysEvent(int32_t scId,
SecCompType type, const std::string& scene, int32_t res)
{
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
if (res == SC_ENHANCE_ERROR_CHALLENGE_CHECK_FAIL) {
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "CHALLENGE_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_ID", scId, "SC_TYPE", type, "CALL_SCENE",
scene);
} else {
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "CALLBACK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_TYPE", type,
"CALL_SCENE", scene, "REASON", TransformCallBackResult(static_cast<enum SCErrCode>(res)));
}
@@ -345,8 +351,12 @@ int32_t SecCompManager::RegisterSecurityComponent(SecCompType type,
std::shared_ptr<SecCompBase> component(componentPtr);
if (component == nullptr) {
SC_LOG_ERROR(LABEL, "Parse component info invalid");
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "COMPONENT_INFO_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_ID", scId, "CALL_SCENE", "REGITSTER", "SC_TYPE", type);
return SC_SERVICE_ERROR_COMPONENT_INFO_INVALID;
}
@@ -392,8 +402,12 @@ int32_t SecCompManager::UpdateSecurityComponent(int32_t scId, const nlohmann::js
std::shared_ptr<SecCompBase> reportComponentInfo(report);
if (reportComponentInfo == nullptr) {
SC_LOG_ERROR(LABEL, "Update component info invalid");
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "COMPONENT_INFO_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_ID", scId, "CALL_SCENE", "UPDATE",
"SC_TYPE", sc->GetType());
return SC_SERVICE_ERROR_COMPONENT_INFO_INVALID;
@@ -430,16 +444,24 @@ int32_t SecCompManager::CheckClickSecurityComponentInfo(std::shared_ptr<SecCompE
std::shared_ptr<SecCompBase> reportComponentInfo(report);
if ((reportComponentInfo == nullptr) || (!reportComponentInfo->GetValid())) {
SC_LOG_ERROR(LABEL, "report component info invalid");
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "COMPONENT_INFO_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_ID", scId, "CALL_SCENE", "CLICK", "SC_TYPE",
sc->GetType());
return SC_SERVICE_ERROR_COMPONENT_INFO_INVALID;
}
if ((!SecCompInfoHelper::CheckRectValid(reportComponentInfo->rect_, reportComponentInfo->windowRect_))) {
SC_LOG_ERROR(LABEL, "compare component info failed.");
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "COMPONENT_INFO_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_ID", scId, "CALL_SCENE", "CLICK", "SC_TYPE",
sc->GetType());
return SC_SERVICE_ERROR_COMPONENT_INFO_INVALID;
@@ -457,6 +479,18 @@ int32_t SecCompManager::CheckClickSecurityComponentInfo(std::shared_ptr<SecCompE
return SC_OK;
}
static void ReportEvent(std::string eventName, HiviewDFX::HiSysEvent::EventType eventType, int32_t scId,
SecCompType scType)
{
int32_t uid = IPCSkeleton::GetCallingUid();
OHOS::AppExecFwk::BundleMgrClient bmsClient;
std::string bundleName = "";
bmsClient.GetNameForUid(uid, bundleName);
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, eventName,
eventType, "CALLER_UID", uid, "CALLER_BUNDLE_NAME", bundleName,
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_ID", scId, "SC_TYPE", scType);
}
int32_t SecCompManager::ReportSecurityComponentClickEvent(int32_t scId,
const nlohmann::json& jsonComponent, const SecCompCallerInfo& caller,
const SecCompClickEvent& clickInfo, const std::vector<sptr<IRemoteObject>>& remote)
@@ -486,9 +520,8 @@ int32_t SecCompManager::ReportSecurityComponentClickEvent(int32_t scId,
res = sc->CheckClickInfo(clickInfo);
if (res != SC_OK) {
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "CLICK_INFO_CHECK_FAILED",
HiviewDFX::HiSysEvent::EventType::SECURITY, "CALLER_UID", IPCSkeleton::GetCallingUid(),
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_ID", scId, "SC_TYPE", sc->GetType());
ReportEvent("CLICK_INFO_CHECK_FAILED", HiviewDFX::HiSysEvent::EventType::SECURITY,
scId, sc->GetType());
if (res == SC_ENHANCE_ERROR_CLICK_EXTRA_CHECK_FAIL) {
malicious_.AddAppToMaliciousAppList(caller.pid);
}
@@ -504,9 +537,8 @@ int32_t SecCompManager::ReportSecurityComponentClickEvent(int32_t scId,
res = sc->GrantTempPermission();
if (res != SC_OK) {
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "TEMP_GRANT_FAILED",
HiviewDFX::HiSysEvent::EventType::FAULT, "CALLER_UID", IPCSkeleton::GetCallingUid(),
"CALLER_PID", IPCSkeleton::GetCallingPid(), "SC_ID", scId, "SC_TYPE", sc->GetType());
ReportEvent("TEMP_GRANT_FAILED", HiviewDFX::HiSysEvent::EventType::FAULT,
scId, sc->GetType());
return res;
}
HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::SEC_COMPONENT, "TEMP_GRANT_SUCCESS",
services/security_component_service/sa/sa_main/sec_comp_stub.cpp
+2 -13
View File
@@ -232,13 +232,8 @@ int32_t SecCompStub::VerifySavePermissionInner(MessageParcel& data, MessageParce
SC_LOG_ERROR(LABEL, "Not medialibrary called");
return SC_SERVICE_ERROR_CALLER_INVALID;
}
MessageParcel deserializedData;
if (!SecCompEnhanceAdapter::EnhanceSrvDeserialize(data, deserializedData, reply)) {
SC_LOG_ERROR(LABEL, "Verify deserialize session info failed");
return SC_SERVICE_ERROR_PARCEL_OPERATE_FAIL;
}
uint32_t tokenId;
if (!deserializedData.ReadUint32(tokenId)) {
if (!data.ReadUint32(tokenId)) {
SC_LOG_ERROR(LABEL, "Verify read component id failed");
return SC_SERVICE_ERROR_PARCEL_OPERATE_FAIL;
}
@@ -249,17 +244,11 @@ int32_t SecCompStub::VerifySavePermissionInner(MessageParcel& data, MessageParce
}
bool res = this->VerifySavePermission(tokenId);
MessageParcel rawReply;
if (!rawReply.WriteBool(res)) {
if (!reply.WriteBool(res)) {
SC_LOG_ERROR(LABEL, "Verify temp save permission result failed");
return SC_SERVICE_ERROR_PARCEL_OPERATE_FAIL;
}
if (!SecCompEnhanceAdapter::EnhanceSrvSerialize(rawReply, reply)) {
SC_LOG_ERROR(LABEL, "Verify serialize session info failed");
return SC_SERVICE_ERROR_PARCEL_OPERATE_FAIL;
}
return SC_OK;
}
services/security_component_service/sa/test/BUILD.gn
+1
View File
@@ -57,6 +57,7 @@ ohos_unittest("sec_comp_service_test") {
"unittest/src/sec_comp_stub_test.cpp",
"unittest/src/service_test_common.cpp",
"unittest/src/window_info_helper_test.cpp",
"unittest/src/zzenv_exit_operate.cpp",
]
configs = [ "${sec_comp_root_dir}/config:coverage_flags" ]
services/security_component_service/sa/test/unittest/src/first_use_dialog_test.cpp
+18
View File
@@ -14,6 +14,7 @@
*/
#include "first_use_dialog_test.h"
#include <cstdio>
#include "accesstoken_kit.h"
#include "location_button.h"
#include "save_button.h"
@@ -42,6 +43,23 @@ void FirstUseDialogTest::SetUpTestCase()
void FirstUseDialogTest::TearDownTestCase()
{
struct stat fstatJson = {};
if (stat(SEC_COMP_SRV_CFG_FILE.c_str(), &fstatJson) != 0) {
return;
}
// if json file is created by root, delete it
if (fstatJson.st_uid == 0) {
std::string cmdline = "rm -f " + SEC_COMP_SRV_CFG_FILE;
system(cmdline.c_str());
}
struct stat fstatDir = {};
if (stat(SEC_COMP_SRV_CFG_PATH.c_str(), &fstatDir) != 0) {
return;
}
if (fstatDir.st_uid == 0) {
std::string cmdline = "chown security_component:security_component " + SEC_COMP_SRV_CFG_PATH;
system(cmdline.c_str());
}
}
void FirstUseDialogTest::SetUp()
services/security_component_service/sa/test/unittest/src/sec_comp_info_helper_test.cpp
+29
View File
@@ -24,6 +24,7 @@
#include "save_button.h"
#include "sec_comp_log.h"
#include "sec_comp_err.h"
#include "sec_comp_tool.h"
#include "service_test_common.h"
#include "window_manager.h"
@@ -620,3 +621,31 @@ HWTEST_F(SecCompInfoHelperTest, GrantTempPermission001, TestSize.Level1)
EXPECT_EQ(SC_SERVICE_ERROR_PERMISSION_OPER_FAIL,
SecCompInfoHelper::GrantTempPermission(*tokenid, shared_comp));
}
/**
* @tc.name: IsColorSimilar001
* @tc.desc: Test IsColorSimilar
* @tc.type: FUNC
* @tc.require:
*/
HWTEST_F(SecCompInfoHelperTest, IsColorSimilar001, TestSize.Level1)
{
SecCompColor color1 = {
.argb = {
.red = 0xFF,
.green = 0xFF,
.blue = 0xFF,
.alpha = 0xFF,
}
};
SecCompColor color2 = {
.argb = {
.red = 0xFF,
.green = 0xFF,
.blue = 0xFF,
.alpha = 0xF0, // different alpha
}
};
EXPECT_TRUE(IsColorSimilar(color1, color2));
}
services/security_component_service/sa/test/unittest/src/sec_comp_manager_test.cpp
+25
View File
@@ -703,3 +703,28 @@ HWTEST_F(SecCompManagerTest, TransformCallBackResult001, TestSize.Level1)
res = SC_SERVICE_ERROR_VALUE_INVALID;
SecCompManager::GetInstance().SendCheckInfoEnhanceSysEvent(scId, LOCATION_COMPONENT, scene, res);
}
/**
* @tc.name: AddSecurityComponentProcess001
* @tc.desc: Test AddSecurityComponentProcess
* @tc.type: FUNC
* @tc.require:
*/
HWTEST_F(SecCompManagerTest, AddSecurityComponentProcess001, TestSize.Level1)
{
bool isSaExit = SecCompManager::GetInstance().isSaExit_;
SecCompManager::GetInstance().isSaExit_ = true;
SecCompCallerInfo info = {
.pid = 0,
.tokenId = 0,
.uid = 0,
};
EXPECT_EQ(SC_SERVICE_ERROR_SERVICE_NOT_EXIST,
SecCompManager::GetInstance().AddSecurityComponentProcess(info));
auto oldmap = SecCompManager::GetInstance().componentMap_;
SecCompManager::GetInstance().componentMap_.clear();
SecCompManager::GetInstance().isSaExit_ = false;
EXPECT_EQ(SC_OK, SecCompManager::GetInstance().AddSecurityComponentProcess(info));
SecCompManager::GetInstance().componentMap_ = oldmap;
SecCompManager::GetInstance().isSaExit_ = isSaExit;
}
services/security_component_service/sa/test/unittest/src/sec_comp_stub_mock_test.cpp
+17
View File
@@ -15,6 +15,7 @@
#include "sec_comp_stub_mock_test.h"
#include "sec_comp_dialog_callback.h"
#include "sec_comp_log.h"
#include "sec_comp_err.h"
#include "sec_comp_click_event_parcel.h"
@@ -249,3 +250,19 @@ HWTEST_F(SecCompStubMockTest, UnmarshallingMock001, TestSize.Level1)
in.WriteBuffer(data, 32);
EXPECT_NE(nullptr, clickParcel->Unmarshalling(in));
}
/**
* @tc.name: PreRegisterSecCompProcessMock001
* @tc.desc: Test PreRegisterSecCompProcessInner
* @tc.type: FUNC
* @tc.require:
*/
HWTEST_F(SecCompStubMockTest, PreRegisterSecCompProcessMock001, TestSize.Level1)
{
MessageParcel data;
MessageParcel reply;
data.FlushBuffer();
reply.FlushBuffer();
data.WriteInt32(1);
ASSERT_EQ(SC_OK, stub_->PreRegisterSecCompProcessInner(data, reply));
}
services/security_component_service/sa/test/unittest/src/zzenv_exit_operate.cpp
+71
View File
@@ -0,0 +1,71 @@
/*
* Copyright (c) 2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <gtest/gtest.h>
#define private public
#include "event_handler.h"
#include "event_runner.h"
#include "sec_comp_manager.h"
#undef private
using namespace testing::ext;
namespace OHOS {
namespace Security {
namespace SecurityComponent {
/**
* @brief This test class is used to release resources before process end to avoid crash
*/
class ZZEnvExitOperate : public testing::Test {
public:
static void SetUpTestCase();
static void TearDownTestCase();
void SetUp();
void TearDown();
};
void ZZEnvExitOperate::SetUpTestCase()
{}
void ZZEnvExitOperate::TearDownTestCase()
{}
void ZZEnvExitOperate::SetUp()
{}
void ZZEnvExitOperate::TearDown()
{}
/**
* @tc.name: ZExitOperateTest001
* @tc.desc: remove ffrt handler to avoid uaf crash
* @tc.type: FUNC
* @tc.require: None
*/
HWTEST_F(ZZEnvExitOperate, ZExitOperateTest001, TestSize.Level1)
{
if (SecCompManager::GetInstance().secRunner_ != nullptr) {
SecCompManager::GetInstance().secRunner_->queue_.reset();
SecCompManager::GetInstance().secRunner_ = nullptr;
}
if (SecCompManager::GetInstance().secHandler_ != nullptr) {
SecCompManager::GetInstance().secHandler_->eventRunner_.reset();
SecCompManager::GetInstance().secHandler_ = nullptr;
}
sleep(5);
}
}
}
}