From b55e1d2f4c430472cc54c54fb7d2b6b3cd64440f Mon Sep 17 00:00:00 2001 From: oh_ci Date: Wed, 23 Jul 2025 02:21:34 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!517=20:?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unittest/src/dlp_permission_kit_test.cpp | 8 +- services/dlp_permission/sa/BUILD.gn | 2 - .../sa/mock/access_token_adapter_mock.cpp | 30 --- .../sa/sa_common/access_token_adapter.cpp | 31 --- .../sa/sa_common/access_token_adapter.h | 30 --- .../sa/sa_main/dlp_permission_service.cpp | 35 +-- services/dlp_permission/sa/test/BUILD.gn | 1 - .../cancelretentionstate_fuzzer.cpp | 10 +- .../cleansandboxconfig_fuzzer.cpp | 10 +- .../clearunreservedsandbox_fuzzer.cpp | 10 +- .../fuzzer/credentialcoverage_fuzzer/BUILD.gn | 217 +++++++++--------- .../credentialcoverage_fuzzer.cpp | 6 +- .../dlpcredential_fuzzer.cpp | 9 +- .../fuzzer/dlpfile_fuzzer/dlpfile_fuzzer.cpp | 6 +- .../dlpparse_fuzzer/dlpparse_fuzzer.cpp | 6 +- .../generatecert_fuzzer.cpp | 10 +- .../getdlpfilevisitrecord_fuzzer.cpp | 10 +- .../getdlpgatheringpolicy_fuzzer.cpp | 10 +- .../getdlpsupportfiletype_fuzzer.cpp | 10 +- .../getmdmpolicy_fuzzer.cpp | 10 +- .../getretentionsandboxlist_fuzzer.cpp | 10 +- .../getsandboxconfig_fuzzer.cpp | 11 +- .../installdlpsandbox_fuzzer.cpp | 10 +- .../parsecert_fuzzer/parsecert_fuzzer.cpp | 10 +- .../parsedlpheader_fuzzer.cpp | 10 +- .../fuzzer/permissioncoverage_fuzzer/BUILD.gn | 1 - .../permissioncoverage_fuzzer.cpp | 8 +- .../permissionproxy_fuzzer.cpp | 6 +- ...egisterdlpsandboxchangecallback_fuzzer.cpp | 9 +- .../registeropendlpfilecallback_fuzzer.cpp | 9 +- .../removemdmpolicy_fuzzer.cpp | 10 +- .../setmdmpolicy_fuzzer.cpp | 10 +- .../setreadflag_fuzzer/setreadflag_fuzzer.cpp | 10 +- .../setsandboxconfig_fuzzer.cpp | 10 +- .../uninstalldlpsandbox_fuzzer.cpp | 10 +- ...egisterdlpsandboxchangecallback_fuzzer.cpp | 10 +- .../unregisteropendlpfilecallback_fuzzer.cpp | 9 +- .../bundlemanageradapter_fuzzer/BUILD.gn | 1 - .../bundlemanageradapter_fuzzer.cpp | 9 +- .../cancelretentionstatestub_fuzzer/BUILD.gn | 1 - .../cancelretentionstatestub_fuzzer.cpp | 10 +- .../cleansandboxconfigstub_fuzzer/BUILD.gn | 1 - .../cleansandboxconfigstub_fuzzer.cpp | 6 +- .../BUILD.gn | 1 - .../clearunreservedsandboxstub_fuzzer.cpp | 10 +- .../BUILD.gn | 1 - .../dlppermissionservicesnormal_fuzzer.cpp | 9 +- .../generatecertstub_fuzzer/BUILD.gn | 1 - .../generatecertstub_fuzzer.cpp | 10 +- .../getdlpfilevisitrecordstub_fuzzer/BUILD.gn | 1 - .../getdlpfilevisitrecordstub_fuzzer.cpp | 10 +- .../getdlpgatheringpolicystub_fuzzer/BUILD.gn | 1 - .../getdlpgatheringpolicystub_fuzzer.cpp | 10 +- .../getdlpsupportfiletypestub_fuzzer/BUILD.gn | 1 - .../getdlpsupportfiletypestub_fuzzer.cpp | 10 +- .../getmdmpolicystub_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - .../getretentionsandboxliststub_fuzzer.cpp | 10 +- .../getsandboxconfigstub_fuzzer/BUILD.gn | 1 - .../getsandboxconfigstub_fuzzer.cpp | 9 +- .../BUILD.gn | 1 - ...andboxexternalauthorizationstub_fuzzer.cpp | 10 +- .../installdlpsandboxstub_fuzzer/BUILD.gn | 1 - .../installdlpsandboxstub_fuzzer.cpp | 10 +- .../isdlpfeatureprovidedstub_fuzzer/BUILD.gn | 1 - .../isindlpsandboxstub_fuzzer/BUILD.gn | 1 - .../isindlpsandboxstub_fuzzer.cpp | 10 +- .../stub_fuzzer/parsecertstub_fuzzer/BUILD.gn | 1 - .../parsecertstub_fuzzer.cpp | 10 +- .../querydlpfileaccessstub_fuzzer/BUILD.gn | 1 - .../BUILD.gn | 1 - ...erydlpfilecopyablebytokenidstub_fuzzer.cpp | 10 +- .../BUILD.gn | 1 - ...terdlpsandboxchangecallbackstub_fuzzer.cpp | 9 +- .../BUILD.gn | 1 - ...registeropendlpfilecallbackstub_fuzzer.cpp | 9 +- .../removemdmpolicystub_fuzzer/BUILD.gn | 1 - .../setmdmpolicystub_fuzzer/BUILD.gn | 1 - .../setreadflagstub_fuzzer/BUILD.gn | 1 - .../setreadflagstub_fuzzer.cpp | 10 +- .../setretentionstatestub_fuzzer/BUILD.gn | 1 - .../setsandboxconfigstub_fuzzer/BUILD.gn | 1 - .../setsandboxconfigstub_fuzzer.cpp | 10 +- .../uninstalldlpsandboxstub_fuzzer/BUILD.gn | 1 - .../uninstalldlpsandboxstub_fuzzer.cpp | 10 +- .../BUILD.gn | 1 - ...terdlpsandboxchangecallbackstub_fuzzer.cpp | 10 +- .../BUILD.gn | 1 - ...registeropendlpfilecallbackstub_fuzzer.cpp | 9 +- 89 files changed, 224 insertions(+), 639 deletions(-) delete mode 100644 services/dlp_permission/sa/mock/access_token_adapter_mock.cpp delete mode 100644 services/dlp_permission/sa/sa_common/access_token_adapter.cpp delete mode 100644 services/dlp_permission/sa/sa_common/access_token_adapter.h diff --git a/interfaces/inner_api/dlp_permission/test/unittest/src/dlp_permission_kit_test.cpp b/interfaces/inner_api/dlp_permission/test/unittest/src/dlp_permission_kit_test.cpp index 1b873dd5..89628f42 100644 --- a/interfaces/inner_api/dlp_permission/test/unittest/src/dlp_permission_kit_test.cpp +++ b/interfaces/inner_api/dlp_permission/test/unittest/src/dlp_permission_kit_test.cpp @@ -80,7 +80,6 @@ static const std::string DLP_ENABEL = "const.dlp.dlp_enable"; static const std::string TRUE_VALUE = "true"; static const uint8_t ARRAY_CHAR_SIZE = 62; static const char CHAR_ARRAY[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; -static const uint64_t SYSTEM_APP_MASK = 0x100000000; } // namespace static uint8_t GetRandNum() @@ -100,7 +99,7 @@ static void TestRecordProcessInfo() DLP_LOG_INFO(LABEL, "get self uid is %{public}d", g_selfUid); } -static bool TestSetSelfTokenId(FullTokenID tokenId) +static bool TestSetSelfTokenId(AccessTokenID tokenId) { // set tokenId can only be called by native process int32_t uid = getuid(); @@ -109,9 +108,8 @@ static bool TestSetSelfTokenId(FullTokenID tokenId) return false; } - tokenId |= SYSTEM_APP_MASK; - DLP_LOG_INFO(LABEL, "set self tokenId from %{public}s to %{public}s", - std::to_string(GetSelfTokenID()).c_str(), std::to_string(tokenId).c_str()); + DLP_LOG_INFO(LABEL, "set self tokenId from %{public}u to %{public}d", + static_cast(GetSelfTokenID()), tokenId); if (SetSelfTokenID(tokenId) != DLP_OK) { DLP_LOG_ERROR(LABEL, "set self tokenId fail"); if (setuid(uid) != 0) { diff --git a/services/dlp_permission/sa/BUILD.gn b/services/dlp_permission/sa/BUILD.gn index 522229fc..ce357e3e 100644 --- a/services/dlp_permission/sa/BUILD.gn +++ b/services/dlp_permission/sa/BUILD.gn @@ -141,7 +141,6 @@ ohos_shared_library("dlp_permission_service") { "callback/open_dlp_file_callback/open_dlp_file_callback_proxy.cpp", "mock/dlp_credential_service.c", "mock/mock_utils.cpp", - "sa_common/access_token_adapter.cpp", "sa_common/bundle_manager_adapter.cpp", "sa_common/permission_manager_adapter.cpp", "sa_main/dlp_credential.cpp", @@ -185,7 +184,6 @@ ohos_shared_library("dlp_permission_service") { "ability_base:want", "ability_runtime:app_manager", "access_token:libaccesstoken_sdk", - "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", diff --git a/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp b/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp deleted file mode 100644 index 95b8d26b..00000000 --- a/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2025 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 "access_token_adapter.h" -#include "tokenid_kit.h" -#include "ipc_skeleton.h" -namespace OHOS { -namespace Security { -namespace DlpPermission { - -bool AccessTokenAdapter::IsSystemApp() -{ - return true; -} - -} // namespace DlpPermission -} // namespace Security -} // namespace OHOS \ No newline at end of file diff --git a/services/dlp_permission/sa/sa_common/access_token_adapter.cpp b/services/dlp_permission/sa/sa_common/access_token_adapter.cpp deleted file mode 100644 index e9641bf9..00000000 --- a/services/dlp_permission/sa/sa_common/access_token_adapter.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2025 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 "access_token_adapter.h" -#include "tokenid_kit.h" -#include "ipc_skeleton.h" -namespace OHOS { -namespace Security { -namespace DlpPermission { - -bool AccessTokenAdapter::IsSystemApp() -{ - uint64_t accessTokenIDEx = IPCSkeleton::GetCallingFullTokenID(); - return Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(accessTokenIDEx); -} - -} // namespace DlpPermission -} // namespace Security -} // namespace OHOS \ No newline at end of file diff --git a/services/dlp_permission/sa/sa_common/access_token_adapter.h b/services/dlp_permission/sa/sa_common/access_token_adapter.h deleted file mode 100644 index ec1ef481..00000000 --- a/services/dlp_permission/sa/sa_common/access_token_adapter.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2025 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 ACCESS_TOKEN_ADAPTER_H -#define ACCESS_TOKEN_ADAPTER_H - -namespace OHOS { -namespace Security { -namespace DlpPermission { - -class AccessTokenAdapter { -public: - static bool IsSystemApp(); -}; -} // namespace DlpPermission -} // namespace Security -} // namespace OHOS -#endif // ACCESS_TOKEN_ADAPTER_H \ No newline at end of file diff --git a/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp b/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp index 9bf88d34..c79f9673 100644 --- a/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp +++ b/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp @@ -16,7 +16,6 @@ #include "dlp_permission_service.h" #include #include "accesstoken_kit.h" -#include "access_token_adapter.h" #include "account_adapt.h" #include "app_mgr_client.h" #include "bundle_manager_adapter.h" @@ -179,9 +178,6 @@ void DlpPermissionService::UnregisterAppStateObserver() int32_t DlpPermissionService::GenerateDlpCertificate( const sptr& policyParcel, const sptr& callback) { - if (!AccessTokenAdapter::IsSystemApp()) { - return DLP_SERVICE_ERROR_NOT_SYSTEM_APP; - } if (!PermissionManagerAdapter::CheckPermission(PERMISSION_ACCESS_DLP_FILE) && !PermissionManagerAdapter::CheckPermission(PERMISSION_ENTERPRISE_ACCESS_DLP_FILE)) { return DLP_SERVICE_ERROR_PERMISSION_DENY; @@ -232,9 +228,6 @@ static bool GetApplicationInfo(std::string appId, AppExecFwk::ApplicationInfo& a int32_t DlpPermissionService::ParseDlpCertificate(const sptr& certParcel, const sptr& callback, const std::string& appId, bool offlineAccess) { - if (!AccessTokenAdapter::IsSystemApp()) { - return DLP_SERVICE_ERROR_NOT_SYSTEM_APP; - } if (!PermissionManagerAdapter::CheckPermission(PERMISSION_ACCESS_DLP_FILE) && !PermissionManagerAdapter::CheckPermission(PERMISSION_ENTERPRISE_ACCESS_DLP_FILE)) { return DLP_SERVICE_ERROR_PERMISSION_DENY; @@ -320,24 +313,9 @@ static int32_t CheckWithInstallDlpSandbox(const std::string& bundleName, DLPFile return DLP_OK; } -static void FillDlpSandboxInfo(DlpSandboxInfo& dlpSandboxInfo, const std::string& bundleName, - DLPFileAccess dlpFileAccess, int32_t userId, const std::string& uri) -{ - dlpSandboxInfo.bundleName = bundleName; - dlpSandboxInfo.dlpFileAccess = dlpFileAccess; - dlpSandboxInfo.userId = userId; - dlpSandboxInfo.pid = IPCSkeleton::GetCallingRealPid(); - dlpSandboxInfo.uri = uri; - dlpSandboxInfo.timeStamp = static_cast( - std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()); -} - int32_t DlpPermissionService::InstallDlpSandbox(const std::string& bundleName, DLPFileAccess dlpFileAccess, int32_t userId, SandboxInfo& sandboxInfo, const std::string& uri) { - if (!AccessTokenAdapter::IsSystemApp()) { - return DLP_SERVICE_ERROR_NOT_SYSTEM_APP; - } int32_t res = CheckWithInstallDlpSandbox(bundleName, dlpFileAccess); if (res != DLP_OK) { return res; @@ -348,6 +326,7 @@ int32_t DlpPermissionService::InstallDlpSandbox(const std::string& bundleName, D bool isReadOnly = dlpFileAccess == DLPFileAccess::READ_ONLY; bool isNeedInstall = true; DlpSandboxInfo dlpSandboxInfo; + dlpSandboxInfo.bundleName = bundleName; res = GetAppIndexFromRetentionInfo(bundleName, isReadOnly, uri, dlpSandboxInfo, isNeedInstall); if (res != DLP_OK) { return res; @@ -368,12 +347,19 @@ int32_t DlpPermissionService::InstallDlpSandbox(const std::string& bundleName, D return DLP_SERVICE_ERROR_INSTALL_SANDBOX_FAIL; } } - FillDlpSandboxInfo(dlpSandboxInfo, bundleName, dlpFileAccess, userId, uri); + + dlpSandboxInfo.dlpFileAccess = dlpFileAccess; + dlpSandboxInfo.userId = userId; + dlpSandboxInfo.pid = IPCSkeleton::GetCallingRealPid(); + dlpSandboxInfo.uri = uri; + dlpSandboxInfo.timeStamp = static_cast( + std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()); if (!InsertDlpSandboxInfo(dlpSandboxInfo, !isNeedInstall)) { return DLP_SERVICE_ERROR_INSTALL_SANDBOX_FAIL; } sandboxInfo.appIndex = dlpSandboxInfo.appIndex; sandboxInfo.tokenId = dlpSandboxInfo.tokenId; + std::unique_lock lock(dlpSandboxDataMutex_); auto it = dlpSandboxData_.find(dlpSandboxInfo.uid); if (it == dlpSandboxData_.end()) { @@ -415,9 +401,6 @@ int32_t DlpPermissionService::UninstallDlpSandboxApp(const std::string& bundleNa int32_t DlpPermissionService::UninstallDlpSandbox(const std::string& bundleName, int32_t appIndex, int32_t userId) { - if (!AccessTokenAdapter::IsSystemApp()) { - return DLP_SERVICE_ERROR_NOT_SYSTEM_APP; - } if (!PermissionManagerAdapter::CheckPermission(PERMISSION_ACCESS_DLP_FILE)) { return DLP_SERVICE_ERROR_PERMISSION_DENY; } diff --git a/services/dlp_permission/sa/test/BUILD.gn b/services/dlp_permission/sa/test/BUILD.gn index 0400d28a..a189bf00 100644 --- a/services/dlp_permission/sa/test/BUILD.gn +++ b/services/dlp_permission/sa/test/BUILD.gn @@ -69,7 +69,6 @@ ohos_unittest("dlp_permission_service_test") { "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_death_recipient.cpp", "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_manager.cpp", "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_proxy.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "${dlp_root_dir}/services/dlp_permission/sa/mock/dlp_credential_service.c", "${dlp_root_dir}/services/dlp_permission/sa/mock/mock_utils.cpp", "${dlp_root_dir}/services/dlp_permission/sa/sa_common/bundle_manager_adapter.cpp", diff --git a/test/fuzztest/dlp_permission/fuzzer/cancelretentionstate_fuzzer/cancelretentionstate_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/cancelretentionstate_fuzzer/cancelretentionstate_fuzzer.cpp index 290b2d1b..01b08f67 100644 --- a/test/fuzztest/dlp_permission/fuzzer/cancelretentionstate_fuzzer/cancelretentionstate_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/cancelretentionstate_fuzzer/cancelretentionstate_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -52,9 +47,8 @@ bool CancelRetentionStateFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/cleansandboxconfig_fuzzer/cleansandboxconfig_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/cleansandboxconfig_fuzzer/cleansandboxconfig_fuzzer.cpp index 50cf4ec2..766acc83 100644 --- a/test/fuzztest/dlp_permission/fuzzer/cleansandboxconfig_fuzzer/cleansandboxconfig_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/cleansandboxconfig_fuzzer/cleansandboxconfig_fuzzer.cpp @@ -25,11 +25,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -51,9 +46,8 @@ bool SetSandboxConfigFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/clearunreservedsandbox_fuzzer/clearunreservedsandbox_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/clearunreservedsandbox_fuzzer/clearunreservedsandbox_fuzzer.cpp index ddb11c47..44b3b445 100644 --- a/test/fuzztest/dlp_permission/fuzzer/clearunreservedsandbox_fuzzer/clearunreservedsandbox_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/clearunreservedsandbox_fuzzer/clearunreservedsandbox_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -49,9 +44,8 @@ bool ClearUnreservedSandboxFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer/BUILD.gn index e89c4044..e8bcb358 100644 --- a/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer/BUILD.gn @@ -1,109 +1,108 @@ -# 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. - -import("//build/config/features.gni") -import("//build/test.gni") -import("../../../../../dlp_permission_service.gni") - -module_output_path = "dlp_permission_service/dlp_permission_service" - -ohos_fuzztest("CredentialCoverageFuzzTest") { - module_out_path = module_output_path - fuzz_config_file = "${dlp_root_dir}/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer" - - configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:napi_fuzz_config" ] - - include_dirs = [ - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/account_adapt", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/app_observer", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager", - "${dlp_root_dir}/services/dlp_permission/sa/callback/dlp_sandbox_change_callback", - "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback", - "${dlp_root_dir}/services/dlp_permission/sa/mock", - "${dlp_root_dir}/services/dlp_permission/sa/sa_main", - "${dlp_root_dir}/services/dlp_permission/sa/sa_common", - "${dlp_root_dir}/services/dlp_permission/sa/storage/include", - "${dlp_root_dir}/frameworks/common/include", - "${dlp_root_dir}/frameworks/dlp_permission/include", - "${dlp_root_dir}/interfaces/inner_api/dlp_parse/include", - "${dlp_root_dir}/interfaces/inner_api/dlp_permission/include", - ] - - sources = [ - "${dlp_root_dir}/frameworks/common/src/cert_parcel.cpp", - "${dlp_root_dir}/frameworks/common/src/permission_policy.cpp", - "${dlp_root_dir}/frameworks/common/src/retention_sandbox_info.cpp", - "${dlp_root_dir}/frameworks/common/src/visited_dlp_file_info.cpp", - "${dlp_root_dir}/frameworks/dlp_permission/src/auth_user_info_parcel.cpp", - "${dlp_root_dir}/frameworks/dlp_permission/src/dlp_permission_info_parcel.cpp", - "${dlp_root_dir}/frameworks/dlp_permission/src/dlp_policy_parcel.cpp", - "${dlp_root_dir}/frameworks/dlp_permission/src/dlp_sandbox_callback_info_parcel.cpp", - "${dlp_root_dir}/frameworks/dlp_permission/src/open_dlp_file_callback_info_parcel.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/account_adapt/account_adapt.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/app_observer/app_state_observer.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/app_observer/app_uninstall_observer.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/file_operator.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/retention_file_manager.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/sandbox_json_manager.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/visit_record_file_manager.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/visit_record_json_manager.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/callback/dlp_sandbox_change_callback/dlp_sandbox_change_callback_death_recipient.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/callback/dlp_sandbox_change_callback/dlp_sandbox_change_callback_manager.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/callback/dlp_sandbox_change_callback/dlp_sandbox_change_callback_proxy.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_death_recipient.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_manager.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_proxy.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/dlp_credential_service.c", - "${dlp_root_dir}/services/dlp_permission/sa/mock/mock_utils.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/sa_common/bundle_manager_adapter.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/sa_common/permission_manager_adapter.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_async_proxy.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/storage/src/dlp_kv_data_storage.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/storage/src/sandbox_config_kv_data_storage.cpp", - "credentialcoverage_fuzzer.cpp" - ] - - deps = [ - "${dlp_root_dir}/services/dlp_permission/sa:dlp_permission_serializer_static", - "${dlp_root_dir}/interfaces/inner_api/dlp_permission:libdlp_permission_sdk", - ] - - external_deps = [ - "ability_base:want", - "ability_runtime:app_manager", - "access_token:libaccesstoken_sdk", - "access_token:libtokensetproc_shared", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "c_utils:utils", - "common_event_service:cesfwk_core", - "common_event_service:cesfwk_innerkits", - "config_policy:configpolicy_util", - "hilog:libhilog", - "hisysevent:libhisysevent", - "init:libbegetutil", - "ipc:ipc_core", - "json:nlohmann_json_static", - "kv_store:distributeddata_inner", - "os_account:domain_account_innerkits", - "os_account:libaccountkits", - "os_account:os_account_innerkits", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - ] - - cflags_cc = [ "-DHILOG_ENABLE" ] - cflags = [ "-DHILOG_ENABLE" ] -} +# 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. + +import("//build/config/features.gni") +import("//build/test.gni") +import("../../../../../dlp_permission_service.gni") + +module_output_path = "dlp_permission_service/dlp_permission_service" + +ohos_fuzztest("CredentialCoverageFuzzTest") { + module_out_path = module_output_path + fuzz_config_file = "${dlp_root_dir}/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer" + + configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:napi_fuzz_config" ] + + include_dirs = [ + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/account_adapt", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/app_observer", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager", + "${dlp_root_dir}/services/dlp_permission/sa/callback/dlp_sandbox_change_callback", + "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback", + "${dlp_root_dir}/services/dlp_permission/sa/mock", + "${dlp_root_dir}/services/dlp_permission/sa/sa_main", + "${dlp_root_dir}/services/dlp_permission/sa/sa_common", + "${dlp_root_dir}/services/dlp_permission/sa/storage/include", + "${dlp_root_dir}/frameworks/common/include", + "${dlp_root_dir}/frameworks/dlp_permission/include", + "${dlp_root_dir}/interfaces/inner_api/dlp_parse/include", + "${dlp_root_dir}/interfaces/inner_api/dlp_permission/include", + ] + + sources = [ + "${dlp_root_dir}/frameworks/common/src/cert_parcel.cpp", + "${dlp_root_dir}/frameworks/common/src/permission_policy.cpp", + "${dlp_root_dir}/frameworks/common/src/retention_sandbox_info.cpp", + "${dlp_root_dir}/frameworks/common/src/visited_dlp_file_info.cpp", + "${dlp_root_dir}/frameworks/dlp_permission/src/auth_user_info_parcel.cpp", + "${dlp_root_dir}/frameworks/dlp_permission/src/dlp_permission_info_parcel.cpp", + "${dlp_root_dir}/frameworks/dlp_permission/src/dlp_policy_parcel.cpp", + "${dlp_root_dir}/frameworks/dlp_permission/src/dlp_sandbox_callback_info_parcel.cpp", + "${dlp_root_dir}/frameworks/dlp_permission/src/open_dlp_file_callback_info_parcel.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/account_adapt/account_adapt.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/app_observer/app_state_observer.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/app_observer/app_uninstall_observer.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/file_operator.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/retention_file_manager.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/sandbox_json_manager.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/visit_record_file_manager.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/adapt_utils/file_manager/visit_record_json_manager.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/callback/dlp_sandbox_change_callback/dlp_sandbox_change_callback_death_recipient.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/callback/dlp_sandbox_change_callback/dlp_sandbox_change_callback_manager.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/callback/dlp_sandbox_change_callback/dlp_sandbox_change_callback_proxy.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_death_recipient.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_manager.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_proxy.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/mock/dlp_credential_service.c", + "${dlp_root_dir}/services/dlp_permission/sa/mock/mock_utils.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/sa_common/bundle_manager_adapter.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/sa_common/permission_manager_adapter.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_async_proxy.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/storage/src/dlp_kv_data_storage.cpp", + "${dlp_root_dir}/services/dlp_permission/sa/storage/src/sandbox_config_kv_data_storage.cpp", + "credentialcoverage_fuzzer.cpp" + ] + + deps = [ + "${dlp_root_dir}/services/dlp_permission/sa:dlp_permission_serializer_static", + "${dlp_root_dir}/interfaces/inner_api/dlp_permission:libdlp_permission_sdk", + ] + + external_deps = [ + "ability_base:want", + "ability_runtime:app_manager", + "access_token:libaccesstoken_sdk", + "access_token:libtokensetproc_shared", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "c_utils:utils", + "common_event_service:cesfwk_core", + "common_event_service:cesfwk_innerkits", + "config_policy:configpolicy_util", + "hilog:libhilog", + "hisysevent:libhisysevent", + "init:libbegetutil", + "ipc:ipc_core", + "json:nlohmann_json_static", + "kv_store:distributeddata_inner", + "os_account:domain_account_innerkits", + "os_account:libaccountkits", + "os_account:os_account_innerkits", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] + + cflags_cc = [ "-DHILOG_ENABLE" ] + cflags = [ "-DHILOG_ENABLE" ] +} \ No newline at end of file diff --git a/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer/credentialcoverage_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer/credentialcoverage_fuzzer.cpp index 9ba49589..32b876c9 100644 --- a/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer/credentialcoverage_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/credentialcoverage_fuzzer/credentialcoverage_fuzzer.cpp @@ -38,7 +38,6 @@ using namespace OHOS::Security::AccessToken; namespace { const uint32_t BUFFER_LENGTH = 64; const uint32_t TWO = 2; -static const uint64_t SYSTEM_APP_MASK = 0x100000000; } namespace OHOS { @@ -138,9 +137,8 @@ bool CredentialCoverageFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/dlpcredential_fuzzer/dlpcredential_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/dlpcredential_fuzzer/dlpcredential_fuzzer.cpp index 61c644f7..a00ed764 100644 --- a/test/fuzztest/dlp_permission/fuzzer/dlpcredential_fuzzer/dlpcredential_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/dlpcredential_fuzzer/dlpcredential_fuzzer.cpp @@ -46,10 +46,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; using Json = nlohmann::json; -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { const std::string ENC_DATA_LEN = "encDataLen"; const std::string ENC_DATA = "encData"; @@ -249,9 +245,8 @@ bool DlpCredentialFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/dlpfile_fuzzer/dlpfile_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/dlpfile_fuzzer/dlpfile_fuzzer.cpp index 8cdbd2c7..c8877339 100644 --- a/test/fuzztest/dlp_permission/fuzzer/dlpfile_fuzzer/dlpfile_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/dlpfile_fuzzer/dlpfile_fuzzer.cpp @@ -40,7 +40,6 @@ static const uint8_t ARRAY_CHAR_SIZE = 62; static const char CHAR_ARRAY[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; static std::string g_accountName = "ohosAnonymousName"; static const std::string DLP_SUFFIX = ".dlp"; -static const uint64_t SYSTEM_APP_MASK = 0x100000000; } static void GenerateRandStr(uint32_t len, const uint8_t *data, std::string& res) @@ -277,9 +276,8 @@ bool DlpFileFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/dlpparse_fuzzer/dlpparse_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/dlpparse_fuzzer/dlpparse_fuzzer.cpp index 9718afc7..5726eff3 100644 --- a/test/fuzztest/dlp_permission/fuzzer/dlpparse_fuzzer/dlpparse_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/dlpparse_fuzzer/dlpparse_fuzzer.cpp @@ -39,7 +39,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; static const char CHAR_ARRAY[] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; static const std::string DLP_TEST_DIR = "/data"; static const std::string LOGIN_EVENT = "Ohos.account.event.LOGIN"; @@ -193,9 +192,8 @@ bool DlpFileFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/generatecert_fuzzer/generatecert_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/generatecert_fuzzer/generatecert_fuzzer.cpp index 3d4bfd22..4a7e7c6b 100644 --- a/test/fuzztest/dlp_permission/fuzzer/generatecert_fuzzer/generatecert_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/generatecert_fuzzer/generatecert_fuzzer.cpp @@ -27,11 +27,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { const int32_t KEY_LEN = 16; constexpr int32_t DATA_LENGTH = KEY_LEN * 6; @@ -84,9 +79,8 @@ bool GenerateCertFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/getdlpfilevisitrecord_fuzzer/getdlpfilevisitrecord_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/getdlpfilevisitrecord_fuzzer/getdlpfilevisitrecord_fuzzer.cpp index b2f39b89..bd7c0ed2 100644 --- a/test/fuzztest/dlp_permission/fuzzer/getdlpfilevisitrecord_fuzzer/getdlpfilevisitrecord_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/getdlpfilevisitrecord_fuzzer/getdlpfilevisitrecord_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -49,9 +44,8 @@ bool GetDlpFileVisitRecordFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/getdlpgatheringpolicy_fuzzer/getdlpgatheringpolicy_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/getdlpgatheringpolicy_fuzzer/getdlpgatheringpolicy_fuzzer.cpp index 2fffa615..137f1647 100644 --- a/test/fuzztest/dlp_permission/fuzzer/getdlpgatheringpolicy_fuzzer/getdlpgatheringpolicy_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/getdlpgatheringpolicy_fuzzer/getdlpgatheringpolicy_fuzzer.cpp @@ -28,11 +28,6 @@ constexpr uint8_t STATUS_NUM = 2; using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -50,9 +45,8 @@ bool GetDlpGatheringPolicyFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/getdlpsupportfiletype_fuzzer/getdlpsupportfiletype_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/getdlpsupportfiletype_fuzzer/getdlpsupportfiletype_fuzzer.cpp index 0e7d0625..594d9c34 100644 --- a/test/fuzztest/dlp_permission/fuzzer/getdlpsupportfiletype_fuzzer/getdlpsupportfiletype_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/getdlpsupportfiletype_fuzzer/getdlpsupportfiletype_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -49,9 +44,8 @@ bool GetDlpSupportFileTypeFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/getmdmpolicy_fuzzer/getmdmpolicy_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/getmdmpolicy_fuzzer/getmdmpolicy_fuzzer.cpp index 6d06af85..b45aebbd 100644 --- a/test/fuzztest/dlp_permission/fuzzer/getmdmpolicy_fuzzer/getmdmpolicy_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/getmdmpolicy_fuzzer/getmdmpolicy_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -49,9 +44,8 @@ bool GetMDMPolicyFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/getretentionsandboxlist_fuzzer/getretentionsandboxlist_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/getretentionsandboxlist_fuzzer/getretentionsandboxlist_fuzzer.cpp index bbdfee8a..52eacfeb 100644 --- a/test/fuzztest/dlp_permission/fuzzer/getretentionsandboxlist_fuzzer/getretentionsandboxlist_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/getretentionsandboxlist_fuzzer/getretentionsandboxlist_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -52,9 +47,8 @@ bool GetRetentionSandboxListFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/getsandboxconfig_fuzzer/getsandboxconfig_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/getsandboxconfig_fuzzer/getsandboxconfig_fuzzer.cpp index 974aae82..33f8cecf 100644 --- a/test/fuzztest/dlp_permission/fuzzer/getsandboxconfig_fuzzer/getsandboxconfig_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/getsandboxconfig_fuzzer/getsandboxconfig_fuzzer.cpp @@ -25,12 +25,8 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { + static std::string Uint8ArrayToString(const uint8_t* buff, size_t size) { std::string str = ""; @@ -59,9 +55,8 @@ bool SetSandboxConfigFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/installdlpsandbox_fuzzer/installdlpsandbox_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/installdlpsandbox_fuzzer/installdlpsandbox_fuzzer.cpp index f5f00d80..b50e1818 100644 --- a/test/fuzztest/dlp_permission/fuzzer/installdlpsandbox_fuzzer/installdlpsandbox_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/installdlpsandbox_fuzzer/installdlpsandbox_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { const int32_t TWO = 2; static void FuzzTest(const uint8_t* data, size_t size) @@ -59,9 +54,8 @@ bool InstallDlpSandboxFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/parsecert_fuzzer/parsecert_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/parsecert_fuzzer/parsecert_fuzzer.cpp index 56ebd6bd..2254a7b6 100644 --- a/test/fuzztest/dlp_permission/fuzzer/parsecert_fuzzer/parsecert_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/parsecert_fuzzer/parsecert_fuzzer.cpp @@ -27,11 +27,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { const int32_t APPID_LENGTH = 30; const int32_t TWO = 2; @@ -62,9 +57,8 @@ bool ParseCertFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/parsedlpheader_fuzzer/parsedlpheader_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/parsedlpheader_fuzzer/parsedlpheader_fuzzer.cpp index c2e205a3..65a9bcd8 100644 --- a/test/fuzztest/dlp_permission/fuzzer/parsedlpheader_fuzzer/parsedlpheader_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/parsedlpheader_fuzzer/parsedlpheader_fuzzer.cpp @@ -52,11 +52,6 @@ ssize_t write(int fd, const void* buf, size_t count) using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; using namespace std; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static const uint32_t BUFFERSIZE = 40; const int32_t ONE = 10; @@ -109,9 +104,8 @@ bool ParseCertFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/permissioncoverage_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/fuzzer/permissioncoverage_fuzzer/BUILD.gn index 17cecda2..45a13b72 100644 --- a/test/fuzztest/dlp_permission/fuzzer/permissioncoverage_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/fuzzer/permissioncoverage_fuzzer/BUILD.gn @@ -63,7 +63,6 @@ ohos_fuzztest("PermissionCoverageFuzzTest") { "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_death_recipient.cpp", "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_manager.cpp", "${dlp_root_dir}/services/dlp_permission/sa/callback/open_dlp_file_callback/open_dlp_file_callback_proxy.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "${dlp_root_dir}/services/dlp_permission/sa/mock/dlp_credential_service.c", "${dlp_root_dir}/services/dlp_permission/sa/mock/mock_utils.cpp", "${dlp_root_dir}/services/dlp_permission/sa/sa_common/bundle_manager_adapter.cpp", diff --git a/test/fuzztest/dlp_permission/fuzzer/permissioncoverage_fuzzer/permissioncoverage_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/permissioncoverage_fuzzer/permissioncoverage_fuzzer.cpp index 508c8187..0610dd3b 100644 --- a/test/fuzztest/dlp_permission/fuzzer/permissioncoverage_fuzzer/permissioncoverage_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/permissioncoverage_fuzzer/permissioncoverage_fuzzer.cpp @@ -38,8 +38,7 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; namespace { -const uint32_t BUFFER_LENGTH = 64; -static const uint64_t SYSTEM_APP_MASK = 0x100000000; + const uint32_t BUFFER_LENGTH = 64; } namespace OHOS { @@ -67,9 +66,8 @@ bool PermissionCoverageFuzzer(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/permissionproxy_fuzzer/permissionproxy_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/permissionproxy_fuzzer/permissionproxy_fuzzer.cpp index aed4747b..ee27ac18 100644 --- a/test/fuzztest/dlp_permission/fuzzer/permissionproxy_fuzzer/permissionproxy_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/permissionproxy_fuzzer/permissionproxy_fuzzer.cpp @@ -38,7 +38,6 @@ namespace { static constexpr int32_t DLP_PERMISSION_SERVICE_SA_ID = 3521; constexpr int32_t SA_LOAD_TIME = 4 * 1000; const uint32_t BUFFER_LENGTH = 64; -static const uint64_t SYSTEM_APP_MASK = 0x100000000; } namespace OHOS { @@ -123,9 +122,8 @@ bool PermissionProxyFuzzer(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/registerdlpsandboxchangecallback_fuzzer/registerdlpsandboxchangecallback_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/registerdlpsandboxchangecallback_fuzzer/registerdlpsandboxchangecallback_fuzzer.cpp index 26be4421..73802be8 100644 --- a/test/fuzztest/dlp_permission/fuzzer/registerdlpsandboxchangecallback_fuzzer/registerdlpsandboxchangecallback_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/registerdlpsandboxchangecallback_fuzzer/registerdlpsandboxchangecallback_fuzzer.cpp @@ -35,10 +35,6 @@ public: void DlpSandboxChangeCallback(DlpSandboxCallbackInfo& result) override {} }; -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -59,9 +55,8 @@ bool RegisterRegisterDlpSandboxChangeCallbackFuzzer(const uint8_t* data, size_t /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/registeropendlpfilecallback_fuzzer/registeropendlpfilecallback_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/registeropendlpfilecallback_fuzzer/registeropendlpfilecallback_fuzzer.cpp index 73e7d023..91f66409 100644 --- a/test/fuzztest/dlp_permission/fuzzer/registeropendlpfilecallback_fuzzer/registeropendlpfilecallback_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/registeropendlpfilecallback_fuzzer/registeropendlpfilecallback_fuzzer.cpp @@ -35,10 +35,6 @@ public: void OnOpenDlpFile(OpenDlpFileCallbackInfo& result) override {} }; -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -58,9 +54,8 @@ bool RegisterRegisterOpenDlpFileCallbackFuzzer(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/removemdmpolicy_fuzzer/removemdmpolicy_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/removemdmpolicy_fuzzer/removemdmpolicy_fuzzer.cpp index f18b7da3..c7848359 100644 --- a/test/fuzztest/dlp_permission/fuzzer/removemdmpolicy_fuzzer/removemdmpolicy_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/removemdmpolicy_fuzzer/removemdmpolicy_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -49,9 +44,8 @@ bool RemoveMDMPolicyFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/setmdmpolicy_fuzzer/setmdmpolicy_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/setmdmpolicy_fuzzer/setmdmpolicy_fuzzer.cpp index 95c4693f..99e31eb1 100644 --- a/test/fuzztest/dlp_permission/fuzzer/setmdmpolicy_fuzzer/setmdmpolicy_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/setmdmpolicy_fuzzer/setmdmpolicy_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -52,9 +47,8 @@ bool SetMDMPolicyFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/setreadflag_fuzzer/setreadflag_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/setreadflag_fuzzer/setreadflag_fuzzer.cpp index 8ad6e130..86fd7345 100644 --- a/test/fuzztest/dlp_permission/fuzzer/setreadflag_fuzzer/setreadflag_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/setreadflag_fuzzer/setreadflag_fuzzer.cpp @@ -23,11 +23,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -48,9 +43,8 @@ bool SetReadFlagFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/setsandboxconfig_fuzzer/setsandboxconfig_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/setsandboxconfig_fuzzer/setsandboxconfig_fuzzer.cpp index 3812b54e..9165a20d 100644 --- a/test/fuzztest/dlp_permission/fuzzer/setsandboxconfig_fuzzer/setsandboxconfig_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/setsandboxconfig_fuzzer/setsandboxconfig_fuzzer.cpp @@ -25,11 +25,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -50,9 +45,8 @@ bool SetSandboxConfigFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/uninstalldlpsandbox_fuzzer/uninstalldlpsandbox_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/uninstalldlpsandbox_fuzzer/uninstalldlpsandbox_fuzzer.cpp index 31e6ca0d..87bb1391 100644 --- a/test/fuzztest/dlp_permission/fuzzer/uninstalldlpsandbox_fuzzer/uninstalldlpsandbox_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/uninstalldlpsandbox_fuzzer/uninstalldlpsandbox_fuzzer.cpp @@ -26,11 +26,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -56,9 +51,8 @@ bool UninstallDlpSandboxFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/unregisterdlpsandboxchangecallback_fuzzer/unregisterdlpsandboxchangecallback_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/unregisterdlpsandboxchangecallback_fuzzer/unregisterdlpsandboxchangecallback_fuzzer.cpp index f90e70e9..4fc0d8aa 100644 --- a/test/fuzztest/dlp_permission/fuzzer/unregisterdlpsandboxchangecallback_fuzzer/unregisterdlpsandboxchangecallback_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/unregisterdlpsandboxchangecallback_fuzzer/unregisterdlpsandboxchangecallback_fuzzer.cpp @@ -27,11 +27,6 @@ constexpr u_int8_t STATUS_NUM = 2; using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -49,9 +44,8 @@ bool UnRegisterDlpSandboxChangeCallbackFuzzTest(const uint8_t* data, size_t size /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/fuzzer/unregisteropendlpfilecallback_fuzzer/unregisteropendlpfilecallback_fuzzer.cpp b/test/fuzztest/dlp_permission/fuzzer/unregisteropendlpfilecallback_fuzzer/unregisteropendlpfilecallback_fuzzer.cpp index 8a845143..93f3e2b2 100644 --- a/test/fuzztest/dlp_permission/fuzzer/unregisteropendlpfilecallback_fuzzer/unregisteropendlpfilecallback_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/fuzzer/unregisteropendlpfilecallback_fuzzer/unregisteropendlpfilecallback_fuzzer.cpp @@ -35,10 +35,6 @@ public: void OnOpenDlpFile(OpenDlpFileCallbackInfo& result) override {} }; -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static void FuzzTest(const uint8_t* data, size_t size) { @@ -58,9 +54,8 @@ bool UnRegisterUnregisterOpenDlpFileCallbackFuzzer(const uint8_t* data, size_t s /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/bundlemanageradapter_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/bundlemanageradapter_fuzzer/BUILD.gn index 21bd52cd..b50c8fae 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/bundlemanageradapter_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/bundlemanageradapter_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("BundleManagerAdapterFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "${dlp_root_dir}/services/dlp_permission/sa/sa_common/bundle_manager_adapter.cpp", "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", "bundlemanageradapter_fuzzer.cpp", diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/bundlemanageradapter_fuzzer/bundlemanageradapter_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/bundlemanageradapter_fuzzer/bundlemanageradapter_fuzzer.cpp index c4b482ec..11dfd06d 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/bundlemanageradapter_fuzzer/bundlemanageradapter_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/bundlemanageradapter_fuzzer/bundlemanageradapter_fuzzer.cpp @@ -46,10 +46,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; using unordered_json = nlohmann::ordered_json; -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { const std::string ENC_DATA_LEN = "encDataLen"; const std::string ENC_DATA = "encData"; @@ -208,9 +204,8 @@ bool BundleManagerAdapterFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/cancelretentionstatestub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/cancelretentionstatestub_fuzzer/BUILD.gn index b61ba750..d5b06653 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/cancelretentionstatestub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/cancelretentionstatestub_fuzzer/BUILD.gn @@ -25,7 +25,6 @@ ohos_fuzztest("CancelRetentionStateStubFuzzTest") { sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "cancelretentionstatestub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/cancelretentionstatestub_fuzzer/cancelretentionstatestub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/cancelretentionstatestub_fuzzer/cancelretentionstatestub_fuzzer.cpp index 6b95c3fc..88f6d7d2 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/cancelretentionstatestub_fuzzer/cancelretentionstatestub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/cancelretentionstatestub_fuzzer/cancelretentionstatestub_fuzzer.cpp @@ -27,11 +27,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; static void FuzzTest(const uint8_t* data, size_t size) @@ -64,9 +59,8 @@ bool CancelRetentionStateFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/cleansandboxconfigstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/cleansandboxconfigstub_fuzzer/BUILD.gn index d499a3f2..d56b106b 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/cleansandboxconfigstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/cleansandboxconfigstub_fuzzer/BUILD.gn @@ -25,7 +25,6 @@ ohos_fuzztest("CleanSandboxConfigStubFuzzTest") { sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "cleansandboxconfigstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/cleansandboxconfigstub_fuzzer/cleansandboxconfigstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/cleansandboxconfigstub_fuzzer/cleansandboxconfigstub_fuzzer.cpp index b51975fc..909bd4d6 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/cleansandboxconfigstub_fuzzer/cleansandboxconfigstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/cleansandboxconfigstub_fuzzer/cleansandboxconfigstub_fuzzer.cpp @@ -35,7 +35,6 @@ namespace { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; const int32_t DEFAULT_USERID = 100; constexpr uint8_t STATUS_NUM = 2; -static const uint64_t SYSTEM_APP_MASK = 0x100000000; } int32_t GetCallingUserId(void) @@ -87,9 +86,8 @@ bool SetSandboxConfigFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/clearunreservedsandboxstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/clearunreservedsandboxstub_fuzzer/BUILD.gn index 93c376b1..49b7654a 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/clearunreservedsandboxstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/clearunreservedsandboxstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("ClearUnreservedSandboxStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "clearunreservedsandboxstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/clearunreservedsandboxstub_fuzzer/clearunreservedsandboxstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/clearunreservedsandboxstub_fuzzer/clearunreservedsandboxstub_fuzzer.cpp index 44d4576e..48621cc0 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/clearunreservedsandboxstub_fuzzer/clearunreservedsandboxstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/clearunreservedsandboxstub_fuzzer/clearunreservedsandboxstub_fuzzer.cpp @@ -29,11 +29,6 @@ constexpr uint8_t STATUS_NUM = 2; using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; static void FuzzTest(const uint8_t* data, size_t size) @@ -66,9 +61,8 @@ bool ClearUnreservedSandboxFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/dlppermissionservicesnormal_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/dlppermissionservicesnormal_fuzzer/BUILD.gn index 221b8a69..7ac40eb2 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/dlppermissionservicesnormal_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/dlppermissionservicesnormal_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("DlpPermissionServicesNormalFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", "dlppermissionservicesnormal_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/dlppermissionservicesnormal_fuzzer/dlppermissionservicesnormal_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/dlppermissionservicesnormal_fuzzer/dlppermissionservicesnormal_fuzzer.cpp index 2c92635c..15672982 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/dlppermissionservicesnormal_fuzzer/dlppermissionservicesnormal_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/dlppermissionservicesnormal_fuzzer/dlppermissionservicesnormal_fuzzer.cpp @@ -34,10 +34,6 @@ using namespace OHOS::Security::AccessToken; static const int32_t DEFAULT_USER_ID = 100; -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; static constexpr uint8_t STATUS_NUM = 2; @@ -218,9 +214,8 @@ bool DlpPermissionServicesNormalFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(DEFAULT_USER_ID, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/generatecertstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/generatecertstub_fuzzer/BUILD.gn index bf0870e4..aea32afa 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/generatecertstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/generatecertstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("GenerateCertStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "generatecertstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/generatecertstub_fuzzer/generatecertstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/generatecertstub_fuzzer/generatecertstub_fuzzer.cpp index 347b31d9..90c0081d 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/generatecertstub_fuzzer/generatecertstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/generatecertstub_fuzzer/generatecertstub_fuzzer.cpp @@ -30,11 +30,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, SECURITY_DOMAIN_DLP_PERMISSION, "GenerateCertFuzzTest" }; @@ -128,9 +123,8 @@ bool GenerateCertFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpfilevisitrecordstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpfilevisitrecordstub_fuzzer/BUILD.gn index b2cff104..9577a0e9 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpfilevisitrecordstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpfilevisitrecordstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("GetDlpFileVisitRecordStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "getdlpfilevisitrecordstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpfilevisitrecordstub_fuzzer/getdlpfilevisitrecordstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpfilevisitrecordstub_fuzzer/getdlpfilevisitrecordstub_fuzzer.cpp index 0001d202..e9670587 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpfilevisitrecordstub_fuzzer/getdlpfilevisitrecordstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpfilevisitrecordstub_fuzzer/getdlpfilevisitrecordstub_fuzzer.cpp @@ -29,11 +29,6 @@ constexpr uint8_t STATUS_NUM = 2; using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -67,9 +62,8 @@ bool GetDlpFileVisitRecordFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpgatheringpolicystub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpgatheringpolicystub_fuzzer/BUILD.gn index 36c6ba0c..b686c140 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpgatheringpolicystub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpgatheringpolicystub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("GetDlpGatheringPolicyStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "getdlpgatheringpolicystub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpgatheringpolicystub_fuzzer/getdlpgatheringpolicystub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpgatheringpolicystub_fuzzer/getdlpgatheringpolicystub_fuzzer.cpp index bbbd8310..dd76aa4f 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpgatheringpolicystub_fuzzer/getdlpgatheringpolicystub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpgatheringpolicystub_fuzzer/getdlpgatheringpolicystub_fuzzer.cpp @@ -29,11 +29,6 @@ constexpr uint8_t STATUS_NUM = 2; using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -67,9 +62,8 @@ bool GetDlpGatheringPolicyFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpsupportfiletypestub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpsupportfiletypestub_fuzzer/BUILD.gn index 225a8a4f..c245bbdf 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpsupportfiletypestub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpsupportfiletypestub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("GetDlpSupportFileTypeStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "getdlpsupportfiletypestub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpsupportfiletypestub_fuzzer/getdlpsupportfiletypestub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpsupportfiletypestub_fuzzer/getdlpsupportfiletypestub_fuzzer.cpp index 03f76c3e..9e5e9906 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getdlpsupportfiletypestub_fuzzer/getdlpsupportfiletypestub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getdlpsupportfiletypestub_fuzzer/getdlpsupportfiletypestub_fuzzer.cpp @@ -28,11 +28,6 @@ constexpr u_int8_t STATUS_NUM = 2; using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -66,9 +61,8 @@ bool GetDlpSupportFileTypeFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getmdmpolicystub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/getmdmpolicystub_fuzzer/BUILD.gn index d2444a30..f6b828f3 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getmdmpolicystub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getmdmpolicystub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("GetMDMPolicyStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "getmdmpolicystub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getretentionsandboxliststub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/getretentionsandboxliststub_fuzzer/BUILD.gn index 419f3375..a00425c2 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getretentionsandboxliststub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getretentionsandboxliststub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("GetRetentionSandboxListStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "getretentionsandboxliststub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getretentionsandboxliststub_fuzzer/getretentionsandboxliststub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/getretentionsandboxliststub_fuzzer/getretentionsandboxliststub_fuzzer.cpp index 9045698b..5369d9da 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getretentionsandboxliststub_fuzzer/getretentionsandboxliststub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getretentionsandboxliststub_fuzzer/getretentionsandboxliststub_fuzzer.cpp @@ -27,11 +27,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -64,9 +59,8 @@ bool GetRetentionSandboxListFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxconfigstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxconfigstub_fuzzer/BUILD.gn index cdea76e5..5f7a09a9 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxconfigstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxconfigstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("GetSandboxConfigStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "getsandboxconfigstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxconfigstub_fuzzer/getsandboxconfigstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxconfigstub_fuzzer/getsandboxconfigstub_fuzzer.cpp index 21b21fe4..ccec5758 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxconfigstub_fuzzer/getsandboxconfigstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxconfigstub_fuzzer/getsandboxconfigstub_fuzzer.cpp @@ -49,10 +49,6 @@ bool BundleManagerAdapter::GetBundleInfo(const std::string &bundleName, int32_t } } -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -89,9 +85,8 @@ bool SetSandboxConfigFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxexternalauthorizationstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxexternalauthorizationstub_fuzzer/BUILD.gn index cd8e0bf9..c3f0af70 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxexternalauthorizationstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxexternalauthorizationstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("GetSandboxExternalAuthorizationStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "getsandboxexternalauthorizationstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxexternalauthorizationstub_fuzzer/getsandboxexternalauthorizationstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxexternalauthorizationstub_fuzzer/getsandboxexternalauthorizationstub_fuzzer.cpp index a3939256..785e9a47 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxexternalauthorizationstub_fuzzer/getsandboxexternalauthorizationstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/getsandboxexternalauthorizationstub_fuzzer/getsandboxexternalauthorizationstub_fuzzer.cpp @@ -27,11 +27,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -74,9 +69,8 @@ bool GetSandboxExternalAuthorizationFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/installdlpsandboxstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/installdlpsandboxstub_fuzzer/BUILD.gn index dfcf5572..e25a029d 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/installdlpsandboxstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/installdlpsandboxstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("InstallDlpSandboxStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "installdlpsandboxstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/installdlpsandboxstub_fuzzer/installdlpsandboxstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/installdlpsandboxstub_fuzzer/installdlpsandboxstub_fuzzer.cpp index 636221f8..7658dcf5 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/installdlpsandboxstub_fuzzer/installdlpsandboxstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/installdlpsandboxstub_fuzzer/installdlpsandboxstub_fuzzer.cpp @@ -28,11 +28,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { const std::string TEST_URI = "datashare:///media/file/8"; constexpr uint32_t MIN_SIZE = 4 * sizeof(int32_t); @@ -81,9 +76,8 @@ bool InstallDlpSandboxFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/isdlpfeatureprovidedstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/isdlpfeatureprovidedstub_fuzzer/BUILD.gn index 8da45c03..1c34644c 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/isdlpfeatureprovidedstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/isdlpfeatureprovidedstub_fuzzer/BUILD.gn @@ -23,7 +23,6 @@ ohos_fuzztest("IsDlpFeatureProvidedStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "isdlpfeatureprovidedstub_fuzzer.cpp", ] deps = [ diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/isindlpsandboxstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/isindlpsandboxstub_fuzzer/BUILD.gn index 97b2fe80..c817c4d6 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/isindlpsandboxstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/isindlpsandboxstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("IsInDlpSandboxStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "isindlpsandboxstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/isindlpsandboxstub_fuzzer/isindlpsandboxstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/isindlpsandboxstub_fuzzer/isindlpsandboxstub_fuzzer.cpp index 09f97beb..b4a10172 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/isindlpsandboxstub_fuzzer/isindlpsandboxstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/isindlpsandboxstub_fuzzer/isindlpsandboxstub_fuzzer.cpp @@ -29,11 +29,6 @@ constexpr uint8_t STATUS_NUM = 2; using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -67,9 +62,8 @@ bool IsInDlpSandboxFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/parsecertstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/parsecertstub_fuzzer/BUILD.gn index 3f3501d6..55b0f5be 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/parsecertstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/parsecertstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("ParseCertStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "parsecertstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/parsecertstub_fuzzer/parsecertstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/parsecertstub_fuzzer/parsecertstub_fuzzer.cpp index afe6b7d3..7997d708 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/parsecertstub_fuzzer/parsecertstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/parsecertstub_fuzzer/parsecertstub_fuzzer.cpp @@ -31,11 +31,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; using Json = nlohmann::json; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { const std::string ENC_DATA_LEN = "encDataLen"; const std::string ENC_DATA = "encData"; @@ -111,9 +106,8 @@ bool ParseCertFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfileaccessstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfileaccessstub_fuzzer/BUILD.gn index 5cbbde70..19875303 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfileaccessstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfileaccessstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("QueryDlpFileAccessStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "querydlpfileaccessstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer/BUILD.gn index 8422bac7..0d222e07 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("QueryDlpFileCopyableByTokenIdStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "querydlpfilecopyablebytokenidstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer.cpp index 53fe5ae4..7a03fc80 100755 --- a/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer/querydlpfilecopyablebytokenidstub_fuzzer.cpp @@ -27,11 +27,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -65,9 +60,8 @@ bool QueryDlpFileCopyableByTokenIdFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer/BUILD.gn index d92248e5..53dfa9a7 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer/BUILD.gn @@ -27,7 +27,6 @@ ohos_fuzztest("RegisterDlpSandboxChangeCallbackStubFuzzTest") { ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "registerdlpsandboxchangecallbackstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer.cpp index 2a25339a..b8e48765 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer/registerdlpsandboxchangecallbackstub_fuzzer.cpp @@ -39,10 +39,6 @@ public: void DlpSandboxChangeCallback(DlpSandboxCallbackInfo& result) override {} }; -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -88,9 +84,8 @@ bool RegisterRegisterDlpSandboxChangeCallbackStubFuzzer(const uint8_t* data, siz /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/registeropendlpfilecallbackstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/registeropendlpfilecallbackstub_fuzzer/BUILD.gn index 1c992bb1..f36c6c7f 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/registeropendlpfilecallbackstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/registeropendlpfilecallbackstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("RegisterOpenDlpFileCallbackStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "registeropendlpfilecallbackstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/registeropendlpfilecallbackstub_fuzzer/registeropendlpfilecallbackstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/registeropendlpfilecallbackstub_fuzzer/registeropendlpfilecallbackstub_fuzzer.cpp index 0b2beb28..2e15edd2 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/registeropendlpfilecallbackstub_fuzzer/registeropendlpfilecallbackstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/registeropendlpfilecallbackstub_fuzzer/registeropendlpfilecallbackstub_fuzzer.cpp @@ -38,10 +38,6 @@ public: void OnOpenDlpFile(OpenDlpFileCallbackInfo& result) override {} }; -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -85,9 +81,8 @@ bool RegisterRegisterOpenDlpFileCallbackStubFuzzer(const uint8_t* data, size_t s /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/removemdmpolicystub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/removemdmpolicystub_fuzzer/BUILD.gn index 790bf2eb..25aee70b 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/removemdmpolicystub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/removemdmpolicystub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("RemoveMDMPolicyStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "removemdmpolicystub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/setmdmpolicystub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/setmdmpolicystub_fuzzer/BUILD.gn index 8afb7ac1..1c280dcd 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/setmdmpolicystub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/setmdmpolicystub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("SetMDMPolicyStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "setmdmpolicystub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/setreadflagstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/setreadflagstub_fuzzer/BUILD.gn index 3d1f364d..88365361 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/setreadflagstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/setreadflagstub_fuzzer/BUILD.gn @@ -25,7 +25,6 @@ ohos_fuzztest("SetReadFlagStubFuzzTest") { sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "setreadflagstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/setreadflagstub_fuzzer/setreadflagstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/setreadflagstub_fuzzer/setreadflagstub_fuzzer.cpp index b035ef8b..fbaf1ac1 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/setreadflagstub_fuzzer/setreadflagstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/setreadflagstub_fuzzer/setreadflagstub_fuzzer.cpp @@ -24,11 +24,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -62,9 +57,8 @@ bool SetReadFlagFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/setretentionstatestub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/setretentionstatestub_fuzzer/BUILD.gn index 8e387c77..2c9c511b 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/setretentionstatestub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/setretentionstatestub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("SetRetentionStateStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "setretentionstatestub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/setsandboxconfigstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/setsandboxconfigstub_fuzzer/BUILD.gn index f9aa401c..780a11e8 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/setsandboxconfigstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/setsandboxconfigstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("SetSandboxConfigStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "setsandboxconfigstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/setsandboxconfigstub_fuzzer/setsandboxconfigstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/setsandboxconfigstub_fuzzer/setsandboxconfigstub_fuzzer.cpp index 5275117b..16a95717 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/setsandboxconfigstub_fuzzer/setsandboxconfigstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/setsandboxconfigstub_fuzzer/setsandboxconfigstub_fuzzer.cpp @@ -46,11 +46,6 @@ bool BundleManagerAdapter::GetBundleInfo(const std::string &bundleName, int32_t } } } - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -83,9 +78,8 @@ bool SetSandboxConfigFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/uninstalldlpsandboxstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/uninstalldlpsandboxstub_fuzzer/BUILD.gn index c279b84d..f16835ca 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/uninstalldlpsandboxstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/uninstalldlpsandboxstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("UninstallDlpSandboxStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "uninstalldlpsandboxstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/uninstalldlpsandboxstub_fuzzer/uninstalldlpsandboxstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/uninstalldlpsandboxstub_fuzzer/uninstalldlpsandboxstub_fuzzer.cpp index eaab5dc3..28f590ce 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/uninstalldlpsandboxstub_fuzzer/uninstalldlpsandboxstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/uninstalldlpsandboxstub_fuzzer/uninstalldlpsandboxstub_fuzzer.cpp @@ -27,11 +27,6 @@ using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -75,9 +70,8 @@ bool UninstallDlpSandboxFuzzTest(const uint8_t* data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer/BUILD.gn index ce4698a0..e776fdc3 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("UnRegisterDlpSandboxChangeCallbackStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "unregisterdlpsandboxchangecallbackstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer.cpp index a97a96ca..49f3860f 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer/unregisterdlpsandboxchangecallbackstub_fuzzer.cpp @@ -29,11 +29,6 @@ constexpr uint8_t STATUS_NUM = 2; using namespace OHOS::Security::DlpPermission; using namespace OHOS::Security::AccessToken; - -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -68,9 +63,8 @@ bool UnRegisterDlpSandboxChangeCallbackFuzzTest(const uint8_t* data, size_t size /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer/BUILD.gn b/test/fuzztest/dlp_permission/stub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer/BUILD.gn index a197721c..736cc6d4 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer/BUILD.gn +++ b/test/fuzztest/dlp_permission/stub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("UnRegisterOpenDlpFileCallbackStubFuzzTest") { configs = [ "${dlp_root_dir}/test/fuzztest/dlp_permission:stub_fuzz_need_skip_timer_config" ] sources = [ "${dlp_root_dir}/services/dlp_permission/sa/sa_main/dlp_permission_service.cpp", - "${dlp_root_dir}/services/dlp_permission/sa/mock/access_token_adapter_mock.cpp", "unregisteropendlpfilecallbackstub_fuzzer.cpp", ] diff --git a/test/fuzztest/dlp_permission/stub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer.cpp b/test/fuzztest/dlp_permission/stub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer.cpp index 46fba39f..a34b071b 100644 --- a/test/fuzztest/dlp_permission/stub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer.cpp +++ b/test/fuzztest/dlp_permission/stub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer/unregisteropendlpfilecallbackstub_fuzzer.cpp @@ -39,10 +39,6 @@ public: void OnOpenDlpFile(OpenDlpFileCallbackInfo& result) override {} }; -namespace { -static const uint64_t SYSTEM_APP_MASK = 0x100000000; -} // namespace - namespace OHOS { static constexpr int32_t SA_ID_DLP_PERMISSION_SERVICE = 3521; @@ -88,9 +84,8 @@ bool UnRegisterUnregisterOpenDlpFileCallbackStubFuzzer(const uint8_t* data, size /* Fuzzer entry point */ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { - AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(100, "com.ohos.dlpmanager", 0); // user_id = 100 - tokenIdEx.tokenIDEx |= SYSTEM_APP_MASK; - SetSelfTokenID(tokenIdEx.tokenIDEx); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.dlpmanager", 0); // user_id = 100 + SetSelfTokenID(tokenId); return 0; } -- Gitee