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

!19403 merge attachabilitycontext into master

Browse Source 
AttachJsAbility Protect

Created-by: zivzhen
Commit-by: wangzhen
Merged-by: openharmony_ci
Description: **IssueNo**:

**Description**:

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

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

**TDD Result**:
pass
**XTS Result**:
pass

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


See merge request: openharmony/ability_ability_runtime!19403
This commit is contained in:
openharmony_ci
2026-05-22 15:49:36 +08:00
parent c5ae33a653 e67f77cfcd
commit ff5f91c2dd
1 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/ability/native/ability_runtime/js_ui_ability.cpp
+51 -33
View File
@@ -156,18 +156,33 @@ napi_value OnSaveStateCallback(napi_env env, napi_callback_info info)
return nullptr; return nullptr;
} }
void *DetachNewAbilityContext(napi_env, void *nativeObject, void *)
{
auto origContext = static_cast<std::weak_ptr<AbilityRuntime::AbilityContext> *>(nativeObject);
if (origContext == nullptr) {
TAG_LOGE(AAFwkTag::UIABILITY, "origContext is null");
return nullptr;
}
TAG_LOGI(AAFwkTag::UIABILITY, "New detached ability context");
auto detachNewContext = new std::weak_ptr<AbilityRuntime::AbilityContext>(*origContext);
return detachNewContext;
}
void DetachFinalizeAbilityContext(void *detachedObject, void *)
{
TAG_LOGI(AAFwkTag::UIABILITY, "Finalizer detached ability context");
delete static_cast<std::weak_ptr<AbilityRuntime::AbilityContext> *>(detachedObject);
}
napi_value AttachJsAbilityContext(napi_env env, void *value, void *) napi_value AttachJsAbilityContext(napi_env env, void *value, void *)
{ {
TAG_LOGD(AAFwkTag::UIABILITY, "called"); TAG_LOGI(AAFwkTag::UIABILITY, "AttachJsAbilityContext");
if (value == nullptr) { if (value == nullptr) {
TAG_LOGE(AAFwkTag::UIABILITY, "invalid params"); TAG_LOGE(AAFwkTag::UIABILITY, "invalid params");
return nullptr; return nullptr;
} }
auto ptr = reinterpret_cast<std::weak_ptr<AbilityRuntime::AbilityContext> *>(value)->lock(); auto ptr = reinterpret_cast<std::weak_ptr<AbilityRuntime::AbilityContext> *>(value)->lock();
if (ptr == nullptr) { CHECK_POINTER_AND_RETURN(ptr, nullptr);
TAG_LOGE(AAFwkTag::UIABILITY, "null ptr");
return nullptr;
}
std::shared_ptr<NativeReference> systemModule = nullptr; std::shared_ptr<NativeReference> systemModule = nullptr;
int32_t screenMode = ptr->GetScreenMode(); int32_t screenMode = ptr->GetScreenMode();
if (screenMode == AAFwk::IDLE_SCREEN_MODE) { if (screenMode == AAFwk::IDLE_SCREEN_MODE) {
@@ -184,25 +199,28 @@ napi_value AttachJsAbilityContext(napi_env env, void *value, void *)
} }
CHECK_POINTER_AND_RETURN(systemModule, nullptr); CHECK_POINTER_AND_RETURN(systemModule, nullptr);
auto contextObj = systemModule->GetNapiValue(); auto contextObj = systemModule->GetNapiValue();
auto coerceStatus = napi_coerce_to_native_binding_object(env, if (!CheckTypeForNapiValue(env, contextObj, napi_object)) {
contextObj, DetachCallbackFunc, AttachJsAbilityContext, value, nullptr); TAG_LOGE(AAFwkTag::UIABILITY, "not napi object");
if (coerceStatus != napi_ok) {
TAG_LOGE(AAFwkTag::UIABILITY, "coerceStatus Failed: %{public}d", coerceStatus);
return nullptr; return nullptr;
} }
auto workContext = new (std::nothrow) std::weak_ptr<AbilityRuntime::AbilityContext>(ptr); auto workContext = new std::weak_ptr<AbilityRuntime::AbilityContext>(ptr);
if (workContext != nullptr) { auto status = napi_coerce_to_native_binding_object(
napi_status status = napi_wrap(env, contextObj, workContext, env, contextObj, DetachNewAbilityContext, AttachJsAbilityContext, workContext, nullptr);
[](napi_env, void* data, void*) { if (status != napi_ok) {
TAG_LOGD(AAFwkTag::UIABILITY, "finalizer for weak_ptr ability context is called"); TAG_LOGE(AAFwkTag::UIABILITY, "coerce ability context failed: %{public}d", status);
delete static_cast<std::weak_ptr<AbilityRuntime::AbilityContext> *>(data); delete workContext;
}, return nullptr;
nullptr, nullptr); }
if (status != napi_ok && workContext != nullptr) { napi_add_detached_finalizer(env, contextObj, DetachFinalizeAbilityContext, nullptr);
TAG_LOGE(AAFwkTag::UIABILITY, "napi_wrap Failed: %{public}d", status); status = napi_wrap(env, contextObj, workContext,
delete workContext; [](napi_env, void* data, void*) {
return nullptr; TAG_LOGD(AAFwkTag::UIABILITY, "finalizer for weak_ptr ability context is called");
} delete static_cast<std::weak_ptr<AbilityRuntime::AbilityContext> *>(data);
}, nullptr, nullptr);
if (status != napi_ok) {
TAG_LOGE(AAFwkTag::UIABILITY, "wrap ability context failed: %{public}d", status);
delete workContext;
return nullptr;
} }
return contextObj; return contextObj;
} }
@@ -217,15 +235,15 @@ void BindContext(napi_env env, std::unique_ptr<NativeReference> contextRef, JsRu
TAG_LOGE(AAFwkTag::UIABILITY, "get ability native object failed"); TAG_LOGE(AAFwkTag::UIABILITY, "get ability native object failed");
return; return;
} }
auto workContext = new (std::nothrow) std::weak_ptr<AbilityRuntime::AbilityContext>(abilityContext); auto workContext = new std::weak_ptr<AbilityRuntime::AbilityContext>(abilityContext);
CHECK_POINTER(workContext);
auto coerceStatus = napi_coerce_to_native_binding_object( auto coerceStatus = napi_coerce_to_native_binding_object(
env, contextObj, DetachCallbackFunc, AttachJsAbilityContext, workContext, nullptr); env, contextObj, DetachNewAbilityContext, AttachJsAbilityContext, workContext, nullptr);
if (coerceStatus != napi_ok) { if (coerceStatus != napi_ok) {
TAG_LOGE(AAFwkTag::UIABILITY, "coerceStatus Failed: %{public}d", coerceStatus); TAG_LOGE(AAFwkTag::UIABILITY, "coerce ability context failed: %{public}d", coerceStatus);
delete workContext; delete workContext;
return; return;
} }
napi_add_detached_finalizer(env, contextObj, DetachFinalizeAbilityContext, nullptr);
abilityContext->Bind(jsRuntime, contextRef.release()); abilityContext->Bind(jsRuntime, contextRef.release());
napi_status wrapStatus = napi_wrap( napi_status wrapStatus = napi_wrap(
env, contextObj, workContext, env, contextObj, workContext,
@@ -235,7 +253,7 @@ void BindContext(napi_env env, std::unique_ptr<NativeReference> contextRef, JsRu
}, },
nullptr, nullptr); nullptr, nullptr);
if (wrapStatus != napi_ok) { if (wrapStatus != napi_ok) {
TAG_LOGE(AAFwkTag::UIABILITY, "napi_wrap failed"); TAG_LOGE(AAFwkTag::UIABILITY, "wrap ability context failed: %{public}d", wrapStatus);
delete workContext; delete workContext;
} }
} }
@@ -448,16 +466,16 @@ void JsUIAbility::SetAbilityContext(std::shared_ptr<AbilityInfo> abilityInfo,
TAG_LOGE(AAFwkTag::UIABILITY, "get ability native object failed"); TAG_LOGE(AAFwkTag::UIABILITY, "get ability native object failed");
return; return;
} }
auto workContext = new (std::nothrow) std::weak_ptr<AbilityRuntime::AbilityContext>(abilityContext_); auto workContext = new std::weak_ptr<AbilityRuntime::AbilityContext>(abilityContext_);
CHECK_POINTER(workContext);
auto coerceStatus = napi_coerce_to_native_binding_object( auto coerceStatus = napi_coerce_to_native_binding_object(
env, contextObj, DetachCallbackFunc, AttachJsAbilityContext, workContext, nullptr); env, contextObj, DetachNewAbilityContext, AttachJsAbilityContext, workContext, nullptr);
if (coerceStatus != napi_ok) { if (coerceStatus != napi_ok) {
TAG_LOGE(AAFwkTag::UIABILITY, "coerceStatus Failed: %{public}d", coerceStatus); TAG_LOGE(AAFwkTag::UIABILITY, "coerce ability context failed: %{public}d", coerceStatus);
delete workContext; delete workContext;
return; return;
} }
napi_add_detached_finalizer(env, contextObj, DetachFinalizeAbilityContext, nullptr);
abilityContext_->Bind(jsRuntime_, shellContextRef_.get()); abilityContext_->Bind(jsRuntime_, shellContextRef_.get());
napi_set_named_property(env, obj, "context", contextObj); napi_set_named_property(env, obj, "context", contextObj);
if (abilityRecovery_ != nullptr) { if (abilityRecovery_ != nullptr) {
@@ -467,8 +485,8 @@ void JsUIAbility::SetAbilityContext(std::shared_ptr<AbilityInfo> abilityInfo,
[](napi_env, void *data, void *hint) { [](napi_env, void *data, void *hint) {
delete static_cast<std::weak_ptr<AbilityRuntime::AbilityContext> *>(data); delete static_cast<std::weak_ptr<AbilityRuntime::AbilityContext> *>(data);
}, nullptr, nullptr); }, nullptr, nullptr);
if (status != napi_ok && workContext != nullptr) { if (status != napi_ok) {
TAG_LOGE(AAFwkTag::UIABILITY, "napi_wrap Failed: %{public}d", status); TAG_LOGE(AAFwkTag::UIABILITY, "wrap ability context failed: %{public}d", status);
delete workContext; delete workContext;
return; return;
} }