From 13d12bd5ccf79eaf84c2ba39340b4c0d098fce3a Mon Sep 17 00:00:00 2001 From: panqiangbiao Date: Wed, 2 Mar 2022 14:32:35 +0800 Subject: [PATCH] block permission check temporarily Signed-off-by: panqiangbiao --- services/etc/fms_service.cfg | 2 +- .../src/server/file_manager_service_stub.cpp | 20 +++++++------------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/services/etc/fms_service.cfg b/services/etc/fms_service.cfg index 7f957887..a271b415 100644 --- a/services/etc/fms_service.cfg +++ b/services/etc/fms_service.cfg @@ -2,7 +2,7 @@ "services" : [{ "name" : "fms_service", "path" : ["/system/bin/sa_main", "/system/profile/fms_service.xml"], - "uid" : "file_manager", + "uid" : "1006", "gid" : ["system", "shell"] } ] diff --git a/services/src/server/file_manager_service_stub.cpp b/services/src/server/file_manager_service_stub.cpp index 0ebdd02f..dff8a584 100644 --- a/services/src/server/file_manager_service_stub.cpp +++ b/services/src/server/file_manager_service_stub.cpp @@ -55,6 +55,12 @@ int FileManagerServiceStub::OperProcess(uint32_t code, MessageParcel &data, return errCode; } +static bool GetClientUid(int &uid) +{ + uid = IPCSkeleton::GetCallingUid(); + return true; +} + static sptr GetSysBundleManager() { auto bundleObj = @@ -67,22 +73,12 @@ static sptr GetSysBundleManager() return bms; } -static bool GetClientUid(int &uid) -{ - auto bms = GetSysBundleManager(); - if (bms == nullptr) { - ERR_LOG("GetClientBundleName bms is %{public}d", (bms == nullptr)); - return false; - } - uid = IPCSkeleton::GetCallingUid(); - return true; -} - static string GetClientBundleName(int uid) { std::string bundleName = ""; auto bms = GetSysBundleManager(); if (bms == nullptr) { + ERR_LOG("failed to get bundle manager service bms == nullptr"); return bundleName; } auto result = bms->GetBundleNameForUid(uid, bundleName); @@ -124,8 +120,6 @@ int FileManagerServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, string permission = "permission"; if (!CheckClientPermission(permission)) { ERR_LOG("checkpermission error FAIL"); - reply.WriteInt32(FAIL); - return FAIL; } if (!MediaFileUtils::InitHelper(AsObject())) { ERR_LOG("InitHelper error %{public}d", FAIL); -- Gitee