openharmony/accessibility
1
0
Fork 0
mirror of https://gitee.com/openharmony/accessibility synced 2025-03-03 02:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1223 安全校验 补充

Browse Source 
Merge pull request !1223 from zhaoqi/master
This commit is contained in:
openharmony_ci 2024-07-13 11:01:25 +00:00 committed by Gitee
commit 8d7d2d41ac
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
services/aams/src/accessible_ability_manager_service.cpp
View File

@ -67,6 +67,8 @@ namespace {
constexpr int32_t TREE_ID_MAX = 0x00001FFF;
constexpr int32_t SHORT_KEY_TIMEOUT_BEFORE_USE = 3000; // ms
constexpr int32_t SHORT_KEY_TIMEOUT_AFTER_USE = 1000; // ms
constexpr int32_t WINDOW_ID_INVALID = -1;
constexpr int64_t ELEMENT_ID_INVALID = -1;
enum SCREENREADER_STATE : int32_t {
UNINIT = -1,
OFF = 0,
@ -275,8 +277,12 @@ RetError AccessibleAbilityManagerService::VerifyingToKenId(const int32_t windowI
{
uint32_t tokenId = IPCSkeleton::GetCallingTokenID();
int32_t treeId = (static_cast<int64_t>(elementId) >> ELEMENT_MOVE_BIT);
HILOG_DEBUG("VerifyingToKenId: treeId[%{public}d]", treeId);
HILOG_DEBUG("VerifyingToKenId: treeId[%{public}d], windowId[%{public}d], elementId[%{public}" PRId64 "]",
treeId, windowId, elementId);
if (elementId == ELEMENT_ID_INVALID || windowId == WINDOW_ID_INVALID) {
HILOG_DEBUG("windowId[%{public}d], elementId[%{public}" PRId64 "]", windowId, elementId);
return RET_OK;
}
sptr<AccessibilityAccountData> accountData = GetCurrentAccountData();
if (accountData == nullptr) {
Utils::RecordUnavailableEvent(A11yUnavailableEvent::CONNECT_EVENT,
@ -310,7 +316,8 @@ RetError AccessibleAbilityManagerService::SendEvent(const AccessibilityEventInfo
return RET_ERR_NULLPTR;
}
if (flag) {
if (VerifyingToKenId(uiEvent.GetWindowId(), uiEvent.GetAccessibilityId()) == RET_OK) {
if (VerifyingToKenId(uiEvent.GetElementInfo().GetWindowId(),
uiEvent.GetElementInfo().GetAccessibilityId()) == RET_OK) {
HILOG_DEBUG("VerifyingToKenId ok");
} else {
HILOG_DEBUG("VerifyingToKenId failed");
@ -1632,6 +1639,7 @@ void AccessibleAbilityManagerService::ElementOperatorCallbackImpl::SetFindFocuse
promise_.set_value();
} else {
HILOG_DEBUG("VerifyingToKenId failed");
promise_.set_value();
}
}
@ -1645,6 +1653,7 @@ void AccessibleAbilityManagerService::ElementOperatorCallbackImpl::SetSearchElem
HILOG_DEBUG("VerifyingToKenId ok");
} else {
HILOG_DEBUG("VerifyingToKenId failed");
elementInfosResult_.clear();
return;
}
elementInfosResult_ = infos;
@ -1662,6 +1671,7 @@ void AccessibleAbilityManagerService::ElementOperatorCallbackImpl::SetSearchElem
HILOG_DEBUG("VerifyingToKenId ok");
} else {
HILOG_DEBUG("VerifyingToKenId failed");
elementInfosResult_.clear();
return;
}
elementInfosResult_ = infos;
@ -1680,6 +1690,7 @@ void AccessibleAbilityManagerService::ElementOperatorCallbackImpl::SetFocusMoveS
promise_.set_value();
} else {
HILOG_DEBUG("VerifyingToKenId failed");
promise_.set_value();
}
}