openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-10-08 00:43:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add user

Browse Source 
Signed-off-by: unknown <sijunjie@huawei.com>
This commit is contained in:
unknown 2022-07-21 17:33:25 +08:00
parent 1a647100d3
commit 6f7cc0e248
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
services/abilitymgr/src/ability_manager_service.cpp
View File

@ -1527,7 +1527,7 @@ int AbilityManagerService::ContinueMission(const std::string &srcDeviceId, const
int32_t missionId, const sptr<IRemoteObject> &callBack, AAFwk::WantParams &wantParams)
{
HILOG_INFO("ContinueMission missionId: %{public}d", missionId);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1600,7 +1600,7 @@ int AbilityManagerService::NotifyContinuationResult(int32_t missionId, int32_t r
int AbilityManagerService::StartSyncRemoteMissions(const std::string& devId, bool fixConflict, int64_t tag)
{
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1610,7 +1610,7 @@ int AbilityManagerService::StartSyncRemoteMissions(const std::string& devId, boo
int AbilityManagerService::StopSyncRemoteMissions(const std::string& devId)
{
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1627,7 +1627,7 @@ int AbilityManagerService::RegisterMissionListener(const std::string &deviceId,
return REGISTER_REMOTE_MISSION_LISTENER_FAIL;
}
CHECK_POINTER_AND_RETURN(listener, ERR_INVALID_VALUE);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1644,7 +1644,7 @@ int AbilityManagerService::UnRegisterMissionListener(const std::string &deviceId
return REGISTER_REMOTE_MISSION_LISTENER_FAIL;
}
CHECK_POINTER_AND_RETURN(listener, ERR_INVALID_VALUE);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1830,7 +1830,7 @@ int AbilityManagerService::LockMissionForCleanup(int32_t missionId)
HILOG_INFO("request unlock mission for clean up all, id :%{public}d", missionId);
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1842,7 +1842,7 @@ int AbilityManagerService::UnlockMissionForCleanup(int32_t missionId)
HILOG_INFO("request unlock mission for clean up all, id :%{public}d", missionId);
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1854,7 +1854,7 @@ int AbilityManagerService::RegisterMissionListener(const sptr<IMissionListener>
HILOG_INFO("request RegisterMissionListener ");
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1866,7 +1866,7 @@ int AbilityManagerService::UnRegisterMissionListener(const sptr<IMissionListener
HILOG_INFO("request RegisterMissionListener ");
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1879,7 +1879,7 @@ int AbilityManagerService::GetMissionInfos(const std::string& deviceId, int32_t
HILOG_INFO("request GetMissionInfos.");
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1910,7 +1910,7 @@ int AbilityManagerService::GetMissionInfo(const std::string& deviceId, int32_t m
HILOG_INFO("request GetMissionInfo, missionId:%{public}d", missionId);
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1946,7 +1946,7 @@ int AbilityManagerService::CleanMission(int32_t missionId)
HILOG_INFO("request CleanMission, missionId:%{public}d", missionId);
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1959,7 +1959,7 @@ int AbilityManagerService::CleanAllMissions()
HILOG_INFO("request CleanAllMissions ");
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1979,7 +1979,7 @@ int AbilityManagerService::MoveMissionToFront(int32_t missionId)
HILOG_INFO("request MoveMissionToFront, missionId:%{public}d", missionId);
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -1997,7 +1997,7 @@ int AbilityManagerService::MoveMissionToFront(int32_t missionId, const StartOpti
HILOG_INFO("request MoveMissionToFront, missionId:%{public}d", missionId);
CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT);
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}
@ -3899,7 +3899,7 @@ int AbilityManagerService::RegisterSnapshotHandler(const sptr<ISnapshotHandler>&
int32_t AbilityManagerService::GetMissionSnapshot(const std::string& deviceId, int32_t missionId,
MissionSnapshot& missionSnapshot, bool isLowResolution)
{
if (PermissionVerification::GetInstance()->VerifyMissionPermission() == CHECK_PERMISSION_FAILED) {
if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) {
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
}

2
services/common/include/permission_verification.h
View File

@ -40,7 +40,7 @@ public:
int VerifyAccountPermission();
int VerifyMissionPermission();
bool VerifyMissionPermission();
private:
DISALLOW_COPY_AND_MOVE(PermissionVerification);

8
services/common/src/permission_verification.cpp
View File

@ -126,17 +126,17 @@ int PermissionVerification::VerifyAccountPermission()
return CHECK_PERMISSION_FAILED;
}
int PermissionVerification::VerifyMissionPermission()
bool PermissionVerification::VerifyMissionPermission()
{
if (IsSACall()) {
return ERR_OK;
return true;
}
if (VerifyCallingPermission(PermissionConstants::PERMISSION_MANAGE_MISSION)) {
HILOG_DEBUG("%{public}s: Permission verification succeeded.", __func__);
return ERR_OK;
return true;
}
HILOG_ERROR("%{public}s: Permission verification failed", __func__);
return CHECK_PERMISSION_FAILED;
return false;
}
unsigned int PermissionVerification::GetCallingTokenID()