diff --git a/frameworks/accesstoken/src/permission_state_full_parcel.cpp b/frameworks/accesstoken/src/permission_state_full_parcel.cpp index da9e38d879df4e752da5c15af340750a1825eb12..de1ad95ee063dc82e730994e007a743bb59e8579 100644 --- a/frameworks/accesstoken/src/permission_state_full_parcel.cpp +++ b/frameworks/accesstoken/src/permission_state_full_parcel.cpp @@ -22,22 +22,12 @@ namespace AccessToken { bool PermissionStateFullParcel::Marshalling(Parcel& out) const { RETURN_IF_FALSE(out.WriteString(this->permStatFull.permissionName)); - RETURN_IF_FALSE(out.WriteBool(this->permStatFull.isGeneral)); - RETURN_IF_FALSE(out.WriteUint32(this->permStatFull.resDeviceID.size())); - for (auto devId : this->permStatFull.resDeviceID) { - RETURN_IF_FALSE(out.WriteString(devId)); - } + RETURN_IF_FALSE(out.WriteString(this->permStatFull.deviceID)); - RETURN_IF_FALSE(out.WriteUint32(this->permStatFull.grantStatus.size())); - for (auto grantStat : this->permStatFull.grantStatus) { - RETURN_IF_FALSE(out.WriteInt32(grantStat)); - } + RETURN_IF_FALSE(out.WriteInt32(this->permStatFull.permGrantStatus)); - RETURN_IF_FALSE(out.WriteUint32(this->permStatFull.grantFlags.size())); - for (auto grantFlag : this->permStatFull.grantFlags) { - RETURN_IF_FALSE(out.WriteUint32(grantFlag)); - } + RETURN_IF_FALSE(out.WriteUint32(this->permStatFull.grantFlag)); return true; } @@ -49,34 +39,18 @@ PermissionStateFullParcel* PermissionStateFullParcel::Unmarshalling(Parcel& in) } RELEASE_IF_FALSE(in.ReadString(permissionStateParcel->permStatFull.permissionName), permissionStateParcel); - RELEASE_IF_FALSE(in.ReadBool(permissionStateParcel->permStatFull.isGeneral), permissionStateParcel); - uint32_t resIdSize = 0; - RELEASE_IF_FALSE(in.ReadUint32(resIdSize), permissionStateParcel); - RELEASE_IF_FALSE(resIdSize <= MAX_DEVICE_ID_SIZE, permissionStateParcel); - for (uint32_t i = 0; i < resIdSize; i++) { - std::string resId; - RELEASE_IF_FALSE(in.ReadString(resId), permissionStateParcel); - permissionStateParcel->permStatFull.resDeviceID.emplace_back(resId); - } + std::string resId; + RELEASE_IF_FALSE(in.ReadString(resId), permissionStateParcel); + permissionStateParcel->permStatFull.deviceID = resId; - uint32_t grantStatsSize = 0; - RELEASE_IF_FALSE(in.ReadUint32(grantStatsSize), permissionStateParcel); - RELEASE_IF_FALSE(grantStatsSize <= MAX_DEVICE_ID_SIZE, permissionStateParcel); - for (uint32_t i = 0; i < grantStatsSize; i++) { - int grantStat; - RELEASE_IF_FALSE(in.ReadInt32(grantStat), permissionStateParcel); - permissionStateParcel->permStatFull.grantStatus.emplace_back(grantStat); - } + int grantStat; + RELEASE_IF_FALSE(in.ReadInt32(grantStat), permissionStateParcel); + permissionStateParcel->permStatFull.permGrantStatus = grantStat; - uint32_t grantFlagSize = 0; - RELEASE_IF_FALSE(in.ReadUint32(grantFlagSize), permissionStateParcel); - RELEASE_IF_FALSE(grantFlagSize <= MAX_DEVICE_ID_SIZE, permissionStateParcel); - for (uint32_t i = 0; i < grantFlagSize; i++) { - uint32_t flag; - RELEASE_IF_FALSE(in.ReadUint32(flag), permissionStateParcel); - permissionStateParcel->permStatFull.grantFlags.emplace_back(flag); - } + uint32_t flag; + RELEASE_IF_FALSE(in.ReadUint32(flag), permissionStateParcel); + permissionStateParcel->permStatFull.grantFlag = flag; return permissionStateParcel; } } // namespace AccessToken diff --git a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp index 134967a0036566e078f8a09df6b23d39b6c4a36f..589aa0aab37626db5a97dd7a38ec7e1c23915f99 100644 --- a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp @@ -307,10 +307,10 @@ napi_value NapiAtManager::Init(napi_env env, napi_value exports) void NapiAtManager::CreateObjects(napi_env env, napi_value exports) { - napi_value grantStatus = nullptr; - napi_create_object(env, &grantStatus); - SetNamedProperty(env, grantStatus, PERMISSION_DENIED, "PERMISSION_DENIED"); - SetNamedProperty(env, grantStatus, PERMISSION_GRANTED, "PERMISSION_GRANTED"); + napi_value permGrantStatus = nullptr; + napi_create_object(env, &permGrantStatus); + SetNamedProperty(env, permGrantStatus, PERMISSION_DENIED, "PERMISSION_DENIED"); + SetNamedProperty(env, permGrantStatus, PERMISSION_GRANTED, "PERMISSION_GRANTED"); napi_value permStateChangeType = nullptr; napi_create_object(env, &permStateChangeType); @@ -337,7 +337,7 @@ void NapiAtManager::CreateObjects(napi_env env, napi_value exports) SetNamedProperty(env, globalSwitchType, LOCATION, "LOCATION"); napi_property_descriptor exportFuncs[] = { - DECLARE_NAPI_PROPERTY("GrantStatus", grantStatus), + DECLARE_NAPI_PROPERTY("permGrantStatus", permGrantStatus), DECLARE_NAPI_PROPERTY("PermissionStateChangeType", permStateChangeType), DECLARE_NAPI_PROPERTY("PermissionStatus", permissionStatus), DECLARE_NAPI_PROPERTY("PermissionRequestToggleStatus", permissionRequestToggleStatus), diff --git a/frameworks/test/unittest/accesstoken_parcel_test.cpp b/frameworks/test/unittest/accesstoken_parcel_test.cpp index a7cf8285973409de3365562eb561712f18a6a95c..41f119f7982c58ec24a2fb3733298993f99b9f64 100644 --- a/frameworks/test/unittest/accesstoken_parcel_test.cpp +++ b/frameworks/test/unittest/accesstoken_parcel_test.cpp @@ -67,17 +67,15 @@ PermissionDef g_permDefBeta = { PermissionStateFull g_permStatAlpha = { .permissionName = TEST_PERMISSION_NAME_ALPHA, - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET }; PermissionStateFull g_permStatBeta = { .permissionName = TEST_PERMISSION_NAME_BETA, - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; } class AccessTokenParcelTest : public testing::Test { @@ -176,14 +174,12 @@ HWTEST_F(AccessTokenParcelTest, HapPolicyParcel001, TestSize.Level1) for (uint32_t i = 0; i < hapPolicyParcel.hapPolicyParameter.permStateList.size(); i++) { EXPECT_EQ(hapPolicyParcel.hapPolicyParameter.permStateList[i].permissionName, readedData->hapPolicyParameter.permStateList[i].permissionName); - EXPECT_EQ(hapPolicyParcel.hapPolicyParameter.permStateList[i].isGeneral, - readedData->hapPolicyParameter.permStateList[i].isGeneral); - EXPECT_EQ(hapPolicyParcel.hapPolicyParameter.permStateList[i].resDeviceID, - readedData->hapPolicyParameter.permStateList[i].resDeviceID); - EXPECT_EQ(hapPolicyParcel.hapPolicyParameter.permStateList[i].grantStatus, - readedData->hapPolicyParameter.permStateList[i].grantStatus); - EXPECT_EQ(hapPolicyParcel.hapPolicyParameter.permStateList[i].grantFlags, - readedData->hapPolicyParameter.permStateList[i].grantFlags); + EXPECT_EQ(hapPolicyParcel.hapPolicyParameter.permStateList[i].deviceID, + readedData->hapPolicyParameter.permStateList[i].deviceID); + EXPECT_EQ(hapPolicyParcel.hapPolicyParameter.permStateList[i].permGrantStatus, + readedData->hapPolicyParameter.permStateList[i].permGrantStatus); + EXPECT_EQ(hapPolicyParcel.hapPolicyParameter.permStateList[i].grantFlag, + readedData->hapPolicyParameter.permStateList[i].grantFlag); } } @@ -393,10 +389,9 @@ HWTEST_F(AccessTokenParcelTest, PermissionStateFullParcel002, TestSize.Level1) { PermissionStateFullParcel permissionStateFullParcel; permissionStateFullParcel.permStatFull.permissionName = "permissionName"; - permissionStateFullParcel.permStatFull.isGeneral = false; - permissionStateFullParcel.permStatFull.resDeviceID = {"device"}; - permissionStateFullParcel.permStatFull.grantStatus = {1}; - permissionStateFullParcel.permStatFull.grantFlags = {0}; + permissionStateFullParcel.permStatFull.deviceID = "device"; + permissionStateFullParcel.permStatFull.permGrantStatus = 1; + permissionStateFullParcel.permStatFull.grantFlag = 0; Parcel parcel; EXPECT_EQ(true, permissionStateFullParcel.Marshalling(parcel)); diff --git a/interfaces/innerkits/accesstoken/include/permission_state_full.h b/interfaces/innerkits/accesstoken/include/permission_state_full.h index e4a7d1566cdf575782556373117d824a59844447..dbc90f20de7cb070e19ea693821bd206b12612fc 100644 --- a/interfaces/innerkits/accesstoken/include/permission_state_full.h +++ b/interfaces/innerkits/accesstoken/include/permission_state_full.h @@ -52,19 +52,22 @@ namespace AccessToken { class PermissionStateFull final { public: std::string permissionName; - /** indicate whether permission is distributed */ - bool isGeneral; - std::vector resDeviceID; + bool isGeneral = true; + std::vector resDeviceID = {}; /** - * permission grant state list, for details about the valid values, + * permission grant state, for details about the valid values, * see the definition of PermissionState in the access_token.h file. */ - std::vector grantStatus; + std::vector grantStatus = {}; /** - * permission grant flag list, for details about the valid values, + * permission grant flag, for details about the valid values, * see the definition of PermissionFlag in the access_token.h file. */ - std::vector grantFlags; + std::vector grantFlags = {}; + + std::string deviceID; + int permGrantStatus; + uint32_t grantFlag; }; } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/update_hap_token_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/update_hap_token_test.cpp index 757c52ac2798594e275d070edd992bace288e567..876cbb726662f30cd38a03caadc2345996410365 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/update_hap_token_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/update_hap_token_test.cpp @@ -48,34 +48,30 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, PermissionStateFull g_testPermReq = { .permissionName = "ohos.permission.MANAGE_HAP_TOKENID", - .isGeneral = true, - .resDeviceID = {"test_device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "test_device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_infoManagerCameraState = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_infoManagerMicrophoneState = { .permissionName = "ohos.permission.MICROPHONE", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_infoManagerCertState = { .permissionName = "ohos.permission.ACCESS_CERT_MANAGER", - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; HapInfoParams g_testHapInfoParams = { @@ -260,10 +256,9 @@ void GetPermissions(string permissionName, PermissionStateFull& stateFull, PreAu { stateFull = { .permissionName = permissionName, - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; info = { @@ -318,11 +313,11 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest004, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(2), permStatList.size()); ASSERT_EQ("ohos.permission.RECEIVE_SMS", permStatList[0].permissionName); - EXPECT_EQ(permStatList[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(permStatList[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(permStatList[0].grantFlag, PERMISSION_SYSTEM_FIXED); ASSERT_EQ("ohos.permission.RECEIVE_MMS", permStatList[1].permissionName); - EXPECT_EQ(permStatList[1].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(permStatList[1].grantFlags[0], PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(permStatList[1].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(permStatList[1].grantFlag, PERMISSION_SYSTEM_FIXED); } /** @@ -341,18 +336,16 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest005, TestSize.Level1) policyParams.apl = APL_SYSTEM_CORE; PermissionStateFull permissionStateFull001 = { .permissionName = "ohos.permission.RUN_DYN_CODE", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; PermissionStateFull permissionStateFull002 = { .permissionName = "ohos.permission.ACCESS_DDK_USB", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.permStateList = {permissionStateFull001, permissionStateFull002}; AccessTokenIDEx fullTokenId; @@ -398,10 +391,9 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest006, TestSize.Level1) TestCommon::GetHapParams(infoParams, policyParams); PermissionStateFull permissionStateFull001 = { .permissionName = "ohos.permission.RUN_DYN_CODE", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.permStateList = {permissionStateFull001}; @@ -423,10 +415,9 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest006, TestSize.Level1) }; PermissionStateFull permissionStateFull003 = { .permissionName = "ohos.permission.ACCESS_EXTENSIONAL_DEVICE_DRIVER", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.permStateList = { permissionStateFull003 }; @@ -455,18 +446,16 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest001, TestSize.Level1) policyParams.apl = APL_NORMAL; PermissionStateFull permissionStateFull001 = { .permissionName = "ohos.permission.RUN_DYN_CODE", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; PermissionStateFull permissionStateFull002 = { .permissionName = "ohos.permission.ACCESS_DDK_USB", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.permStateList = {permissionStateFull001}; AccessTokenIDEx fullTokenId; @@ -513,18 +502,16 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest002, TestSize.Level1) policyParams.apl = APL_NORMAL; PermissionStateFull permissionStateFull001 = { .permissionName = "ohos.permission.RUN_DYN_CODE", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; PermissionStateFull permissionStateFull002 = { .permissionName = "ohos.permission.ACCESS_DDK_USB", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.permStateList = {permissionStateFull001, permissionStateFull002}; @@ -568,18 +555,16 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest003, TestSize.Level1) policyParams.apl = APL_SYSTEM_CORE; PermissionStateFull permissionStateFull001 = { .permissionName = "ohos.permission.RUN_DYN_CODE", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; PermissionStateFull permissionStateFull002 = { .permissionName = "ohos.permission.ACCESS_DDK_USB", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.permStateList = {permissionStateFull001, permissionStateFull002}; @@ -622,10 +607,9 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest004, TestSize.Level1) policyParams.apl = APL_SYSTEM_CORE; PermissionStateFull permissionStateFull001 = { .permissionName = "ohos.permission.MANAGE_FINGERPRINT_AUTH", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.permStateList = {permissionStateFull001}; AccessTokenIDEx fullTokenId; @@ -669,17 +653,15 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest005, TestSize.Level1) infoParams.appDistributionType = APP_DISTRIBUTION_TYPE_ENTERPRISE_MDM; PermissionStateFull permissionStateFull001 = { .permissionName = "ohos.permission.ENTERPRISE_MANAGE_SETTINGS", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; PermissionStateFull permissionStateFull002 = { .permissionName = "ohos.permission.MANAGE_FINGERPRINT_AUTH", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.permStateList = {permissionStateFull001, permissionStateFull002}; AccessTokenIDEx fullTokenId; @@ -746,8 +728,8 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest006, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(1), state.size()); ASSERT_EQ("ohos.permission.CAMERA", state[0].permissionName); - EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(state[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[0].grantFlag, PERMISSION_SYSTEM_FIXED); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -804,11 +786,11 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest007, TestSize.Level1) AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false); ASSERT_EQ(static_cast(2), state.size()); ASSERT_EQ("ohos.permission.CAMERA", state[0].permissionName); - EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[0].grantFlags[0], PERMISSION_USER_FIXED); + EXPECT_EQ(state[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[0].grantFlag, PERMISSION_USER_FIXED); ASSERT_EQ("ohos.permission.MICROPHONE", state[1].permissionName); - EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(state[1].grantFlags[0], PERMISSION_USER_FIXED); + EXPECT_EQ(state[1].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(state[1].grantFlag, PERMISSION_USER_FIXED); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -861,10 +843,10 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest008, TestSize.Level1) std::vector state; AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false); ASSERT_EQ(static_cast(2), state.size()); - EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[0].grantFlags[0], PERMISSION_GRANTED_BY_POLICY); - EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(state[1].grantFlags[0], PERMISSION_DEFAULT_FLAG); + EXPECT_EQ(state[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[0].grantFlag, PERMISSION_GRANTED_BY_POLICY); + EXPECT_EQ(state[1].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(state[1].grantFlag, PERMISSION_DEFAULT_FLAG); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -914,10 +896,10 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest009, TestSize.Level1) std::vector state; AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false); ASSERT_EQ(static_cast(2), state.size()); - EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); - EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(state[1].grantFlags[0], PERMISSION_USER_FIXED | PERMISSION_GRANTED_BY_POLICY); + EXPECT_EQ(state[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[0].grantFlag, PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(state[1].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(state[1].grantFlag, PERMISSION_USER_FIXED | PERMISSION_GRANTED_BY_POLICY); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -1019,17 +1001,15 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenAbnormalTest003, TestSize.Level1) PermissionStateFull permissionStateFull001 = { .permissionName = "", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; PermissionStateFull permissionStateFull002 = { .permissionName = "ohos.permission.test", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.permStateList.emplace_back(permissionStateFull001); policyParams.permStateList.emplace_back(permissionStateFull002); @@ -1071,17 +1051,15 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenAbnormalTest004, TestSize.Level1) PermissionStateFull permissionStateFull001 = { .permissionName = "ohos.permission.AGENT_REQUIRE_FORM", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; PermissionStateFull permissionStateFull002 = { .permissionName = "ohos.permission.MANAGE_DEVICE_AUTH_CRED", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = PERMISSION_SYSTEM_FIXED }; policyParams.aclRequestedList = {""}; ret = AccessTokenKit::UpdateHapToken(fullTokenId, updateHapInfoParams, policyParams); diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_deny_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_deny_test.cpp index 5d2505b7bab6ceb0bae41fe01c760e612dde05c2..759d87ae67c95751fec2e7ef6d260af020d82148 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_deny_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_deny_test.cpp @@ -366,10 +366,9 @@ HWTEST_F(AccessTokenDenyTest, UnregisterPermStateChangeCallback001, TestSize.Lev PermissionStateFull testState = { .permissionName = "ohos.permission.GET_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; HapPolicyParams policyPrams = { .apl = APL_NORMAL, diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp index 689a5b530b138063fee71dcf41b39519f93fb176..a83429f6321be65515263c4dce463c2c05431574 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp @@ -49,26 +49,23 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, PermissionStateFull g_getPermissionReq = { .permissionName = "ohos.permission.GET_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device2", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_revokePermissionReq = { .permissionName = "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device2", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_grantPermissionReq = { .permissionName = "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device2", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionDef g_infoManagerTestPermDef1 = { @@ -106,26 +103,23 @@ PermissionDef g_infoManagerTestPermDef3 = { PermissionStateFull g_infoManagerTestState1 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; PermissionStateFull g_infoManagerTestState2 = { .permissionName = "ohos.permission.test2", - .isGeneral = false, - .resDeviceID = {"device 1", "device 2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED, PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1, 2} + .deviceID = "device 1", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; PermissionStateFull g_infoManagerTestState3 = { .permissionName = "ohos.permission.GET_BUNDLE_INFO", - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; HapInfoParams g_infoManagerTestInfoParms = { @@ -203,58 +197,51 @@ PermissionDef g_locationTestDefUserGrant = { PermissionStateFull g_locationTestStateSystemGrant = { .permissionName = "ohos.permission.locationtest1", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_locationTestStateUserGrant = { .permissionName = "ohos.permission.locationtest2", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; PermissionStateFull g_locationTestStateVague02 = { .permissionName = "ohos.permission.APPROXIMATELY_LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull g_locationTestStateVague10 = { .permissionName = "ohos.permission.APPROXIMATELY_LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; PermissionStateFull g_locationTestStateVague12 = { .permissionName = "ohos.permission.APPROXIMATELY_LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull g_locationTestStateAccurate02 = { .permissionName = "ohos.permission.LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull g_locationTestStateAccurate10 = { .permissionName = "ohos.permission.LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; HapInfoParams g_infoManagerTestNormalInfoParms = { @@ -336,34 +323,30 @@ void PreparePermStateListExt(HapPolicyParams &policy) { PermissionStateFull permStatAlpha = { .permissionName = TEST_PERMISSION_NAME_ALPHA, - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET }; PermissionStateFull permStatBeta = { .permissionName = TEST_PERMISSION_NAME_BETA, - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull permTestState5 = { .permissionName = "ohos.permission.GET_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull permTestState6 = { .permissionName = "ohos.permission.DISABLE_PERMISSION_DIALOG", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; policy.permStateList.emplace_back(permStatAlpha); policy.permStateList.emplace_back(permStatBeta); @@ -375,34 +358,30 @@ void PreparePermStateList(HapPolicyParams &policy) { PermissionStateFull permTestState1 = { .permissionName = "ohos.permission.testPermDef1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG}, + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG, }; PermissionStateFull permTestState2 = { .permissionName = "ohos.permission.testPermDef2", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET }; PermissionStateFull permTestState3 = { .permissionName = "ohos.permission.testPermDef3", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull permTestState4 = { .permissionName = "ohos.permission.testPermDef4", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET }; policy.permStateList.emplace_back(permTestState1); policy.permStateList.emplace_back(permTestState2); @@ -978,10 +957,9 @@ HWTEST_F(AccessTokenKitExtensionTest, GetPermissionFlag006, TestSize.Level1) { static PermissionStateFull infoManagerTestStateA = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET }; static HapPolicyParams infoManagerTestPolicyPrams1 = { .apl = APL_NORMAL, @@ -1058,10 +1036,9 @@ HWTEST_F(AccessTokenKitExtensionTest, RegisterPermStateChangeCallback001, TestSi static PermissionStateFull infoManagerTestStateA = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = 1 }; static HapPolicyParams infoManagerTestPolicyPrams1 = { .apl = APL_NORMAL, @@ -1128,17 +1105,15 @@ HWTEST_F(AccessTokenKitExtensionTest, RegisterPermStateChangeCallback002, TestSi static PermissionStateFull infoManagerTestStateA = { .permissionName = "ohos.permission.GET_BUNDLE_INFO", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull infoManagerTestStateB = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams infoManagerTestPolicyPrams2 = { .apl = APL_SYSTEM_BASIC, @@ -1185,17 +1160,15 @@ HWTEST_F(AccessTokenKitExtensionTest, RegisterPermStateChangeCallback003, TestSi static PermissionStateFull infoManagerTestStateA = { .permissionName = "ohos.permission.GET_BUNDLE_INFO", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = 1 }; static PermissionStateFull infoManagerTestStateB = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = 1 }; static HapPolicyParams infoManagerTestPolicyPrams3 = { .apl = APL_SYSTEM_CORE, @@ -1251,17 +1224,15 @@ HWTEST_F(AccessTokenKitExtensionTest, RegisterPermStateChangeCallback004, TestSi static PermissionStateFull infoManagerTestStateA = { .permissionName = "ohos.permission.GET_BUNDLE_INFO", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_GRANTED}, - .grantFlags = {1}, + .deviceID = "local2", + .permGrantStatus = PERMISSION_GRANTED, + .grantFlag = 1, }; static PermissionStateFull infoManagerTestStateB = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams infoManagerTestPolicyPrams4 = { .apl = APL_NORMAL, @@ -1307,17 +1278,15 @@ HWTEST_F(AccessTokenKitExtensionTest, RegisterPermStateChangeCallback005, TestSi { static PermissionStateFull infoManagerTestStateA = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = 1 }; static PermissionStateFull infoManagerTestStateB = { .permissionName = "ohos.permission.GET_BUNDLE_INFO", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams infoManagerTestPolicyPrams5 = { .apl = APL_NORMAL, @@ -1379,10 +1348,9 @@ HWTEST_F(AccessTokenKitExtensionTest, RegisterPermStateChangeCallback006, TestSi static PermissionStateFull infoManagerTestState = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = 1 }; static HapPolicyParams infoManagerTestPolicyPrams6 = { .apl = APL_SYSTEM_BASIC, @@ -1591,10 +1559,9 @@ HWTEST_F(AccessTokenKitExtensionTest, RegisterPermStateChangeCallback013, TestSi PermStateChangeScope scopeInfo; static PermissionStateFull infoManagerTestStateA = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = 1 }; static HapPolicyParams infoManagerTestPolicyPrams13 = { .apl = APL_SYSTEM_BASIC, @@ -1650,10 +1617,9 @@ HWTEST_F(AccessTokenKitExtensionTest, RegisterPermStateChangeCallback014, TestSi PermStateChangeScope scopeInfo; static PermissionStateFull infoManagerTestStateA = { .permissionName = "ohos.permission.READ_MEDIA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PERMISSION_DENIED}, - .grantFlags = {1} + .deviceID = "local2", + .permGrantStatus = PERMISSION_DENIED, + .grantFlag = 1 }; static HapPolicyParams infoManagerTestPolicyPrams14 = { .apl = APL_SYSTEM_BASIC, diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index e6c4d9d20d4adb3de7cc6c773659a5920788b0ea..894fef85b18f0a43aecc9b45e0caaf51c52884b7 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -69,18 +69,16 @@ PermissionDef g_infoManagerTestPermDef2 = { PermissionStateFull g_infoManagerTestState1 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; PermissionStateFull g_infoManagerTestState2 = { .permissionName = "ohos.permission.test2", - .isGeneral = false, - .resDeviceID = {"device 1", "device 2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED, PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1, 2} + .deviceID = "device 1", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; HapInfoParams g_infoManagerTestInfoParms = { @@ -187,31 +185,27 @@ void TestPreparePermStateList(HapPolicyParams &policy) { PermissionStateFull permStatMicro = { .permissionName = TEST_PERMISSION_NAME_A_MICRO, - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET }; PermissionStateFull permStatCamera = { .permissionName = TEST_PERMISSION_NAME_A_CAMERA, - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull permStatAlpha = { .permissionName = TEST_PERMISSION_NAME_ALPHA, - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET }; PermissionStateFull permStatBeta = { .permissionName = TEST_PERMISSION_NAME_BETA, - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; policy.permStateList.emplace_back(permStatMicro); policy.permStateList.emplace_back(permStatCamera); @@ -350,24 +344,23 @@ HWTEST_F(AccessTokenKitTest, GetPermissionUsedType002, TestSize.Level1) std::string writeCalendar = "ohos.permission.WRITE_CALENDAR"; PermissionStateFull testState1 = { .permissionName = accessBluetooth, - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_COMPONENT_SET} + + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_COMPONENT_SET }; PermissionStateFull testState2 = { .permissionName = sendMessages, - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; PermissionStateFull testState3 = { .permissionName = writeCalendar, - .isGeneral = false, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; HapPolicyParams testPolicyPrams = { .apl = APL_NORMAL, @@ -538,7 +531,7 @@ HWTEST_F(AccessTokenKitTest, GetReqPermissions001, TestSize.Level1) ASSERT_EQ(TEST_PERMISSION_NAME_A_MICRO, permStatList[0].permissionName); res = AccessTokenKit::VerifyAccessToken(tokenID, TEST_PERMISSION_NAME_A_MICRO, false); - ASSERT_EQ(res, permStatList[0].grantStatus[0]); + ASSERT_EQ(res, permStatList[0].permGrantStatus); } /** @@ -558,7 +551,7 @@ HWTEST_F(AccessTokenKitTest, GetReqPermissions002, TestSize.Level1) ASSERT_EQ(TEST_PERMISSION_NAME_A_CAMERA, permStatList[0].permissionName); ret = AccessTokenKit::VerifyAccessToken(tokenID, TEST_PERMISSION_NAME_A_CAMERA, false); - ASSERT_EQ(ret, permStatList[0].grantStatus[0]); + ASSERT_EQ(ret, permStatList[0].permGrantStatus); } /** @@ -860,10 +853,10 @@ HWTEST_F(AccessTokenKitTest, SetPermissionRequestToggleStatus004, TestSize.Level PermissionStateFull infoManagerTestState = { .permissionName = "ohos.permission.DISABLE_PERMISSION_DIALOG", - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; HapPolicyParams infoManagerTestPolicyPrams = { @@ -977,10 +970,10 @@ static void AllocAndSetHapToken(void) PermissionStateFull infoManagerTestState1 = { .permissionName = "ohos.permission.DISABLE_PERMISSION_DIALOG", - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; PermissionDef infoManagerTestPermDef2 = { @@ -997,10 +990,9 @@ static void AllocAndSetHapToken(void) PermissionStateFull infoManagerTestState2 = { .permissionName = "ohos.permission.GET_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; HapPolicyParams infoManagerTestPolicyPrams = { @@ -1538,24 +1530,21 @@ HWTEST_F(AccessTokenKitTest, ClearUserGrantedPermissionState004, TestSize.Level0 AccessTokenIDEx tokenIdEx = {0}; OHOS::Security::AccessToken::PermissionStateFull infoManagerTestState1 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_DENIED}, - .grantFlags = {PERMISSION_GRANTED_BY_POLICY | PERMISSION_DEFAULT_FLAG} + .deviceID = "local", + .permGrantStatus = OHOS::Security::AccessToken::PermissionState::PERMISSION_DENIED, + .grantFlag = PERMISSION_GRANTED_BY_POLICY | PERMISSION_DEFAULT_FLAG }; OHOS::Security::AccessToken::PermissionStateFull infoManagerTestState2 = { .permissionName = "ohos.permission.SEND_MESSAGES", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_DENIED}, - .grantFlags = {PERMISSION_GRANTED_BY_POLICY | PERMISSION_USER_FIXED} + .deviceID = "local", + .permGrantStatus = OHOS::Security::AccessToken::PermissionState::PERMISSION_DENIED, + .grantFlag = PERMISSION_GRANTED_BY_POLICY | PERMISSION_USER_FIXED }; OHOS::Security::AccessToken::PermissionStateFull infoManagerTestState3 = { .permissionName = "ohos.permission.RECEIVE_SMS", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PERMISSION_USER_FIXED} + .deviceID = "local", + .permGrantStatus = OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED, + .grantFlag = PERMISSION_USER_FIXED }; OHOS::Security::AccessToken::HapPolicyParams infoManagerTestPolicyPrams = { .apl = OHOS::Security::AccessToken::ATokenAplEnum::APL_NORMAL, @@ -2866,7 +2855,7 @@ HWTEST_F(AccessTokenKitTest, UpdateHapToken008, TestSize.Level1) /** * @tc.name: UpdateHapToken009 - * @tc.desc: old permission define will not update its grantStatus. + * @tc.desc: old permission define will not update its permGrantStatus. * @tc.type: FUNC * @tc.require: Issue Number */ @@ -2874,10 +2863,9 @@ HWTEST_F(AccessTokenKitTest, UpdateHapToken009, TestSize.Level1) { static PermissionStateFull infoManagerTestStateA = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET }; static HapPolicyParams infoManagerTestPolicyPrams1 = { .apl = APL_NORMAL, @@ -2899,9 +2887,9 @@ HWTEST_F(AccessTokenKitTest, UpdateHapToken009, TestSize.Level1) AccessTokenID tokenID = tokenIdEx.tokenIdExStruct.tokenID; GTEST_LOG_(INFO) << "tokenID :" << tokenID; - ASSERT_EQ(AccessTokenKit::VerifyAccessToken(tokenID, permission, false), infoManagerTestState.grantStatus[0]); + ASSERT_EQ(AccessTokenKit::VerifyAccessToken(tokenID, permission, false), infoManagerTestState.permGrantStatus); - infoManagerTestState.grantStatus[0] = PermissionState::PERMISSION_DENIED; + infoManagerTestState.permGrantStatus = PermissionState::PERMISSION_DENIED; HapPolicyParams infoManagerTestPolicyPrams = { .apl = APL_NORMAL, .domain = "test.domain", diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_request_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_request_test.cpp index 2cae73f64953a67f78c8b51e664e0b4e2569cf7d..db5b4388a7014128c89920f9b697bef5444a926a 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_request_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_request_test.cpp @@ -39,83 +39,72 @@ static constexpr int32_t BACKGROUND_LOCATION_API_VERSION = 11; PermissionStateFull g_locationTestStateSystemGrant = { .permissionName = "ohos.permission.UPDATE_SYSTEM", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_locationTestStateUserGrant = { .permissionName = "ohos.permission.APP_TRACKING_CONSENT", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; PermissionStateFull g_locationTestStateVague02 = { .permissionName = "ohos.permission.APPROXIMATELY_LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull g_locationTestStateVague10 = { .permissionName = "ohos.permission.APPROXIMATELY_LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; PermissionStateFull g_locationTestStateVague12 = { .permissionName = "ohos.permission.APPROXIMATELY_LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull g_locationTestStateAccurate02 = { .permissionName = "ohos.permission.LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull g_locationTestStateAccurate10 = { .permissionName = "ohos.permission.LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; PermissionStateFull g_locationTestStateAccurate12 = { .permissionName = "ohos.permission.LOCATION", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull g_locationTestStateBack02 = { .permissionName = "ohos.permission.LOCATION_IN_BACKGROUND", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; PermissionStateFull g_locationTestStateBack10 = { .permissionName = "ohos.permission.LOCATION_IN_BACKGROUND", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; PermissionStateFull g_locationTestStateBack12 = { .permissionName = "ohos.permission.LOCATION_IN_BACKGROUND", - .isGeneral = true, - .resDeviceID = {"device"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; } @@ -174,7 +163,7 @@ AccessTokenIDEx AllocHapToken(std::vector& permissionStateF HWTEST_F(AccessTokenLocationRequestTest, GetSelfPermissionsState001, TestSize.Level1) { std::vector permissionStateFulls; - permissionStateFulls.emplace_back(g_locationTestStateVague10); // {-1,0} {grantStatus, grantFlags} + permissionStateFulls.emplace_back(g_locationTestStateVague10); // {-1,0} {permGrantStatus, grantFlag} AccessTokenIDEx tokenIdEx = AllocHapToken(permissionStateFulls, BACKGROUND_LOCATION_API_VERSION); AccessTokenID tokenID = tokenIdEx.tokenIdExStruct.tokenID; diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.cpp index 956b4adc369037677fd1a02b8c9edb900489f0e6..4902ce4e690f10f9c5794945184ec357d9181e1b 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.cpp @@ -27,10 +27,9 @@ static const int32_t INDEX_ZERO = 0; static std::string SHORT_TEMP_PERMISSION = "ohos.permission.SHORT_TERM_WRITE_IMAGEVIDEO"; static PermissionStateFull g_permiState = { .permissionName = SHORT_TEMP_PERMISSION, - .isGeneral = true, - .resDeviceID = {"localC"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "localC", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams g_policyPrams = { diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp index 02337045e058ffcf61cad76254c65f93a9ee4937..5322af443074791030c8c06228153f6e7aaa531d 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp @@ -43,73 +43,64 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, PermissionStateFull g_tddPermReq = { .permissionName = MANAGE_HAP_TOKENID_PERMISSION, - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_tddPermGrant = { .permissionName = "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_tddPermRevoke = { .permissionName = "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_infoManagerCameraState = { .permissionName = APP_TRACKING_PERMISSION, - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_infoBlueToothManagerState = { .permissionName = ACCESS_BLUETOOTH_PERMISSION, - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_infoManagerMicrophoneState = { .permissionName = CALENDAR_PERMISSION, - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_infoManagerCertState = { .permissionName = CERT_PERMISSION, - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_infoManagerTestState4 = { .permissionName = "ohos.permission.ACCESS_BUNDLE_DIR", - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_infoManagerTestStateMdm = { .permissionName = "ohos.permission.SET_ENTERPRISE_INFO", - .isGeneral = true, - .resDeviceID = {"local3"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local3", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; HapInfoParams g_tddHapInfoParams = { @@ -222,7 +213,7 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken002, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(1), permStatList.size()); ASSERT_EQ(CERT_PERMISSION, permStatList[0].permissionName); - EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(permStatList[0].grantFlag, PERMISSION_SYSTEM_FIXED); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -281,7 +272,7 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken004, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(1), permStatList.size()); ASSERT_EQ(CALENDAR_PERMISSION, permStatList[0].permissionName); - EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(permStatList[0].grantFlag, PERMISSION_SYSTEM_FIXED); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -316,7 +307,7 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken005, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(1), permStatList.size()); ASSERT_EQ(CALENDAR_PERMISSION, permStatList[0].permissionName); - EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_GRANTED_BY_POLICY); + EXPECT_EQ(permStatList[0].grantFlag, PERMISSION_GRANTED_BY_POLICY); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -465,11 +456,11 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken011, TestSize.Level1) res = AccessTokenKit::GetReqPermissions(dlpFullTokenId2.tokenIdExStruct.tokenID, permStatList2, false); ASSERT_EQ(permStatList2.size(), permStatList1.size()); EXPECT_EQ(APP_TRACKING_PERMISSION, permStatList2[0].permissionName); - EXPECT_EQ(permStatList2[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(permStatList2[0].grantFlags[0], PERMISSION_USER_SET); + EXPECT_EQ(permStatList2[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(permStatList2[0].grantFlag, PERMISSION_USER_SET); EXPECT_EQ(CALENDAR_PERMISSION, permStatList2[1].permissionName); - EXPECT_EQ(permStatList2[1].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(permStatList2[1].grantFlags[0], PERMISSION_USER_SET); + EXPECT_EQ(permStatList2[1].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(permStatList2[1].grantFlag, PERMISSION_USER_SET); ASSERT_EQ(RET_SUCCESS, res); } @@ -556,8 +547,8 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken002, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(1), permStatList.size()); ASSERT_EQ(APP_TRACKING_PERMISSION, permStatList[0].permissionName); - EXPECT_EQ(permStatList[0].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_USER_FIXED); + EXPECT_EQ(permStatList[0].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(permStatList[0].grantFlag, PERMISSION_USER_FIXED); UpdateHapInfoParams info; info.appIDDesc = "TEST"; @@ -575,11 +566,11 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken002, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(2), permStatList1.size()); ASSERT_EQ(APP_TRACKING_PERMISSION, permStatList1[0].permissionName); - EXPECT_EQ(permStatList1[0].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(permStatList1[0].grantFlags[0], PERMISSION_USER_FIXED); + EXPECT_EQ(permStatList1[0].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(permStatList1[0].grantFlag, PERMISSION_USER_FIXED); ASSERT_EQ(CALENDAR_PERMISSION, permStatList1[1].permissionName); - EXPECT_EQ(permStatList1[1].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(permStatList1[1].grantFlags[0], PERMISSION_DEFAULT_FLAG); + EXPECT_EQ(permStatList1[1].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(permStatList1[1].grantFlag, PERMISSION_DEFAULT_FLAG); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -626,11 +617,11 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken003, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(2), permStatList1.size()); ASSERT_EQ(APP_TRACKING_PERMISSION, permStatList1[0].permissionName); - EXPECT_EQ(permStatList1[0].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(permStatList1[0].grantFlags[0], PERMISSION_DEFAULT_FLAG); + EXPECT_EQ(permStatList1[0].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(permStatList1[0].grantFlag, PERMISSION_DEFAULT_FLAG); ASSERT_EQ(CALENDAR_PERMISSION, permStatList1[1].permissionName); - EXPECT_EQ(permStatList1[1].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(permStatList1[1].grantFlags[0], PERMISSION_GRANTED_BY_POLICY); + EXPECT_EQ(permStatList1[1].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(permStatList1[1].grantFlag, PERMISSION_GRANTED_BY_POLICY); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -674,8 +665,8 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken004, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(2), state.size()); ASSERT_EQ(CALENDAR_PERMISSION, state[1].permissionName); - EXPECT_EQ(state[1].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[1].grantFlags[0], PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(state[1].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[1].grantFlag, PERMISSION_SYSTEM_FIXED); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -882,8 +873,8 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken010, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(1), state.size()); ASSERT_EQ(APP_TRACKING_PERMISSION, state[0].permissionName); - EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(state[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[0].grantFlag, PERMISSION_SYSTEM_FIXED); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -927,8 +918,8 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken011, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(1), state.size()); ASSERT_EQ(APP_TRACKING_PERMISSION, state[0].permissionName); - EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(state[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[0].grantFlag, PERMISSION_SYSTEM_FIXED); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -981,11 +972,11 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken012, TestSize.Level1) AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false); ASSERT_EQ(static_cast(2), state.size()); ASSERT_EQ(APP_TRACKING_PERMISSION, state[0].permissionName); - EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[0].grantFlags[0], PERMISSION_USER_FIXED); + EXPECT_EQ(state[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[0].grantFlag, PERMISSION_USER_FIXED); ASSERT_EQ(CALENDAR_PERMISSION, state[1].permissionName); - EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(state[1].grantFlags[0], PERMISSION_USER_FIXED); + EXPECT_EQ(state[1].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(state[1].grantFlag, PERMISSION_USER_FIXED); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -1037,10 +1028,10 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken013, TestSize.Level1) std::vector state; AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false); ASSERT_EQ(static_cast(2), state.size()); - EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[0].grantFlags[0], PERMISSION_GRANTED_BY_POLICY); - EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(state[1].grantFlags[0], PERMISSION_DEFAULT_FLAG); + EXPECT_EQ(state[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[0].grantFlag, PERMISSION_GRANTED_BY_POLICY); + EXPECT_EQ(state[1].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(state[1].grantFlag, PERMISSION_DEFAULT_FLAG); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -1088,10 +1079,10 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken014, TestSize.Level1) std::vector state; AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false); ASSERT_EQ(static_cast(2), state.size()); - EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); - EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); - EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); - EXPECT_EQ(state[1].grantFlags[0], PERMISSION_USER_FIXED | PERMISSION_GRANTED_BY_POLICY); + EXPECT_EQ(state[0].permGrantStatus, PERMISSION_GRANTED); + EXPECT_EQ(state[0].grantFlag, PERMISSION_SYSTEM_FIXED); + EXPECT_EQ(state[1].permGrantStatus, PERMISSION_DENIED); + EXPECT_EQ(state[1].grantFlag, PERMISSION_USER_FIXED | PERMISSION_GRANTED_BY_POLICY); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/clone_app_permission_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/clone_app_permission_test.cpp index 8d6c3956c8eba291f5c3cc5df6389dfacd239a03..b4aed9939d5dee714cf9cf9003762d0afee47aa0 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/clone_app_permission_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/clone_app_permission_test.cpp @@ -77,18 +77,16 @@ HapInfoParams g_infoParmsReadOnly = { PermissionStateFull g_stateFullControl = { .permissionName = "ohos.permission.WRITE_MEDIA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_stateAll = { .permissionName = PERMISSION_ALL, - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; HapPolicyParams g_policyParams = { @@ -128,17 +126,15 @@ void CloneAppPermissionTest::SetUpTestCase() }; PermissionStateFull stateGrant = { .permissionName = TEST_PERMISSION_GRANT, - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 0 }; PermissionStateFull stateRevoke = { .permissionName = TEST_PERMISSION_REVOKE, - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 0 }; HapPolicyParams policyParams = { .apl = APL_NORMAL, diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/edm_policy_set_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/edm_policy_set_test.cpp index 804f23e24d75bdc08cd14b81567898ff7c75f1e2..5c8d00415e59f431cb644fe1bbb3b9384a958185 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/edm_policy_set_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/edm_policy_set_test.cpp @@ -41,26 +41,23 @@ static const std::string REVOKE_SENSITIVE_PERMISSIONS = "ohos.permission.REVOKE_ PermissionStateFull g_infoManagerInternetState = { .permissionName = INTERNET, - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {0} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 0 }; PermissionStateFull g_infoManagerNetWorkState = { .permissionName = GET_NETWORK_STATS, - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {0} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 0 }; PermissionStateFull g_infoManagerManageNetState = { .permissionName = LOCATION, - .isGeneral = true, - .resDeviceID = {"local2"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local2", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; // Permission set @@ -86,26 +83,23 @@ uint64_t g_selfShellTokenId; PermissionStateFull g_tddPermReq = { .permissionName = MANAGE_HAP_TOKEN_ID_PERMISSION, - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_tddPermGet = { .permissionName = "ohos.permission.GET_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; PermissionStateFull g_tddPermRevoke = { .permissionName = "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; HapInfoParams g_tddHapInfoParams = { @@ -269,7 +263,7 @@ HWTEST_F(EdmPolicySetTest, InitUserPolicy008, TestSize.Level1) EXPECT_EQ(RET_SUCCESS, res); ASSERT_EQ(static_cast(2), permStatList.size()); EXPECT_EQ(INTERNET, permStatList[0].permissionName); - EXPECT_EQ(PERMISSION_GRANTED, permStatList[0].grantStatus[0]); + EXPECT_EQ(PERMISSION_GRANTED, permStatList[0].permGrantStatus); EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullIdUser1.tokenIdExStruct.tokenID)); EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullIdUser2.tokenIdExStruct.tokenID)); diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp index 788e0a8dcecd0a0dbf3943a4eed52d82e2c15ca5..883f5d65b279cd077a48a2dc301adeedfeab4824 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp @@ -56,18 +56,16 @@ PermissionDef g_infoManagerTestPermDef2 = { PermissionStateFull g_infoManagerTestState1 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local4"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1}, + .deviceID = "local4", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1, }; PermissionStateFull g_infoManagerTestState2 = { .permissionName = "ohos.permission.test2", - .isGeneral = false, - .resDeviceID = {"device 1", "device 2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED, PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1, 2}, + .deviceID = "device 1", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1, }; HapInfoParams g_infoManagerTestInfoParms = { @@ -244,10 +242,9 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo001, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID1, 0x20100000); PermissionStateFull infoManagerTestState2 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local4"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local4", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; std::vector permStateList1; permStateList1.emplace_back(infoManagerTestState2); @@ -343,10 +340,9 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo002, TestSize.Level1) PermissionStateFull infoManagerTestState_2 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; std::vector permStateList2; permStateList2.emplace_back(infoManagerTestState_2); @@ -375,10 +371,9 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo003, TestSize.Level1) PermissionStateFull infoManagerTestState_3 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {11}, // wrong flags + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 11, // wrong flags }; std::vector permStateList3; permStateList3.emplace_back(infoManagerTestState_3); @@ -416,10 +411,9 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo004, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID4, 0x20100000); PermissionStateFull infoManagerTestState_4 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, // first denied - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, // first denied + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; std::vector permStateList4; permStateList4.emplace_back(infoManagerTestState_4); @@ -439,7 +433,7 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo004, TestSize.Level1) ret = AccessTokenKit::VerifyAccessToken(mapID, "ohos.permission.CAMERA", false); ASSERT_EQ(ret, PermissionState::PERMISSION_DENIED); - remoteTokenInfo4.permStateList[0].grantStatus[0] = PermissionState::PERMISSION_GRANTED; // second granted + remoteTokenInfo4.permStateList[0].permGrantStatus = PermissionState::PERMISSION_GRANTED; // second granted ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID4, remoteTokenInfo4); ASSERT_EQ(ret, RET_SUCCESS); @@ -463,10 +457,9 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo005, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID5, 0x20100000); PermissionStateFull infoManagerTestState5 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, // first denied - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, // first denied + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; std::vector permStateList5; permStateList5.emplace_back(infoManagerTestState5); @@ -509,16 +502,14 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo006, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID6, 0x20100000); PermissionStateFull infoManagerTestState6 = { .permissionName = "ohos.permission.READ_AUDIO", - .isGeneral = true, - .resDeviceID = {"local4"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, // first grant - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local4", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, // first grant + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; PermissionStateFull infoManagerTestState7 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local4"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, // first grant - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local4", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, // first grant + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; std::vector permStateList6; permStateList6.emplace_back(infoManagerTestState6); permStateList6.emplace_back(infoManagerTestState7); @@ -563,10 +554,9 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo007, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID7, 0x20100000); PermissionStateFull infoManagerTestState7 = { .permissionName = "ohos.permission.READ_AUDIO", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, // first denied - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, // first denied + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; std::vector permStateList7; permStateList7.emplace_back(infoManagerTestState7); @@ -604,10 +594,9 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo008, TestSize.Level1) int32_t DEFAULT_API_VERSION = 8; PermissionStateFull infoManagerTestState8 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, // first denied - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, // first denied + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; std::vector permStateList8; permStateList8.emplace_back(infoManagerTestState8); @@ -652,10 +641,9 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo009, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID9, 0x20100000); PermissionStateFull infoManagerTestState9 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local4"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET}}; + .deviceID = "local4", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET}; std::vector permStateList9; permStateList9.emplace_back(infoManagerTestState9); @@ -709,10 +697,9 @@ HWTEST_F(RemoteTokenKitTest, SetRemoteHapTokenInfo010, TestSize.Level1) PermissionStateFull infoManagerTestState = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET}; std::vector permStateList; permStateList.emplace_back(infoManagerTestState); @@ -738,10 +725,9 @@ HWTEST_F(RemoteTokenKitTest, DeleteRemoteDeviceToken001, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID1, 0x20100000); PermissionStateFull infoManagerTestState_3 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local4"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET}}; + .deviceID = "local4", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET}; std::vector permStateList1; permStateList1.emplace_back(infoManagerTestState_3); @@ -781,10 +767,9 @@ HWTEST_F(RemoteTokenKitTest, DeleteRemoteDeviceToken002, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID2, 0x20100000); PermissionStateFull infoManagerTestState_2 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local4"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET}}; + .deviceID = "local4", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET}; std::vector permStateList2; permStateList2.emplace_back(infoManagerTestState_2); @@ -844,10 +829,9 @@ HWTEST_F(RemoteTokenKitTest, DeleteRemoteDeviceTokens001, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID1, 0x20100001); PermissionStateFull infoManagerTestState4 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local4"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET}}; + .deviceID = "local4", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET}; std::vector permStateList1; permStateList1.emplace_back(infoManagerTestState4); @@ -895,10 +879,9 @@ HWTEST_F(RemoteTokenKitTest, DeleteRemoteDeviceTokens002, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID2, 0x20100001); PermissionStateFull infoManagerTestState2 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET}; std::vector permStateList2; permStateList2.emplace_back(infoManagerTestState2); @@ -947,23 +930,16 @@ HWTEST_F(RemoteTokenKitTest, GetHapTokenInfoFromRemote001, TestSize.Level1) ASSERT_EQ(ret, RET_SUCCESS); ASSERT_EQ(infoSync.baseInfo.apl, g_infoManagerTestPolicyPrams.apl); ASSERT_EQ(infoSync.permStateList.size(), static_cast(2)); - ASSERT_EQ(infoSync.permStateList[1].grantFlags.size(), static_cast(2)); ASSERT_EQ(infoSync.permStateList[0].permissionName, g_infoManagerTestPolicyPrams.permStateList[0].permissionName); - ASSERT_EQ(infoSync.permStateList[0].grantFlags[0], g_infoManagerTestPolicyPrams.permStateList[0].grantFlags[0]); - ASSERT_EQ(infoSync.permStateList[0].grantStatus[0], g_infoManagerTestPolicyPrams.permStateList[0].grantStatus[0]); - ASSERT_EQ(infoSync.permStateList[0].resDeviceID[0], g_infoManagerTestPolicyPrams.permStateList[0].resDeviceID[0]); - ASSERT_EQ(infoSync.permStateList[0].isGeneral, g_infoManagerTestPolicyPrams.permStateList[0].isGeneral); + ASSERT_EQ(infoSync.permStateList[0].grantFlag, g_infoManagerTestPolicyPrams.permStateList[0].grantFlag); + ASSERT_EQ(infoSync.permStateList[0].permGrantStatus, g_infoManagerTestPolicyPrams.permStateList[0].permGrantStatus); + ASSERT_EQ(infoSync.permStateList[0].deviceID, g_infoManagerTestPolicyPrams.permStateList[0].deviceID); ASSERT_EQ(infoSync.permStateList[1].permissionName, g_infoManagerTestPolicyPrams.permStateList[1].permissionName); - ASSERT_EQ(infoSync.permStateList[1].grantFlags[0], g_infoManagerTestPolicyPrams.permStateList[1].grantFlags[0]); - ASSERT_EQ(infoSync.permStateList[1].grantStatus[0], g_infoManagerTestPolicyPrams.permStateList[1].grantStatus[0]); - ASSERT_EQ(infoSync.permStateList[1].resDeviceID[0], g_infoManagerTestPolicyPrams.permStateList[1].resDeviceID[0]); - ASSERT_EQ(infoSync.permStateList[1].isGeneral, g_infoManagerTestPolicyPrams.permStateList[1].isGeneral); - - ASSERT_EQ(infoSync.permStateList[1].grantFlags[1], g_infoManagerTestPolicyPrams.permStateList[1].grantFlags[1]); - ASSERT_EQ(infoSync.permStateList[1].grantStatus[1], g_infoManagerTestPolicyPrams.permStateList[1].grantStatus[1]); - ASSERT_EQ(infoSync.permStateList[1].resDeviceID[1], g_infoManagerTestPolicyPrams.permStateList[1].resDeviceID[1]); + ASSERT_EQ(infoSync.permStateList[1].grantFlag, g_infoManagerTestPolicyPrams.permStateList[1].grantFlag); + ASSERT_EQ(infoSync.permStateList[1].permGrantStatus, g_infoManagerTestPolicyPrams.permStateList[1].permGrantStatus); + ASSERT_EQ(infoSync.permStateList[1].deviceID, g_infoManagerTestPolicyPrams.permStateList[1].deviceID); ASSERT_EQ(infoSync.baseInfo.bundleName, g_infoManagerTestInfoParms.bundleName); ASSERT_EQ(infoSync.baseInfo.userID, g_infoManagerTestInfoParms.userID); @@ -989,10 +965,9 @@ HWTEST_F(RemoteTokenKitTest, GetHapTokenInfoFromRemote002, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID2, 0x20100000); PermissionStateFull infoManagerTestState2 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET}; std::vector permStateList2; permStateList2.emplace_back(infoManagerTestState2); @@ -1042,10 +1017,9 @@ HWTEST_F(RemoteTokenKitTest, AllocLocalTokenID001, TestSize.Level1) AccessTokenKit::DeleteRemoteToken(deviceID1, 0x20100000); PermissionStateFull infoManagerTestState_1 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local4"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET}}; + .deviceID = "local4", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET}; std::vector permStateList1; permStateList1.emplace_back(infoManagerTestState_1); diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/security_component_grant_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/security_component_grant_test.cpp index 6b00f84e5d6eda79e13a5550b347180cff08c87a..4e4a0ee81d234cf530fe6f9c94f1a383f877c92e 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/security_component_grant_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/security_component_grant_test.cpp @@ -34,10 +34,9 @@ static const int TEST_USER_ID = 0; PermissionStateFull g_infoManagerTestState1 = { .permissionName = TEST_PERMISSION, - .isGeneral = true, - .resDeviceID = {"local5"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0}, + .deviceID = "local5", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0, }; HapInfoParams g_infoManagerTestInfoParms = { diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/share_permission_with_sandbox_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/share_permission_with_sandbox_test.cpp index e94defee89f4f54bd7b529fb93f597dcd461bb02..729cb7b376671add45f9c48b4271adf08985c8d5 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/share_permission_with_sandbox_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/share_permission_with_sandbox_test.cpp @@ -62,34 +62,30 @@ HapInfoParams g_infoParmsReadOnly = { PermissionStateFull g_stateFullControl = { .permissionName = "ohos.permission.PRINT", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_stateNone = { .permissionName = "ohos.permission.INTERNET", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_stateAll = { .permissionName = PERMISSION_ALL, - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; PermissionStateFull g_stateNotDisplayed = { .permissionName = "ohos.permission.ANSWER_CALL", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 0 }; HapPolicyParams g_policyParams = { @@ -113,17 +109,15 @@ void SharePermissionTest::SetUpTestCase() }; PermissionStateFull stateGrant = { .permissionName = TEST_PERMISSION_GRANT, - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 0 }; PermissionStateFull stateRevoke = { .permissionName = TEST_PERMISSION_REVOKE, - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 0 }; HapPolicyParams policyParams = { .apl = APL_NORMAL, diff --git a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp index 08ba77640cf97f7d612ac03ad4e898875884ecde..cb1b2af52aaa927caaab5475718e2274da01b118 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -64,10 +64,9 @@ const static uint32_t MAX_PERMISSION_USED_TYPE_SIZE = 2000; static PermissionStateFull g_infoManagerTestStateA = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams g_policyPramsA = { .apl = APL_NORMAL, @@ -82,10 +81,9 @@ static HapInfoParams g_infoParmsA = { static PermissionStateFull g_infoManagerTestStateB = { .permissionName = "ohos.permission.MICROPHONE", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams g_policyPramsB = { .apl = APL_NORMAL, @@ -100,10 +98,9 @@ static HapInfoParams g_infoParmsB = { static PermissionStateFull g_infoManagerTestStateC = { .permissionName = "ohos.permission.PERMISSION_USED_STATS", - .isGeneral = true, - .resDeviceID = {"localC"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "localC", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static HapInfoParams g_infoParmsC = { .userID = 1, diff --git a/services/accesstokenmanager/main/cpp/include/database/data_translator.h b/services/accesstokenmanager/main/cpp/include/database/data_translator.h index a731e9b2f60f72b4ec0ae9c6891da4815b795f7b..f9f12ffa9459af43850d563bf88b304a39deb9b1 100644 --- a/services/accesstokenmanager/main/cpp/include/database/data_translator.h +++ b/services/accesstokenmanager/main/cpp/include/database/data_translator.h @@ -30,7 +30,7 @@ public: static int TranslationIntoGenericValues(const PermissionDef& inPermissionDef, GenericValues& outGenericValues); static int TranslationIntoPermissionDef(const GenericValues& inGenericValues, PermissionDef& outPermissionDef); static int TranslationIntoGenericValues(const PermissionStateFull& inPermissionState, - const unsigned int grantIndex, GenericValues& outGenericValues); + GenericValues& outGenericValues); static int TranslationIntoPermissionStateFull(const GenericValues& inGenericValues, PermissionStateFull& outPermissionState); }; diff --git a/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h b/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h index a3d0408b59d504f06916059980fec16c3af4ff66..6ebf7dc3e15a5fb5092faaad543adf5a1528b23e 100644 --- a/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h +++ b/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h @@ -38,7 +38,7 @@ public: static void FilterInvalidPermissionState(ATokenTypeEnum tokenType, bool doPermAvailableCheck, const std::vector& permList, std::vector& result); static bool IsGrantModeValid(int grantMode); - static bool IsGrantStatusValid(int grantStatus); + static bool IspermGrantStatusValid(int permGrantStatus); private: static void DeduplicateResDevID(const PermissionStateFull& permState, PermissionStateFull& result); }; diff --git a/services/accesstokenmanager/main/cpp/src/database/data_translator.cpp b/services/accesstokenmanager/main/cpp/src/database/data_translator.cpp index f6432e200eaaedfb46d1f3211adabe106c2e4595..b838c2cb8df1e2627b5797282b8d1ba26168dfae 100644 --- a/services/accesstokenmanager/main/cpp/src/database/data_translator.cpp +++ b/services/accesstokenmanager/main/cpp/src/database/data_translator.cpp @@ -72,27 +72,19 @@ int DataTranslator::TranslationIntoPermissionDef(const GenericValues& inGenericV } int DataTranslator::TranslationIntoGenericValues(const PermissionStateFull& inPermissionState, - const unsigned int grantIndex, GenericValues& outGenericValues) + GenericValues& outGenericValues) { - if (grantIndex >= inPermissionState.resDeviceID.size() || grantIndex >= inPermissionState.grantStatus.size() || - grantIndex >= inPermissionState.grantFlags.size()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Perm status grant size is wrong"); - return ERR_PARAM_INVALID; - } outGenericValues.Put(TokenFiledConst::FIELD_PERMISSION_NAME, inPermissionState.permissionName); - outGenericValues.Put(TokenFiledConst::FIELD_DEVICE_ID, inPermissionState.resDeviceID[grantIndex]); - outGenericValues.Put(TokenFiledConst::FIELD_GRANT_IS_GENERAL, inPermissionState.isGeneral ? 1 : 0); - outGenericValues.Put(TokenFiledConst::FIELD_GRANT_STATE, inPermissionState.grantStatus[grantIndex]); - int32_t grantFlags = static_cast(inPermissionState.grantFlags[grantIndex]); - outGenericValues.Put(TokenFiledConst::FIELD_GRANT_FLAG, grantFlags); + outGenericValues.Put(TokenFiledConst::FIELD_DEVICE_ID, inPermissionState.deviceID); + outGenericValues.Put(TokenFiledConst::FIELD_GRANT_STATE, inPermissionState.permGrantStatus); + int32_t grantFlag = static_cast(inPermissionState.grantFlag); + outGenericValues.Put(TokenFiledConst::FIELD_GRANT_FLAG, grantFlag); return RET_SUCCESS; } int DataTranslator::TranslationIntoPermissionStateFull(const GenericValues& inGenericValues, PermissionStateFull& outPermissionState) { - outPermissionState.isGeneral = - ((inGenericValues.GetInt(TokenFiledConst::FIELD_GRANT_IS_GENERAL) == 1) ? true : false); outPermissionState.permissionName = inGenericValues.GetString(TokenFiledConst::FIELD_PERMISSION_NAME); if (!DataValidator::IsPermissionNameValid(outPermissionState.permissionName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Permission name is wrong"); @@ -110,7 +102,7 @@ int DataTranslator::TranslationIntoPermissionStateFull(const GenericValues& inGe "ERROR_REASON", "permission deviceId error"); return ERR_PARAM_INVALID; } - outPermissionState.resDeviceID.push_back(devID); + outPermissionState.deviceID = devID; int grantFlag = (PermissionFlag)inGenericValues.GetInt(TokenFiledConst::FIELD_GRANT_FLAG); if (!PermissionValidator::IsPermissionFlagValid(grantFlag)) { @@ -121,20 +113,20 @@ int DataTranslator::TranslationIntoPermissionStateFull(const GenericValues& inGe return ERR_PARAM_INVALID; } - outPermissionState.grantFlags.push_back(grantFlag); + outPermissionState.grantFlag = grantFlag; - int grantStatus = (PermissionState)inGenericValues.GetInt(TokenFiledConst::FIELD_GRANT_STATE); - if (!PermissionValidator::IsGrantStatusValid(grantStatus)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GrantStatus is wrong"); + int permGrantStatus = (PermissionState)inGenericValues.GetInt(TokenFiledConst::FIELD_GRANT_STATE); + if (!PermissionValidator::IspermGrantStatusValid(permGrantStatus)) { + ACCESSTOKEN_LOG_ERROR(LABEL, "permGrantStatus is wrong"); HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::ACCESS_TOKEN, "PERMISSION_CHECK", HiviewDFX::HiSysEvent::EventType::FAULT, "CODE", LOAD_DATABASE_ERROR, "ERROR_REASON", "permission grant status error"); return ERR_PARAM_INVALID; } if (grantFlag & PERMISSION_ALLOW_THIS_TIME) { - grantStatus = PERMISSION_DENIED; + permGrantStatus = PERMISSION_DENIED; } - outPermissionState.grantStatus.push_back(grantStatus); + outPermissionState.permGrantStatus = permGrantStatus; return RET_SUCCESS; } diff --git a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp index 2efc2cc774ab8822d83c43016d27dc388f0c6e10..8a476f35971fd289746b7d9348bce47b91c6c314 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp @@ -79,13 +79,13 @@ void DlpPermissionSetManager::UpdatePermStateWithDlpInfo(int32_t hapDlpType, { ACCESSTOKEN_LOG_DEBUG(LABEL, "DlpType: %{public}d", hapDlpType); for (auto iter = permStateList.begin(); iter != permStateList.end(); ++iter) { - if (iter->grantStatus[0] == PERMISSION_DENIED) { + if (iter->permGrantStatus == PERMISSION_DENIED) { continue; } int32_t permissionDlpMode = GetPermDlpMode(iter->permissionName); bool res = IsPermDlpModeAvailableToDlpHap(hapDlpType, permissionDlpMode); if (!res) { - iter->grantStatus[0] = PERMISSION_DENIED; + iter->permGrantStatus = PERMISSION_DENIED; } } } diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp index 8f43561641744165a095499343fbb8ae6e55f3df..cfe834644ff8401b9323935756948c63920babe1 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp @@ -203,9 +203,9 @@ static bool IsPermissionRequestedInHap(const std::vector& p return false; } ACCESSTOKEN_LOG_DEBUG(LABEL, "Find goal permission: %{public}s, status: %{public}d, flag: %{public}d", - permission.c_str(), iter->grantStatus[0], iter->grantFlags[0]); - status = iter->grantStatus[0]; - flag = static_cast(iter->grantFlags[0]); + permission.c_str(), iter->permGrantStatus, iter->grantFlag); + status = iter->permGrantStatus; + flag = static_cast(iter->grantFlag); return true; } @@ -237,7 +237,7 @@ static bool IsPermissionRestrictedByRules(const std::string& permission) void PermissionManager::GetSelfPermissionState(const std::vector& permsList, PermissionListState& permState, int32_t apiVersion) { - int32_t goalGrantStatus; + int32_t goalpermGrantStatus; uint32_t goalGrantFlag; // api8 require vague location permission refuse directly because there is no vague location permission in api8 @@ -245,7 +245,7 @@ void PermissionManager::GetSelfPermissionState(const std::vector& gr bool PermissionManager::IsPermissionStateOrFlagMatched(const PermissionStateFull& state1, const PermissionStateFull& state2) { - return ((state1.grantStatus[0] == state2.grantStatus[0]) && (state1.grantFlags[0] == state2.grantFlags[0])); + return ((state1.permGrantStatus == state2.permGrantStatus) && (state1.grantFlag == state2.grantFlag)); } void PermissionManager::GetStateOrFlagChangedList(std::vector& stateListBefore, @@ -979,12 +979,12 @@ bool PermissionManager::InitPermissionList(const std::string& appDistributionTyp ACCESSTOKEN_LOG_ERROR(LABEL, "Available range of %{public}s is invalid.", permDef.permissionName.c_str()); return false; } - state.grantFlags[0] = PERMISSION_DEFAULT_FLAG; - state.grantStatus[0] = PERMISSION_DENIED; + state.grantFlag = PERMISSION_DEFAULT_FLAG; + state.permGrantStatus = PERMISSION_DENIED; if (permDef.grantMode == AccessToken::GrantMode::SYSTEM_GRANT) { - state.grantFlags[0] = PERMISSION_SYSTEM_FIXED; - state.grantStatus[0] = PERMISSION_GRANTED; + state.grantFlag = PERMISSION_SYSTEM_FIXED; + state.permGrantStatus = PERMISSION_GRANTED; initializedList.emplace_back(state); continue; } @@ -994,8 +994,8 @@ bool PermissionManager::InitPermissionList(const std::string& appDistributionTyp } bool userCancelable = true; if (IsUserGrantPermPreAuthorized(policy.preAuthorizationInfo, state.permissionName, userCancelable)) { - state.grantFlags[0] = userCancelable ? PERMISSION_GRANTED_BY_POLICY : PERMISSION_SYSTEM_FIXED; - state.grantStatus[0] = PERMISSION_GRANTED; + state.grantFlag = userCancelable ? PERMISSION_GRANTED_BY_POLICY : PERMISSION_SYSTEM_FIXED; + state.permGrantStatus = PERMISSION_GRANTED; } initializedList.emplace_back(state); } diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_policy_set.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_policy_set.cpp index e6556104af9ed5d5b58d8c256ce171a54bf70cbb..11694962f0ed86efdcc085ac8649349877624f5b 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_policy_set.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_policy_set.cpp @@ -50,9 +50,9 @@ void PermissionPolicySet::GetPermissionBriefData(std::vector& lis BriefPermData data = {0}; uint32_t code; if (TransferPermissionToOpcode(state.permissionName, code)) { - data.status = (state.grantStatus[0] == PERMISSION_GRANTED) ? 1 : 0; + data.status = (state.permGrantStatus == PERMISSION_GRANTED) ? 1 : 0; data.permCode = code; - data.flag = state.grantFlags[0]; + data.flag = state.grantFlag; list.emplace_back(data); } } @@ -108,26 +108,24 @@ std::shared_ptr PermissionPolicySet::BuildPermissionPolicyS void PermissionPolicySet::UpdatePermStateFull(const PermissionStateFull& permOld, PermissionStateFull& permNew) { - if (permNew.isGeneral == permOld.isGeneral) { - // if user_grant permission is not operated by user, it keeps the new initalized state. - // the new state can be pre_authorization. - if ((permOld.grantFlags[0] == PERMISSION_DEFAULT_FLAG) && (permOld.grantStatus[0] == PERMISSION_DENIED)) { - return; - } - // if old user_grant permission is granted by pre_authorization fixed, it keeps the new initalized state. - // the new state can be pre_authorization or not. - if ((permOld.grantFlags[0] == PERMISSION_SYSTEM_FIXED) || - // if old user_grant permission is granted by pre_authorization unfixed - // and the user has not operated this permission, it keeps the new initalized state. - (permOld.grantFlags[0] == PERMISSION_GRANTED_BY_POLICY)) { - return; - } - - // if old user_grant permission has been operated by user, it keeps the old status and old flag. - permNew.resDeviceID = permOld.resDeviceID; - permNew.grantStatus = permOld.grantStatus; - permNew.grantFlags = permOld.grantFlags; + // if user_grant permission is not operated by user, it keeps the new initalized state. + // the new state can be pre_authorization. + if ((permOld.grantFlag == PERMISSION_DEFAULT_FLAG) && (permOld.permGrantStatus == PERMISSION_DENIED)) { + return; + } + // if old user_grant permission is granted by pre_authorization fixed, it keeps the new initalized state. + // the new state can be pre_authorization or not. + if ((permOld.grantFlag == PERMISSION_SYSTEM_FIXED) || + // if old user_grant permission is granted by pre_authorization unfixed + // and the user has not operated this permission, it keeps the new initalized state. + (permOld.grantFlag == PERMISSION_GRANTED_BY_POLICY)) { + return; } + + // if old user_grant permission has been operated by user, it keeps the old status and old flag. + permNew.deviceID = permOld.deviceID; + permNew.permGrantStatus = permOld.permGrantStatus; + permNew.grantFlag = permOld.grantFlag; } void PermissionPolicySet::Update(const std::vector& permStateList) @@ -183,13 +181,13 @@ std::shared_ptr PermissionPolicySet::RestorePermissionPolic void PermissionPolicySet::MergePermissionStateFull(std::vector& permStateList, PermissionStateFull& state) { - uint32_t flag = GetFlagWroteToDb(state.grantFlags[0]); - state.grantFlags[0] = flag; + uint32_t flag = GetFlagWroteToDb(state.grantFlag); + state.grantFlag = flag; for (auto iter = permStateList.begin(); iter != permStateList.end(); iter++) { if (state.permissionName == iter->permissionName) { - iter->resDeviceID.emplace_back(state.resDeviceID[0]); - iter->grantStatus.emplace_back(state.grantStatus[0]); - iter->grantFlags.emplace_back(state.grantFlags[0]); + iter->deviceID = state.deviceID; + iter->permGrantStatus = state.permGrantStatus; + iter->grantFlag = state.grantFlag; ACCESSTOKEN_LOG_DEBUG(LABEL, "Update permission: %{public}s.", state.permissionName.c_str()); return; } @@ -202,21 +200,11 @@ void PermissionPolicySet::StorePermissionState(std::vector& value { for (const auto& permissionState : permStateList_) { ACCESSTOKEN_LOG_DEBUG(LABEL, "PermissionName: %{public}s", permissionState.permissionName.c_str()); - if (permissionState.isGeneral) { - GenericValues genericValues; - genericValues.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId_)); - DataTranslator::TranslationIntoGenericValues(permissionState, 0, genericValues); - valueList.emplace_back(genericValues); - continue; - } - - unsigned int stateSize = permissionState.resDeviceID.size(); - for (unsigned int i = 0; i < stateSize; i++) { - GenericValues genericValues; - genericValues.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId_)); - DataTranslator::TranslationIntoGenericValues(permissionState, i, genericValues); - valueList.emplace_back(genericValues); - } + GenericValues genericValues; + genericValues.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId_)); + DataTranslator::TranslationIntoGenericValues(permissionState, genericValues); + valueList.emplace_back(genericValues); + continue; } } @@ -236,13 +224,8 @@ int PermissionPolicySet::QueryPermissionFlag(const std::string& permissionName, Utils::UniqueReadGuard infoGuard(this->permPolicySetLock_); for (const auto& perm : permStateList_) { if (perm.permissionName == permissionName) { - if (perm.isGeneral) { - flag = perm.grantFlags[0]; - return RET_SUCCESS; - } else { - ACCESSTOKEN_LOG_ERROR(LABEL, "Permission %{public}s is invalid", permissionName.c_str()); - return AccessTokenError::ERR_PARAM_INVALID; - } + flag = perm.grantFlag; + return RET_SUCCESS; } } ACCESSTOKEN_LOG_ERROR(LABEL, "Invalid params!"); @@ -264,19 +247,19 @@ int32_t PermissionPolicySet::UpdatePermStateList( return permissionName == permState.permissionName; }); if (iter != permStateList_.end()) { - if ((static_cast(iter->grantFlags[0]) & PERMISSION_SYSTEM_FIXED) == PERMISSION_SYSTEM_FIXED) { + if ((static_cast(iter->grantFlag) & PERMISSION_SYSTEM_FIXED) == PERMISSION_SYSTEM_FIXED) { ACCESSTOKEN_LOG_ERROR(LABEL, "Permission fixed by system!"); return AccessTokenError::ERR_PARAM_INVALID; } - iter->grantStatus[0] = isGranted ? PERMISSION_GRANTED : PERMISSION_DENIED; - iter->grantFlags[0] = UpdateWithNewFlag(iter->grantFlags[0], flag); + iter->permGrantStatus = isGranted ? PERMISSION_GRANTED : PERMISSION_DENIED; + iter->grantFlag = UpdateWithNewFlag(iter->grantFlag, flag); uint32_t opCode; if (!TransferPermissionToOpcode(permissionName, opCode)) { ACCESSTOKEN_LOG_ERROR(LABEL, "permissionName is invalid %{public}s.", permissionName.c_str()); return AccessTokenError::ERR_PARAM_INVALID; } - bool status = (iter->grantStatus[0] == PERMISSION_GRANTED) ? 1 : 0; - return PermissionDataBrief::GetInstance().SetBriefPermData(tokenId_, opCode, status, iter->grantFlags[0]); + bool status = (iter->permGrantStatus == PERMISSION_GRANTED) ? 1 : 0; + return PermissionDataBrief::GetInstance().SetBriefPermData(tokenId_, opCode, status, iter->grantFlag); } else { ACCESSTOKEN_LOG_ERROR(LABEL, "Permission not request!"); return AccessTokenError::ERR_PARAM_INVALID; @@ -336,23 +319,19 @@ void PermissionPolicySet::ResetUserGrantPermissionStatus(void) { Utils::UniqueWriteGuard infoGuard(this->permPolicySetLock_); for (auto& perm : permStateList_) { - if (perm.isGeneral) { - uint32_t oldFlag = static_cast(perm.grantFlags[0]); - if ((oldFlag & PERMISSION_SYSTEM_FIXED) != 0) { - continue; - } - /* A user_grant permission has been set by system for cancellable pre-authorization. */ - /* it should keep granted when the app reset. */ - if ((oldFlag & PERMISSION_GRANTED_BY_POLICY) != 0) { - perm.grantStatus[0] = PERMISSION_GRANTED; - perm.grantFlags[0] = PERMISSION_GRANTED_BY_POLICY; - continue; - } - perm.grantStatus[0] = PERMISSION_DENIED; - perm.grantFlags[0] = PERMISSION_DEFAULT_FLAG; - } else { + uint32_t oldFlag = static_cast(perm.grantFlag); + if ((oldFlag & PERMISSION_SYSTEM_FIXED) != 0) { + continue; + } + /* A user_grant permission has been set by system for cancellable pre-authorization. */ + /* it should keep granted when the app reset. */ + if ((oldFlag & PERMISSION_GRANTED_BY_POLICY) != 0) { + perm.permGrantStatus = PERMISSION_GRANTED; + perm.grantFlag = PERMISSION_GRANTED_BY_POLICY; continue; } + perm.permGrantStatus = PERMISSION_DENIED; + perm.grantFlag = PERMISSION_DEFAULT_FLAG; } std::vector list; GetPermissionBriefData(list, permStateList_); @@ -373,7 +352,7 @@ void PermissionPolicySet::GetPermissionStateList(std::vector& opCodeLi uint32_t code; if (TransferPermissionToOpcode(state.permissionName, code)) { opCodeList.emplace_back(code); - statusList.emplace_back(state.grantStatus[0] == PERMISSION_GRANTED); + statusList.emplace_back(state.permGrantStatus == PERMISSION_GRANTED); } } } @@ -405,38 +384,12 @@ void PermStateFullToString(const PermissionStateFull& state, std::string& info) info.append(R"( {)"); info.append("\n"); info.append(R"( "permissionName": ")" + state.permissionName + R"(")" + ",\n"); - info.append(R"( "isGeneral": )" + std::to_string(state.isGeneral) + ",\n"); #ifndef ATM_BUILD_VARIANT_USER_ENABLE - info.append(R"( "resDeviceIDList": [ )"); - for (auto iter = state.resDeviceID.begin(); iter != state.resDeviceID.end(); iter++) { - info.append("\n"); - info.append(R"( { "resDeviceID": ")" + *iter + R"(")" + " }"); - if (iter != (state.resDeviceID.end() - 1)) { - info.append(","); - } - } - info.append("\n ],\n"); + info.append(R"( "deviceIDList": ")" + state.deviceID + R"(")" + ",\n"); #endif - info.append(R"( "grantStatusList": [)"); - for (auto iter = state.grantStatus.begin(); iter != state.grantStatus.end(); iter++) { - info.append("\n"); - info.append(R"( { "grantStatus": )" + std::to_string(*iter) + " }"); - if (iter != (state.grantStatus.end() - 1)) { - info.append(","); - } - } - info.append("\n ],\n"); - - info.append(R"( "grantFlagsList": [)"); - for (auto iter = state.grantFlags.begin(); iter != state.grantFlags.end(); iter++) { - info.append("\n"); - info.append(R"( { "grantFlag": )" + std::to_string(*iter) + " }"); - if (iter != (state.grantFlags.end() - 1)) { - info.append(","); - } - } - info.append("\n ],\n"); + info.append(R"( "permGrantStatusList": ")" + std::to_string(state.permGrantStatus) + R"(")" + ",\n"); + info.append(R"( "grantFlagList": ")" + std::to_string(state.grantFlag) + R"(")" + ",\n"); info.append(R"( })"); } diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_validator.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_validator.cpp index ff5368af56982aa0566af3d253cc396430c23b32..c57f5959ba81be72280413c1b84d3a247f01bef3 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_validator.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_validator.cpp @@ -33,9 +33,9 @@ bool PermissionValidator::IsGrantModeValid(int grantMode) return grantMode == GrantMode::SYSTEM_GRANT || grantMode == GrantMode::USER_GRANT; } -bool PermissionValidator::IsGrantStatusValid(int grantStatus) +bool PermissionValidator::IspermGrantStatusValid(int permGrantStatus) { - return grantStatus == PermissionState::PERMISSION_GRANTED || grantStatus == PermissionState::PERMISSION_DENIED; + return permGrantStatus == PermissionState::PERMISSION_GRANTED || permGrantStatus == PermissionState::PERMISSION_DENIED; } bool PermissionValidator::IsPermissionFlagValid(uint32_t flag) @@ -109,22 +109,11 @@ bool PermissionValidator::IsPermissionStateValid(const PermissionStateFull& perm if (!DataValidator::IsPermissionNameValid(permState.permissionName)) { return false; } - size_t resDevIdSize = permState.resDeviceID.size(); - size_t grantStatSize = permState.grantStatus.size(); - size_t grantFlagSize = permState.grantFlags.size(); - if ((grantStatSize != resDevIdSize) || (grantFlagSize != resDevIdSize)) { - ACCESSTOKEN_LOG_ERROR(LABEL, - "list size is invalid, grantStatSize %{public}zu, grantFlagSize %{public}zu, resDevIdSize %{public}zu.", - grantStatSize, grantFlagSize, resDevIdSize); + if (!IspermGrantStatusValid(permState.permGrantStatus) || + !IsPermissionFlagValid(permState.grantFlag)) { + ACCESSTOKEN_LOG_ERROR(LABEL, "permGrantStatus or grantFlag is invalid"); return false; } - for (uint32_t i = 0; i < resDevIdSize; i++) { - if (!IsGrantStatusValid(permState.grantStatus[i]) || - !IsPermissionFlagValid(permState.grantFlags[i])) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GrantStatus or grantFlags is invalid"); - return false; - } - } return true; } @@ -144,20 +133,10 @@ void PermissionValidator::FilterInvalidPermissionDef( void PermissionValidator::DeduplicateResDevID(const PermissionStateFull& permState, PermissionStateFull& result) { - std::set resDevId; - auto stateIter = permState.grantStatus.begin(); - auto flagIter = permState.grantFlags.begin(); - for (auto it = permState.resDeviceID.begin(); it != permState.resDeviceID.end(); ++it, ++stateIter, ++flagIter) { - if (resDevId.count(*it) != 0) { - continue; - } - resDevId.insert(*it); - result.resDeviceID.emplace_back(*it); - result.grantStatus.emplace_back(*stateIter); - result.grantFlags.emplace_back(*flagIter); - } + result.deviceID = permState.deviceID; + result.permGrantStatus = permState.permGrantStatus; + result.grantFlag = permState.grantFlag; result.permissionName = permState.permissionName; - result.isGeneral = permState.isGeneral; } void PermissionValidator::FilterInvalidPermissionState(ATokenTypeEnum tokenType, bool doPermAvailableCheck, diff --git a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp index ac8c0cee1ce3797c9e9c18011b04c7e3c8e665d0..8f7ae3ff3c5254a6d03e527c1efd55768e28c161 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp @@ -524,7 +524,7 @@ void TempPermissionObserver::RevokeAllTempPermission(AccessTokenID tokenID) return; } for (const auto& permissionState : tmpList) { - if (permissionState.grantFlags[0] & PERMISSION_ALLOW_THIS_TIME) { + if (permissionState.grantFlag & PERMISSION_ALLOW_THIS_TIME) { if (PermissionManager::GetInstance().RevokePermission( tokenID, permissionState.permissionName, PERMISSION_ALLOW_THIS_TIME) != RET_SUCCESS) { ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID:%{public}d revoke permission:%{public}s failed!", @@ -543,7 +543,7 @@ void TempPermissionObserver::RevokeTempPermission(AccessTokenID tokenID, const s return; } for (const auto& permissionState : tmpList) { - if ((permissionState.grantFlags[0] & PERMISSION_ALLOW_THIS_TIME) && + if ((permissionState.grantFlag & PERMISSION_ALLOW_THIS_TIME) && permissionState.permissionName == permissionName) { if (PermissionManager::GetInstance().RevokePermission( tokenID, permissionState.permissionName, PERMISSION_ALLOW_THIS_TIME) != RET_SUCCESS) { @@ -562,7 +562,7 @@ void TempPermissionObserver::OnAppMgrRemoteDiedHandle() std::vector tmpList; GetPermissionStateFull(iter->first, tmpList); for (const auto& permissionState : tmpList) { - if (!(permissionState.grantFlags[0] & PERMISSION_ALLOW_THIS_TIME)) { + if (!(permissionState.grantFlag & PERMISSION_ALLOW_THIS_TIME)) { continue; } int32_t ret = PermissionManager::GetInstance().RevokePermission( diff --git a/services/accesstokenmanager/main/cpp/src/token/hap_token_info_inner.cpp b/services/accesstokenmanager/main/cpp/src/token/hap_token_info_inner.cpp index 2ce195d9e27b92a2cf59807695ac7e596069d608..03585fcbb457f0252adf49ccb0b2343637711ab0 100644 --- a/services/accesstokenmanager/main/cpp/src/token/hap_token_info_inner.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/hap_token_info_inner.cpp @@ -402,12 +402,11 @@ int32_t HapTokenInfoInner::GetPermissionStateListFromBrief(std::vector(state.grantFlags[0])); + modifyValue.Put(TokenFiledConst::FIELD_GRANT_STATE, state.permGrantStatus); + modifyValue.Put(TokenFiledConst::FIELD_GRANT_FLAG, static_cast(state.grantFlag)); GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenID)); diff --git a/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp index 51132d7a838e6bb3e11eeb6f05ddb117c8d3bbe8..eafd5f6ed2ead2f69a23b18a8e00c32d3f0d1fcb 100644 --- a/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp @@ -64,10 +64,9 @@ int32_t NativeReqPermsGet( continue; } permState.permissionName = permReq; - permState.isGeneral = true; - permState.resDeviceID.push_back(DEFAULT_DEVICEID); - permState.grantStatus.push_back(PERMISSION_GRANTED); - permState.grantFlags.push_back(PERMISSION_SYSTEM_FIXED); + permState.deviceID = DEFAULT_DEVICEID; + permState.permGrantStatus = PERMISSION_GRANTED; + permState.grantFlag = PERMISSION_SYSTEM_FIXED; permStateList.push_back(permState); permRes.insert(permReq); } diff --git a/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp b/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp index 92a33c82c63bd95d2bb09ed73004cde98b609f20..faa178c009f9793398e55c0634f29942e795c581 100644 --- a/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp +++ b/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp @@ -41,10 +41,9 @@ static constexpr int INST_INDEX = 0; static PermissionStateFull g_permState = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; static HapInfoParams g_info = { diff --git a/services/accesstokenmanager/test/unittest/accesstoken_database_test.cpp b/services/accesstokenmanager/test/unittest/accesstoken_database_test.cpp index 43d4c4ad0825d1f33d6bb351dd4fb860d685cffc..1750a6a26d4828029ab37bd94c226a3dd51f18d4 100644 --- a/services/accesstokenmanager/test/unittest/accesstoken_database_test.cpp +++ b/services/accesstokenmanager/test/unittest/accesstoken_database_test.cpp @@ -42,24 +42,6 @@ void AccessTokenDatabaseTest::TearDown() { } -/** - * @tc.name: DatabaseTranslationTest001 - * @tc.desc: test TranslationIntoGenericValues - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(AccessTokenDatabaseTest, DatabaseTranslationTest001, TestSize.Level1) -{ - DataTranslator trans; - PermissionStateFull inPermissionDef; - inPermissionDef.resDeviceID.resize(0); // 0 is the size - - unsigned int grantIndex = 1; // 1 is a test input - GenericValues outGenericValues; - - EXPECT_EQ(ERR_PARAM_INVALID, trans.TranslationIntoGenericValues(inPermissionDef, grantIndex, outGenericValues)); -} - /** * @tc.name: DatabaseTranslationTest002 * @tc.desc: test TranslationIntoPermissionStateFull diff --git a/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp b/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp index 2d6acfe9e97223e17a6cb65a7fbcd4348f45282c..bc1ea8e13f2141d7ab99aa3952d65953c8eac509 100644 --- a/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp +++ b/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp @@ -79,18 +79,16 @@ static PermissionDef g_infoManagerTestPermDef2 = { static PermissionStateFull g_infoManagerTestState1 = { .permissionName = "open the door", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {1}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = 1, + .grantFlag = 1 }; static PermissionStateFull g_infoManagerTestState2 = { .permissionName = "break the door", - .isGeneral = false, - .resDeviceID = {"device 1", "device 2"}, - .grantStatus = {1, 3}, - .grantFlags = {1, 2} + .deviceID = "device 1", + .permGrantStatus = 1, + .grantFlag = 1 }; static HapInfoParams g_infoManagerTestInfoParms = { @@ -109,10 +107,9 @@ static HapPolicyParams g_infoManagerTestPolicyPrams1 = { static PermissionStateFull g_permState = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = false, - .resDeviceID = {"dev-001", "dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED, PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG, PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; #ifdef TOKEN_SYNC_ENABLE @@ -477,24 +474,21 @@ HWTEST_F(AccessTokenInfoManagerTest, InitHapToken003, TestSize.Level1) HapPolicyParcel policy; PermissionStateFull permissionStateA = { .permissionName = "ohos.permission.GET_ALL_APP_ACCOUNTS", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {1}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = 1, + .grantFlag = 1 }; PermissionStateFull permissionStateB = { .permissionName = "ohos.permission.PRELOAD_APPLICATION", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {1}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = 1, + .grantFlag = 1 }; PermissionStateFull permissionStateC = { .permissionName = "ohos.permission.test", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {1}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = 1, + .grantFlag = 1 }; policy.hapPolicyParameter = { .apl = APL_NORMAL, @@ -1592,35 +1586,14 @@ HWTEST_F(AccessTokenInfoManagerTest, IsPermissionStateValid001, TestSize.Level1) int grantState = PermissionState::PERMISSION_DENIED; uint32_t grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG; - std::vector resDeviceID; - std::vector grantStates; - std::vector grantFlags; - - resDeviceID.emplace_back(deviceID); - grantStates.emplace_back(grantState); - grantFlags.emplace_back(grantFlag); - PermissionStateFull permState = { .permissionName = permissionName, - .isGeneral = false, - .resDeviceID = resDeviceID, - .grantStatus = grantStates, - .grantFlags = grantFlags + .deviceID = deviceID, + .permGrantStatus = grantState, + .grantFlag = grantFlag }; ASSERT_EQ(false, PermissionValidator::IsPermissionStateValid(permState)); // permissionName empty - - permState.permissionName = "com.ohos.TEST"; - permState.resDeviceID.emplace_back("dev-002"); - // deviceID nums not equal status nums or flag nums - ASSERT_EQ(false, PermissionValidator::IsPermissionStateValid(permState)); - - permState.grantStatus.emplace_back(PermissionState::PERMISSION_DENIED); - // deviceID nums not equal flag nums - ASSERT_EQ(false, PermissionValidator::IsPermissionStateValid(permState)); - - permState.grantFlags.emplace_back(PermissionFlag::PERMISSION_DEFAULT_FLAG); - ASSERT_EQ(true, PermissionValidator::IsPermissionStateValid(permState)); } /** @@ -1666,13 +1639,11 @@ HWTEST_F(AccessTokenInfoManagerTest, DeduplicateResDevID001, TestSize.Level1) GTEST_LOG_(INFO) << "DeduplicateResDevID001"; PermissionStateFull permState = { .permissionName = "ohos.permission.TEST", - .isGeneral = false, - .resDeviceID = {"dev-001", "dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED, PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG, PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; GTEST_LOG_(INFO) << "DeduplicateResDevID001_1"; - ASSERT_EQ(static_cast(2), permState.resDeviceID.size()); std::vector permList; permList.emplace_back(permState); @@ -1680,7 +1651,6 @@ HWTEST_F(AccessTokenInfoManagerTest, DeduplicateResDevID001, TestSize.Level1) GTEST_LOG_(INFO) << "DeduplicateResDevID001_2"; PermissionValidator::FilterInvalidPermissionState(TOKEN_NATIVE, false, permList, result); // resDevId.count != 0 GTEST_LOG_(INFO) << "DeduplicateResDevID001_3"; - ASSERT_EQ(static_cast(1), result[0].resDeviceID.size()); } /** @@ -1693,28 +1663,25 @@ HWTEST_F(AccessTokenInfoManagerTest, Update001, TestSize.Level1) { PermissionStateFull perm1 = { .permissionName = "ohos.permission.TEST1", - .isGeneral = false, - .resDeviceID = {"dev-001", "dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED, PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG, PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; PermissionStateFull perm2 = { .permissionName = "ohos.permission.TEST2", - .isGeneral = true, - .resDeviceID = {"dev-001", "dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED, PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG, PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; PermissionStateFull perm3 = { .permissionName = "ohos.permission.TEST1", - .isGeneral = true, - .resDeviceID = {"dev-001", "dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED, PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG, PermissionFlag::PERMISSION_DEFAULT_FLAG} + + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; ASSERT_EQ(false, perm1.permissionName == perm2.permissionName); ASSERT_EQ(true, perm1.permissionName == perm3.permissionName); - ASSERT_EQ(false, perm1.isGeneral == perm3.isGeneral); AccessTokenID tokenId = 123; // 123 is random input std::vector permStateList1; @@ -1728,7 +1695,7 @@ HWTEST_F(AccessTokenInfoManagerTest, Update001, TestSize.Level1) permStateList1); policySet->Update(permStateList2); // iter reach end - policySet->Update(permStateList3); // permNew.isGeneral != permOld.isGeneral + policySet->Update(permStateList3); } /** @@ -1777,7 +1744,6 @@ HWTEST_F(AccessTokenInfoManagerTest, RestorePermissionPolicy001, TestSize.Level1 std::shared_ptr policySet2 = PermissionPolicySet::RestorePermissionPolicy(tokenId, permStateRes2); // state.permissionName == iter->permissionName - ASSERT_EQ(static_cast(2), policySet2->permStateList_[0].resDeviceID.size()); } /** @@ -1802,10 +1768,9 @@ HWTEST_F(AccessTokenInfoManagerTest, QueryPermissionFlag001, TestSize.Level1) }; PermissionStateFull perm = { .permissionName = "ohos.permission.TEST", - .isGeneral = false, - .resDeviceID = {"dev-001", "dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED, PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG, PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; AccessTokenID tokenId = 0x280bc140; // 0x280bc140 is random native @@ -1819,14 +1784,6 @@ HWTEST_F(AccessTokenInfoManagerTest, QueryPermissionFlag001, TestSize.Level1) // perm.permissionName != permissionName int flag = 0; ASSERT_EQ(ERR_PERMISSION_NOT_EXIST, policySet->QueryPermissionFlag("ohos.permission.TEST1", flag)); - // isGeneral is false - ASSERT_EQ(ERR_PARAM_INVALID, policySet->QueryPermissionFlag("ohos.permission.TEST", flag)); - - perm.isGeneral = true; - std::shared_ptr policySet1 = PermissionPolicySet::BuildPermissionPolicySet(tokenId, - permStateList); - // isGeneral is true - ASSERT_EQ(ERR_PARAM_INVALID, policySet1->QueryPermissionFlag("ohos.permission.TEST", flag)); } /** @@ -1839,10 +1796,9 @@ HWTEST_F(AccessTokenInfoManagerTest, UpdatePermissionStatus001, TestSize.Level1) { PermissionStateFull perm = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = false, - .resDeviceID = {"dev-001", "dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED, PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG, PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; AccessTokenID tokenId = 789; // 789 is random input @@ -1858,10 +1814,6 @@ HWTEST_F(AccessTokenInfoManagerTest, UpdatePermissionStatus001, TestSize.Level1) bool changed = false; ASSERT_EQ(ERR_PARAM_INVALID, policySet->UpdatePermissionStatus("ohos.permission.TEST1", isGranted, flag, changed)); - - // isGeneral is false - ASSERT_EQ(RET_SUCCESS, policySet->UpdatePermissionStatus("ohos.permission.CAMERA", - isGranted, flag, changed)); } /** @@ -1874,10 +1826,9 @@ HWTEST_F(AccessTokenInfoManagerTest, ResetUserGrantPermissionStatus001, TestSize { PermissionStateFull perm = { .permissionName = "ohos.permission.TEST", - .isGeneral = false, - .resDeviceID = {"dev-001", "dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED, PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG, PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; AccessTokenID tokenId = 1011; // 1011 is random input @@ -1888,9 +1839,6 @@ HWTEST_F(AccessTokenInfoManagerTest, ResetUserGrantPermissionStatus001, TestSize permStateList); ASSERT_EQ(tokenId, policySet->tokenId_); - - // isGeneral is false - policySet->ResetUserGrantPermissionStatus(); } /** diff --git a/services/accesstokenmanager/test/unittest/native_token_receptor_test.cpp b/services/accesstokenmanager/test/unittest/native_token_receptor_test.cpp index c6f5061cade7ce8e3a15b0bd8ed3b6e786661644..283b3b926b21d54e3882f17e7227f0e4511ad577 100644 --- a/services/accesstokenmanager/test/unittest/native_token_receptor_test.cpp +++ b/services/accesstokenmanager/test/unittest/native_token_receptor_test.cpp @@ -326,26 +326,23 @@ static void PermStateListSet(std::vector &permStateList) { PermissionStateFull infoManagerTestState1 = { .permissionName = "ohos.permission.ACCELEROMETER", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {0}, - .grantFlags = {0} + .deviceID = "local", + .permGrantStatus = 0, + .grantFlag = 0 }; PermissionStateFull infoManagerTestState2 = { .permissionName = "ohos.permission.MANAGE_USER_IDM", - .isGeneral = true, - .resDeviceID = {"device 1", "device 2"}, - .grantStatus = {0, 0}, - .grantFlags = {0, 2} + .deviceID = "device 1", + .permGrantStatus = 0, + .grantFlag = 0 }; PermissionStateFull infoManagerTestState3 = { .permissionName = "ohos.permission.USER_TEAT", - .isGeneral = true, - .resDeviceID = {"device 1", "device 2"}, - .grantStatus = {0, 0}, - .grantFlags = {0, 2} + .deviceID = "device 1", + .permGrantStatus = 0, + .grantFlag = 0 }; permStateList.emplace_back(infoManagerTestState1); permStateList.emplace_back(infoManagerTestState2); diff --git a/services/accesstokenmanager/test/unittest/permission_manager_test.cpp b/services/accesstokenmanager/test/unittest/permission_manager_test.cpp index 24c191423753585a8e703b491fac3d5ed641663d..a9f845bb7cee607da4f47a62f1e08463d2454b63 100644 --- a/services/accesstokenmanager/test/unittest/permission_manager_test.cpp +++ b/services/accesstokenmanager/test/unittest/permission_manager_test.cpp @@ -71,18 +71,16 @@ static PermissionDef g_infoManagerTestPermDef2 = { static PermissionStateFull g_infoManagerTestState1 = { .permissionName = "open the door", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {1}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = 1, + .grantFlag = 1 }; static PermissionStateFull g_infoManagerTestState2 = { .permissionName = "break the door", - .isGeneral = false, - .resDeviceID = {"device 1", "device 2"}, - .grantStatus = {1, 3}, - .grantFlags = {1, 2} + .deviceID = "device 1", + .permGrantStatus = 1, + .grantFlag = 1 }; static HapInfoParams g_infoManagerTestInfoParms = { @@ -100,79 +98,69 @@ static HapPolicyParams g_infoManagerTestPolicyPrams1 = { }; static PermissionStateFull g_infoManagerTestStateA = { - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_infoManagerTestStateB = { - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_infoManagerTestStateC = { - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_infoManagerTestStateD = { - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_permState1 = { .permissionName = "ohos.permission.TEST", - .isGeneral = false, - .resDeviceID = {"dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; static PermissionStateFull g_permState2 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = false, - .resDeviceID = {"dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; static PermissionStateFull g_permState6 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_POLICY_FIXED} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_POLICY_FIXED }; static PermissionStateFull g_permState7 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"dev-001"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_POLICY_FIXED} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_POLICY_FIXED }; static PermissionStateFull g_permState8 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_POLICY_FIXED | PermissionFlag::PERMISSION_USER_SET} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_POLICY_FIXED | PermissionFlag::PERMISSION_USER_SET }; static PermissionStateFull g_permState9 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"dev-001"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_POLICY_FIXED | PermissionFlag::PERMISSION_USER_SET} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_POLICY_FIXED | PermissionFlag::PERMISSION_USER_SET }; static PermissionDef g_infoManagerPermDef1 = { @@ -296,9 +284,9 @@ void PermissionManagerTest::TearDown() static AccessTokenID CreateTempHapTokenInfo() { g_infoManagerTestStateA.permissionName = "ohos.permission.APPROXIMATELY_LOCATION"; - g_infoManagerTestStateA.grantStatus[0] = PERMISSION_DENIED; + g_infoManagerTestStateA.permGrantStatus = PERMISSION_DENIED; g_infoManagerTestStateB.permissionName = "ohos.permission.READ_PASTEBOARD"; - g_infoManagerTestStateB.grantStatus[0] = PERMISSION_DENIED; + g_infoManagerTestStateB.permGrantStatus = PERMISSION_DENIED; static HapPolicyParams infoManagerTestPolicyPrams = { .apl = APL_NORMAL, .domain = "test.domain", @@ -504,13 +492,13 @@ HWTEST_F(PermissionManagerTest, DlpPermissionConfig003, TestSize.Level1) static void PrepareUserPermState() { g_infoManagerTestStateA.permissionName = "ohos.permission.MEDIA_LOCATION"; - g_infoManagerTestStateA.grantStatus[0] = PERMISSION_DENIED; + g_infoManagerTestStateA.permGrantStatus = PERMISSION_DENIED; g_infoManagerTestStateB.permissionName = "ohos.permission.MICROPHONE"; - g_infoManagerTestStateB.grantStatus[0] = PERMISSION_DENIED; + g_infoManagerTestStateB.permGrantStatus = PERMISSION_DENIED; g_infoManagerTestStateC.permissionName = "ohos.permission.READ_CALENDAR"; - g_infoManagerTestStateC.grantStatus[0] = PERMISSION_DENIED; + g_infoManagerTestStateC.permGrantStatus = PERMISSION_DENIED; g_infoManagerTestStateD.permissionName = "ohos.permission.READ_CALL_LOG"; - g_infoManagerTestStateD.grantStatus[0] = PERMISSION_DENIED; + g_infoManagerTestStateD.permGrantStatus = PERMISSION_DENIED; } static void PrepareJsonData2() @@ -1243,10 +1231,9 @@ HWTEST_F(PermissionManagerTest, GetPermissionFlag002, TestSize.Level1) }; PermissionStateFull permStat = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; HapPolicyParams policyPrams = { .apl = APL_NORMAL, @@ -1333,10 +1320,9 @@ HWTEST_F(PermissionManagerTest, UpdateTokenPermissionState003, TestSize.Level1) }; PermissionStateFull permStat = { .permissionName = permissionName, - .isGeneral = true, - .resDeviceID = {"dev-001"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_DEFAULT_FLAG} + .deviceID = "dev-001", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_DEFAULT_FLAG }; HapPolicyParams policy = { .apl = APL_NORMAL, diff --git a/services/accesstokenmanager/test/unittest/short_grant_manager_test.cpp b/services/accesstokenmanager/test/unittest/short_grant_manager_test.cpp index f59ff424dcf51201554cb73ecd599df9ce7813f0..abdb0f2a43405b4317d3c3e2dfa01181bdf16fc5 100644 --- a/services/accesstokenmanager/test/unittest/short_grant_manager_test.cpp +++ b/services/accesstokenmanager/test/unittest/short_grant_manager_test.cpp @@ -34,10 +34,9 @@ namespace { static std::string SHORT_TEMP_PERMISSION = "ohos.permission.SHORT_TERM_WRITE_IMAGEVIDEO"; static PermissionStateFull g_permiState = { .permissionName = SHORT_TEMP_PERMISSION, - .isGeneral = true, - .resDeviceID = {"localC"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {1} + .deviceID = "localC", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 1 }; static HapPolicyParams g_policyParams = { diff --git a/services/common/database/test/unittest/database_test.cpp b/services/common/database/test/unittest/database_test.cpp index a37e376f56d3a3b9ec5d0c2a63d14ac6b06192eb..bee6481959fc053b1f6497882f92e3bb221de452 100644 --- a/services/common/database/test/unittest/database_test.cpp +++ b/services/common/database/test/unittest/database_test.cpp @@ -290,64 +290,16 @@ HWTEST_F(DatabaseTest, DataTranslatorTranslationIntoGenericValues001, TestSize.L ACCESSTOKEN_LOG_INFO(LABEL, "DataTranslatorTranslationIntoGenericValues001 begin"); PermissionStateFull grantPermissionReq = { .permissionName = "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device1"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} + .deviceID = "device1", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED }; - int grantIndex = 1; GenericValues genericValues; ASSERT_NE(RET_SUCCESS, - DataTranslator::TranslationIntoGenericValues(grantPermissionReq, grantIndex, genericValues)); + DataTranslator::TranslationIntoGenericValues(grantPermissionReq, genericValues)); ACCESSTOKEN_LOG_INFO(LABEL, "DataTranslatorTranslationIntoGenericValues001 end"); } -/* - * @tc.name: DataTranslatorTranslationIntoGenericValues002 - * @tc.desc: DataTranslatorTranslationIntoGenericValues function test - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(DatabaseTest, DataTranslatorTranslationIntoGenericValues002, TestSize.Level1) -{ - ACCESSTOKEN_LOG_INFO(LABEL, "DataTranslatorTranslationIntoGenericValues002 begin"); - PermissionStateFull grantPermissionReq = { - .permissionName = "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device1", "device2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} - }; - int grantIndex = 1; - GenericValues genericValues; - ASSERT_NE(RET_SUCCESS, - DataTranslator::TranslationIntoGenericValues(grantPermissionReq, grantIndex, genericValues)); - ACCESSTOKEN_LOG_INFO(LABEL, "DataTranslatorTranslationIntoGenericValues002 end"); -} - -/* - * @tc.name: DataTranslatorTranslationIntoGenericValues003 - * @tc.desc: DataTranslatorTranslationIntoGenericValues function test - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(DatabaseTest, DataTranslatorTranslationIntoGenericValues003, TestSize.Level1) -{ - ACCESSTOKEN_LOG_INFO(LABEL, "DataTranslatorTranslationIntoGenericValues003 begin"); - PermissionStateFull grantPermissionReq = { - .permissionName = "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", - .isGeneral = true, - .resDeviceID = {"device1", "device2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED, PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED} - }; - int grantIndex = 1; - GenericValues genericValues; - ASSERT_NE(RET_SUCCESS, - DataTranslator::TranslationIntoGenericValues(grantPermissionReq, grantIndex, genericValues)); - ACCESSTOKEN_LOG_INFO(LABEL, "DataTranslatorTranslationIntoGenericValues003 end"); -} - /* * @tc.name: DataTranslatorTranslationIntoPermissionStateFull001 * @tc.desc: TranslationIntoPermissionStateFull function test diff --git a/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp b/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp index b81359df89eb2fbec7d8de7bc74c4ee90c524183..f958b12c7c1523d43dd18f46638fe32981fa0963 100644 --- a/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp +++ b/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp @@ -56,18 +56,16 @@ static constexpr int32_t PERMISSION_USED_TYPE_WITH_PICKER_TYPE_VALUE = 3; static constexpr int32_t RANDOM_TOKENID = 123; static PermissionStateFull g_testState1 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_testState2 = { .permissionName = "ohos.permission.MANAGE_CAMERA_CONFIG", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams g_PolicyPrams1 = { diff --git a/services/privacymanager/test/unittest/permission_record_manager_test.cpp b/services/privacymanager/test/unittest/permission_record_manager_test.cpp index 6a504bddb66265eb5dde20c69713f5877c62f4a7..9f36273ac4787a516ff641ca2c8b552278b1c619 100644 --- a/services/privacymanager/test/unittest/permission_record_manager_test.cpp +++ b/services/privacymanager/test/unittest/permission_record_manager_test.cpp @@ -67,26 +67,23 @@ static const int32_t VALUE_MAX_LEN = 32; static const char* EDM_MIC_MUTE_KEY = "persist.edm.mic_disable"; static PermissionStateFull g_testState1 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_testState2 = { .permissionName = "ohos.permission.MANAGE_CAMERA_CONFIG", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_testState3 = { .permissionName = "ohos.permission.MANAGE_AUDIO_CONFIG", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams g_PolicyPrams1 = { diff --git a/services/privacymanager/test/unittest/privacy_manager_service_test.cpp b/services/privacymanager/test/unittest/privacy_manager_service_test.cpp index 69a974c3a91295665cd0b1253096cb732c64e955..0d781321838cd80e60bd5db21da22b70e1a64d50 100644 --- a/services/privacymanager/test/unittest/privacy_manager_service_test.cpp +++ b/services/privacymanager/test/unittest/privacy_manager_service_test.cpp @@ -44,10 +44,9 @@ constexpr const char* LOCATION_PERMISSION_NAME = "ohos.permission.LOCATION"; static AccessTokenIDEx g_tokenID = {0}; static PermissionStateFull g_testState = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams g_PolicyPrams1 = { diff --git a/services/privacymanager/test/unittest/sensitive_manager_test.cpp b/services/privacymanager/test/unittest/sensitive_manager_test.cpp index 59f005afc154eeab8d38463946c0e5aa038a95fb..ee5cceeffd19af80ea8f2203d006dd4b69980596 100644 --- a/services/privacymanager/test/unittest/sensitive_manager_test.cpp +++ b/services/privacymanager/test/unittest/sensitive_manager_test.cpp @@ -45,42 +45,37 @@ public: static AccessTokenID g_selfTokenId = 0; static PermissionStateFull g_testState1 = { .permissionName = "ohos.permission.RUNNING_STATE_OBSERVER", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_testState2 = { .permissionName = "ohos.permission.MANAGE_CAMERA_CONFIG", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_testState3 = { .permissionName = "ohos.permission.GET_RUNNING_INFO", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_testState4 = { .permissionName = "ohos.permission.MANAGE_AUDIO_CONFIG", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_testState5 = { .permissionName = "ohos.permission.MICROPHONE_CONTROL", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static HapPolicyParams g_PolicyPrams1 = { diff --git a/services/tokensyncmanager/src/command/base_remote_command.cpp b/services/tokensyncmanager/src/command/base_remote_command.cpp index bd08ab1e3c5d75d7574087de9246b31366a17198..c92311e6550ed3816010f8a307423ec4d1a4e313 100644 --- a/services/tokensyncmanager/src/command/base_remote_command.cpp +++ b/services/tokensyncmanager/src/command/base_remote_command.cpp @@ -124,23 +124,15 @@ nlohmann::json BaseRemoteCommand::ToNativeTokenInfoJson(const NativeTokenInfoFor void BaseRemoteCommand::ToPermStateJson(nlohmann::json& permStateJson, const PermissionStateFull& state) { - if (state.resDeviceID.size() != state.grantStatus.size() || state.resDeviceID.size() != state.grantFlags.size()) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "State grant config size is invalid"); - return; - } nlohmann::json permConfigsJson; - uint32_t size = state.resDeviceID.size(); - for (uint32_t i = 0; i < size; i++) { - nlohmann::json permConfigJson = nlohmann::json { - {"resDeviceID", state.resDeviceID[i]}, - {"grantStatus", state.grantStatus[i]}, - {"grantFlags", state.grantFlags[i]}, - }; - permConfigsJson.emplace_back(permConfigJson); - } + nlohmann::json permConfigJson = nlohmann::json { + {"deviceID", state.deviceID}, + {"permGrantStatus", state.permGrantStatus}, + {"grantFlag", state.grantFlag}, + }; + permConfigsJson.emplace_back(permConfigJson); permStateJson["permissionName"] = state.permissionName; - permStateJson["isGeneral"] = state.isGeneral; permStateJson["grantConfig"] = permConfigsJson; } @@ -212,26 +204,25 @@ void BaseRemoteCommand::FromPermStateListJson(const nlohmann::json& hapTokenJson continue; } permissionJson.at("permissionName").get_to(permission.permissionName); - permissionJson.at("isGeneral").get_to(permission.isGeneral); nlohmann::json grantConfigsJson = permissionJson.at("grantConfig").get(); for (const auto& grantConfigJson :grantConfigsJson) { - if (grantConfigJson.find("resDeviceID") == grantConfigJson.end() || - !grantConfigJson.at("resDeviceID").is_string() || - grantConfigJson.find("grantStatus") == grantConfigJson.end() || - !grantConfigJson.at("grantStatus").is_number() || - grantConfigJson.find("grantFlags") == grantConfigJson.end() || - !grantConfigJson.at("grantFlags").is_number()) { + if (grantConfigJson.find("deviceID") == grantConfigJson.end() || + !grantConfigJson.at("deviceID").is_string() || + grantConfigJson.find("permGrantStatus") == grantConfigJson.end() || + !grantConfigJson.at("permGrantStatus").is_number() || + grantConfigJson.find("grantFlag") == grantConfigJson.end() || + !grantConfigJson.at("grantFlag").is_number()) { continue; } std::string deviceID; - grantConfigJson.at("resDeviceID").get_to(deviceID); - int grantStatus; - grantConfigJson.at("grantStatus").get_to(grantStatus); - int grantFlags; - grantConfigJson.at("grantFlags").get_to(grantFlags); - permission.resDeviceID.emplace_back(deviceID); - permission.grantStatus.emplace_back(grantStatus); - permission.grantFlags.emplace_back(grantFlags); + grantConfigJson.at("deviceID").get_to(deviceID); + int permGrantStatus; + grantConfigJson.at("permGrantStatus").get_to(permGrantStatus); + int grantFlag; + grantConfigJson.at("grantFlag").get_to(grantFlag); + permission.deviceID = deviceID; + permission.permGrantStatus = permGrantStatus; + permission.grantFlag = grantFlag; } permStateList.emplace_back(permission); } diff --git a/services/tokensyncmanager/test/unittest/token_sync_service_test.cpp b/services/tokensyncmanager/test/unittest/token_sync_service_test.cpp index 85a82fec78a8723ba5c13f56ca7bbd13c6db9cd3..0343d87ebdeb43c3bc8b9e5868e703ff4f994ff3 100644 --- a/services/tokensyncmanager/test/unittest/token_sync_service_test.cpp +++ b/services/tokensyncmanager/test/unittest/token_sync_service_test.cpp @@ -206,18 +206,16 @@ static PermissionDef g_infoManagerTestPermDef2 = { static PermissionStateFull g_infoManagerTestState1 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static PermissionStateFull g_infoManagerTestState2 = { .permissionName = "ohos.permission.test2", - .isGeneral = false, - .resDeviceID = {"device 1", "device 2"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED, PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1, 2} + .deviceID = "device 1", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1 }; static HapInfoParams g_infoManagerTestInfoParms = { @@ -471,10 +469,9 @@ HWTEST_F(TokenSyncServiceTest, FromPermStateListJson001, TestSize.Level1) PermissionStateFull infoManagerTestState = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; std::vector permStateList; permStateList.emplace_back(infoManagerTestState); @@ -492,19 +489,17 @@ HWTEST_F(TokenSyncServiceTest, FromPermStateListJson001, TestSize.Level1) PermissionStateFull state1 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local", "local1"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; nlohmann::json permStateJson; cmd->ToPermStateJson(permStateJson, state1); PermissionStateFull state2 = { .permissionName = "ohos.permission.test1", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED, PermissionFlag::PERMISSION_SYSTEM_FIXED}}; + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; cmd->ToPermStateJson(permStateJson, state2); EXPECT_EQ(hap.baseInfo.tokenID, remoteTokenInfo.baseInfo.tokenID); @@ -557,8 +552,8 @@ HWTEST_F(TokenSyncServiceTest, FromPermStateListJson002, TestSize.Level1) nlohmann::json hapTokenJsonNull = "{\\\"apl\\\":1,\\\"appID\\\":\\\"\\\",\\\"bundleName\\\":\\\"\\\"," "\\\"deviceID\\\":\\\"\\\",\\\"instIndex\\\":0,\\\"permState\\\":[{\\\"permissionName\\\":\\\"TEST\\\", " - "\\\"grantConfig\\\":[{\\\"resDeviceID\\\":\\\"device\\\", " - "\\\"grantStatus\\\":0, \\\"grantFlags\\\":0}]}],\\\"tokenAttr\\\":0," + "\\\"grantConfig\\\":[{\\\"deviceID\\\":\\\"device\\\", " + "\\\"permGrantStatus\\\":0, \\\"grantFlag\\\":0}]}],\\\"tokenAttr\\\":0," "\\\"tokenID\\\":111,\\\"userID\\\":0,\\\"version\\\":1}"; std::vector permStateListNull; cmd->FromPermStateListJson(hapTokenJsonNull, permStateListNull); @@ -581,7 +576,7 @@ HWTEST_F(TokenSyncServiceTest, FromPermStateListJson002, TestSize.Level1) hapTokenJsonNull = "{\\\"apl\\\":1,\\\"appID\\\":\\\"\\\",\\\"bundleName\\\":\\\"\\\"," "\\\"deviceID\\\":\\\"\\\",\\\"instIndex\\\":0,\\\"permState\\\":[{\\\"permissionName\\\":\\\"TEST\\\", " "\\\"isGeneral\\\":1, \\\"grantConfig\\\":[{" - "\\\"grantStatus\\\":0, \\\"grantFlags\\\":0}]}],\\\"tokenAttr\\\":0," + "\\\"permGrantStatus\\\":0, \\\"grantFlag\\\":0}]}],\\\"tokenAttr\\\":0," "\\\"tokenID\\\":111,\\\"userID\\\":0,\\\"version\\\":1}"; cmd->FromPermStateListJson(hapTokenJsonNull, permStateListNull); EXPECT_EQ(permStateListNull.size(), 0); @@ -1448,18 +1443,16 @@ HWTEST_F(TokenSyncServiceTest, ProcessBufferedCommandsWithThread001, TestSize.Le namespace { PermissionStateFull g_infoManagerTestUpdateState1 = { .permissionName = "ohos.permission.CAMERA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {1} + .deviceID = "local", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 1 }; PermissionStateFull g_infoManagerTestUpdateState2 = { .permissionName = "ohos.permission.ANSWER_CALL", - .isGeneral = false, - .resDeviceID = {"device 1", "device 2"}, - .grantStatus = {PermissionState::PERMISSION_DENIED, PermissionState::PERMISSION_DENIED}, - .grantFlags = {1, 2} + .deviceID = "device 1", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = 1 }; HapTokenInfo g_remoteHapInfoBasic = { diff --git a/test/fuzztest/innerkits/accesstoken/allochaptoken_fuzzer/allochaptoken_fuzzer.cpp b/test/fuzztest/innerkits/accesstoken/allochaptoken_fuzzer/allochaptoken_fuzzer.cpp index 7faa917fe60ab427b25d88d7b4ae08b50ad076d7..23cebb04f3dba7ceba1250250c69b46df1743b95 100644 --- a/test/fuzztest/innerkits/accesstoken/allochaptoken_fuzzer/allochaptoken_fuzzer.cpp +++ b/test/fuzztest/innerkits/accesstoken/allochaptoken_fuzzer/allochaptoken_fuzzer.cpp @@ -50,10 +50,9 @@ namespace OHOS { PermissionStateFull testState; testState.permissionName = permissionName; - testState.isGeneral = true; - testState.resDeviceID = {fuzzData.GenerateRandomString()}; - testState.grantStatus = {PermissionState::PERMISSION_GRANTED}; - testState.grantFlags = {1}; + testState.deviceID = fuzzData.GenerateRandomString(); + testState.permGrantStatus = PermissionState::PERMISSION_GRANTED; + testState.grantFlag = 1; HapInfoParams TestInfoParms = { .userID = 1, .bundleName = bundleName, diff --git a/test/fuzztest/innerkits/accesstoken/inithaptoken_fuzzer/inithaptoken_fuzzer.cpp b/test/fuzztest/innerkits/accesstoken/inithaptoken_fuzzer/inithaptoken_fuzzer.cpp index 13c7e9f7c9b501bcba68a52c408ed3ac06e53dbb..1dad5554594d4dbe7e89c1275982aa368609dd84 100644 --- a/test/fuzztest/innerkits/accesstoken/inithaptoken_fuzzer/inithaptoken_fuzzer.cpp +++ b/test/fuzztest/innerkits/accesstoken/inithaptoken_fuzzer/inithaptoken_fuzzer.cpp @@ -53,10 +53,9 @@ namespace OHOS { PermissionStateFull testState; testState.permissionName = permissionName; - testState.isGeneral = true; - testState.resDeviceID = {fuzzData.GenerateRandomString()}; - testState.grantStatus = {PermissionState::PERMISSION_GRANTED}; - testState.grantFlags = {1}; + testState.deviceID = fuzzData.GenerateRandomString(); + testState.permGrantStatus = PermissionState::PERMISSION_GRANTED; + testState.grantFlag = 1; HapInfoParams TestInfoParms = { .userID = 1, .bundleName = bundleName, diff --git a/test/fuzztest/innerkits/accesstoken/setremotehaptokeninfo_fuzzer/setremotehaptokeninfo_fuzzer.cpp b/test/fuzztest/innerkits/accesstoken/setremotehaptokeninfo_fuzzer/setremotehaptokeninfo_fuzzer.cpp index f419e3607c957065ab9a7ebfabbde21304f6521f..59ea6e4fa71e7abbc088a1e4146bafebdcb4fe47 100644 --- a/test/fuzztest/innerkits/accesstoken/setremotehaptokeninfo_fuzzer/setremotehaptokeninfo_fuzzer.cpp +++ b/test/fuzztest/innerkits/accesstoken/setremotehaptokeninfo_fuzzer/setremotehaptokeninfo_fuzzer.cpp @@ -46,11 +46,10 @@ namespace OHOS { .tokenAttr = 0 }; PermissionStateFull infoManagerTestState = { - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .isGeneral = true, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED, + .permGrantStatus = PermissionState::PERMISSION_GRANTED, .permissionName = fuzzData.GenerateRandomString(), - .resDeviceID = {fuzzData.GenerateRandomString()}}; + .deviceID = fuzzData.GenerateRandomString()}; std::vector permStateList; permStateList.emplace_back(infoManagerTestState); HapTokenInfoForSync remoteTokenInfo = { diff --git a/test/fuzztest/innerkits/accesstoken/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp b/test/fuzztest/innerkits/accesstoken/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp index 4344bf50b9c2ec270d981d6fbc67924ac22927ff..39b5b94bcc2980e107b936edcd063a2ac61582c1 100644 --- a/test/fuzztest/innerkits/accesstoken/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp +++ b/test/fuzztest/innerkits/accesstoken/updatehaptoken_fuzzer/updatehaptoken_fuzzer.cpp @@ -51,10 +51,9 @@ namespace OHOS { PermissionStateFull testState; testState.permissionName = permissionName; - testState.isGeneral = true; - testState.resDeviceID = {fuzzData.GenerateRandomString()}; - testState.grantStatus = {PermissionState::PERMISSION_GRANTED}; - testState.grantFlags = {1}; + testState.deviceID = fuzzData.GenerateRandomString(); + testState.permGrantStatus = PermissionState::PERMISSION_GRANTED; + testState.grantFlag = 1; HapPolicyParams TestPolicyParams = { .apl = APL_NORMAL, .domain = fuzzData.GenerateRandomString(), diff --git a/test/fuzztest/services/accesstoken/allochaptokenstub_fuzzer/allochaptokenstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/allochaptokenstub_fuzzer/allochaptokenstub_fuzzer.cpp index b2120ce073bf3c3ca89c4f50a8d4159f4ca8aaf9..89dfee2113b9b0e040a9d41b484c964f20b91d01 100644 --- a/test/fuzztest/services/accesstoken/allochaptokenstub_fuzzer/allochaptokenstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/allochaptokenstub_fuzzer/allochaptokenstub_fuzzer.cpp @@ -47,10 +47,9 @@ namespace OHOS { .descriptionId = 1}; PermissionStateFull TestState = { .permissionName = permissionName, - .isGeneral = true, - .resDeviceID = {fuzzData.GenerateRandomString()}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1}, + .deviceID = fuzzData.GenerateRandomString(), + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1, }; HapInfoParams TestInfoParms = { .userID = 1, diff --git a/test/fuzztest/services/accesstoken/gethaptokeninfoextstub_fuzzer/gethaptokeninfoextstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/gethaptokeninfoextstub_fuzzer/gethaptokeninfoextstub_fuzzer.cpp index 2f2c8dfc706cb2d0e9cd194697181658af504c54..97e23cdcf373257373a8aa5ebe71b21a652d157b 100644 --- a/test/fuzztest/services/accesstoken/gethaptokeninfoextstub_fuzzer/gethaptokeninfoextstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/gethaptokeninfoextstub_fuzzer/gethaptokeninfoextstub_fuzzer.cpp @@ -48,17 +48,15 @@ namespace OHOS { { PermissionStateFull permStatAlpha = { .permissionName = TEST_PERMISSION_NAME_ALPHA, - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_SET} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_DENIED, + .grantFlag = PermissionFlag::PERMISSION_USER_SET }; PermissionStateFull permStatBeta = { .permissionName = TEST_PERMISSION_NAME_BETA, - .isGeneral = true, - .resDeviceID = {"device3"}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {PermissionFlag::PERMISSION_USER_FIXED} + .deviceID = "device3", + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = PermissionFlag::PERMISSION_USER_FIXED }; policy.permStateList.emplace_back(permStatAlpha); diff --git a/test/fuzztest/services/accesstoken/initHapTokenstub_fuzzer/initHapTokenstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/initHapTokenstub_fuzzer/initHapTokenstub_fuzzer.cpp index 56332abe80fab61442a1b3b7153de5ec55fef196..de72f79baeb24ef677998ed3117d8d8cee968029 100644 --- a/test/fuzztest/services/accesstoken/initHapTokenstub_fuzzer/initHapTokenstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/initHapTokenstub_fuzzer/initHapTokenstub_fuzzer.cpp @@ -47,10 +47,9 @@ namespace OHOS { .descriptionId = 1}; PermissionStateFull TestState = { .permissionName = permissionName, - .isGeneral = true, - .resDeviceID = {fuzzData.GenerateRandomString()}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1}, + .deviceID = fuzzData.GenerateRandomString(), + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1, }; HapInfoParams TestInfoParms = { .userID = 1, diff --git a/test/fuzztest/services/accesstoken/setremotehaptokeninfostub_fuzzer/setremotehaptokeninfostub_fuzzer.cpp b/test/fuzztest/services/accesstoken/setremotehaptokeninfostub_fuzzer/setremotehaptokeninfostub_fuzzer.cpp index 4913dbdd308c77c4ae42f2722eab7f7a6d5d0125..40e1e6c36441c3648f23e4740ddfcfc36f47398d 100644 --- a/test/fuzztest/services/accesstoken/setremotehaptokeninfostub_fuzzer/setremotehaptokeninfostub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/setremotehaptokeninfostub_fuzzer/setremotehaptokeninfostub_fuzzer.cpp @@ -52,17 +52,15 @@ namespace OHOS { .tokenAttr = 0 }; PermissionStateFull infoManagerTestState = { - .grantFlags = {PermissionFlag::PERMISSION_SYSTEM_FIXED}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .isGeneral = true, + .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED, + .permGrantStatus = PermissionState::PERMISSION_GRANTED, .permissionName = permissionName, - .resDeviceID = {fuzzData.GenerateRandomString()}}; + .deviceID = fuzzData.GenerateRandomString()}; PermissionStateFull infoManagerTestState2 = { - .grantFlags = {PermissionFlag::PERMISSION_USER_SET}, - .grantStatus = {PermissionState::PERMISSION_DENIED}, - .isGeneral = true, + .grantFlag = PermissionFlag::PERMISSION_USER_SET, + .permGrantStatus = PermissionState::PERMISSION_DENIED, .permissionName = permissionName, - .resDeviceID = {fuzzData.GenerateRandomString()}}; + .deviceID = fuzzData.GenerateRandomString()}; std::vector permStateList; permStateList.emplace_back(infoManagerTestState); HapTokenInfoForSync remoteTokenInfo = { diff --git a/test/fuzztest/services/accesstoken/updatehaptokenstub_fuzzer/updatehaptokenstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/updatehaptokenstub_fuzzer/updatehaptokenstub_fuzzer.cpp index c82f03aaacda84a59d13ac9e9bfb92a2a79a17f3..848971c4e97c2a537cc56670cdc5b81531452884 100644 --- a/test/fuzztest/services/accesstoken/updatehaptokenstub_fuzzer/updatehaptokenstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/updatehaptokenstub_fuzzer/updatehaptokenstub_fuzzer.cpp @@ -44,10 +44,9 @@ namespace OHOS { .description = fuzzData.GenerateRandomString(), .descriptionId = 1}; PermissionStateFull testState = {.permissionName = permissionName, - .isGeneral = true, - .resDeviceID = {fuzzData.GenerateRandomString()}, - .grantStatus = {PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1}}; + .deviceID = fuzzData.GenerateRandomString(), + .permGrantStatus = PermissionState::PERMISSION_GRANTED, + .grantFlag = 1}; HapPolicyParams policy = {.apl = APL_NORMAL, .domain = fuzzData.GenerateRandomString(), .permList = {testPermDef},