openharmony/useriam_user_auth
1
0
Fork 0
mirror of https://github.com/openharmony/useriam_user_auth.git synced 2026-07-01 20:36:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

!110 解决UserAuth构建选项告警

Browse Source 
Merge pull request !110 from Tianshi Liu/master
This commit is contained in:
openharmony_ci
2022-03-23 07:51:06 +00:00
committed by Gitee
parent 3891ee564a 3cc404802b
commit 1195ef0af6
2 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/BUILD.gn
+2
View File
@@ -58,5 +58,7 @@ ohos_shared_library("userauthservice") {
"samgr_standard:samgr_proxy",
]
remove_configs = [ "//build/config/compiler:no_exceptions" ]
part_name = "${userauth_native_part_name}"
}
services/src/userauth_service.cpp
+17 -32
View File
@@ -130,14 +130,10 @@ void UserAuthService::GetProperty(const GetPropertyRequest request, sptr<IUserAu
callback->onResult(FAIL, extraInfo);
return;
}
try {
sptr<IRemoteObject::DeathRecipient> dr = new UserAuthServiceCallbackDeathRecipient(callback);
if ((!callback->AsObject()->AddDeathRecipient(dr))) {
USERAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient UserAuthServiceCallbackDeathRecipient");
}
} catch (const std::bad_alloc &e) {
USERAUTH_HILOGE(MODULE_SERVICE, "bad_alloc");
return;
sptr<IRemoteObject::DeathRecipient> dr = new UserAuthServiceCallbackDeathRecipient(callback);
if ((!callback->AsObject()->AddDeathRecipient(dr))) {
USERAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient UserAuthServiceCallbackDeathRecipient");
}
uint64_t callerId = static_cast<uint64_t>(this->GetCallingUid());
@@ -161,15 +157,12 @@ void UserAuthService::SetProperty(const SetPropertyRequest request, sptr<IUserAu
callback->onResult(E_CHECK_PERMISSION_FAILED, extraInfo);
return;
}
try {
sptr<IRemoteObject::DeathRecipient> dr = new UserAuthServiceCallbackDeathRecipient(callback);
if ((!callback->AsObject()->AddDeathRecipient(dr))) {
USERAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient UserAuthServiceCallbackDeathRecipient");
}
} catch (const std::bad_alloc &e) {
USERAUTH_HILOGE(MODULE_SERVICE, "bad_alloc");
return;
sptr<IRemoteObject::DeathRecipient> dr = new UserAuthServiceCallbackDeathRecipient(callback);
if ((!callback->AsObject()->AddDeathRecipient(dr))) {
USERAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient UserAuthServiceCallbackDeathRecipient");
}
uint64_t callerId = static_cast<uint64_t>(this->GetCallingUid());
callerName = std::to_string(callerId);
@@ -227,15 +220,11 @@ uint64_t UserAuthService::Auth(const uint64_t challenge, const AuthType authType
CoAuthInfo coAuthInfo;
AuthResult extraInfo;
try {
sptr<IRemoteObject::DeathRecipient> dr = new UserAuthServiceCallbackDeathRecipient(callback);
if ((!callback->AsObject()->AddDeathRecipient(dr))) {
USERAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient UserAuthServiceCallbackDeathRecipient");
}
} catch (const std::bad_alloc &e) {
USERAUTH_HILOGE(MODULE_SERVICE, "bad_alloc");
return invalidContextId;
sptr<IRemoteObject::DeathRecipient> dr = new UserAuthServiceCallbackDeathRecipient(callback);
if ((!callback->AsObject()->AddDeathRecipient(dr))) {
USERAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient UserAuthServiceCallbackDeathRecipient");
}
if (GetControllerData(callback, extraInfo, authTurstLevel, callerId, callerName, contextId) == FAIL) {
return invalidContextId;
}
@@ -285,15 +274,11 @@ uint64_t UserAuthService::AuthUser(const int32_t userId, const uint64_t challeng
CoAuthInfo coAuthInfo;
AuthResult extraInfo = {};
try {
sptr<IRemoteObject::DeathRecipient> dr = new UserAuthServiceCallbackDeathRecipient(callback);
if ((!callback->AsObject()->AddDeathRecipient(dr))) {
USERAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient UserAuthServiceCallbackDeathRecipient");
}
} catch (const std::bad_alloc &e) {
USERAUTH_HILOGE(MODULE_SERVICE, "bad_alloc");
return invalidContextId;
sptr<IRemoteObject::DeathRecipient> dr = new UserAuthServiceCallbackDeathRecipient(callback);
if ((!callback->AsObject()->AddDeathRecipient(dr))) {
USERAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient UserAuthServiceCallbackDeathRecipient");
}
if (!CheckPermission(ACCESS_USER_AUTH_INTERNAL_PERMISSION)) {
USERAUTH_HILOGE(MODULE_SERVICE, "Permission check failed");
callback->onResult(E_CHECK_PERMISSION_FAILED, extraInfo);