diff --git a/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn b/test/fuzztest/access_token/allochaptoken_fuzzer/BUILD.gn index 7f773f0c8783c753227dbe7ac6235611bd08eac6..d0fc5f5f2eaf16d8182ea1637aa6b19b8b723c51 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 094fa5d6e8dd6b6588426bacbb3488f68b7f2148..f8b23b0412cd259b70cca02bdc0418c91c491c0a 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 87ddbd2a1ba111d741b878cf65b7f3db550671f0..0c424e29f87d3fae439d16dff5629e406741d636 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 993f3a07938bbae6ef1bdab63c4ccaec2e23436f..0f21d32ded7400c1a69efafcb63b3c598ea93d68 100644 --- a/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp +++ b/test/fuzztest/access_token/alloclocaltokenid_fuzzer/alloclocaltokenid_fuzzer.cpp @@ -27,14 +27,14 @@ 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; + return TOKENID != 0; } 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 38d3c84257250af93ecddfbe6de09264c7797797..59b64e92c6031e6adda1725a459e9eeb665a379a 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 7b22eff366e08c8fe672982153d7381f79c3e6a7..f3403797a977cf26c2ee34ea7f7684a93999700f 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 32f153f3fc6b6b8b93f2d345bf837a709092e599..75477a0d5448e2182c40c374f9b79681937268f0 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 6d69bec7578736595543f4b7b00eea1503394314..c4e8d936e8169c3962dffbf945e1998943dcbd1e 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 3350c7640ad7b6e7298d5745323369c6e5abd0ec..e3960666a535dfbeb9b58b936309c0000dbfb1b9 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 5b686f792b3c90db14caf6cf5615c491a2636b93..65cebb7eb5a5aac64497be331de4aa5f6f12b0a5 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 bcd031a6b9b30fb70605e526d33b19fa692ed059..d422a42a5d0248c7510ba8c8f4af5fe9db86f281 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 f37c047465f08512de0205367db15f9c64e9328a..a115d7f219e3830d691d1a61a9b6bad18bc1598a 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 9252021015ee050df1214e70abf658f939dda9ec..8b018b2c36470285f3a7329ab1da86e312a787b2 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 38fbe3a3ddc46e595bc1ac7e530a02c15ea8d463..558976a63cabf1d8f740a42d6c991f8c896441a0 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 328246ace4697bb6c57f53431b05530f77ff5468..af7020915ca0f82f2f6620b1015eb56b8d061382 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 9175d62dd4c63ebcaf8b08ee0c5ef42639fdd93a..644f266153bcfdbf889ed700b16aa0773f1932bc 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 bb588f85f353625a963923da27ed0c838459fd7b..d1f4cbf0900a1b0e9e90b82a2c479e3df71a8518 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 b821ba9744ec018eb45bb31217aea99ec792b8ec..c0ededf133a9fdfc08b26beabf013fdfe38c3551 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 94f45a4198179b274bd451cc6ffeceec43ae6b56..2b4f8a2a3d727cd06dfdc2019ca0deacf4bae97e 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 c2a1dc550d10526de2c9cc44bbac700a3e70ff93..7dcc443c7815703d9af3b52e54475cc07de9cd3d 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 d9591910a650268a960d17402879b6574ca80057..df7f00dfe10a448014b3cb24f16e83e94667b42b 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 b4b69c86f24236a6ac91dd1280f76f0d2a58e8cc..4c2a41b19022803bfa825b98fbbf7f253c96872e 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 fbfdebf50ae9cd6223c102b80eaf064b5059caec..580e14874f066d39e83c46587c7e29769449e93a 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 60f33a71144027afb6122c3a324c2bd77cc758a0..73aaf6003ab6dbaffb448feae16f5fa28455e783 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 2ae1796e744ff1822440024ce7581ab3c6b2b9f9..0fad0482641816cdbcea745ce483cd5f98f7c7d7 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 4fcdd1c352671d7f0e66154459457980e20e3a42..83e440c8b083e3988002aecf0364973a64075b2d 100644 --- a/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp +++ b/test/fuzztest/access_token/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp @@ -28,38 +28,36 @@ 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); + result = AccessTokenKit::UpdateHapToken(TOKENID, testName, TestPolicyPrams); } return result; } diff --git a/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn b/test/fuzztest/access_token/verifyaccesstoken001_fuzzer/BUILD.gn index d373c815713442263d787b034b55b3e7a31393c0..8921f1833b4b034f47daa9844962af4834f23710 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 ec6ff93689895931158108758bef7fe98290192e..659df6dcbb7a08d6275b16ba33e8c7613dc7b33d 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 96160481713587bbcef647043bfb2ab642f657ba..c3993eba59db56846fe1a3ad047372f8fd14222f 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 de192b189201ad65264335e22dc077c2acc86a1a..34ef0098adbea1f7ab6a5264b361e932a4d05b7e 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; }