From c14ae28d36d4cc5661995b52598124f312c8105b Mon Sep 17 00:00:00 2001 From: yangliu Date: Wed, 20 Aug 2025 16:13:43 +0800 Subject: [PATCH 1/6] update Signed-off-by: yangliu --- .../distributeddataservice/app/src/kvstore_data_service.cpp | 2 -- .../distributeddataservice/app/src/security/sensitive.cpp | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/distributeddataservice/app/src/kvstore_data_service.cpp b/services/distributeddataservice/app/src/kvstore_data_service.cpp index 51af0c61e..d4294c4e5 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service.cpp @@ -982,8 +982,6 @@ void KvStoreDataService::NotifyAccountEvent(const AccountEventInfo &eventInfo) void KvStoreDataService::InitSecurityAdapter(std::shared_ptr executors) { - auto ret = DATASL_OnStart(); - ZLOGI("datasl on start ret:%d", ret); security_ = std::make_shared(executors); if (security_ == nullptr) { ZLOGE("security is nullptr."); diff --git a/services/distributeddataservice/app/src/security/sensitive.cpp b/services/distributeddataservice/app/src/security/sensitive.cpp index 0cf9aa506..b522ccf42 100644 --- a/services/distributeddataservice/app/src/security/sensitive.cpp +++ b/services/distributeddataservice/app/src/security/sensitive.cpp @@ -113,9 +113,11 @@ uint32_t Sensitive::GetSensitiveLevel(const std::string &udid) ZLOGE("init query params failed! udid:[%{public}s]", Anonymous::Change(udid).c_str()); return DATA_SEC_LEVEL1; } - + auto ret = DATASL_OnStart(); + ZLOGI("datasl on start ret:%{public}d", ret); uint32_t level = DATA_SEC_LEVEL1; int32_t result = DATASL_GetHighestSecLevel(&query, &level); + DATASL_OnStop(); if (result != DEVSL_SUCCESS) { ZLOGE("get highest level failed(%{public}s)! level: %{public}d, error: %d", Anonymous::Change(udid).c_str(), securityLevel, result); -- Gitee From 96e0f539a40ec67672e4f6c920455eec972e218f Mon Sep 17 00:00:00 2001 From: yangliu Date: Thu, 21 Aug 2025 16:48:20 +0800 Subject: [PATCH 2/6] update Signed-off-by: yangliu --- .../distributeddataservice/app/src/security/sensitive.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/src/security/sensitive.cpp b/services/distributeddataservice/app/src/security/sensitive.cpp index b522ccf42..0b097a05a 100644 --- a/services/distributeddataservice/app/src/security/sensitive.cpp +++ b/services/distributeddataservice/app/src/security/sensitive.cpp @@ -114,7 +114,10 @@ uint32_t Sensitive::GetSensitiveLevel(const std::string &udid) return DATA_SEC_LEVEL1; } auto ret = DATASL_OnStart(); - ZLOGI("datasl on start ret:%{public}d", ret); + if (ret != DEVSL_SUCCESS) { + ZLOGI("datasl on start failed, ret:%{public}d", ret); + return DATA_SEC_LEVEL1; + } uint32_t level = DATA_SEC_LEVEL1; int32_t result = DATASL_GetHighestSecLevel(&query, &level); DATASL_OnStop(); -- Gitee From 676971d7f5d32cb78cf2743a6b043f6ff85d8aa2 Mon Sep 17 00:00:00 2001 From: yangliu Date: Wed, 27 Aug 2025 17:46:46 +0800 Subject: [PATCH 3/6] update Signed-off-by: yangliu --- .../distributeddataservice/app/src/security/sensitive.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/distributeddataservice/app/src/security/sensitive.cpp b/services/distributeddataservice/app/src/security/sensitive.cpp index 0b097a05a..bd5924bb2 100644 --- a/services/distributeddataservice/app/src/security/sensitive.cpp +++ b/services/distributeddataservice/app/src/security/sensitive.cpp @@ -113,12 +113,12 @@ uint32_t Sensitive::GetSensitiveLevel(const std::string &udid) ZLOGE("init query params failed! udid:[%{public}s]", Anonymous::Change(udid).c_str()); return DATA_SEC_LEVEL1; } - auto ret = DATASL_OnStart(); - if (ret != DEVSL_SUCCESS) { + auto result = DATASL_OnStart(); + if (result != DEVSL_SUCCESS) { ZLOGI("datasl on start failed, ret:%{public}d", ret); return DATA_SEC_LEVEL1; } - uint32_t level = DATA_SEC_LEVEL1; + level = DATA_SEC_LEVEL1; int32_t result = DATASL_GetHighestSecLevel(&query, &level); DATASL_OnStop(); if (result != DEVSL_SUCCESS) { -- Gitee From 22f5fa48b6f02a11604f7b8c941756701843b2ca Mon Sep 17 00:00:00 2001 From: yangliu Date: Wed, 27 Aug 2025 17:48:42 +0800 Subject: [PATCH 4/6] update Signed-off-by: yangliu --- services/distributeddataservice/app/src/security/sensitive.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/src/security/sensitive.cpp b/services/distributeddataservice/app/src/security/sensitive.cpp index bd5924bb2..0724e2953 100644 --- a/services/distributeddataservice/app/src/security/sensitive.cpp +++ b/services/distributeddataservice/app/src/security/sensitive.cpp @@ -119,7 +119,7 @@ uint32_t Sensitive::GetSensitiveLevel(const std::string &udid) return DATA_SEC_LEVEL1; } level = DATA_SEC_LEVEL1; - int32_t result = DATASL_GetHighestSecLevel(&query, &level); + result = DATASL_GetHighestSecLevel(&query, &level); DATASL_OnStop(); if (result != DEVSL_SUCCESS) { ZLOGE("get highest level failed(%{public}s)! level: %{public}d, error: %d", -- Gitee From b89de0a9f37537815ed3bbc3a83fb6ebc6a56ae6 Mon Sep 17 00:00:00 2001 From: yangliu Date: Wed, 27 Aug 2025 18:10:00 +0800 Subject: [PATCH 5/6] update Signed-off-by: yangliu --- services/distributeddataservice/app/src/security/sensitive.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/src/security/sensitive.cpp b/services/distributeddataservice/app/src/security/sensitive.cpp index 0724e2953..6687fc410 100644 --- a/services/distributeddataservice/app/src/security/sensitive.cpp +++ b/services/distributeddataservice/app/src/security/sensitive.cpp @@ -115,7 +115,7 @@ uint32_t Sensitive::GetSensitiveLevel(const std::string &udid) } auto result = DATASL_OnStart(); if (result != DEVSL_SUCCESS) { - ZLOGI("datasl on start failed, ret:%{public}d", ret); + ZLOGI("datasl on start failed, ret:%{public}d", result); return DATA_SEC_LEVEL1; } level = DATA_SEC_LEVEL1; -- Gitee From f993fecb726bf2090ce3cdbdb2a0d557dba4efb8 Mon Sep 17 00:00:00 2001 From: yangliu Date: Fri, 29 Aug 2025 10:30:45 +0800 Subject: [PATCH 6/6] update Signed-off-by: yangliu --- .../distributeddataservice/app/src/security/sensitive.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributeddataservice/app/src/security/sensitive.cpp b/services/distributeddataservice/app/src/security/sensitive.cpp index 6687fc410..dcc023e3c 100644 --- a/services/distributeddataservice/app/src/security/sensitive.cpp +++ b/services/distributeddataservice/app/src/security/sensitive.cpp @@ -115,10 +115,10 @@ uint32_t Sensitive::GetSensitiveLevel(const std::string &udid) } auto result = DATASL_OnStart(); if (result != DEVSL_SUCCESS) { - ZLOGI("datasl on start failed, ret:%{public}d", result); + ZLOGE("datasl on start failed, ret:%{public}d", result); return DATA_SEC_LEVEL1; } - level = DATA_SEC_LEVEL1; + uint32_t level = DATA_SEC_LEVEL1; result = DATASL_GetHighestSecLevel(&query, &level); DATASL_OnStop(); if (result != DEVSL_SUCCESS) { -- Gitee