openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-27 17:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>

Browse Source 
Changes to be committed:
This commit is contained in:
ma-shaoyin 2023-08-02 21:17:01 +08:00
parent 78812eea49
commit ace6f3e86c
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/include/input_method_system_ability.h
View File

@ -20,6 +20,7 @@
#include <map>
#include <thread>
#include "access_token.h"
#include "application_info.h"
#include "bundle_mgr_proxy.h"
#include "event_handler.h"
@ -36,6 +37,7 @@ namespace OHOS {
namespace MiscServices {
using AbilityType = AppExecFwk::ExtensionAbilityType;
using namespace AppExecFwk;
using namespace Security::AccessToken;
enum class ServiceRunningState { STATE_NOT_START, STATE_RUNNING };
struct SwitchInfo {
@ -121,6 +123,7 @@ private:
int32_t SwitchLanguage();
int32_t SwitchType();
int32_t GenerateClientInfo(InputClientInfo &clientInfo);
bool CheckBrokerTokenID(AccessTokenID tokenId);
};
} // namespace MiscServices
} // namespace OHOS

29
services/src/input_method_system_ability.cpp
View File

@ -32,6 +32,7 @@
#include "itypes_util.h"
#include "key_event.h"
#include "message_handler.h"
#include "native_token_info.h"
#include "os_account_manager.h"
#include "sys/prctl.h"
#include "system_ability_definition.h"
@ -40,7 +41,6 @@ namespace OHOS {
namespace MiscServices {
using namespace MessageID;
using namespace AccountSA;
using namespace Security::AccessToken;
REGISTER_SYSTEM_ABILITY_BY_ID(InputMethodSystemAbility, INPUT_METHOD_SYSTEM_ABILITY_ID, true);
constexpr std::int32_t INIT_INTERVAL = 10000L;
constexpr std::int32_t MAIN_USER_ID = 100;
@ -213,7 +213,7 @@ void InputMethodSystemAbility::StopInputService(const std::string &imeId)
int32_t InputMethodSystemAbility::PrepareInput(InputClientInfo &clientInfo)
{
AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID();
if (AccessTokenKit::GetTokenType(tokenId) != TypeATokenTypeEnum::TOKEN_NATIVE) {
if (!CheckBrokerTokenID(tokenId)) {
if (!BundleChecker::IsFocused(IPCSkeleton::GetCallingPid(), tokenId)) {
return ErrorCode::ERROR_CLIENT_NOT_FOCUSED;
}
@ -254,7 +254,7 @@ int32_t InputMethodSystemAbility::ReleaseInput(sptr<IInputClient> client)
int32_t InputMethodSystemAbility::StartInput(sptr<IInputClient> client, bool isShowKeyboard, bool attachFlag)
{
AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID();
if (AccessTokenKit::GetTokenType(tokenId) != TypeATokenTypeEnum::TOKEN_NATIVE) {
if (!CheckBrokerTokenID(tokenId)) {
if (!BundleChecker::IsFocused(IPCSkeleton::GetCallingPid(), tokenId)) {
return ErrorCode::ERROR_CLIENT_NOT_FOCUSED;
}
@ -269,7 +269,7 @@ int32_t InputMethodSystemAbility::StartInput(sptr<IInputClient> client, bool isS
int32_t InputMethodSystemAbility::StopInput(sptr<IInputClient> client)
{
AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID();
if (AccessTokenKit::GetTokenType(tokenId) != TypeATokenTypeEnum::TOKEN_NATIVE) {
if (!CheckBrokerTokenID(tokenId)) {
if (!userSession_->IsFocused(IPCSkeleton::GetCallingPid(), tokenId)) {
return ErrorCode::ERROR_CLIENT_NOT_FOCUSED;
}
@ -284,7 +284,7 @@ int32_t InputMethodSystemAbility::StopInput(sptr<IInputClient> client)
int32_t InputMethodSystemAbility::StopInputSession()
{
AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID();
if (AccessTokenKit::GetTokenType(tokenId) != TypeATokenTypeEnum::TOKEN_NATIVE) {
if (!CheckBrokerTokenID(tokenId)) {
if (!userSession_->IsFocused(IPCSkeleton::GetCallingPid(), tokenId)) {
return ErrorCode::ERROR_CLIENT_NOT_FOCUSED;
}
@ -313,7 +313,7 @@ int32_t InputMethodSystemAbility::SetCoreAndAgent(sptr<IInputMethodCore> core, s
int32_t InputMethodSystemAbility::HideCurrentInput()
{
AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID();
if (AccessTokenKit::GetTokenType(tokenId) == TypeATokenTypeEnum::TOKEN_NATIVE) {
if (CheckBrokerTokenID(tokenId)) {
return userSession_->OnHideKeyboardSelf();
}
if (!BundleChecker::CheckPermission(tokenId, PERMISSION_CONNECT_IME_ABILITY)) {
@ -329,7 +329,7 @@ int32_t InputMethodSystemAbility::HideCurrentInput()
int32_t InputMethodSystemAbility::ShowCurrentInput()
{
AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID();
if (AccessTokenKit::GetTokenType(tokenId) == TypeATokenTypeEnum::TOKEN_NATIVE) {
if (CheckBrokerTokenID(tokenId)) {
return userSession_->OnShowKeyboardSelf();
}
@ -480,7 +480,7 @@ int32_t InputMethodSystemAbility::SwitchSubType(const ImeInfo &info)
int32_t InputMethodSystemAbility::HideCurrentInputDeprecated()
{
AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID();
if (AccessTokenKit::GetTokenType(tokenId) != TypeATokenTypeEnum::TOKEN_NATIVE) {
if (!CheckBrokerTokenID(tokenId)) {
if (!userSession_->IsFocused(IPCSkeleton::GetCallingPid(), tokenId)) {
return ErrorCode::ERROR_CLIENT_NOT_FOCUSED;
}
@ -491,7 +491,7 @@ int32_t InputMethodSystemAbility::HideCurrentInputDeprecated()
int32_t InputMethodSystemAbility::ShowCurrentInputDeprecated()
{
AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID();
if (AccessTokenKit::GetTokenType(tokenId) != TypeATokenTypeEnum::TOKEN_NATIVE) {
if (!CheckBrokerTokenID(tokenId)) {
if (!userSession_->IsFocused(IPCSkeleton::GetCallingPid(), tokenId)) {
return ErrorCode::ERROR_CLIENT_NOT_FOCUSED;
}
@ -773,5 +773,16 @@ bool InputMethodSystemAbility::InitFocusChangeMonitor()
},
[this]() { StartInputService(ImeInfoInquirer::GetInstance().GetStartedIme(userId_)); });
}
bool InputMethodSystemAbility::CheckBrokerTokenID(AccessTokenID tokenId)
{
NativeTokenInfo nativeTokenInfoRes;
AccessTokenKit::GetNativeTokenInfo(tokenId, nativeTokenInfoRes);
if (AccessTokenKit::GetTokenType(tokenId) == TypeATokenTypeEnum::TOKEN_NATIVE
&& nativeTokenInfoRes.processName == "broker" && nativeTokenInfoRes.apl == ATokenAplEnum::APL_SYSTEM_BASIC) {
return true;
}
return false;
}
} // namespace MiscServices
} // namespace OHOS