From 063a9d816e58abb906904c69b7187fa7175f574b Mon Sep 17 00:00:00 2001 From: lvyuanyuan Date: Mon, 24 Jul 2023 07:48:33 +0000 Subject: [PATCH] media share Signed-off-by: lvyuanyuan Change-Id: I0f70095c0adaaa8f693bb79fe362d87bac69d2df --- interfaces/common/include/media_share.h | 44 +++++ interfaces/common/src/media_share.cpp | 152 ++++++++++++++++++ interfaces/innerkits/native/BUILD.gn | 7 + .../native/file_share/src/file_share.cpp | 38 +++++ interfaces/kits/js/BUILD.gn | 1 + .../js/file_share/grant_uri_permission.cpp | 132 ++------------- .../kits/js/file_share/grant_uri_permission.h | 24 --- 7 files changed, 251 insertions(+), 147 deletions(-) create mode 100644 interfaces/common/include/media_share.h create mode 100644 interfaces/common/src/media_share.cpp diff --git a/interfaces/common/include/media_share.h b/interfaces/common/include/media_share.h new file mode 100644 index 000000000..a1fc1acb1 --- /dev/null +++ b/interfaces/common/include/media_share.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef FILEMANAGEMENT_APP_FILE_SERVICE_INTERFACES_INNERKITS_NATIVE_COMMON_INCLUDE_MEDIA_SHARE_H +#define FILEMANAGEMENT_APP_FILE_SERVICE_INTERFACES_INNERKITS_NATIVE_COMMON_INCLUDE_MEDIA_SHARE_H + +#include + +#include "datashare_values_bucket.h" +#include "filemgmt_libn.h" +#include "iremote_broker.h" + +namespace OHOS { +namespace AppFileService { +class FileShareGrantToken : public IRemoteBroker { +public: + DECLARE_INTERFACE_DESCRIPTOR(u"ohos.fileshare.grantUriPermission"); + + FileShareGrantToken() = default; + virtual ~FileShareGrantToken() noexcept = default; +}; + +class MediaShare { +public: + static int InsertByDatashare(napi_env env, const DataShare::DataShareValuesBucket &valuesBucket, + bool isApi10); + static int GetDataShareInfo(const std::string &uri, const std::string &bundleName, + DataShare::DataShareValuesBucket &valuesBucket, bool &isApi10, const std::string &mode); + static std::string GetModeFromFlag(unsigned int flag); +}; +} // namespace AppFileService +} // namespace OHOS +#endif \ No newline at end of file diff --git a/interfaces/common/src/media_share.cpp b/interfaces/common/src/media_share.cpp new file mode 100644 index 000000000..f032ae34b --- /dev/null +++ b/interfaces/common/src/media_share.cpp @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "media_share.h" + +#include "datashare_helper.h" +#include "iremote_stub.h" +#include "log.h" +#include "want.h" + +using namespace std; +using namespace OHOS::DataShare; +namespace OHOS { +namespace AppFileService { +namespace { + const std::string MEDIALIBRARY_DATA_URI = "datashare:///media"; + const string MEDIA_GRANT_URI_PERMISSION = + "datashare:///media/bundle_permission_insert_operation/bundle_permission_insert_operation"; + const string MEDIA_API_VERSION_10 = "?api_version=10"; + const string PERMISSION_BUNDLE_NAME = "bundle_name"; + const string PERMISSION_FILE_ID = "file_id"; + const string PERMISSION_MODE = "mode"; + const string PERMISSION_TABLE_TYPE = "table_type"; + const string MEDIA_FILE_URI_PHOTO_PREFEX = "file://media/Photo/"; + const string MEDIA_FILE_URI_AUDIO_PREFEX = "file://media/Audio/"; + const string MEDIA_FILE_URI_VIDEO_PREFEX = "file://media/video/"; + const string MEDIA_FILE_URI_IMAGE_PREFEX = "file://media/image/"; + const string MEDIA_FILE_URI_FILE_PREFEX = "file://media/file/"; + const string MEDIA_FILE_URI_Audio_PREFEX = "file://media/audio/"; +} + +enum MediaFileTable { + FILE_TABLE = 0, + PHOTO_TABLE = 1, + AUDIO_TABLE = 2, +}; + +static int32_t GetMediaTypeAndApiFromUri(const std::string &uri, bool &isApi10) +{ + if (uri.find(MEDIA_FILE_URI_PHOTO_PREFEX) == 0) { + isApi10 = true; + return MediaFileTable::PHOTO_TABLE; + } else if (uri.find(MEDIA_FILE_URI_VIDEO_PREFEX) == 0 || + uri.find(MEDIA_FILE_URI_IMAGE_PREFEX) == 0) { + return MediaFileTable::PHOTO_TABLE; + } else if (uri.find(MEDIA_FILE_URI_AUDIO_PREFEX) == 0) { + isApi10 = true; + return MediaFileTable::AUDIO_TABLE; + } else if (uri.find(MEDIA_FILE_URI_Audio_PREFEX) == 0) { + return MediaFileTable::AUDIO_TABLE; + } else if (uri.find(MEDIA_FILE_URI_FILE_PREFEX) == 0) { + return MediaFileTable::FILE_TABLE; + } + + return MediaFileTable::FILE_TABLE; +} + +static bool IsAllDigits(string idStr) +{ + for (size_t i = 0; i < idStr.size(); i++) { + if (!isdigit(idStr[i])) { + return false; + } + } + return true; +} + +static string GetIdFromUri(string uri) +{ + string rowNum = ""; + size_t pos = uri.rfind('/'); + if (pos != string::npos) { + rowNum = uri.substr(pos + 1); + if (!IsAllDigits(rowNum)) { + rowNum = ""; + } + } + return rowNum; +} + +string MediaShare::GetModeFromFlag(unsigned int flag) +{ + string mode = ""; + if (flag & OHOS::AAFwk::Want::FLAG_AUTH_READ_URI_PERMISSION) { + mode += "r"; + } + if (flag & OHOS::AAFwk::Want::FLAG_AUTH_WRITE_URI_PERMISSION) { + mode += "w"; + } + return mode; +} + +int MediaShare::GetDataShareInfo(const string &uri, const string &bundleName, + DataShareValuesBucket &valuesBucket, bool &isApi10, const string &mode) +{ + string idStr = GetIdFromUri(uri); + if (idStr == "") { + LOGE("FileShare::GetJSArgs get fileId parameter failed!"); + return EINVAL; + } + + int32_t fileId = stoi(idStr); + int32_t filesType = GetMediaTypeAndApiFromUri(uri, isApi10); + valuesBucket.Put(PERMISSION_FILE_ID, fileId); + valuesBucket.Put(PERMISSION_BUNDLE_NAME, bundleName); + valuesBucket.Put(PERMISSION_MODE, mode); + valuesBucket.Put(PERMISSION_TABLE_TYPE, filesType); + + return 0; +} + +int MediaShare::InsertByDatashare(napi_env env, const DataShareValuesBucket &valuesBucket, bool isApi10) +{ + int ret = -1; + std::shared_ptr dataShareHelper = nullptr; + sptr remote = new IRemoteStub(); + if (remote == nullptr) { + LOGE("FileShare::InsertByDatashare get remoteObject failed!"); + return -ENOMEM; + } + + dataShareHelper = DataShareHelper::Creator(remote->AsObject(), MEDIALIBRARY_DATA_URI); + if (!dataShareHelper) { + LOGE("FileShare::InsertByDatashare connect to datashare failed!"); + return -FileManagement::LibN::E_PERMISSION; + } + string uriStr = MEDIA_GRANT_URI_PERMISSION; + if (isApi10) { + uriStr += MEDIA_API_VERSION_10; + } + + Uri uri(uriStr); + ret = dataShareHelper->Insert(uri, valuesBucket); + if (ret < 0) { + LOGE("FileShare::InsertByDatashare insert failed with error code %{public}d!", ret); + return ret; + } + return ret; +} +} // namespace AppFileService +} // namespace OHOS \ No newline at end of file diff --git a/interfaces/innerkits/native/BUILD.gn b/interfaces/innerkits/native/BUILD.gn index 2810c8a4e..109e476af 100644 --- a/interfaces/innerkits/native/BUILD.gn +++ b/interfaces/innerkits/native/BUILD.gn @@ -35,6 +35,7 @@ config("file_uri_config") { ohos_shared_library("fileshare_native") { sources = [ "../../common/src/json_utils.cpp", + "../../common/src/media_share.cpp", "../../common/src/sandbox_helper.cpp", "file_share/src/file_share.cpp", ] @@ -47,7 +48,13 @@ ohos_shared_library("fileshare_native") { "ability_base:zuri", "access_token:libaccesstoken_sdk", "c_utils:utils", + "data_share:datashare_common", + "data_share:datashare_consumer", + "file_api:filemgmt_libhilog", + "file_api:filemgmt_libn", "hilog:libhilog", + "ipc:ipc_core", + "napi:ace_napi", ] part_name = "app_file_service" diff --git a/interfaces/innerkits/native/file_share/src/file_share.cpp b/interfaces/innerkits/native/file_share/src/file_share.cpp index 8045d8552..b15ffe8ec 100644 --- a/interfaces/innerkits/native/file_share/src/file_share.cpp +++ b/interfaces/innerkits/native/file_share/src/file_share.cpp @@ -25,6 +25,7 @@ #include "accesstoken_kit.h" #include "hap_token_info.h" #include "log.h" +#include "media_share.h" #include "sandbox_helper.h" #include "uri.h" @@ -46,6 +47,7 @@ const string DATA_APP_EL2_PATH = "/data/service/el2/"; const string SHARE_R_PATH = "/r/"; const string SHARE_RW_PATH = "/rw/"; const string SHARE_PATH = "/share/"; +const string MEDIA = "media"; } struct FileShareInfo { @@ -128,6 +130,26 @@ static int32_t GetShareFileType(FileShareInfo &info) return -ENOENT; } +static int32_t GetShareMediaInfo(const string &uri, const string &bundleName, uint32_t flag) +{ + DataShare::DataShareValuesBucket valuesBucket; + bool isApi10; + string mode = MediaShare::GetModeFromFlag(flag); + int32_t ret = MediaShare::GetDataShareInfo(uri, bundleName, valuesBucket, isApi10, mode); + if (ret != 0) { + LOGE("Failed to GetDataShareInfo %{public}d", ret); + return ret; + } + + ret = MediaShare::InsertByDatashare(nullptr, valuesBucket, isApi10); + if (ret != 0) { + LOGE("Failed to InsertByDatashare %{public}d", ret); + return ret; + } + + return 0; +} + static int32_t GetFileShareInfo(const string &uri, uint32_t tokenId, uint32_t flag, FileShareInfo &info) { int32_t ret = 0; @@ -138,6 +160,16 @@ static int32_t GetFileShareInfo(const string &uri, uint32_t tokenId, uint32_t fl } GetProviderInfo(uri, info); + + if (info.providerBundleName_ == MEDIA) { + ret = GetShareMediaInfo(uri, info.targetBundleName_, flag); + if (ret != 0) { + LOGE("Failed to GetShareMediaInfo %{public}d", ret); + return ret; + } + + return 0; + } ret = SandboxHelper::GetPhysicalPath(uri, info.currentUid_, info.providerLowerPath_); if (ret != 0) { @@ -213,6 +245,7 @@ static int32_t PreparePreShareDir(FileShareInfo &info) int32_t CreateShareFile(const string &uri, uint32_t tokenId, uint32_t flag) { + LOGI("CreateShareFile Enter!"); FileShareInfo info; int32_t ret = GetFileShareInfo(uri, tokenId, flag, info); if (ret != 0) { @@ -220,6 +253,11 @@ int32_t CreateShareFile(const string &uri, uint32_t tokenId, uint32_t flag) return ret; } + if (info.providerBundleName_ == MEDIA) { + LOGI("Create Media Share File Successfully!"); + return 0; + } + if ((ret = PreparePreShareDir(info)) != 0) { LOGE("PreparePreShareDir failed"); return ret; diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index bc8a7129d..94ea84dfc 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -48,6 +48,7 @@ ohos_shared_library("fileshare") { ] sources = [ + "../../common/src/media_share.cpp", "file_share/fileshare_n_exporter.cpp", "file_share/grant_uri_permission.cpp", ] diff --git a/interfaces/kits/js/file_share/grant_uri_permission.cpp b/interfaces/kits/js/file_share/grant_uri_permission.cpp index bae9c7c2b..0079c00ec 100644 --- a/interfaces/kits/js/file_share/grant_uri_permission.cpp +++ b/interfaces/kits/js/file_share/grant_uri_permission.cpp @@ -15,7 +15,6 @@ #include "grant_uri_permission.h" #include "ability.h" -#include "datashare_helper.h" #include "datashare_values_bucket.h" #include "ipc_skeleton.h" #include "log.h" @@ -23,6 +22,8 @@ #include "tokenid_kit.h" #include "want.h" +#include "media_share.h" + using namespace OHOS::DataShare; using namespace OHOS::FileManagement::LibN; using namespace OHOS::DistributedFS::ModuleRemoteUri; @@ -30,93 +31,12 @@ using namespace OHOS::DistributedFS::ModuleRemoteUri; namespace OHOS { namespace AppFileService { namespace ModuleFileShare { - enum MediaFileTable { - FILE_TABLE = 0, - PHOTO_TABLE = 1, - AUDIO_TABLE = 2, - }; - - static bool IsAllDigits(string idStr) - { - for (size_t i = 0; i < idStr.size(); i++) { - if (!isdigit(idStr[i])) { - return false; - } - } - return true; - } - static bool IsSystemApp() { uint64_t fullTokenId = OHOS::IPCSkeleton::GetCallingFullTokenID(); return Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(fullTokenId); } - static string DealWithUriWithName(string str) - { - static uint32_t MEET_COUNT = 6; - uint32_t count = 0; - uint32_t index; - for (index = 0; index < str.length(); index++) { - if (str[index] == '/') { - count++; - } - if (count == MEET_COUNT) { - break; - } - } - if (count == MEET_COUNT) { - str = str.substr(0, index); - } - return str; - } - - static string GetIdFromUri(string uri) - { - uri = DealWithUriWithName(uri); - string rowNum = ""; - size_t pos = uri.rfind('/'); - if (pos != string::npos) { - rowNum = uri.substr(pos + 1); - if (!IsAllDigits(rowNum)) { - rowNum = ""; - } - } - return rowNum; - } - - static string GetModeFromFlag(unsigned int flag) - { - string mode = ""; - if (flag & OHOS::AAFwk::Want::FLAG_AUTH_READ_URI_PERMISSION) { - mode += "r"; - } - if (flag & OHOS::AAFwk::Want::FLAG_AUTH_WRITE_URI_PERMISSION) { - mode += "w"; - } - return mode; - } - - static int32_t GetMediaTypeAndApiFromUri(const std::string &uri, bool &isApi10) - { - if (uri.find(MEDIA_FILE_URI_PHOTO_PREFEX) == 0) { - isApi10 = true; - return MediaFileTable::PHOTO_TABLE; - } else if (uri.find(MEDIA_FILE_URI_VIDEO_PREFEX) == 0 || - uri.find(MEDIA_FILE_URI_IMAGE_PREFEX) == 0) { - return MediaFileTable::PHOTO_TABLE; - } else if (uri.find(MEDIA_FILE_URI_AUDIO_PREFEX) == 0) { - isApi10 = true; - return MediaFileTable::AUDIO_TABLE; - } else if (uri.find(MEDIA_FILE_URI_Audio_PREFEX) == 0) { - return MediaFileTable::AUDIO_TABLE; - } else if (uri.find(MEDIA_FILE_URI_FILE_PREFEX) == 0) { - return MediaFileTable::FILE_TABLE; - } - - return MediaFileTable::FILE_TABLE; - } - static napi_value GetJSArgs(napi_env env, const NFuncArg &funcArg, DataShareValuesBucket &valuesBucket, bool &isApi10) { @@ -144,7 +64,7 @@ namespace ModuleFileShare { string mode; if (NVal(env, funcArg[NARG_POS::THIRD]).TypeIs(napi_number)) { auto [succFlag, flag] = NVal(env, funcArg[NARG_POS::THIRD]).ToInt32(); - mode = GetModeFromFlag(flag); + mode = MediaShare::GetModeFromFlag(flag); } else if (NVal(env, funcArg[NARG_POS::THIRD]).TypeIs(napi_string)) { auto [succFlag, flag, lenFlag] = NVal(env, funcArg[NARG_POS::THIRD]).ToUTF8String(); mode = string(flag.get()); @@ -154,52 +74,18 @@ namespace ModuleFileShare { return nullptr; } - string idStr = GetIdFromUri(string(path.get())); - if (idStr == "") { - LOGE("FileShare::GetJSArgs get fileId parameter failed!"); - NError(EINVAL).ThrowErr(env); + int ret = MediaShare::GetDataShareInfo(string(path.get()), string(bundleName.get()), + valuesBucket, isApi10, mode); + if (ret != 0) { + LOGE("FileShare::GetJSArgs GetDataShareInfo failed!"); + NError(ret).ThrowErr(env); return nullptr; } - int32_t fileId = stoi(idStr); - int32_t filesType = GetMediaTypeAndApiFromUri(string(path.get()), isApi10); - valuesBucket.Put(PERMISSION_FILE_ID, fileId); - valuesBucket.Put(PERMISSION_BUNDLE_NAME, string(bundleName.get())); - valuesBucket.Put(PERMISSION_MODE, mode); - valuesBucket.Put(PERMISSION_TABLE_TYPE, filesType); napi_get_boolean(env, true, &result); return result; } - static int InsertByDatashare(napi_env env, const DataShareValuesBucket &valuesBucket, bool isApi10) - { - int ret = -1; - std::shared_ptr dataShareHelper = nullptr; - sptr remote = new IRemoteStub(); - if (remote == nullptr) { - LOGE("FileShare::InsertByDatashare get remoteObject failed!"); - return -ENOMEM; - } - - dataShareHelper = DataShare::DataShareHelper::Creator(remote->AsObject(), MEDIALIBRARY_DATA_URI); - if (!dataShareHelper) { - LOGE("FileShare::InsertByDatashare connect to datashare failed!"); - return -E_PERMISSION; - } - string uriStr = MEDIA_GRANT_URI_PERMISSION; - if (isApi10) { - uriStr += MEDIA_API_VERSION_10; - } - - Uri uri(uriStr); - ret = dataShareHelper->Insert(uri, valuesBucket); - if (ret < 0) { - LOGE("FileShare::InsertByDatashare insert failed with error code %{public}d!", ret); - return ret; - } - return ret; - } - napi_value GrantUriPermission::Async(napi_env env, napi_callback_info info) { if (!IsSystemApp()) { @@ -224,7 +110,7 @@ namespace ModuleFileShare { } auto cbExec = [valuesBucket, isApi10, env]() -> NError { - int ret = InsertByDatashare(env, valuesBucket, isApi10); + int ret = MediaShare::InsertByDatashare(env, valuesBucket, isApi10); if (ret < 0) { LOGE("FileShare::GrantUriPermission InsertByDatashare failed!"); return NError(-ret); diff --git a/interfaces/kits/js/file_share/grant_uri_permission.h b/interfaces/kits/js/file_share/grant_uri_permission.h index d7c654b27..fe9b53eea 100644 --- a/interfaces/kits/js/file_share/grant_uri_permission.h +++ b/interfaces/kits/js/file_share/grant_uri_permission.h @@ -25,31 +25,7 @@ namespace ModuleFileShare { using namespace std; -const string MEDIA_GRANT_URI_PERMISSION = - "datashare:///media/bundle_permission_insert_operation/bundle_permission_insert_operation"; -const string MEDIALIBRARY_DATA_URI = "datashare:///media"; -const string MEDIA_FILEMODE_READONLY = "r"; const string GRANT_URI_NAME = "file_share_grant_uri_permission"; -const string MEDIA_API_VERSION_10 = "?api_version=10"; -const string PERMISSION_BUNDLE_NAME = "bundle_name"; -const string PERMISSION_FILE_ID = "file_id"; -const string PERMISSION_MODE = "mode"; -const string PERMISSION_TABLE_TYPE = "table_type"; -const string MEDIA_FILE_URI_PHOTO_PREFEX = "file://media/Photo/"; -const string MEDIA_FILE_URI_AUDIO_PREFEX = "file://media/Audio/"; -const string MEDIA_FILE_URI_VIDEO_PREFEX = "file://media/video/"; -const string MEDIA_FILE_URI_IMAGE_PREFEX = "file://media/image/"; -const string MEDIA_FILE_URI_FILE_PREFEX = "file://media/file/"; -const string MEDIA_FILE_URI_Audio_PREFEX = "file://media/audio/"; - -class FileShareGrantToken : public IRemoteBroker { -public: - DECLARE_INTERFACE_DESCRIPTOR(u"ohos.fileshare.grantUriPermission"); - - FileShareGrantToken() = default; - virtual ~FileShareGrantToken() noexcept = default; -}; - class GrantUriPermission final { public: static napi_value Async(napi_env env, napi_callback_info info); -- Gitee