From 44e5e6fd94fd34f7621181fca29025a75f543079 Mon Sep 17 00:00:00 2001 From: "zhaoyuan17@huawei.com" Date: Fri, 24 Sep 2021 16:34:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4check=20permit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaoyuan17@huawei.com --- .../kits/ability/native/src/ability.cpp | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/frameworks/kits/ability/native/src/ability.cpp b/frameworks/kits/ability/native/src/ability.cpp index 22607f8903a..135a6281bed 100755 --- a/frameworks/kits/ability/native/src/ability.cpp +++ b/frameworks/kits/ability/native/src/ability.cpp @@ -2585,20 +2585,21 @@ sptr Ability::GetBundleMgr() bool Ability::CheckPermission() { APP_LOGI("%{public}s called.", __func__); - int32_t uid = IPCSkeleton::GetCallingUid(); - if (!iBundleMgr_->CheckIsSystemAppByUid(uid)) { - APP_LOGE("%{public}s fail, form is not system app. uid:%{public}d", __func__, uid); - return false; - } - - std::string bundleName; - bool result = iBundleMgr_->GetBundleNameForUid(uid, bundleName); - if (!result || bundleName.empty()) { - APP_LOGE("%{public}s failed, cannot get bundle name by uid:%{public}d", __func__, uid); - return false; - } - - return CheckFormPermission(bundleName); + // int32_t uid = IPCSkeleton::GetCallingUid(); + // if (!iBundleMgr_->CheckIsSystemAppByUid(uid)) { + // APP_LOGE("%{public}s fail, form is not system app. uid:%{public}d", __func__, uid); + // return false; + // } + + // std::string bundleName; + // bool result = iBundleMgr_->GetBundleNameForUid(uid, bundleName); + // if (!result || bundleName.empty()) { + // APP_LOGE("%{public}s failed, cannot get bundle name by uid:%{public}d", __func__, uid); + // return false; + // } + + // return CheckFormPermission(bundleName); + return true; } bool Ability::CheckFormPermission(const std::string &bundleName) const -- Gitee From 2ce3212274e080c8b52d82a9cfbc4ce000c8e58b Mon Sep 17 00:00:00 2001 From: "zhaoyuan17@huawei.com" Date: Fri, 24 Sep 2021 20:44:30 +0800 Subject: [PATCH 2/2] clear permission Signed-off-by: zhaoyuan17@huawei.com --- frameworks/kits/ability/native/src/ability.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/frameworks/kits/ability/native/src/ability.cpp b/frameworks/kits/ability/native/src/ability.cpp index 135a6281bed..0c965990133 100755 --- a/frameworks/kits/ability/native/src/ability.cpp +++ b/frameworks/kits/ability/native/src/ability.cpp @@ -2585,21 +2585,7 @@ sptr Ability::GetBundleMgr() bool Ability::CheckPermission() { APP_LOGI("%{public}s called.", __func__); - // int32_t uid = IPCSkeleton::GetCallingUid(); - // if (!iBundleMgr_->CheckIsSystemAppByUid(uid)) { - // APP_LOGE("%{public}s fail, form is not system app. uid:%{public}d", __func__, uid); - // return false; - // } - - // std::string bundleName; - // bool result = iBundleMgr_->GetBundleNameForUid(uid, bundleName); - // if (!result || bundleName.empty()) { - // APP_LOGE("%{public}s failed, cannot get bundle name by uid:%{public}d", __func__, uid); - // return false; - // } - - // return CheckFormPermission(bundleName); - return true; + return true; } bool Ability::CheckFormPermission(const std::string &bundleName) const -- Gitee