From 7e3eddf3daa246ee8027aae100a476be23c8d7ca Mon Sep 17 00:00:00 2001
From: wanxiaoqing <wanxiaoqing@huawei.com>
Date: Mon, 7 Apr 2025 09:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wanxiaoqing <wanxiaoqing@huawei.com>
---
 .../service/udmf/udmf_service_impl.cpp        | 29 ++++++++++++++-----
 .../service/udmf/udmf_service_impl.h          |  1 +
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/services/distributeddataservice/service/udmf/udmf_service_impl.cpp b/services/distributeddataservice/service/udmf/udmf_service_impl.cpp
index 75da80ecc..dbdac8110 100644
--- a/services/distributeddataservice/service/udmf/udmf_service_impl.cpp
+++ b/services/distributeddataservice/service/udmf/udmf_service_impl.cpp
@@ -183,11 +183,23 @@ int32_t UdmfServiceImpl::GetData(const QueryOption &query, UnifiedData &unifiedD
     return res;
 }
 
-int32_t UdmfServiceImpl::RetrieveData(const QueryOption &query, UnifiedData &unifiedData)
+bool UdmfServiceImpl::CheckDragParams(UnifiedKey &key, const QueryOption &query)
 {
-    UnifiedKey key(query.key);
     if (!key.IsValid()) {
         ZLOGE("Unified key: %{public}s is invalid.", query.key.c_str());
+        return false;
+    }
+    if (key.intention != UD_INTENTION_MAP.at(UD_INTENTION_DRAG)) {
+        ZLOGE("Invalid intention:%{public}s", key.intention.c_str());
+        return false;
+    }
+    return true;
+}
+
+int32_t UdmfServiceImpl::RetrieveData(const QueryOption &query, UnifiedData &unifiedData)
+{
+    UnifiedKey key(query.key);
+    if (!CheckDragParams(key, query)) {
         return E_INVALID_PARAMETERS;
     }
     auto store = StoreCache::GetInstance().GetStore(key.intention);
@@ -698,15 +710,16 @@ int32_t UdmfServiceImpl::QueryDataCommon(
 {
     auto find = UD_INTENTION_MAP.find(query.intention);
     std::string intention = find == UD_INTENTION_MAP.end() ? intention : find->second;
-    if (!UnifiedDataUtils::IsValidOptions(query.key, intention)) {
+    UnifiedKey key(query.key);
+    if (!UnifiedDataUtils::IsValidOptions(key, intention, UD_INTENTION_MAP.at(UD_INTENTION_DATA_HUB))) {
         ZLOGE("Unified key: %{public}s and intention: %{public}s is invalid.", query.key.c_str(), intention.c_str());
         return E_INVALID_PARAMETERS;
     }
-    std::string dataPrefix = DATA_PREFIX + intention;
-    UnifiedKey key(query.key);
-    key.IsValid();
-    if (intention.empty()) {
-        dataPrefix = key.key;
+    std::string dataPrefix;
+    if (key.key.empty()) {
+        dataPrefix = DATA_PREFIX + intention;
+    } else {
+        dataPrefix = UnifiedKey(key.key).GetKeyCommonPrefix();
         intention = key.intention;
     }
     ZLOGD("dataPrefix = %{public}s, intention: %{public}s.", dataPrefix.c_str(), intention.c_str());
diff --git a/services/distributeddataservice/service/udmf/udmf_service_impl.h b/services/distributeddataservice/service/udmf/udmf_service_impl.h
index 4b6096f51..3b557e09b 100644
--- a/services/distributeddataservice/service/udmf/udmf_service_impl.h
+++ b/services/distributeddataservice/service/udmf/udmf_service_impl.h
@@ -67,6 +67,7 @@ private:
     bool HasDatahubPriviledge(const std::string &bundleName);
     void RegisterAsyncProcessInfo(const std::string &businessUdKey);
     int32_t ProcessCrossDeviceData(UnifiedData &unifiedData, std::vector<Uri> &uris);
+    bool CheckDragParams(UnifiedKey &key, const QueryOption &query);
 
     class Factory {
     public:
-- 
Gitee