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

!19044 merge master into master

Browse Source 
回退私有API修改

Created-by: xuzhihao666
Commit-by: xuzhihao
Merged-by: openharmony_ci
Description: **IssueNo**:
https://gitcode.com/openharmony/ability_ability_runtime/issues/15033
**Description**:
私有API整改需求回退
**稳定性自检：**
| 自检项                                                       | 自检结果  |
| ------------------------------------------------------------ | -------- |
| 涉及跨进程调用的相关操作需要抛至主线程或加锁防止并发              | y         |
| 成员变量进行赋值或创建需要排查并发                               |     y     |
| 谨慎在lambda表达式中使用引用捕获                                |    y      |
| 谨慎在未经拷贝的情况下使用外部传入的string、C字符串               |      y    |
| map\vector\list\set等stl模板类使用时需要排查并发                |    y      |
| 谨慎考虑加锁范围                                               |        y  |
| 在IPC通信中谨慎使用同步通信方式                                 |      y    |
| 禁止传递this指针至其他模块或线程（特别是eventhandler任务）        |      y    |
| 禁止将外部传入的裸指针在内部直接构造智能指针                      |      y    |
| 禁止多个独立创建的智能指针管理同一地址                           |       y   |
| 禁止在析构函数中抛异步任务                                      |        y  |
| 禁止js对象在非js线程（例如在IPC线程）创建、使用或销毁             |     y     |
| 禁止在对外接口中未经判空直接使用外部传入的指针                    |     y     |
| 禁止接口返回局部变量引用                                        |         y |
| 禁止在信号函数中加锁                                            |      y    |
| 禁止在关键流程（SA启动、应用启动等主流程）执行耗时的操作           |     y     |
| 禁止将同一个cpp编译在不同的so中                                 |     y     |

**安全编码自检：**
| 自检项                                                          | 自检结果 |
| -------------------------------------------------------------- | -------- |
| 裸指针避免通过隐式转换构造为sptr                                 |    y      |
| json对象在取值之前必须先判断类型，避免类型不匹配                   |  y        |
| 序列化时必须对传入的数组大小进行校验，避免出现超大数组              |    y      |
| 避免使用未明确位宽的整型，选择使用int8_t、uint8_t等类型            |      y    |
| 外部传入的路径要做规范化校验，对路径中的.、..、../等特殊字符严格校验 |     y     |
| 指针变量、表示资源描述符的变量、bool变量必须赋初值                  |    y      |
| readParcelable获取的对象使用前需要判空                            |   y       |
| 分配和释放内存的函数需要成对出现                                   |      y    |
| 申请内存后异常退出前需要及时进行内存释放                            |  y        |
| 内存申请前必须对内存大小进行合法性校验                              |    y      |
| 内存分配后必须判断是否成功                                         |       y   |
| 禁止使用realloc、alloca函数                                       |  y        |
| 禁止打印文件路径、口令等敏感信息，如有需要，使用private修饰          |   y       |
| 禁止打印内存地址                                                  |       y   |
| 整数之间运算时必须严格检查，确保不会出现溢出、反转、除0               |       y   |
| 禁止对有符号整数进行位操作符运算                                    |    y      |
| 禁止对指针进行逻辑或位运算                                         | y         |
| 循环次数如果收外部数据控制，需要检验其合法性                         |      y    |
| 禁止使用内存操作类危险函数，需要使用安全函数                         |   y       |
| 谨慎使用不可重入函数                                               |      y    |
| 必须检查安全函数的返回值，并进行正确处理                             |  y        |
| 禁止仅通过TokenType类型判断绕过权限校验                             |     y     |

**TDD Result**:

**XTS Result**:

### 是否已执行L0用例
- [ ] 已验证
- [ ] 不涉及。如不涉及，请写明理由


See merge request: openharmony/ability_ability_runtime!19044
This commit is contained in:
openharmony_ci
2026-04-27 14:48:39 +08:00
parent ed9fee5c5e 379099d7e8
commit 585b4c59e0
4 changed files with 5 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/ability/native/ability_runtime/js_ability_context.cpp
+2 -60
View File
@@ -71,8 +71,6 @@ const std::string KEY_REQUEST_ID = "com.ohos.param.requestId";
const std::string TRACE_ATOMIC_SERVICE = "StartAtomicService";
constexpr int32_t CALLER_TIME_OUT = 10; // 10s
const std::string JSON_KEY_ERR_MSG = "errMsg";
constexpr const int32_t API26 = 26;
constexpr const int32_t API_VERSION_MOD = 100;
namespace {
static std::map<ConnectionKey, sptr<JSAbilityConnection>, KeyCompare> g_connects;
@@ -354,49 +352,12 @@ napi_value JsAbilityContext::ConnectAbilityWithAccount(napi_env env, napi_callba
GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnConnectAbilityWithAccount);
}
napi_value JsAbilityContext::ConnectAbilityWithAccountRestricted(napi_env env, napi_callback_info info)
{
NapiCallbackInfo napiInfo;
JsAbilityContext* jsContext = static_cast<JsAbilityContext*>(
GetNapiCallbackInfoAndThis(env, info, napiInfo, nullptr));
if (jsContext == nullptr) {
return CreateJsUndefined(env);
}
if (CheckSatisfyTargetAPIVersion(jsContext->context_, API26)) {
TAG_LOGE(AAFwkTag::CONTEXT, "connectAbilityWithAccount is not supported for API 26+");
ThrowInvalidParamError(env, "connectAbilityWithAccount is not supported for API 26+, "
"please use connectServiceExtensionAbilityWithAccount instead.");
return CreateJsUndefined(env);
}
GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnConnectAbilityWithAccount);
}
napi_value JsAbilityContext::DisconnectAbility(napi_env env, napi_callback_info info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnDisconnectAbility);
}
napi_value JsAbilityContext::DisconnectAbilityRestricted(napi_env env, napi_callback_info info)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
NapiCallbackInfo napiInfo;
JsAbilityContext* jsContext = static_cast<JsAbilityContext*>(
GetNapiCallbackInfoAndThis(env, info, napiInfo, nullptr));
if (jsContext == nullptr) {
return CreateJsUndefined(env);
}
if (CheckSatisfyTargetAPIVersion(jsContext->context_, API26)) {
TAG_LOGE(AAFwkTag::CONTEXT, "disconnectAbility is not supported for API 26+");
ThrowInvalidParamError(env, "disconnectAbility is not supported for API 26+, "
"please use disconnectServiceExtensionAbility instead.");
return CreateJsUndefined(env);
}
GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnDisconnectAbility);
}
napi_value JsAbilityContext::TerminateSelf(napi_env env, napi_callback_info info)
{
GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnTerminateSelf);
@@ -2467,10 +2428,10 @@ napi_value CreateJsAbilityContext(napi_env env, std::shared_ptr<AbilityContext>
JsAbilityContext::StopServiceExtensionAbilityWithAccount);
BindNativeFunction(env, object, "connectServiceExtensionAbility", moduleName, JsAbilityContext::ConnectAbility);
BindNativeFunction(env, object, "connectAbilityWithAccount", moduleName,
JsAbilityContext::ConnectAbilityWithAccountRestricted);
JsAbilityContext::ConnectAbilityWithAccount);
BindNativeFunction(env, object, "connectServiceExtensionAbilityWithAccount", moduleName,
JsAbilityContext::ConnectAbilityWithAccount);
BindNativeFunction(env, object, "disconnectAbility", moduleName, JsAbilityContext::DisconnectAbilityRestricted);
BindNativeFunction(env, object, "disconnectAbility", moduleName, JsAbilityContext::DisconnectAbility);
BindNativeFunction(
env, object, "disconnectServiceExtensionAbility", moduleName, JsAbilityContext::DisconnectAbility);
BindNativeFunction(env, object, "terminateSelf", moduleName, JsAbilityContext::TerminateSelf);
@@ -3590,25 +3551,6 @@ napi_value JsAbilityContext::OnSetMissionWindowIcon(napi_env env, NapiCallbackIn
#endif
}
bool JsAbilityContext::CheckSatisfyTargetAPIVersion(
const std::weak_ptr<AbilityContext>& context, int32_t version)
{
auto abilityContext = context.lock();
if (!abilityContext) {
TAG_LOGE(AAFwkTag::CONTEXT, "null context when check api version");
return false;
}
auto applicationInfo = abilityContext->GetApplicationInfo();
if (!applicationInfo) {
TAG_LOGE(AAFwkTag::CONTEXT, "null applicationInfo");
return false;
}
TAG_LOGD(AAFwkTag::CONTEXT, "targetAPIVersion: %{public}d", applicationInfo->apiTargetVersion);
return applicationInfo->apiTargetVersion % API_VERSION_MOD >= version;
}
int32_t JsAbilityContext::GenerateRequestCode()
{
std::lock_guard lock(requestCodeMutex_);
frameworks/native/ability/native/js_service_extension_context.cpp
+3 -62
View File
@@ -56,8 +56,6 @@ constexpr size_t ARGC_FOUR = 4;
constexpr const char* ATOMIC_SERVICE_PREFIX = "com.atomicservice.";
const std::string JSON_KEY_ERR_MSG = "errMsg";
const std::string KEY_REQUEST_ID = "com.ohos.param.requestId";
constexpr const int32_t API26 = 26;
constexpr const int32_t API_VERSION_MOD = 100;
class StartAbilityByCallParameters {
public:
@@ -142,24 +140,6 @@ public:
GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnConnectAbilityWithAccount);
}
static napi_value ConnectAbilityWithAccountRestricted(napi_env env, napi_callback_info info)
{
NapiCallbackInfo napiInfo;
JsServiceExtensionContext* jsContext = static_cast<JsServiceExtensionContext*>(
GetNapiCallbackInfoAndThis(env, info, napiInfo, nullptr));
if (jsContext == nullptr) {
return CreateJsUndefined(env);
}
if (CheckSatisfyTargetAPIVersion(jsContext->context_, API26)) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "connectAbilityWithAccount is not supported for API 26+");
ThrowInvalidParamError(env, "connectAbilityWithAccount is not supported for API 26+, "
"please use connectServiceExtensionAbilityWithAccount instead.");
return CreateJsUndefined(env);
}
GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnConnectAbilityWithAccount);
}
static napi_value TerminateAbility(napi_env env, napi_callback_info info)
{
GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnTerminateAbility);
@@ -175,24 +155,6 @@ public:
GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnDisconnectAbility);
}
static napi_value DisconnectAbilityRestricted(napi_env env, napi_callback_info info)
{
NapiCallbackInfo napiInfo;
JsServiceExtensionContext* jsContext = static_cast<JsServiceExtensionContext*>(
GetNapiCallbackInfoAndThis(env, info, napiInfo, nullptr));
if (jsContext == nullptr) {
return CreateJsUndefined(env);
}
if (CheckSatisfyTargetAPIVersion(jsContext->context_, API26)) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "disconnectAbility is not supported for API 26+");
ThrowInvalidParamError(env, "disconnectAbility is not supported for API 26+, "
"please use disconnectServiceExtensionAbility instead.");
return CreateJsUndefined(env);
}
GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnDisconnectAbility);
}
static napi_value StartServiceExtensionAbility(napi_env env, napi_callback_info info)
{
GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnStartExtensionAbility);
@@ -239,8 +201,6 @@ public:
}
private:
static bool CheckSatisfyTargetAPIVersion(
const std::weak_ptr<ServiceExtensionContext>& context, int32_t version);
std::weak_ptr<ServiceExtensionContext> context_;
sptr<JsFreeInstallObserver> freeInstallObserver_ = nullptr;
static void ClearFailedCallConnection(
@@ -1726,7 +1686,7 @@ napi_value CreateJsServiceExtensionContext(napi_env env, std::shared_ptr<Service
BindNativeFunction(
env, object, "connectServiceExtensionAbility", moduleName, JsServiceExtensionContext::ConnectAbility);
BindNativeFunction(env, object, "disconnectAbility",
moduleName, JsServiceExtensionContext::DisconnectAbilityRestricted);
moduleName, JsServiceExtensionContext::DisconnectAbility);
BindNativeFunction(env, object, "disconnectServiceExtensionAbility",
moduleName, JsServiceExtensionContext::DisconnectAbility);
BindNativeFunction(env, object, "startAbilityWithAccount",
@@ -1734,8 +1694,8 @@ napi_value CreateJsServiceExtensionContext(napi_env env, std::shared_ptr<Service
BindNativeFunction(env, object, "startUIAbilities", moduleName, JsServiceExtensionContext::StartUIAbilities);
BindNativeFunction(env, object, "startAbilityByCall",
moduleName, JsServiceExtensionContext::StartAbilityByCall);
BindNativeFunction(env, object, "connectAbilityWithAccount", moduleName,
JsServiceExtensionContext::ConnectAbilityWithAccountRestricted);
BindNativeFunction(
env, object, "connectAbilityWithAccount", moduleName, JsServiceExtensionContext::ConnectAbilityWithAccount);
BindNativeFunction(env, object,
"connectServiceExtensionAbilityWithAccount", moduleName, JsServiceExtensionContext::ConnectAbilityWithAccount);
BindNativeFunction(env, object, "startServiceExtensionAbility", moduleName,
@@ -1972,24 +1932,5 @@ void JSServiceExtensionConnection::CallJsFailed(int32_t errorCode)
napi_call_function(env_, obj, method, ARGC_ONE, argv, nullptr);
TAG_LOGD(AAFwkTag::SERVICE_EXT, "end");
}
bool JsServiceExtensionContext::CheckSatisfyTargetAPIVersion(
const std::weak_ptr<ServiceExtensionContext>& context, int32_t version)
{
auto extensionContext = context.lock();
if (!extensionContext) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "null context when check api version");
return false;
}
auto applicationInfo = extensionContext->GetApplicationInfo();
if (!applicationInfo) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "null applicationInfo");
return false;
}
TAG_LOGD(AAFwkTag::SERVICE_EXT, "targetAPIVersion: %{public}d", applicationInfo->apiTargetVersion);
return applicationInfo->apiTargetVersion % API_VERSION_MOD >= version;
}
} // namespace AbilityRuntime
} // namespace OHOS
frameworks/native/appkit/ability_runtime/context/js_application_context_utils.cpp
-18
View File
@@ -57,8 +57,6 @@ constexpr size_t INDEX_TWO = 2;
constexpr int32_t ERROR_CODE_ONE = 1;
constexpr double FOUNT_SIZE = 0.0;
const char* MD_NAME = "JsApplicationContextUtils";
constexpr const int32_t API26 = 26;
constexpr const int32_t API_VERSION_MOD = 100;
} // namespace
napi_value JsApplicationContextUtils::CreateBundleContext(napi_env env, napi_callback_info info)
@@ -1279,10 +1277,6 @@ napi_value JsApplicationContextUtils::OnRegisterAbilityLifecycleCallback(
TAG_LOGE(AAFwkTag::APPKIT, "null applicationContext");
return CreateJsUndefined(env);
}
if (applicationContext->GetApplicationInfo()->apiTargetVersion % API_VERSION_MOD >= API26) {
TAG_LOGE(AAFwkTag::APPKIT, "reject registerAbilityLifecycleCallback");
return CreateJsUndefined(env);
}
if (callback_ != nullptr) {
TAG_LOGD(AAFwkTag::APPKIT, "callback_ is not nullptr");
return CreateJsValue(env, callback_->Register(info.argv[0]));
@@ -1303,10 +1297,6 @@ napi_value JsApplicationContextUtils::OnUnregisterAbilityLifecycleCallback(
TAG_LOGE(AAFwkTag::APPKIT, "null ApplicationContext");
errCode = ERROR_CODE_ONE;
}
if (applicationContext->GetApplicationInfo()->apiTargetVersion % API_VERSION_MOD >= API26) {
TAG_LOGE(AAFwkTag::APPKIT, "reject unregisterAbilityLifecycleCallback");
return CreateJsUndefined(env);
}
int32_t callbackId = -1;
if (info.argc != ARGC_ONE && info.argc != ARGC_TWO) {
TAG_LOGE(AAFwkTag::APPKIT, "not enough params");
@@ -1375,10 +1365,6 @@ napi_value JsApplicationContextUtils::OnRegisterEnvironmentCallback(
TAG_LOGE(AAFwkTag::APPKIT, "null applicationContext");
return CreateJsUndefined(env);
}
if (applicationContext->GetApplicationInfo()->apiTargetVersion % API_VERSION_MOD >= API26) {
TAG_LOGE(AAFwkTag::APPKIT, "reject registerEnvironmentCallback");
return CreateJsUndefined(env);
}
if (envCallback_ != nullptr) {
TAG_LOGD(AAFwkTag::APPKIT, "envCallback_ is not nullptr");
return CreateJsValue(env, envCallback_->Register(info.argv[0]));
@@ -1398,10 +1384,6 @@ napi_value JsApplicationContextUtils::OnUnregisterEnvironmentCallback(
TAG_LOGE(AAFwkTag::APPKIT, "null applicationContext");
errCode = ERROR_CODE_ONE;
}
if (applicationContext->GetApplicationInfo()->apiTargetVersion % API_VERSION_MOD >= API26) {
TAG_LOGE(AAFwkTag::APPKIT, "reject unregisterEnvironmentCallback");
return CreateJsUndefined(env);
}
int32_t callbackId = -1;
if (info.argc != ARGC_ONE && info.argc != ARGC_TWO) {
TAG_LOGE(AAFwkTag::APPKIT, "Not enough params");
interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h
-4
View File
@@ -54,9 +54,7 @@ public:
static napi_value StopServiceExtensionAbilityWithAccount(napi_env env, napi_callback_info info);
static napi_value ConnectAbility(napi_env env, napi_callback_info info);
static napi_value ConnectAbilityWithAccount(napi_env env, napi_callback_info info);
static napi_value ConnectAbilityWithAccountRestricted(napi_env env, napi_callback_info info);
static napi_value DisconnectAbility(napi_env env, napi_callback_info info);
static napi_value DisconnectAbilityRestricted(napi_env env, napi_callback_info info);
static napi_value TerminateSelf(napi_env env, napi_callback_info info);
static napi_value TerminateSelfWithResult(napi_env env, napi_callback_info info);
static napi_value BackToCallerAbilityWithResult(napi_env env, napi_callback_info info);
@@ -113,8 +111,6 @@ private:
private:
static void ClearFailedCallConnection(
const std::weak_ptr<AbilityContext>& abilityContext, const std::shared_ptr<CallerCallBack> &callback);
static bool CheckSatisfyTargetAPIVersion(
const std::weak_ptr<AbilityContext>& context, int32_t version);
napi_value OnStartAbility(napi_env env, NapiCallbackInfo& info, bool isStartRecent = false);
napi_value OnOpenLink(napi_env env, NapiCallbackInfo& info);
napi_value OnOpenLinkInner(napi_env env, const AAFwk::Want &want, int requestCode, const std::string &startTime,