openharmony/distributeddatamgr_datamgr_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/distributeddatamgr_datamgr_service synced 2024-11-27 00:51:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2422 fix get remote uri block local drag problem

Browse Source 
Merge pull request !2422 from Power-the-WORLD/fix-get-remote-uri
This commit is contained in:
openharmony_ci 2024-11-20 02:31:21 +00:00 committed by Gitee
commit b815fa1461
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/distributeddataservice/service/udmf/preprocess/preprocess_utils.cpp
View File

@ -197,7 +197,6 @@ int32_t PreProcessUtils::SetRemoteUri(uint32_t tokenId, UnifiedData &data)
BizScene::SET_DATA, SetDataStage::GERERATE_DFS_URI, StageRes::FAILED, E_FS_ERROR);
ZLOGE("Get remoteUri failed, ret = %{public}d, userId: %{public}d, uri size:%{public}zu.",
ret, userId, uris.size());
return E_FS_ERROR;
}
}
return E_OK;

32
services/distributeddataservice/service/udmf/udmf_service_impl.cpp
View File

@ -273,24 +273,23 @@ bool UdmfServiceImpl::IsReadAndKeep(const std::vector<Privilege> &privileges, co
int32_t UdmfServiceImpl::ProcessUri(const QueryOption &query, UnifiedData &unifiedData)
{
std::string localDeviceId = PreProcessUtils::GetLocalDeviceId();
auto records = unifiedData.GetRecords();
if (unifiedData.GetRuntime() == nullptr) {
return E_DB_ERROR;
}
std::string sourceDeviceId = unifiedData.GetRuntime()->deviceId;
if (localDeviceId != sourceDeviceId) {
SetRemoteUri(query, records);
int32_t verifyRes = ProcessCrossDeviceData(unifiedData);
if (verifyRes != E_OK) {
ZLOGE("verify unifieddata fail, key=%{public}s, stauts=%{public}d", query.key.c_str(), verifyRes);
return verifyRes;
}
std::string bundleName;
if (!PreProcessUtils::GetHapBundleNameByToken(query.tokenId, bundleName)) {
ZLOGE("GetHapBundleNameByToken fail, key=%{public}s, tokenId=%{private}d.", query.key.c_str(), query.tokenId);
return E_ERROR;
}
std::string sourceDeviceId = unifiedData.GetRuntime()->deviceId;
if (localDeviceId == sourceDeviceId && query.tokenId == unifiedData.GetRuntime()->tokenId) {
ZLOGW("No need to grant uri permissions, queryKey=%{public}s.", query.key.c_str());
return E_OK;
}
std::vector<Uri> allUri;
auto records = unifiedData.GetRecords();
for (auto record : records) {
if (record != nullptr && PreProcessUtils::IsFileType(record->GetType())) {
auto file = static_cast<File *>(record.get());
@ -315,25 +314,36 @@ int32_t UdmfServiceImpl::ProcessUri(const QueryOption &query, UnifiedData &unifi
RadarReporterAdapter::ReportFail(std::string(__FUNCTION__),
BizScene::GET_DATA, GetDataStage::GRANT_URI_PERMISSION, StageRes::FAILED, E_NO_PERMISSION);
ZLOGE("GrantUriPermission fail, bundleName=%{public}s, key=%{public}s.",
bundleName.c_str(), query.key.c_str());
bundleName.c_str(), query.key.c_str());
return E_NO_PERMISSION;
}
return E_OK;
}
void UdmfServiceImpl::SetRemoteUri(const QueryOption &query, std::vector<std::shared_ptr<UnifiedRecord>> &records)
int32_t UdmfServiceImpl::ProcessCrossDeviceData(UnifiedData &unifiedData)
{
if (unifiedData.GetRuntime() == nullptr) {
ZLOGE("Get runtime empty!");
return E_DB_ERROR;
}
std::string localDeviceId = PreProcessUtils::GetLocalDeviceId();
std::string sourceDeviceId = unifiedData.GetRuntime()->deviceId;
if (localDeviceId == sourceDeviceId) {
return E_OK;
}
auto records = unifiedData.GetRecords();
for (auto record : records) {
if (record != nullptr && PreProcessUtils::IsFileType(record->GetType())) {
auto file = static_cast<File *>(record.get());
std::string remoteUri = file->GetRemoteUri();
if (remoteUri.empty()) {
ZLOGW("Get remoteUri is empyt, key=%{public}s.", query.key.c_str());
continue;
ZLOGE("when cross devices, remote uri is required!");
return E_ERROR;
}
file->SetUri(remoteUri); // cross dev, need dis path.
}
}
return E_OK;
}
int32_t UdmfServiceImpl::GetBatchData(const QueryOption &query, std::vector<UnifiedData> &unifiedDataSet)

2
services/distributeddataservice/service/udmf/udmf_service_impl.h
View File

@ -59,9 +59,9 @@ private:
int32_t RetrieveData(const QueryOption &query, UnifiedData &unifiedData);
int32_t QueryDataCommon(const QueryOption &query, std::vector<UnifiedData> &dataSet, std::shared_ptr<Store> &store);
int32_t ProcessUri(const QueryOption &query, UnifiedData &unifiedData);
void SetRemoteUri(const QueryOption &query, std::vector<std::shared_ptr<UnifiedRecord>> &records);
bool IsPermissionInCache(const QueryOption &query);
bool IsReadAndKeep(const std::vector<Privilege> &privileges, const QueryOption &query);
int32_t ProcessCrossDeviceData(UnifiedData &unifiedData);
class Factory {
public: