From 176e9733f6dc7f9c7016a9514517871edc1349bc Mon Sep 17 00:00:00 2001 From: cc_ggboy Date: Sat, 27 Aug 2022 15:57:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fuzz=E7=94=A8=E4=BE=8Basan=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=BF=90=E8=A1=8C=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8C=91=E5=8D=95monthly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cc_ggboy --- .../allochaptoken_fuzzer/BUILD.gn | 5 ---- .../allochaptoken_fuzzer.cpp | 27 +++++++++---------- .../alloclocaltokenid_fuzzer/BUILD.gn | 5 ---- .../alloclocaltokenid_fuzzer.cpp | 7 ++--- .../checknativedcap_fuzzer/BUILD.gn | 5 ---- .../checknativedcap_fuzzer.cpp | 3 ++- .../BUILD.gn | 5 ---- .../deleteremotedevicetokens_fuzzer/BUILD.gn | 5 ---- .../deleteremotedevicetokens_fuzzer.cpp | 3 ++- .../deleteremotetoken_fuzzer/BUILD.gn | 5 ---- .../deleteremotetoken_fuzzer.cpp | 3 ++- .../access_token/deletetoken_fuzzer/BUILD.gn | 5 ---- .../getdefpermission_fuzzer/BUILD.gn | 5 ---- .../getdefpermission_fuzzer.cpp | 13 +++++---- .../getpermissionflags_fuzzer/BUILD.gn | 5 ---- .../getpermissionflags_fuzzer.cpp | 3 ++- .../grantpermission_fuzzer/BUILD.gn | 5 ---- .../grantpermission_fuzzer.cpp | 3 ++- .../BUILD.gn | 5 ---- .../revokeusergrantedpermission_fuzzer.cpp | 3 ++- .../setremotehaptokeninfo_fuzzer/BUILD.gn | 5 ---- .../setremotehaptokeninfo_fuzzer.cpp | 15 +++++------ .../setremotenativetokeninfo_fuzzer/BUILD.gn | 5 ---- .../setremotenativetokeninfo_fuzzer.cpp | 11 ++++---- .../updatehaptoken_fuzzer/BUILD.gn | 5 ---- .../updatehaptoken_fuzzer.cpp | 21 +++++++-------- .../verifyaccesstoken001_fuzzer/BUILD.gn | 5 ---- .../verifyaccesstoken001_fuzzer.cpp | 3 ++- .../verifyaccesstoken_fuzzer/BUILD.gn | 5 ---- .../verifyaccesstoken_fuzzer.cpp | 3 ++- 30 files changed, 59 insertions(+), 139 deletions(-) diff --git a/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn index 7f773f0c8..d0fc5f5f2 100644 --- a/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("AllocHapTokenFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/allochaptoken_fuzzer/allochaptoken_fuzzer.cpp b/test/fuzztest/access_token/allochaptoken_fuzzer/allochaptoken_fuzzer.cpp index 094fa5d6e..f8b23b041 100644 --- a/test/fuzztest/access_token/allochaptoken_fuzzer/allochaptoken_fuzzer.cpp +++ b/test/fuzztest/access_token/allochaptoken_fuzzer/allochaptoken_fuzzer.cpp @@ -15,9 +15,10 @@ #include "allochaptoken_fuzzer.h" +#include +#include #include #include -#include #undef private #include "accesstoken_kit.h" @@ -27,40 +28,38 @@ using namespace OHOS::Security::AccessToken; namespace OHOS { bool AllocHapTokenFuzzTest(const uint8_t* data, size_t size) { - bool result = false; - std::string testdata; AccessTokenIDEx tokenIdEx = {0}; if ((data == nullptr) || (size <= 0)) { - return result; + return tokenIdEx.tokenIdExStruct.tokenID != 0; } if (size > 0) { - testdata = reinterpret_cast(data); + std::string testName(reinterpret_cast(data), size); PermissionDef TestPermDef = { - .permissionName = testdata, - .bundleName = testdata, + .permissionName = testName, + .bundleName = testName, .grantMode = 1, .availableLevel = APL_NORMAL, - .label = testdata, + .label = testName, .labelId = 1, - .description = testdata, + .description = testName, .descriptionId = 1 }; PermissionStateFull TestState = { - .permissionName = testdata, + .permissionName = testName, .isGeneral = true, - .resDeviceID = {testdata}, + .resDeviceID = {testName}, .grantStatus = {PermissionState::PERMISSION_GRANTED}, .grantFlags = {1}, }; HapInfoParams TestInfoParms = { .userID = 1, - .bundleName = testdata, + .bundleName = testName, .instIndex = 0, - .appIDDesc = testdata + .appIDDesc = testName }; HapPolicyParams TestPolicyPrams = { .apl = APL_NORMAL, - .domain = testdata, + .domain = testName, .permList = {TestPermDef}, .permStateList = {TestState} }; diff --git a/test/fuzztest/access_token/alloclocaltokenid_fuzzer/BUILD.gn b/test/fuzztest/access_token/alloclocaltokenid_fuzzer/BUILD.gn index 87ddbd2a1..0c424e29f 100644 --- a/test/fuzztest/access_token/alloclocaltokenid_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/alloclocaltokenid_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("AllocLocalTokenIDFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp b/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp index 993f3a079..7a834474d 100644 --- a/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp +++ b/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp @@ -27,14 +27,11 @@ using namespace OHOS::Security::AccessToken; namespace OHOS { bool AllocLocalTokenIDFuzzTest(const uint8_t* data, size_t size) { - bool result = false; AccessTokenID TOKENID = 0; - if ((data == nullptr) || (size <= 0)) { - return result; - } if (size > 0) { + std::string testName(reinterpret_cast(data), size); AccessTokenID REMOTETOKENID = static_cast(size); - TOKENID = AccessTokenKit::AllocLocalTokenID(reinterpret_cast(data), REMOTETOKENID); + TOKENID = AccessTokenKit::AllocLocalTokenID(testName, REMOTETOKENID); } return TOKENID != 0; } diff --git a/test/fuzztest/access_token/checknativedcap_fuzzer/BUILD.gn b/test/fuzztest/access_token/checknativedcap_fuzzer/BUILD.gn index 38d3c8425..59b64e92c 100644 --- a/test/fuzztest/access_token/checknativedcap_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/checknativedcap_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("CheckNativeDCapFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/checknativedcap_fuzzer/checknativedcap_fuzzer.cpp b/test/fuzztest/access_token/checknativedcap_fuzzer/checknativedcap_fuzzer.cpp index 7b22eff36..f3403797a 100644 --- a/test/fuzztest/access_token/checknativedcap_fuzzer/checknativedcap_fuzzer.cpp +++ b/test/fuzztest/access_token/checknativedcap_fuzzer/checknativedcap_fuzzer.cpp @@ -33,7 +33,8 @@ namespace OHOS { } if (size > 0) { AccessTokenID TOKENID = static_cast(size); - result = AccessTokenKit::CheckNativeDCap(TOKENID, reinterpret_cast(data)); + std::string testName(reinterpret_cast(data), size); + result = AccessTokenKit::CheckNativeDCap(TOKENID, testName); } return result; } diff --git a/test/fuzztest/access_token/clearusergrantedpermissionstate_fuzzer/BUILD.gn b/test/fuzztest/access_token/clearusergrantedpermissionstate_fuzzer/BUILD.gn index 32f153f3f..75477a0d5 100644 --- a/test/fuzztest/access_token/clearusergrantedpermissionstate_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/clearusergrantedpermissionstate_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("ClearUserGrantedPermissionStateFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/BUILD.gn b/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/BUILD.gn index 6d69bec75..c4e8d936e 100644 --- a/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("DeleteRemoteDeviceTokensFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/deleteremotedevicetokens_fuzzer.cpp b/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/deleteremotedevicetokens_fuzzer.cpp index 3350c7640..e3960666a 100644 --- a/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/deleteremotedevicetokens_fuzzer.cpp +++ b/test/fuzztest/access_token/deleteremotedevicetokens_fuzzer/deleteremotedevicetokens_fuzzer.cpp @@ -36,7 +36,8 @@ namespace OHOS { return result; } if (size > 0) { - result = AccessTokenKit::DeleteRemoteDeviceTokens(reinterpret_cast(data)); + std::string testName(reinterpret_cast(data), size); + result = AccessTokenKit::DeleteRemoteDeviceTokens(testName); } #endif diff --git a/test/fuzztest/access_token/deleteremotetoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/deleteremotetoken_fuzzer/BUILD.gn index 5b686f792..65cebb7eb 100644 --- a/test/fuzztest/access_token/deleteremotetoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/deleteremotetoken_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("DeleteRemoteTokenFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/deleteremotetoken_fuzzer/deleteremotetoken_fuzzer.cpp b/test/fuzztest/access_token/deleteremotetoken_fuzzer/deleteremotetoken_fuzzer.cpp index bcd031a6b..d422a42a5 100644 --- a/test/fuzztest/access_token/deleteremotetoken_fuzzer/deleteremotetoken_fuzzer.cpp +++ b/test/fuzztest/access_token/deleteremotetoken_fuzzer/deleteremotetoken_fuzzer.cpp @@ -36,7 +36,8 @@ namespace OHOS { } if (size > 0) { AccessTokenID TOKENID = static_cast(size); - result = AccessTokenKit::DeleteRemoteToken(reinterpret_cast(data), TOKENID); + std::string testName(reinterpret_cast(data), size); + result = AccessTokenKit::DeleteRemoteToken(testName, TOKENID); } #endif diff --git a/test/fuzztest/access_token/deletetoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/deletetoken_fuzzer/BUILD.gn index f37c04746..a115d7f21 100644 --- a/test/fuzztest/access_token/deletetoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/deletetoken_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("DeleteTokenFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/getdefpermission_fuzzer/BUILD.gn b/test/fuzztest/access_token/getdefpermission_fuzzer/BUILD.gn index 925202101..8b018b2c3 100644 --- a/test/fuzztest/access_token/getdefpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/getdefpermission_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("GetDefPermissionFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/getdefpermission_fuzzer/getdefpermission_fuzzer.cpp b/test/fuzztest/access_token/getdefpermission_fuzzer/getdefpermission_fuzzer.cpp index 38fbe3a3d..558976a63 100644 --- a/test/fuzztest/access_token/getdefpermission_fuzzer/getdefpermission_fuzzer.cpp +++ b/test/fuzztest/access_token/getdefpermission_fuzzer/getdefpermission_fuzzer.cpp @@ -30,23 +30,22 @@ namespace OHOS { bool GetDefPermissionFuzzTest(const uint8_t* data, size_t size) { bool result = false; - std::string testdata; if ((data == nullptr) || (size <= 0)) { return result; } if (size > 0) { - testdata = reinterpret_cast(data); + std::string testName(reinterpret_cast(data), size); PermissionDef PERMISSIONDEF = { - .permissionName = testdata, - .bundleName = testdata, + .permissionName = testName, + .bundleName = testName, .grantMode = 1, - .label = testdata, + .label = testName, .labelId = 1, - .description = testdata, + .description = testName, .availableLevel = APL_NORMAL, .descriptionId = 1 }; - result = AccessTokenKit::GetDefPermission(testdata, PERMISSIONDEF); + result = AccessTokenKit::GetDefPermission(testName, PERMISSIONDEF); } return result; } diff --git a/test/fuzztest/access_token/getpermissionflags_fuzzer/BUILD.gn b/test/fuzztest/access_token/getpermissionflags_fuzzer/BUILD.gn index 328246ace..af7020915 100644 --- a/test/fuzztest/access_token/getpermissionflags_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/getpermissionflags_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("GetPermissionFlagsFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/getpermissionflags_fuzzer/getpermissionflags_fuzzer.cpp b/test/fuzztest/access_token/getpermissionflags_fuzzer/getpermissionflags_fuzzer.cpp index 9175d62dd..644f26615 100644 --- a/test/fuzztest/access_token/getpermissionflags_fuzzer/getpermissionflags_fuzzer.cpp +++ b/test/fuzztest/access_token/getpermissionflags_fuzzer/getpermissionflags_fuzzer.cpp @@ -33,7 +33,8 @@ namespace OHOS { } if (size > 0) { AccessTokenID TOKENID = static_cast(size); - result = AccessTokenKit::GetPermissionFlag(TOKENID, reinterpret_cast(data)); + std::string testName(reinterpret_cast(data), size); + result = AccessTokenKit::GetPermissionFlag(TOKENID, testName); } return result; } diff --git a/test/fuzztest/access_token/grantpermission_fuzzer/BUILD.gn b/test/fuzztest/access_token/grantpermission_fuzzer/BUILD.gn index bb588f85f..d1f4cbf09 100644 --- a/test/fuzztest/access_token/grantpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/grantpermission_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("GrantPermissionFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/grantpermission_fuzzer/grantpermission_fuzzer.cpp b/test/fuzztest/access_token/grantpermission_fuzzer/grantpermission_fuzzer.cpp index b821ba974..c0ededf13 100644 --- a/test/fuzztest/access_token/grantpermission_fuzzer/grantpermission_fuzzer.cpp +++ b/test/fuzztest/access_token/grantpermission_fuzzer/grantpermission_fuzzer.cpp @@ -33,7 +33,8 @@ namespace OHOS { } if (size > 0) { AccessTokenID TOKENID = static_cast(size); - result = AccessTokenKit::GrantPermission(TOKENID, reinterpret_cast(data), 0); + std::string testName(reinterpret_cast(data), size); + result = AccessTokenKit::GrantPermission(TOKENID, testName, 0); } return result; } diff --git a/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/BUILD.gn b/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/BUILD.gn index 94f45a419..2b4f8a2a3 100644 --- a/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("RevokeUserGrantedPermissionFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/revokeusergrantedpermission_fuzzer.cpp b/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/revokeusergrantedpermission_fuzzer.cpp index c2a1dc550..7dcc443c7 100644 --- a/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/revokeusergrantedpermission_fuzzer.cpp +++ b/test/fuzztest/access_token/revokeusergrantedpermission_fuzzer/revokeusergrantedpermission_fuzzer.cpp @@ -33,7 +33,8 @@ namespace OHOS { } if (size > 0) { AccessTokenID TOKENID = static_cast(size); - result = AccessTokenKit::RevokePermission(TOKENID, reinterpret_cast(data), 0); + std::string testName(reinterpret_cast(data), size); + result = AccessTokenKit::RevokePermission(TOKENID, testName, 0); } return result; } diff --git a/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/BUILD.gn b/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/BUILD.gn index d9591910a..df7f00dfe 100644 --- a/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("SetRemoteHapTokenInfoFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/setremotehaptokeninfo_fuzzer.cpp b/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/setremotehaptokeninfo_fuzzer.cpp index b4b69c86f..4c2a41b19 100644 --- a/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/setremotehaptokeninfo_fuzzer.cpp +++ b/test/fuzztest/access_token/setremotehaptokeninfo_fuzzer/setremotehaptokeninfo_fuzzer.cpp @@ -29,21 +29,20 @@ namespace OHOS { { bool result = false; #ifdef TOKEN_SYNC_ENABLE - std::string testdata; if ((data == nullptr) || (size <= 0)) { return result; } if (size > 0) { - testdata = reinterpret_cast(data); + std::string testName(reinterpret_cast(data), size); AccessTokenID TOKENID = static_cast(size); HapTokenInfo baseInfo = { .apl = APL_NORMAL, .ver = 1, .userID = 1, - .bundleName = testdata, + .bundleName = testName, .instIndex = 1, - .appID = testdata, - .deviceID = testdata, + .appID = testName, + .deviceID = testName, .tokenID = TOKENID, .tokenAttr = 0 }; @@ -51,8 +50,8 @@ namespace OHOS { .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}, .grantStatus = {PermissionState::PERMISSION_GRANTED}, .isGeneral = true, - .permissionName = testdata, - .resDeviceID = {testdata}}; + .permissionName = testName, + .resDeviceID = {testName}}; std::vector permStateList; permStateList.emplace_back(infoManagerTestState); HapTokenInfoForSync remoteTokenInfo = { @@ -60,7 +59,7 @@ namespace OHOS { .permStateList = permStateList }; - result = AccessTokenKit::SetRemoteHapTokenInfo(reinterpret_cast(data), remoteTokenInfo); + result = AccessTokenKit::SetRemoteHapTokenInfo(testName, remoteTokenInfo); } #endif return result; diff --git a/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/BUILD.gn b/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/BUILD.gn index fbfdebf50..580e14874 100644 --- a/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("SetRemoteNativeTokenInfoFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/setremotenativetokeninfo_fuzzer.cpp b/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/setremotenativetokeninfo_fuzzer.cpp index 60f33a711..73aaf6003 100644 --- a/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/setremotenativetokeninfo_fuzzer.cpp +++ b/test/fuzztest/access_token/setremotenativetokeninfo_fuzzer/setremotenativetokeninfo_fuzzer.cpp @@ -31,27 +31,26 @@ namespace OHOS { #ifdef TOKEN_SYNC_ENABLE - std::string testdata; if ((data == nullptr) || (size <= 0)) { return result; } if (size > 0) { - testdata = reinterpret_cast(data); + std::string testName(reinterpret_cast(data), size); AccessTokenID TOKENID = static_cast(size); NativeTokenInfoForSync native1 = { .baseInfo.apl = APL_NORMAL, .baseInfo.ver = 1, - .baseInfo.processName = testdata, - .baseInfo.dcap = {testdata, testdata}, + .baseInfo.processName = testName, + .baseInfo.dcap = {testName, testName}, .baseInfo.tokenID = TOKENID, .baseInfo.tokenAttr = 0, - .baseInfo.nativeAcls = {testdata}, + .baseInfo.nativeAcls = {testName}, }; std::vector nativeTokenInfoList; nativeTokenInfoList.emplace_back(native1); - result = AccessTokenKit::SetRemoteNativeTokenInfo(reinterpret_cast(data), nativeTokenInfoList); + result = AccessTokenKit::SetRemoteNativeTokenInfo(testName, nativeTokenInfoList); } #endif diff --git a/test/fuzztest/access_token/updatehaptoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/updatehaptoken_fuzzer/BUILD.gn index 2ae1796e7..0fad04826 100644 --- a/test/fuzztest/access_token/updatehaptoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/updatehaptoken_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("UpdateHapTokenFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp b/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp index 4fcdd1c35..030d7fe13 100644 --- a/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp +++ b/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp @@ -28,38 +28,37 @@ namespace OHOS { bool UpdateHapTokenFuzzTest(const uint8_t* data, size_t size) { bool result = false; - std::string testdata; if ((data == nullptr) || (size <= 0)) { return result; } if (size > 0) { AccessTokenID TOKENID = static_cast(size); - testdata = reinterpret_cast(data); + std::string testName(reinterpret_cast(data), size); PermissionDef TestPermDef = { - .permissionName = testdata, - .bundleName = testdata, + .permissionName = testName, + .bundleName = testName, .grantMode = 1, .availableLevel = APL_NORMAL, - .label = testdata, + .label = testName, .labelId = 1, - .description = testdata, + .description = testName, .descriptionId = 1 }; PermissionStateFull TestState = { - .permissionName = testdata, + .permissionName = testName, .isGeneral = true, - .resDeviceID = {testdata}, + .resDeviceID = {testName}, .grantStatus = {PermissionState::PERMISSION_GRANTED}, .grantFlags = {1}, }; HapPolicyParams TestPolicyPrams = { .apl = APL_NORMAL, - .domain = testdata, + .domain = testName, .permList = {TestPermDef}, .permStateList = {TestState} }; - - result = AccessTokenKit::UpdateHapToken(TOKENID, testdata, TestPolicyPrams); + constexpr int32_t DEFAULT_API_VERSION = 8; + result = AccessTokenKit::UpdateHapToken(TOKENID, testName, DEFAULT_API_VERSION, TestPolicyPrams); } return result; } diff --git a/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn b/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn index d373c8157..8921f1833 100644 --- a/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("VerifyAccessToken001FuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/verifyaccesstoken001_fuzzer.cpp b/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/verifyaccesstoken001_fuzzer.cpp index ec6ff9368..659df6dcb 100644 --- a/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/verifyaccesstoken001_fuzzer.cpp +++ b/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/verifyaccesstoken001_fuzzer.cpp @@ -33,7 +33,8 @@ namespace OHOS { } if (size > 0) { AccessTokenID TOKENID = static_cast(size); - result = AccessTokenKit::VerifyAccessToken(TOKENID, TOKENID, reinterpret_cast(data)); + std::string testName(reinterpret_cast(data), size); + result = AccessTokenKit::VerifyAccessToken(TOKENID, TOKENID, testName); } return result; } diff --git a/test/fuzztest/access_token/verifyaccesstoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/verifyaccesstoken_fuzzer/BUILD.gn index 961604817..c3993eba5 100644 --- a/test/fuzztest/access_token/verifyaccesstoken_fuzzer/BUILD.gn +++ b/test/fuzztest/access_token/verifyaccesstoken_fuzzer/BUILD.gn @@ -38,9 +38,4 @@ ohos_fuzztest("VerifyAccessTokenFuzzTest") { "c_utils:utils", "hiviewdfx_hilog_native:libhilog", ] - - defines = [ - "ACCOUNT_LOG_TAG = \"AccessTokenFuzzTest\"", - "LOG_DOMAIN = 0xD001B00", - ] } diff --git a/test/fuzztest/access_token/verifyaccesstoken_fuzzer/verifyaccesstoken_fuzzer.cpp b/test/fuzztest/access_token/verifyaccesstoken_fuzzer/verifyaccesstoken_fuzzer.cpp index de192b189..34ef0098a 100644 --- a/test/fuzztest/access_token/verifyaccesstoken_fuzzer/verifyaccesstoken_fuzzer.cpp +++ b/test/fuzztest/access_token/verifyaccesstoken_fuzzer/verifyaccesstoken_fuzzer.cpp @@ -33,7 +33,8 @@ namespace OHOS { } if (size > 0) { AccessTokenID TOKENID = static_cast(size); - result = AccessTokenKit::VerifyAccessToken(TOKENID, reinterpret_cast(data)); + std::string testName(reinterpret_cast(data), size); + result = AccessTokenKit::VerifyAccessToken(TOKENID, testName); } return result; } -- Gitee From 07c8431e089fa80f94675ca33982d1d647aadedf Mon Sep 17 00:00:00 2001 From: cc_ggboy Date: Sat, 27 Aug 2022 16:07:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fuzz=E7=94=A8=E4=BE=8Basan=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=BF=90=E8=A1=8C=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8C=91=E5=8D=95monthly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cc_ggboy --- .../updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp b/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp index 030d7fe13..83e440c8b 100644 --- a/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp +++ b/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp @@ -57,8 +57,7 @@ namespace OHOS { .permList = {TestPermDef}, .permStateList = {TestState} }; - constexpr int32_t DEFAULT_API_VERSION = 8; - result = AccessTokenKit::UpdateHapToken(TOKENID, testName, DEFAULT_API_VERSION, TestPolicyPrams); + result = AccessTokenKit::UpdateHapToken(TOKENID, testName, TestPolicyPrams); } return result; } -- Gitee From 07d74df6e3f81dc05295fca3a73e339429dae82c Mon Sep 17 00:00:00 2001 From: cc_ggboy Date: Tue, 30 Aug 2022 09:15:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fuzz=E7=94=A8=E4=BE=8Basan=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=BF=90=E8=A1=8C=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8C=91=E5=8D=95monthly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cc_ggboy --- .../alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp b/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp index 7a834474d..0f21d32de 100644 --- a/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp +++ b/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp @@ -28,6 +28,9 @@ namespace OHOS { bool AllocLocalTokenIDFuzzTest(const uint8_t* data, size_t size) { AccessTokenID TOKENID = 0; + if ((data == nullptr) || (size <= 0)) { + return TOKENID != 0; + } if (size > 0) { std::string testName(reinterpret_cast(data), size); AccessTokenID REMOTETOKENID = static_cast(size); -- Gitee