From 9a02c244dc79668e1d32ddff8e99a8dbc4b05858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B0=B8=E5=BF=A0?= Date: Wed, 10 Sep 2025 13:18:20 +0000 Subject: [PATCH 1/6] add cert max size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王永忠 --- .../dlp_permission/src/dlp_permission_public_interface.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp index 4d8cd81b..d7717cc7 100644 --- a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp +++ b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp @@ -33,6 +33,8 @@ static const std::string DLP_REAL_TYPE = "realFileType"; static const std::string CERT_SIZE = "certSize"; static const uint32_t MIN_REALY_TYPE_LENGTH = 2; static const uint32_t MAX_REALY_TYPE_LENGTH = 5; +static const uint32_t EXTRA_CERT_SIZE = (2 << 32) - 1; +static const uint32_t MAX_CERT_SIZE = 30 * 1024; static bool checkParams(GenerateInfoParams& params, const nlohmann::json& jsonObj, const std::string& versionKey, const std::string& infoKey) { @@ -74,7 +76,7 @@ int32_t GenerateDlpGeneralInfo(const GenerateInfoParams& params, std::string& ge if (params.realType.size() >= MIN_REALY_TYPE_LENGTH && params.realType.size() <= MAX_REALY_TYPE_LENGTH) { dlp_general_info[DLP_REAL_TYPE] = params.realType; } - dlp_general_info[CERT_SIZE] = params.certSize; + dlp_general_info[CERT_SIZE] = params.certSize ^ EXTRA_CERT_SIZE; generalInfo = dlp_general_info.dump(); return DLP_OK; } @@ -124,6 +126,9 @@ int32_t ParseDlpGeneralInfo(const std::string& generalInfo, GenerateInfoParams& params.certSize = 0; if (iter != jsonObj.end() && iter->is_number_integer()) { params.certSize = iter->get(); + if (params.certSize > MAX_CERT_SIZE) { + params.certSize ^= EXTRA_CERT_SIZE; + } } return DLP_OK; } -- Gitee From c025d44b9645dedf0034e44b636cb1b56bcb42d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B0=B8=E5=BF=A0?= Date: Wed, 10 Sep 2025 13:50:23 +0000 Subject: [PATCH 2/6] add cert size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王永忠 --- .../dlp_permission/src/dlp_permission_public_interface.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp index d7717cc7..307e4d3c 100644 --- a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp +++ b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp @@ -126,9 +126,7 @@ int32_t ParseDlpGeneralInfo(const std::string& generalInfo, GenerateInfoParams& params.certSize = 0; if (iter != jsonObj.end() && iter->is_number_integer()) { params.certSize = iter->get(); - if (params.certSize > MAX_CERT_SIZE) { - params.certSize ^= EXTRA_CERT_SIZE; - } + params.certSize = (params.certSize > MAX_CERT_SIZE) ? (params.certSize ^ EXTRA_CERT_SIZE) : params.certSize; } return DLP_OK; } -- Gitee From e0039db3d7c4d08943821485dbd196b86806e15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B0=B8=E5=BF=A0?= Date: Thu, 11 Sep 2025 01:26:17 +0000 Subject: [PATCH 3/6] modify cert size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王永忠 --- .../dlp_permission/src/dlp_permission_public_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp index 307e4d3c..bf060161 100644 --- a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp +++ b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp @@ -33,7 +33,7 @@ static const std::string DLP_REAL_TYPE = "realFileType"; static const std::string CERT_SIZE = "certSize"; static const uint32_t MIN_REALY_TYPE_LENGTH = 2; static const uint32_t MAX_REALY_TYPE_LENGTH = 5; -static const uint32_t EXTRA_CERT_SIZE = (2 << 32) - 1; +static const uint32_t EXTRA_CERT_SIZE = UINT32_MAX; static const uint32_t MAX_CERT_SIZE = 30 * 1024; static bool checkParams(GenerateInfoParams& params, const nlohmann::json& jsonObj, const std::string& versionKey, const std::string& infoKey) -- Gitee From 13c2348b6916abce635a4ea978245ea1058bd93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B0=B8=E5=BF=A0?= Date: Thu, 11 Sep 2025 09:17:26 +0000 Subject: [PATCH 4/6] update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王永忠 --- .../dlp_permission/src/dlp_permission_public_interface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp index bf060161..c361b5b8 100644 --- a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp +++ b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp @@ -1,3 +1,4 @@ + /* * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -100,11 +101,10 @@ int32_t ParseDlpGeneralInfo(const std::string& generalInfo, GenerateInfoParams& return DLP_PARSE_ERROR_VALUE_INVALID; } auto iter = jsonObj.find(DLP_OFFLINE_FLAG); - if (iter != jsonObj.end() && iter->is_boolean()) { - params.offlineAccessFlag = iter->get(); - } else { + if ((iter == jsonObj.end()) || !(iter->is_boolean()) { return DLP_PARSE_ERROR_VALUE_INVALID; } + params.offlineAccessFlag = iter->get(); iter = jsonObj.find(DLP_CONTACT_ACCOUNT); if (iter != jsonObj.end() && iter->is_string()) { params.contactAccount = iter->get(); -- Gitee From 6f318159c52c44d9a6b4eb4b650298814db8ebdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B0=B8=E5=BF=A0?= Date: Thu, 11 Sep 2025 12:50:24 +0000 Subject: [PATCH 5/6] update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王永忠 --- .../dlp_permission/src/dlp_permission_public_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp index c361b5b8..685baedd 100644 --- a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp +++ b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp @@ -101,7 +101,7 @@ int32_t ParseDlpGeneralInfo(const std::string& generalInfo, GenerateInfoParams& return DLP_PARSE_ERROR_VALUE_INVALID; } auto iter = jsonObj.find(DLP_OFFLINE_FLAG); - if ((iter == jsonObj.end()) || !(iter->is_boolean()) { + if ((iter == jsonObj.end()) || !(iter->is_boolean())) { return DLP_PARSE_ERROR_VALUE_INVALID; } params.offlineAccessFlag = iter->get(); -- Gitee From 227be9d5b575aac9bda93e4d6e4797b9b760f873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B0=B8=E5=BF=A0?= Date: Thu, 11 Sep 2025 12:52:55 +0000 Subject: [PATCH 6/6] update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王永忠 --- .../dlp_permission/src/dlp_permission_public_interface.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp index 685baedd..c617e68d 100644 --- a/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp +++ b/interfaces/inner_api/dlp_permission/src/dlp_permission_public_interface.cpp @@ -1,4 +1,3 @@ - /* * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); -- Gitee