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

!19502 merge fix_uri into master

Browse Source 
QueryExtensionAbilityInfoByUri替换为QueryExtensionAbilityInfoByUriOptimal

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

**Description**: QueryExtensionAbilityInfoByUri替换为QueryExtensionAbilityInfoByUriOptimal

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

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

**TDD Result**: PASS

**XTS Result**: PASS

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


See merge request: openharmony/ability_ability_runtime!19502
This commit is contained in:
openharmony_ci
2026-06-02 15:57:20 +08:00
parent 44937e41ef 8006d5f3bf
commit 09cd8823e7
12 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/appkit/ability_bundle_manager_helper/bundle_mgr_helper.cpp
+14
View File
@@ -727,6 +727,20 @@ bool BundleMgrHelper::QueryExtensionAbilityInfoByUri(
return bundleMgr->QueryExtensionAbilityInfoByUri(uri, userId, extensionAbilityInfo);
}
bool BundleMgrHelper::QueryExtensionAbilityInfoByUriOptimal(
const std::string &uri, int32_t userId, ExtensionAbilityInfo &extensionAbilityInfo)
{
TAG_LOGD(AAFwkTag::BUNDLEMGRHELPER, "called");
auto bundleMgr = Connect();
if (bundleMgr == nullptr) {
TAG_LOGE(AAFwkTag::BUNDLEMGRHELPER, "null bundleMgr");
return false;
}
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
return bundleMgr->QueryExtensionAbilityInfoByUriOptimal(uri, userId, extensionAbilityInfo);
}
bool BundleMgrHelper::ImplicitQueryInfoByPriority(
const Want &want, int32_t flags, int32_t userId, AbilityInfo &abilityInfo, ExtensionAbilityInfo &extensionInfo)
{
interfaces/kits/native/appkit/ability_bundle_manager_helper/bundle_mgr_helper.h
+2
View File
@@ -83,6 +83,8 @@ public:
bool UnregisterBundleEventCallback(const sptr<IBundleEventCallback> &bundleEventCallback);
bool QueryExtensionAbilityInfoByUri(
const std::string &uri, int32_t userId, ExtensionAbilityInfo &extensionAbilityInfo);
bool QueryExtensionAbilityInfoByUriOptimal(
const std::string &uri, int32_t userId, ExtensionAbilityInfo &extensionAbilityInfo);
bool ImplicitQueryInfoByPriority(const Want &want, int32_t flags, int32_t userId,
AbilityInfo &abilityInfo, ExtensionAbilityInfo &extensionInfo);
bool QueryAbilityInfoByUri(const std::string &abilityUri, int32_t userId, AbilityInfo &abilityInfo);
services/abilitymgr/src/ability_manager_service.cpp
+4 -2
View File
@@ -5830,7 +5830,8 @@ int32_t AbilityManagerService::ConnectAbilityCommon(
auto bms = AbilityUtil::GetBundleManagerHelper();
CHECK_POINTER_AND_RETURN(bms, ERR_INVALID_VALUE);
bool queryResult = IN_PROCESS_CALL(bms->QueryExtensionAbilityInfoByUri(uri, validUserId, extensionInfo));
bool queryResult =
IN_PROCESS_CALL(bms->QueryExtensionAbilityInfoByUriOptimal(uri, validUserId, extensionInfo));
if (!queryResult || extensionInfo.name.empty() || extensionInfo.bundleName.empty()) {
TAG_LOGE(AAFwkTag::SERVICE_EXT, "invalid extension ability info");
if (extensionType == AppExecFwk::ExtensionAbilityType::UI_SERVICE) {
@@ -5955,7 +5956,8 @@ int AbilityManagerService::ConnectUIExtensionAbility(const Want &want, const spt
auto bms = AbilityUtil::GetBundleManagerHelper();
CHECK_POINTER_AND_RETURN(bms, ERR_INVALID_VALUE);
bool queryResult = IN_PROCESS_CALL(bms->QueryExtensionAbilityInfoByUri(uri, validUserId, extensionInfo));
bool queryResult =
IN_PROCESS_CALL(bms->QueryExtensionAbilityInfoByUriOptimal(uri, validUserId, extensionInfo));
if (!queryResult || extensionInfo.name.empty() || extensionInfo.bundleName.empty()) {
TAG_LOGE(AAFwkTag::UI_EXT, "invalid extension ability info");
eventInfo.errReason = "invalid extension ability info";
services/abilitymgr/src/interceptor/screen_unlock_interceptor.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ bool ScreenUnlockInterceptor::QueryTargetAbilityInfoByUri(const AbilityIntercept
std::string uri = param.want.GetUri().ToString();
TAG_LOGD(AAFwkTag::ABILITYMGR, "Query by uri: %{private}s, userId: %{public}d", uri.c_str(), param.userId);
AppExecFwk::ExtensionAbilityInfo extensionInfo;
bool queryResult = IN_PROCESS_CALL(bundleMgrHelper->QueryExtensionAbilityInfoByUri(
bool queryResult = IN_PROCESS_CALL(bundleMgrHelper->QueryExtensionAbilityInfoByUriOptimal(
uri, param.userId, extensionInfo));
if (!queryResult || extensionInfo.name.empty() || extensionInfo.bundleName.empty()) {
TAG_LOGD(AAFwkTag::ABILITYMGR, "Cannot find extension by uri");
test/unittest/ability_permission_util_second_test/mock/src/mock_bundle_mgr_helper.cpp
+6
View File
@@ -244,6 +244,12 @@ bool BundleMgrHelper::QueryExtensionAbilityInfoByUri(
return false;
}
bool BundleMgrHelper::QueryExtensionAbilityInfoByUriOptimal(
const std::string& uri, int32_t userId, ExtensionAbilityInfo& extensionAbilityInfo)
{
return false;
}
bool BundleMgrHelper::ImplicitQueryInfoByPriority(
const Want& want, int32_t flags, int32_t userId, AbilityInfo& abilityInfo, ExtensionAbilityInfo& extensionInfo)
{
test/unittest/app_exit_reason_helper_fourth_test/mock/include/bundle_mgr_helper.h
+6
View File
@@ -191,6 +191,12 @@ public:
return false;
}
bool QueryExtensionAbilityInfoByUriOptimal(
const std::string& uri, int32_t userId, ExtensionAbilityInfo& extensionAbilityInfo)
{
return false;
}
bool ImplicitQueryInfoByPriority(const AAFwk::Want& want, int32_t flags, int32_t userId, AbilityInfo& abilityInfo,
ExtensionAbilityInfo& extensionInfo)
{
test/unittest/app_mgr_service_fourth_test/mock/include/mock_bundle_mgr_helper.h
+2
View File
@@ -76,6 +76,8 @@ public:
bool UnregisterBundleEventCallback(const sptr<IBundleEventCallback>& bundleEventCallback);
bool QueryExtensionAbilityInfoByUri(
const std::string& uri, int32_t userId, ExtensionAbilityInfo& extensionAbilityInfo);
bool QueryExtensionAbilityInfoByUriOptimal(
const std::string& uri, int32_t userId, ExtensionAbilityInfo& extensionAbilityInfo);
bool ImplicitQueryInfoByPriority(
const Want& want, int32_t flags, int32_t userId, AbilityInfo& abilityInfo, ExtensionAbilityInfo& extensionInfo);
bool QueryAbilityInfoByUri(const std::string& abilityUri, int32_t userId, AbilityInfo& abilityInfo);
test/unittest/app_mgr_service_inner_eighth_test/mock/src/mock_bundle_mgr_helper.cpp
+6
View File
@@ -241,6 +241,12 @@ bool BundleMgrHelper::QueryExtensionAbilityInfoByUri(
return false;
}
bool BundleMgrHelper::QueryExtensionAbilityInfoByUriOptimal(
const std::string& uri, int32_t userId, ExtensionAbilityInfo& extensionAbilityInfo)
{
return false;
}
bool BundleMgrHelper::ImplicitQueryInfoByPriority(
const Want& want, int32_t flags, int32_t userId, AbilityInfo& abilityInfo, ExtensionAbilityInfo& extensionInfo)
{
test/unittest/app_mgr_service_inner_ninth_test/mock/src/mock_bundle_mgr_helper.cpp
+6
View File
@@ -241,6 +241,12 @@ bool BundleMgrHelper::QueryExtensionAbilityInfoByUri(
return false;
}
bool BundleMgrHelper::QueryExtensionAbilityInfoByUriOptimal(
const std::string& uri, int32_t userId, ExtensionAbilityInfo& extensionAbilityInfo)
{
return false;
}
bool BundleMgrHelper::ImplicitQueryInfoByPriority(
const Want& want, int32_t flags, int32_t userId, AbilityInfo& abilityInfo, ExtensionAbilityInfo& extensionInfo)
{
test/unittest/app_mgr_service_inner_seventh_test/mock/src/mock_bundle_mgr_helper.cpp
+6
View File
@@ -239,6 +239,12 @@ bool BundleMgrHelper::QueryExtensionAbilityInfoByUri(
return false;
}
bool BundleMgrHelper::QueryExtensionAbilityInfoByUriOptimal(
const std::string& uri, int32_t userId, ExtensionAbilityInfo& extensionAbilityInfo)
{
return false;
}
bool BundleMgrHelper::ImplicitQueryInfoByPriority(
const Want& want, int32_t flags, int32_t userId, AbilityInfo& abilityInfo, ExtensionAbilityInfo& extensionInfo)
{
test/unittest/app_mgr_service_inner_sixth_test/mock/include/mock_bundle_mgr_helper.h
+2
View File
@@ -78,6 +78,8 @@ public:
bool UnregisterBundleEventCallback(const sptr<IBundleEventCallback>& bundleEventCallback);
bool QueryExtensionAbilityInfoByUri(
const std::string& uri, int32_t userId, ExtensionAbilityInfo& extensionAbilityInfo);
bool QueryExtensionAbilityInfoByUriOptimal(
const std::string& uri, int32_t userId, ExtensionAbilityInfo& extensionAbilityInfo);
bool ImplicitQueryInfoByPriority(
const Want& want, int32_t flags, int32_t userId, AbilityInfo& abilityInfo, ExtensionAbilityInfo& extensionInfo);
bool QueryAbilityInfoByUri(const std::string& abilityUri, int32_t userId, AbilityInfo& abilityInfo);
test/unittest/crowd_test_interceptor_test/mock/mock_bundle_mgr_helper.cpp
+6
View File
@@ -235,6 +235,12 @@ bool BundleMgrHelper::QueryExtensionAbilityInfoByUri(
return false;
}
bool BundleMgrHelper::QueryExtensionAbilityInfoByUriOptimal(
const std::string &uri, int32_t userId, ExtensionAbilityInfo &extensionAbilityInfo)
{
return false;
}
bool BundleMgrHelper::ImplicitQueryInfoByPriority(
const Want &want, int32_t flags, int32_t userId, AbilityInfo &abilityInfo, ExtensionAbilityInfo &extensionInfo)
{