!19605 merge 0613_abilitykit into master

0613_abilitykit

Created-by: Luobniz21
Commit-by: Luobniz21
Merged-by: openharmony_ci
Description: **IssueNo**:https://gitcode.com/openharmony/ability_ability_runtime/issues/14747

**Description**:

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

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

**TDD Result**:
![image.png](https://raw.gitcode.com/user-images/assets/4421702/23e8db2c-2e11-4a54-9901-495d2508c947/image.png 'image.png')
**XTS Result**:
![image.png](https://raw.gitcode.com/user-images/assets/4421702/b25efbbd-d3f5-449d-ac23-667e70d6cfff/image.png 'image.png')
![image.png](https://raw.gitcode.com/user-images/assets/4421702/61a0ed6c-d7da-4296-a244-3e89de3777fe/image.png 'image.png')
### 是否已执行L0用例
- [x] 已验证
- [ ] 不涉及。如不涉及，请写明理由


See merge request: openharmony/ability_ability_runtime!19605

frameworks/ets/ani/ability_manager/BUILD.gn

@@ -61,6 +61,7 @@ ohos_shared_library("ability_manager_ani_kit") {
     "${ability_runtime_innerkits_path}/runtime:runtime",
     "${ability_runtime_native_path}/ability:ability_context_native",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/appkit:app_context",
     "${ability_runtime_path}/frameworks/ets/ani/ani_common:ani_common",

frameworks/ets/ani/ani_common/BUILD.gn

@@ -99,6 +99,7 @@ ohos_shared_library("ani_common") {
     "${ability_runtime_innerkits_path}/error_utils:ability_runtime_error_util",
     "${ability_runtime_innerkits_path}/runtime:runtime",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/appkit:app_context",
     "${ability_runtime_native_path}/appkit:application_context_manager",

frameworks/native/ability/native/BUILD.gn

@@ -324,23 +324,17 @@ ohos_shared_library("abilitykit_native") {
     "${ability_runtime_native_path}/ability/native/data_ability_helper_impl.cpp",
     "${ability_runtime_native_path}/ability/native/data_ability_impl.cpp",
     "${ability_runtime_native_path}/ability/native/data_uri_utils.cpp",
-    "${ability_runtime_native_path}/ability/native/distributed_ability_runtime/distributed_client.cpp",
-    "${ability_runtime_native_path}/ability/native/free_install_observer_proxy.cpp",
-    "${ability_runtime_native_path}/ability/native/free_install_observer_stub.cpp",
     "${ability_runtime_native_path}/ability/native/insight_intent_host_client.cpp",
     "${ability_runtime_native_path}/ability/native/js_deferred_callback.cpp",
     "${ability_runtime_native_path}/ability/native/js_free_install_observer.cpp",
     "${ability_runtime_native_path}/ability/native/js_query_erms_observer.cpp",
     "${ability_runtime_native_path}/ability/native/js_start_abilities_observer.cpp",
     "${ability_runtime_native_path}/ability/native/preload_ui_extension_host_client.cpp",
-    "${ability_runtime_native_path}/ability/native/query_erms_observer_proxy.cpp",
-    "${ability_runtime_native_path}/ability/native/query_erms_observer_stub.cpp",
     "${ability_runtime_native_path}/ability/native/service_ability_impl.cpp",
     "${ability_runtime_native_path}/ability/native/start_abilities_observer.cpp",
     "${ability_runtime_native_path}/appkit/app/app_context.cpp",
     "${ability_runtime_native_path}/appkit/app/context_container.cpp",
     "${ability_runtime_native_path}/appkit/app/context_deal.cpp",
-    "${ability_runtime_native_path}/appkit/app/sys_mgr_client.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/launch_param.cpp",
   ]
   configs = [
@@ -354,6 +348,7 @@ ohos_shared_library("abilitykit_native") {
   ]
 
   deps = [
+    ":ability_observer_ipc",
     ":abilitykit_utils",
     ":configuration_helper",
     ":continuation_ipc",
@@ -496,6 +491,61 @@ ohos_shared_library("abilitykit_native") {
   part_name = "ability_runtime"
 }
 
+ohos_shared_library("ability_observer_ipc") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    cfi_vcall_icall_only = true
+    debug = false
+  }
+
+  include_dirs = [
+    "${ability_runtime_path}/interfaces/inner_api/runtime/include",
+    "${ability_runtime_path}/interfaces/kits/native/ability/native",
+    "${ability_runtime_path}/interfaces/kits/native/ability/native/ability_runtime",
+    "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
+    "${ability_runtime_napi_path}/inner/napi_ability_common",
+    "${ability_runtime_path}/interfaces/kits/native/ability/native/ability_business_error",
+  ]
+
+  sources = [
+    "${ability_runtime_native_path}/ability/native/free_install_observer_proxy.cpp",
+    "${ability_runtime_native_path}/ability/native/free_install_observer_stub.cpp",
+    "${ability_runtime_native_path}/ability/native/query_erms_observer_proxy.cpp",
+    "${ability_runtime_native_path}/ability/native/query_erms_observer_stub.cpp",
+    "${ability_runtime_native_path}/ability/native/distributed_ability_runtime/distributed_client.cpp",
+    "${ability_runtime_native_path}/appkit/app/sys_mgr_client.cpp",
+  ]
+
+  configs = [
+    ":ability_config",
+    "${ability_runtime_services_path}/common:optimize_config",
+  ]
+
+  deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:mission_info",
+    "${ability_runtime_innerkits_path}/runtime:runtime",
+    "${ability_runtime_path}/utils/global/common:runtime_utils",
+    "${ability_runtime_native_path}/ability/native:ability_business_error",
+  ]
+
+  external_deps = [
+    "ability_base:want",
+    "c_utils:utils",
+    "hilog:libhilog",
+    "hitrace:hitrace_meter",
+    "ipc:ipc_core",
+    "napi:ace_napi",
+    "samgr:samgr_proxy",
+  ]
+
+  subsystem_name = "ability"
+  innerapi_tags = [ "platformsdk" ]
+  part_name = "ability_runtime"
+}
+
 ohos_shared_library("cj_abilitykit_native_ffi") {
   sanitize = {
     integer_overflow = true
@@ -1095,6 +1145,7 @@ ohos_shared_library("uiabilitykit_native") {
   configs = [ "${ability_runtime_services_path}/common:optimize_config" ]
 
   deps = [
+    ":ability_observer_ipc",
     ":abilitykit_native",
     ":abilitykit_utils",
     ":configuration_helper",

services/abilitymgr/BUILD.gn

@@ -64,6 +64,7 @@ config("abilityms_config") {
     "//prebuilts/jdk/jdk8/linux-x86/include/linux",
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_innerkits_path}/dataobs_manager/include",
+    "${ability_runtime_path}/interfaces/kits/native/ability/native/distributed_ability_runtime",
     "${ability_runtime_path}/tools/aa/include",
     "${ability_runtime_innerkits_path}/wantagent/include",
     "${ability_runtime_innerkits_path}/session_handler/include",
@@ -155,7 +156,7 @@ ohos_shared_library("abilityms") {
     "${ability_runtime_innerkits_path}/foreground_app_obs_manager:foreground_app_obs_manager",
     "${ability_runtime_innerkits_path}/session_handler:session_handler",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:auto_startup_callback",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/global/freeze:freeze_util",

test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn

@@ -61,7 +61,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") {
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/app_manager:app_manager",
     "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/server/startup:startup_util",
     "${ability_runtime_services_path}/abilitymgr:abilityms",

test/unittest/ability_manager_service_first_test/BUILD.gn

@@ -79,7 +79,7 @@ ohos_unittest("ability_manager_service_first_test") {
     "${ability_runtime_innerkits_path}/session_handler:session_handler",
     "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:auto_startup_callback",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/global/common:runtime_utils",

test/unittest/ability_manager_service_fourteenth_test/BUILD.gn

@@ -272,7 +272,7 @@ ohos_unittest("ability_manager_service_fourteenth_test") {
     "${ability_runtime_innerkits_path}/session_handler:session_handler",
     "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:auto_startup_callback",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/global/common:runtime_utils",

test/unittest/ability_manager_service_second_test/BUILD.gn

@@ -274,7 +274,7 @@ ohos_unittest("ability_manager_service_second_test") {
     "${ability_runtime_innerkits_path}/session_handler:session_handler",
     "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:auto_startup_callback",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/global/common:runtime_utils",

test/unittest/ability_manager_service_sixth_test/BUILD.gn

@@ -91,7 +91,7 @@ ohos_unittest("ability_manager_service_sixth_test") {
     "${ability_runtime_innerkits_path}/session_handler:session_handler",
     "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:auto_startup_callback",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/global/common:runtime_utils",

test/unittest/ability_manager_service_third_test/BUILD.gn

@@ -86,7 +86,7 @@ ohos_unittest("ability_manager_service_third_test") {
     "${ability_runtime_innerkits_path}/session_handler:session_handler",
     "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:auto_startup_callback",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/global/common:runtime_utils",

test/unittest/ability_manager_service_thirteenth_test/BUILD.gn

@@ -276,7 +276,7 @@ ohos_unittest("ability_manager_service_thirteenth_test") {
     "${ability_runtime_innerkits_path}/session_handler:session_handler",
     "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:auto_startup_callback",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/global/common:runtime_utils",

test/unittest/ams_mgr_kill_process_test/BUILD.gn

@@ -53,7 +53,7 @@ ohos_unittest("AmsMgrKillProcessTest") {
 
   deps = [
     "${ability_runtime_innerkits_path}/app_manager:app_manager",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_services_path}/appmgr:libappms",
     "${ability_runtime_services_path}/common:perm_verification",

test/unittest/child_process_manager_test/BUILD.gn

@@ -44,7 +44,7 @@ ohos_unittest("child_process_manager_test") {
     "${ability_runtime_innerkits_path}/app_manager:app_manager",
     "${ability_runtime_innerkits_path}/runtime:runtime",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_path}/interfaces/inner_api/child_process_manager:child_process_manager",
     "${ability_runtime_services_path}/common:app_util_static",
   ]

test/unittest/cj_test_runner_test/BUILD.gn

@@ -64,7 +64,7 @@ ohos_unittest("cj_test_runner_test") {
     "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
     "${ability_runtime_innerkits_path}/runtime:runtime",
     "${ability_runtime_native_path}/ability/native:ability_thread",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/ability/native:uiabilitykit_native",
     "${ability_runtime_native_path}/appkit:app_context",
     "${ability_runtime_native_path}/appkit:appkit_delegator",

test/unittest/insight_intent/insight_intent_execute_manager_second_test/BUILD.gn

@@ -52,7 +52,7 @@ ohos_unittest("insight_intent_execute_manager_second_test") {
   deps = [
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_services_path}/common:app_util",
     "${ability_runtime_services_path}/common:perm_verification",

test/unittest/insight_intent/insight_intent_execute_manager_test/BUILD.gn

@@ -44,7 +44,7 @@ ohos_unittest("insight_intent_execute_manager_test") {
   deps = [
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${ability_runtime_services_path}/common:app_util",

test/unittest/sys_mgr_client_test/BUILD.gn

@@ -39,7 +39,7 @@ ohos_unittest("sys_mgr_client_test") {
   deps = [
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/runtime:runtime",
-    "${ability_runtime_native_path}/ability/native:abilitykit_native",
+    "${ability_runtime_native_path}/ability/native:ability_observer_ipc",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
   ]