From 84b079fa9b3bad75fd9cba3ccaec99caa63acd04 Mon Sep 17 00:00:00 2001 From: lwx Date: Fri, 17 Jan 2025 11:15:28 +0800 Subject: [PATCH] =?UTF-8?q?log=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lwx --- .../src/accesstoken_callback_stubs.cpp | 21 +- .../src/accesstoken_death_recipient.cpp | 9 +- .../accesstoken/src/accesstoken_kit.cpp | 185 +++++++++--------- .../src/accesstoken_manager_client.cpp | 129 ++++++------ .../innerkits/accesstoken/src/tokenid_kit.cpp | 7 +- .../privacy/src/state_change_callback.cpp | 7 +- .../src/state_change_callback_stub.cpp | 12 +- .../src/token_callback_stub.cpp | 13 +- .../tokensync/src/token_sync_kit.cpp | 12 +- .../src/token_sync_manager_client.cpp | 23 ++- .../src/token_sync_manager_proxy.cpp | 32 ++- 11 files changed, 208 insertions(+), 242 deletions(-) diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp index bfa1c4dde..f338f9360 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp @@ -17,7 +17,7 @@ #include "access_token.h" #include "access_token_error.h" -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "permission_state_change_info_parcel.h" #include "string_ex.h" @@ -30,9 +30,6 @@ namespace OHOS { namespace Security { namespace AccessToken { namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { - LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AccessTokenCallbackStubs" -}; #ifdef TOKEN_SYNC_ENABLE static const int32_t ACCESSTOKEN_UID = 3020; #endif // TOKEN_SYNC_ENABLE @@ -41,10 +38,10 @@ static const int32_t ACCESSTOKEN_UID = 3020; int32_t PermissionStateChangeCallbackStub::OnRemoteRequest( uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Entry, code: 0x%{public}x", code); + LOGD(ATM_DOMAIN, ATM_TAG, "Entry, code: 0x%{public}x", code); std::u16string descriptor = data.ReadInterfaceToken(); if (descriptor != IPermissionStateCallback::GetDescriptor()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str()); return ERROR_IPC_REQUEST_FAIL; } @@ -53,7 +50,7 @@ int32_t PermissionStateChangeCallbackStub::OnRemoteRequest( PermStateChangeInfo result; sptr resultSptr = data.ReadParcelable(); if (resultSptr == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "ReadParcelable fail"); + LOGE(ATM_DOMAIN, ATM_TAG, "ReadParcelable fail"); return ERR_READ_PARCEL_FAILED; } @@ -68,10 +65,10 @@ int32_t PermissionStateChangeCallbackStub::OnRemoteRequest( int32_t TokenSyncCallbackStub::OnRemoteRequest( uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { - ACCESSTOKEN_LOG_INFO(LABEL, "Called."); + LOGI(ATM_DOMAIN, ATM_TAG, "Called."); std::u16string descriptor = data.ReadInterfaceToken(); if (descriptor != ITokenSyncCallback::GetDescriptor()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get unexpect descriptor, descriptor = %{public}s", + LOGE(ATM_DOMAIN, ATM_TAG, "Get unexpect descriptor, descriptor = %{public}s", Str16ToStr8(descriptor).c_str()); return ERROR_IPC_REQUEST_FAIL; } @@ -95,7 +92,7 @@ int32_t TokenSyncCallbackStub::OnRemoteRequest( void TokenSyncCallbackStub::GetRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply) { if (!IsAccessTokenCalling()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Permission denied, func = %{public}s", __func__); + LOGE(ATM_DOMAIN, ATM_TAG, "Permission denied, func = %{public}s", __func__); reply.WriteInt32(ERR_IDENTITY_CHECK_FAILED); return; } @@ -110,7 +107,7 @@ void TokenSyncCallbackStub::GetRemoteHapTokenInfoInner(MessageParcel& data, Mess void TokenSyncCallbackStub::DeleteRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply) { if (!IsAccessTokenCalling()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Permission denied, func = %{public}s", __func__); + LOGE(ATM_DOMAIN, ATM_TAG, "Permission denied, func = %{public}s", __func__); reply.WriteInt32(ERR_IDENTITY_CHECK_FAILED); return; } @@ -123,7 +120,7 @@ void TokenSyncCallbackStub::DeleteRemoteHapTokenInfoInner(MessageParcel& data, M void TokenSyncCallbackStub::UpdateRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply) { if (!IsAccessTokenCalling()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Permission denied, func = %{public}s", __func__); + LOGE(ATM_DOMAIN, ATM_TAG, "Permission denied, func = %{public}s", __func__); reply.WriteInt32(ERR_IDENTITY_CHECK_FAILED); return; } diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.cpp index 095981870..500bac171 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.cpp @@ -13,20 +13,15 @@ * limitations under the License. */ #include "accesstoken_death_recipient.h" -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "accesstoken_manager_client.h" namespace OHOS { namespace Security { namespace AccessToken { -namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { - LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AccessTokenDeathRecipient"}; -} // namespace - void AccessTokenDeathRecipient::OnRemoteDied(const wptr& object) { - ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called", __func__); + LOGI(ATM_DOMAIN, ATM_TAG, "%{public}s called", __func__); AccessTokenManagerClient::GetInstance().OnRemoteDiedHandle(); } } // namespace AccessToken diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp index 870e25653..81f3d55d3 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp @@ -16,7 +16,7 @@ #include "accesstoken_kit.h" #include #include -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "access_token_error.h" #include "accesstoken_manager_client.h" #include "constant_common.h" @@ -33,7 +33,6 @@ namespace OHOS { namespace Security { namespace AccessToken { namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AccessTokenKit"}; static const uint64_t SYSTEM_APP_MASK = (static_cast(1) << 32); static const uint64_t TOKEN_ID_LOWMASK = 0xffffffff; static const int INVALID_DLP_TOKEN_FLAG = -1; @@ -43,10 +42,10 @@ static const int FIRSTCALLER_TOKENID_DEFAULT = 0; PermUsedTypeEnum AccessTokenKit::GetPermissionUsedType( AccessTokenID tokenID, const std::string& permissionName) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, permissionName=%{public}s.", + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, permissionName=%{public}s.", tokenID, permissionName.c_str()); if ((tokenID == INVALID_TOKENID) || (!DataValidator::IsPermissionNameValid(permissionName))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param failed."); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param failed."); return PermUsedTypeEnum::INVALID_USED_TYPE; } return AccessTokenManagerClient::GetInstance().GetPermissionUsedType(tokenID, permissionName); @@ -55,14 +54,14 @@ PermUsedTypeEnum AccessTokenKit::GetPermissionUsedType( int AccessTokenKit::GrantPermissionForSpecifiedTime( AccessTokenID tokenID, const std::string& permissionName, uint32_t onceTime) { - ACCESSTOKEN_LOG_INFO(LABEL, "TokenID=%{public}d, permissionName=%{public}s, onceTime=%{public}d.", + LOGI(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, permissionName=%{public}s, onceTime=%{public}d.", tokenID, permissionName.c_str(), onceTime); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Invalid tokenID"); + LOGE(ATM_DOMAIN, ATM_TAG, "Invalid tokenID"); return AccessTokenError::ERR_PARAM_INVALID; } if (!DataValidator::IsPermissionNameValid(permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Invalid permissionName"); + LOGE(ATM_DOMAIN, ATM_TAG, "Invalid permissionName"); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().GrantPermissionForSpecifiedTime(tokenID, permissionName, onceTime); @@ -87,13 +86,13 @@ static void TransferHapPolicyParams(const HapPolicyParams& policyIn, HapPolicy& AccessTokenIDEx AccessTokenKit::AllocHapToken(const HapInfoParams& info, const HapPolicyParams& policy) { AccessTokenIDEx res = {0}; - ACCESSTOKEN_LOG_INFO(LABEL, "UserID: %{public}d, bundleName :%{public}s, \ + LOGI(ATM_DOMAIN, ATM_TAG, "UserID: %{public}d, bundleName :%{public}s, \ permList: %{public}zu, stateList: %{public}zu", info.userID, info.bundleName.c_str(), policy.permList.size(), policy.permStateList.size()); if ((!DataValidator::IsUserIdValid(info.userID)) || !DataValidator::IsAppIDDescValid(info.appIDDesc) || !DataValidator::IsBundleNameValid(info.bundleName) || !DataValidator::IsAplNumValid(policy.apl) || !DataValidator::IsDomainValid(policy.domain) || !DataValidator::IsDlpTypeValid(info.dlpType)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param failed"); return res; } HapPolicy newPolicy; @@ -111,13 +110,13 @@ int32_t AccessTokenKit::InitHapToken(const HapInfoParams& info, HapPolicyParams& int32_t AccessTokenKit::InitHapToken(const HapInfoParams& info, HapPolicyParams& policy, AccessTokenIDEx& fullTokenId, HapInfoCheckResult& result) { - ACCESSTOKEN_LOG_INFO(LABEL, "UserID: %{public}d, bundleName :%{public}s, \ + LOGI(ATM_DOMAIN, ATM_TAG, "UserID: %{public}d, bundleName :%{public}s, \ permList: %{public}zu, stateList: %{public}zu", info.userID, info.bundleName.c_str(), policy.permList.size(), policy.permStateList.size()); if ((!DataValidator::IsUserIdValid(info.userID)) || !DataValidator::IsAppIDDescValid(info.appIDDesc) || !DataValidator::IsBundleNameValid(info.bundleName) || !DataValidator::IsAplNumValid(policy.apl) || !DataValidator::IsDomainValid(policy.domain) || !DataValidator::IsDlpTypeValid(info.dlpType)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param failed"); return AccessTokenError::ERR_PARAM_INVALID; } HapPolicy newPolicy; @@ -127,12 +126,12 @@ permList: %{public}zu, stateList: %{public}zu", AccessTokenID AccessTokenKit::AllocLocalTokenID(const std::string& remoteDeviceID, AccessTokenID remoteTokenID) { - ACCESSTOKEN_LOG_INFO(LABEL, "DeviceID=%{public}s, tokenID=%{public}d", + LOGI(ATM_DOMAIN, ATM_TAG, "DeviceID=%{public}s, tokenID=%{public}d", ConstantCommon::EncryptDevId(remoteDeviceID).c_str(), remoteTokenID); #ifdef DEBUG_API_PERFORMANCE - ACCESSTOKEN_LOG_DEBUG(LABEL, "Api_performance:start call"); + LOGD(ATM_DOMAIN, ATM_TAG, "Api_performance:start call"); AccessTokenID resID = AccessTokenManagerClient::GetInstance().AllocLocalTokenID(remoteDeviceID, remoteTokenID); - ACCESSTOKEN_LOG_DEBUG(LABEL, "Api_performance:end call"); + LOGD(ATM_DOMAIN, ATM_TAG, "Api_performance:end call"); return resID; #else return AccessTokenManagerClient::GetInstance().AllocLocalTokenID(remoteDeviceID, remoteTokenID); @@ -149,12 +148,12 @@ int32_t AccessTokenKit::UpdateHapToken( int32_t AccessTokenKit::UpdateHapToken(AccessTokenIDEx& tokenIdEx, const UpdateHapInfoParams& info, const HapPolicyParams& policy, HapInfoCheckResult& result) { - ACCESSTOKEN_LOG_INFO(LABEL, "TokenID: %{public}d, isSystemApp: %{public}d, \ + LOGI(ATM_DOMAIN, ATM_TAG, "TokenID: %{public}d, isSystemApp: %{public}d, \ permList: %{public}zu, stateList: %{public}zu", tokenIdEx.tokenIdExStruct.tokenID, info.isSystemApp, policy.permList.size(), policy.permStateList.size()); if ((tokenIdEx.tokenIdExStruct.tokenID == INVALID_TOKENID) || (!DataValidator::IsAppIDDescValid(info.appIDDesc)) || (!DataValidator::IsAplNumValid(policy.apl))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input param failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Input param failed"); return AccessTokenError::ERR_PARAM_INVALID; } HapPolicy newPolicy; @@ -164,7 +163,7 @@ permList: %{public}zu, stateList: %{public}zu", int AccessTokenKit::DeleteToken(AccessTokenID tokenID) { - ACCESSTOKEN_LOG_INFO(LABEL, "TokenID=%{public}d.", tokenID); + LOGI(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", tokenID); if (tokenID == INVALID_TOKENID) { return AccessTokenError::ERR_PARAM_INVALID; } @@ -173,9 +172,9 @@ int AccessTokenKit::DeleteToken(AccessTokenID tokenID) ATokenTypeEnum AccessTokenKit::GetTokenType(AccessTokenID tokenID) __attribute__((no_sanitize("cfi"))) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d.", tokenID); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", tokenID); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid."); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid."); return TOKEN_INVALID; } return AccessTokenManagerClient::GetInstance().GetTokenType(tokenID); @@ -183,9 +182,9 @@ ATokenTypeEnum AccessTokenKit::GetTokenType(AccessTokenID tokenID) __attribute__ ATokenTypeEnum AccessTokenKit::GetTokenTypeFlag(AccessTokenID tokenID) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d.", tokenID); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", tokenID); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return TOKEN_INVALID; } AccessTokenIDInner *idInner = reinterpret_cast(&tokenID); @@ -195,9 +194,9 @@ ATokenTypeEnum AccessTokenKit::GetTokenTypeFlag(AccessTokenID tokenID) ATokenTypeEnum AccessTokenKit::GetTokenType(FullTokenID tokenID) { AccessTokenID id = tokenID & TOKEN_ID_LOWMASK; - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d.", id); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", id); if (id == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return TOKEN_INVALID; } return AccessTokenManagerClient::GetInstance().GetTokenType(id); @@ -206,9 +205,9 @@ ATokenTypeEnum AccessTokenKit::GetTokenType(FullTokenID tokenID) ATokenTypeEnum AccessTokenKit::GetTokenTypeFlag(FullTokenID tokenID) { AccessTokenID id = tokenID & TOKEN_ID_LOWMASK; - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d.", id); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", id); if (id == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return TOKEN_INVALID; } AccessTokenIDInner *idInner = reinterpret_cast(&id); @@ -218,10 +217,10 @@ ATokenTypeEnum AccessTokenKit::GetTokenTypeFlag(FullTokenID tokenID) AccessTokenID AccessTokenKit::GetHapTokenID( int32_t userID, const std::string& bundleName, int32_t instIndex) __attribute__((no_sanitize("cfi"))) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "UserID=%{public}d, bundleName=%{public}s, instIndex=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "UserID=%{public}d, bundleName=%{public}s, instIndex=%{public}d.", userID, bundleName.c_str(), instIndex); if ((!DataValidator::IsUserIdValid(userID)) || (!DataValidator::IsBundleNameValid(bundleName))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Hap token param check failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Hap token param check failed"); return INVALID_TOKENID; } AccessTokenIDEx tokenIdEx = @@ -232,10 +231,10 @@ AccessTokenID AccessTokenKit::GetHapTokenID( AccessTokenIDEx AccessTokenKit::GetHapTokenIDEx(int32_t userID, const std::string& bundleName, int32_t instIndex) { AccessTokenIDEx tokenIdEx = {0}; - ACCESSTOKEN_LOG_DEBUG(LABEL, "UserID=%{public}d, bundleName=%{public}s, instIndex=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "UserID=%{public}d, bundleName=%{public}s, instIndex=%{public}d.", userID, bundleName.c_str(), instIndex); if ((!DataValidator::IsUserIdValid(userID)) || (!DataValidator::IsBundleNameValid(bundleName))) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Hap token param check failed"); + LOGE(ATM_DOMAIN, ATM_TAG, "Hap token param check failed"); return tokenIdEx; } return AccessTokenManagerClient::GetInstance().GetHapTokenID(userID, bundleName, instIndex); @@ -243,9 +242,9 @@ AccessTokenIDEx AccessTokenKit::GetHapTokenIDEx(int32_t userID, const std::strin int32_t AccessTokenKit::GetTokenIDByUserID(int32_t userID, std::unordered_set& tokenIdList) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "UserID=%{public}d.", userID); + LOGD(ATM_DOMAIN, ATM_TAG, "UserID=%{public}d.", userID); if (!DataValidator::IsUserIdValid(userID)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "UserID=%{public}d is invalid", userID); + LOGE(ATM_DOMAIN, ATM_TAG, "UserID=%{public}d is invalid", userID); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().GetTokenIDByUserID(userID, tokenIdList); @@ -254,9 +253,9 @@ int32_t AccessTokenKit::GetTokenIDByUserID(int32_t userID, std::unordered_set& permList, PermissionGrantInfo& info) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "PermList.size=%{public}zu.", permList.size()); + LOGD(ATM_DOMAIN, ATM_TAG, "PermList.size=%{public}zu.", permList.size()); return AccessTokenManagerClient::GetInstance().GetSelfPermissionsState(permList, info); } int32_t AccessTokenKit::GetPermissionsStatus(AccessTokenID tokenID, std::vector& permList) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, permList.size=%{public}zu.", tokenID, permList.size()); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, permList.size=%{public}zu.", tokenID, permList.size()); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().GetPermissionsStatus(tokenID, permList); @@ -293,10 +292,10 @@ int32_t AccessTokenKit::GetPermissionsStatus(AccessTokenID tokenID, std::vector< int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName, bool crossIpc) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, permissionName=%{public}s, crossIpc=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, permissionName=%{public}s, crossIpc=%{public}d.", tokenID, permissionName.c_str(), crossIpc); if (!DataValidator::IsPermissionNameValid(permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "PermissionName is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "PermissionName is invalid"); return PERMISSION_DENIED; } @@ -315,7 +314,7 @@ int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::string& int AccessTokenKit::VerifyAccessToken( AccessTokenID callerTokenID, AccessTokenID firstTokenID, const std::string& permissionName, bool crossIpc) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "CallerToken=%{public}d, firstToken=%{public}d, permissionName=%{public}s.", + LOGD(ATM_DOMAIN, ATM_TAG, "CallerToken=%{public}d, firstToken=%{public}d, permissionName=%{public}s.", callerTokenID, firstTokenID, permissionName.c_str()); int ret = AccessTokenKit::VerifyAccessToken(callerTokenID, permissionName, crossIpc); if (ret != PERMISSION_GRANTED) { @@ -329,7 +328,7 @@ int AccessTokenKit::VerifyAccessToken( int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, permissionName=%{public}s.", + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, permissionName=%{public}s.", tokenID, permissionName.c_str()); uint32_t code; if (!TransferPermissionToOpcode(permissionName, code)) { @@ -346,7 +345,7 @@ int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::string& int AccessTokenKit::VerifyAccessToken( AccessTokenID callerTokenID, AccessTokenID firstTokenID, const std::string& permissionName) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "CallerToken=%{public}d, firstToken=%{public}d, permissionName=%{public}s.", + LOGD(ATM_DOMAIN, ATM_TAG, "CallerToken=%{public}d, firstToken=%{public}d, permissionName=%{public}s.", callerTokenID, firstTokenID, permissionName.c_str()); int ret = AccessTokenKit::VerifyAccessToken(callerTokenID, permissionName); if (ret != PERMISSION_GRANTED) { @@ -361,7 +360,7 @@ int AccessTokenKit::VerifyAccessToken( int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::vector& permissionList, std::vector& permStateList, bool crossIpc) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, permissionlist.size=%{public}zu, crossIpc=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, permissionlist.size=%{public}zu, crossIpc=%{public}d.", tokenID, permissionList.size(), crossIpc); permStateList.clear(); if (crossIpc) { @@ -404,14 +403,14 @@ int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::vector& permDefList) __attribute__((no_sanitize("cfi"))) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d.", tokenID); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", tokenID); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } @@ -431,9 +430,9 @@ int AccessTokenKit::GetDefPermissions( int AccessTokenKit::GetReqPermissions( AccessTokenID tokenID, std::vector& reqPermList, bool isSystemGrant) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, isSystemGrant=%{public}d.", tokenID, isSystemGrant); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, isSystemGrant=%{public}d.", tokenID, isSystemGrant); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } @@ -442,14 +441,14 @@ int AccessTokenKit::GetReqPermissions( int AccessTokenKit::GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName, uint32_t& flag) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, permissionName=%{public}s.", + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, permissionName=%{public}s.", tokenID, permissionName.c_str()); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } if (!DataValidator::IsPermissionNameValid(permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "PermissionName is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "PermissionName is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().GetPermissionFlag(tokenID, permissionName, flag); @@ -457,18 +456,18 @@ int AccessTokenKit::GetPermissionFlag(AccessTokenID tokenID, const std::string& int AccessTokenKit::GrantPermission(AccessTokenID tokenID, const std::string& permissionName, uint32_t flag) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, permissionName=%{public}s, flag=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, permissionName=%{public}s, flag=%{public}d.", tokenID, permissionName.c_str(), flag); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } if (!DataValidator::IsPermissionNameValid(permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "PermissionName is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "PermissionName is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } if (!DataValidator::IsPermissionFlagValid(flag)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Flag is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "Flag is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().GrantPermission(tokenID, permissionName, flag); @@ -476,18 +475,18 @@ int AccessTokenKit::GrantPermission(AccessTokenID tokenID, const std::string& pe int AccessTokenKit::RevokePermission(AccessTokenID tokenID, const std::string& permissionName, uint32_t flag) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, permissionName=%{public}s, flag=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, permissionName=%{public}s, flag=%{public}d.", tokenID, permissionName.c_str(), flag); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Invalid tokenID"); + LOGE(ATM_DOMAIN, ATM_TAG, "Invalid tokenID"); return AccessTokenError::ERR_PARAM_INVALID; } if (!DataValidator::IsPermissionNameValid(permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Invalid permissionName"); + LOGE(ATM_DOMAIN, ATM_TAG, "Invalid permissionName"); return AccessTokenError::ERR_PARAM_INVALID; } if (!DataValidator::IsPermissionFlagValid(flag)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Invalid flag"); + LOGE(ATM_DOMAIN, ATM_TAG, "Invalid flag"); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().RevokePermission(tokenID, permissionName, flag); @@ -495,9 +494,9 @@ int AccessTokenKit::RevokePermission(AccessTokenID tokenID, const std::string& p int AccessTokenKit::ClearUserGrantedPermissionState(AccessTokenID tokenID) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d.", tokenID); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", tokenID); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().ClearUserGrantedPermissionState(tokenID); @@ -506,18 +505,18 @@ int AccessTokenKit::ClearUserGrantedPermissionState(AccessTokenID tokenID) int32_t AccessTokenKit::SetPermissionRequestToggleStatus(const std::string& permissionName, uint32_t status, int32_t userID = 0) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "PermissionName=%{public}s, status=%{public}d, userID=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "PermissionName=%{public}s, status=%{public}d, userID=%{public}d.", permissionName.c_str(), status, userID); if (!DataValidator::IsPermissionNameValid(permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "PermissionName is invalid."); + LOGE(ATM_DOMAIN, ATM_TAG, "PermissionName is invalid."); return AccessTokenError::ERR_PARAM_INVALID; } if (!DataValidator::IsToggleStatusValid(status)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Toggle status is invalid."); + LOGE(ATM_DOMAIN, ATM_TAG, "Toggle status is invalid."); return AccessTokenError::ERR_PARAM_INVALID; } if (!DataValidator::IsUserIdValid(userID)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "UserID is invalid."); + LOGE(ATM_DOMAIN, ATM_TAG, "UserID is invalid."); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().SetPermissionRequestToggleStatus(permissionName, status, userID); @@ -526,14 +525,14 @@ int32_t AccessTokenKit::SetPermissionRequestToggleStatus(const std::string& perm int32_t AccessTokenKit::GetPermissionRequestToggleStatus(const std::string& permissionName, uint32_t& status, int32_t userID = 0) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "PermissionName=%{public}s, userID=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "PermissionName=%{public}s, userID=%{public}d.", permissionName.c_str(), userID); if (!DataValidator::IsPermissionNameValid(permissionName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "PermissionName is invalid."); + LOGE(ATM_DOMAIN, ATM_TAG, "PermissionName is invalid."); return AccessTokenError::ERR_PARAM_INVALID; } if (!DataValidator::IsUserIdValid(userID)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "UserID is invalid."); + LOGE(ATM_DOMAIN, ATM_TAG, "UserID is invalid."); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().GetPermissionRequestToggleStatus(permissionName, status, userID); @@ -541,9 +540,9 @@ int32_t AccessTokenKit::GetPermissionRequestToggleStatus(const std::string& perm int32_t AccessTokenKit::RequestAppPermOnSetting(AccessTokenID tokenID) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "tokenID=%{public}d.", tokenID); + LOGD(ATM_DOMAIN, ATM_TAG, "tokenID=%{public}d.", tokenID); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().RequestAppPermOnSetting(tokenID); @@ -552,14 +551,14 @@ int32_t AccessTokenKit::RequestAppPermOnSetting(AccessTokenID tokenID) int32_t AccessTokenKit::RegisterPermStateChangeCallback( const std::shared_ptr& callback) { - ACCESSTOKEN_LOG_INFO(LABEL, "Called"); + LOGI(ATM_DOMAIN, ATM_TAG, "Called"); return AccessTokenManagerClient::GetInstance().RegisterPermStateChangeCallback(callback, SYSTEM_REGISTER_TYPE); } int32_t AccessTokenKit::UnRegisterPermStateChangeCallback( const std::shared_ptr& callback) { - ACCESSTOKEN_LOG_INFO(LABEL, "Called"); + LOGI(ATM_DOMAIN, ATM_TAG, "Called"); return AccessTokenManagerClient::GetInstance().UnRegisterPermStateChangeCallback(callback, SYSTEM_REGISTER_TYPE); } @@ -577,9 +576,9 @@ int32_t AccessTokenKit::UnRegisterSelfPermStateChangeCallback( int32_t AccessTokenKit::GetHapDlpFlag(AccessTokenID tokenID) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d.", tokenID); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", tokenID); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return INVALID_DLP_TOKEN_FLAG; } AccessTokenIDInner *idInner = reinterpret_cast(&tokenID); @@ -597,9 +596,9 @@ int32_t AccessTokenKit::ReloadNativeTokenInfo() int AccessTokenKit::GetHapTokenInfoExtension(AccessTokenID tokenID, HapTokenInfoExt& info) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d.", tokenID); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", tokenID); if (GetTokenTypeFlag(tokenID) != TOKEN_HAP) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID =%{public}d is invalid.", tokenID); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID =%{public}d is invalid.", tokenID); return AccessTokenError::ERR_PARAM_INVALID; } @@ -609,7 +608,7 @@ int AccessTokenKit::GetHapTokenInfoExtension(AccessTokenID tokenID, HapTokenInfo AccessTokenID AccessTokenKit::GetNativeTokenId(const std::string& processName) { if (!DataValidator::IsProcessNameValid(processName)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "ProcessName is invalid, processName=%{public}s", processName.c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "ProcessName is invalid, processName=%{public}s", processName.c_str()); return INVALID_TOKENID; } return AccessTokenManagerClient::GetInstance().GetNativeTokenId(processName); @@ -618,9 +617,9 @@ AccessTokenID AccessTokenKit::GetNativeTokenId(const std::string& processName) #ifdef TOKEN_SYNC_ENABLE int AccessTokenKit::GetHapTokenInfoFromRemote(AccessTokenID tokenID, HapTokenInfoForSync& hapSync) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d.", tokenID); + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d.", tokenID); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } @@ -630,47 +629,47 @@ int AccessTokenKit::GetHapTokenInfoFromRemote(AccessTokenID tokenID, HapTokenInf int AccessTokenKit::SetRemoteHapTokenInfo(const std::string& deviceID, const HapTokenInfoForSync& hapSync) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "DeviceID=%{public}s, tokenID=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "DeviceID=%{public}s, tokenID=%{public}d.", ConstantCommon::EncryptDevId(deviceID).c_str(), hapSync.baseInfo.tokenID); return AccessTokenManagerClient::GetInstance().SetRemoteHapTokenInfo(deviceID, hapSync); } int AccessTokenKit::DeleteRemoteToken(const std::string& deviceID, AccessTokenID tokenID) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "DeviceID=%{public}s, tokenID=%{public}d.", + LOGD(ATM_DOMAIN, ATM_TAG, "DeviceID=%{public}s, tokenID=%{public}d.", ConstantCommon::EncryptDevId(deviceID).c_str(), tokenID); return AccessTokenManagerClient::GetInstance().DeleteRemoteToken(deviceID, tokenID); } int AccessTokenKit::DeleteRemoteDeviceTokens(const std::string& deviceID) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "DeviceID=%{public}s.", ConstantCommon::EncryptDevId(deviceID).c_str()); + LOGD(ATM_DOMAIN, ATM_TAG, "DeviceID=%{public}s.", ConstantCommon::EncryptDevId(deviceID).c_str()); return AccessTokenManagerClient::GetInstance().DeleteRemoteDeviceTokens(deviceID); } AccessTokenID AccessTokenKit::GetRemoteNativeTokenID(const std::string& deviceID, AccessTokenID tokenID) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "DeviceID=%{public}s., tokenID=%{public}d", + LOGD(ATM_DOMAIN, ATM_TAG, "DeviceID=%{public}s., tokenID=%{public}d", ConstantCommon::EncryptDevId(deviceID).c_str(), tokenID); return AccessTokenManagerClient::GetInstance().GetRemoteNativeTokenID(deviceID, tokenID); } int32_t AccessTokenKit::RegisterTokenSyncCallback(const std::shared_ptr& syncCallback) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Call RegisterTokenSyncCallback."); + LOGD(ATM_DOMAIN, ATM_TAG, "Call RegisterTokenSyncCallback."); return AccessTokenManagerClient::GetInstance().RegisterTokenSyncCallback(syncCallback); } int32_t AccessTokenKit::UnRegisterTokenSyncCallback() { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Call UnRegisterTokenSyncCallback."); + LOGD(ATM_DOMAIN, ATM_TAG, "Call UnRegisterTokenSyncCallback."); return AccessTokenManagerClient::GetInstance().UnRegisterTokenSyncCallback(); } #endif void AccessTokenKit::DumpTokenInfo(const AtmToolsParamInfo& info, std::string& dumpInfo) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID=%{public}d, bundleName=%{public}s, processName=%{public}s.", + LOGD(ATM_DOMAIN, ATM_TAG, "TokenID=%{public}d, bundleName=%{public}s, processName=%{public}s.", info.tokenId, info.bundleName.c_str(), info.processName.c_str()); AccessTokenManagerClient::GetInstance().DumpTokenInfo(info, dumpInfo); } @@ -693,19 +692,19 @@ void AccessTokenKit::GetPermissionManagerInfo(PermissionGrantInfo& info) int32_t AccessTokenKit::InitUserPolicy( const std::vector& userList, const std::vector& permList) { - ACCESSTOKEN_LOG_INFO(LABEL, "Enter."); + LOGI(ATM_DOMAIN, ATM_TAG, "Enter."); return AccessTokenManagerClient::GetInstance().InitUserPolicy(userList, permList); } int32_t AccessTokenKit::UpdateUserPolicy(const std::vector& userList) { - ACCESSTOKEN_LOG_INFO(LABEL, "Enter."); + LOGI(ATM_DOMAIN, ATM_TAG, "Enter."); return AccessTokenManagerClient::GetInstance().UpdateUserPolicy(userList); } int32_t AccessTokenKit::ClearUserPolicy() { - ACCESSTOKEN_LOG_INFO(LABEL, "Enter."); + LOGI(ATM_DOMAIN, ATM_TAG, "Enter."); return AccessTokenManagerClient::GetInstance().ClearUserPolicy(); } @@ -718,7 +717,7 @@ uint64_t AccessTokenKit::GetRenderTokenID(uint64_t tokenId) { AccessTokenID id = tokenId & TOKEN_ID_LOWMASK; if (id == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return tokenId; } AccessTokenIDInner *idInner = reinterpret_cast(&id); diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp index a8e0ce1f1..66df084ad 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp @@ -15,7 +15,7 @@ #include "accesstoken_manager_client.h" -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "access_token_error.h" #include "accesstoken_manager_proxy.h" #include "atm_tools_param_info_parcel.h" @@ -30,9 +30,6 @@ namespace OHOS { namespace Security { namespace AccessToken { namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { - LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "AccessTokenManagerClient" -}; static constexpr int32_t VALUE_MAX_LEN = 32; static const char* ACCESS_TOKEN_SERVICE_INIT_KEY = "accesstoken.permission.init"; std::recursive_mutex g_instanceMutex; @@ -57,7 +54,7 @@ AccessTokenManagerClient::AccessTokenManagerClient() AccessTokenManagerClient::~AccessTokenManagerClient() { - ACCESSTOKEN_LOG_ERROR(LABEL, "~AccessTokenManagerClient"); + LOGE(ATM_DOMAIN, ATM_TAG, "~AccessTokenManagerClient"); std::lock_guard lock(proxyMutex_); ReleaseProxy(); } @@ -67,7 +64,7 @@ PermUsedTypeEnum AccessTokenManagerClient::GetPermissionUsedType( { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null."); return PermUsedTypeEnum::INVALID_USED_TYPE; } return proxy->GetPermissionUsedType(tokenID, permissionName); @@ -82,15 +79,15 @@ int AccessTokenManagerClient::VerifyAccessToken(AccessTokenID tokenID, const std char value[VALUE_MAX_LEN] = {0}; int32_t ret = GetParameter(ACCESS_TOKEN_SERVICE_INIT_KEY, "", value, VALUE_MAX_LEN - 1); if ((ret < 0) || (static_cast(std::atoll(value)) != 0)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "At service has been started, ret=%{public}d.", ret); + LOGE(ATM_DOMAIN, ATM_TAG, "At service has been started, ret=%{public}d.", ret); return PERMISSION_DENIED; } AccessTokenIDInner *idInner = reinterpret_cast(&tokenID); if (static_cast(idInner->type) == TOKEN_NATIVE) { - ACCESSTOKEN_LOG_INFO(LABEL, "At service has not been started."); + LOGI(ATM_DOMAIN, ATM_TAG, "At service has not been started."); return PERMISSION_GRANTED; } - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return PERMISSION_DENIED; } @@ -99,7 +96,7 @@ int AccessTokenManagerClient::VerifyAccessToken(AccessTokenID tokenID, { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->VerifyAccessToken(tokenID, permissionList, permStateList); @@ -110,7 +107,7 @@ int AccessTokenManagerClient::GetDefPermission( { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } PermissionDefParcel permissionDefParcel; @@ -123,7 +120,7 @@ int AccessTokenManagerClient::GetDefPermissions(AccessTokenID tokenID, std::vect { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } std::vector parcelList; @@ -140,7 +137,7 @@ int AccessTokenManagerClient::GetReqPermissions( { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } std::vector parcelList; @@ -162,7 +159,7 @@ int AccessTokenManagerClient::GetPermissionFlag( { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->GetPermissionFlag(tokenID, permissionName, flag); @@ -173,13 +170,13 @@ PermissionOper AccessTokenManagerClient::GetSelfPermissionsState(std::vectorGrantPermission(tokenID, permissionName, flag); @@ -251,7 +248,7 @@ int AccessTokenManagerClient::RevokePermission(AccessTokenID tokenID, const std: { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->RevokePermission(tokenID, permissionName, flag); @@ -262,7 +259,7 @@ int AccessTokenManagerClient::GrantPermissionForSpecifiedTime( { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->GrantPermissionForSpecifiedTime(tokenID, permissionName, onceTime); @@ -272,7 +269,7 @@ int AccessTokenManagerClient::ClearUserGrantedPermissionState(AccessTokenID toke { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->ClearUserGrantedPermissionState(tokenID); @@ -283,7 +280,7 @@ int32_t AccessTokenManagerClient::SetPermissionRequestToggleStatus(const std::st { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null."); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->SetPermissionRequestToggleStatus(permissionName, status, userID); @@ -294,7 +291,7 @@ int32_t AccessTokenManagerClient::GetPermissionRequestToggleStatus(const std::st { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null."); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->GetPermissionRequestToggleStatus(permissionName, status, userID); @@ -304,7 +301,7 @@ int32_t AccessTokenManagerClient::RequestAppPermOnSetting(AccessTokenID tokenID) { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null."); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->RequestAppPermOnSetting(tokenID); @@ -316,18 +313,18 @@ int32_t AccessTokenManagerClient::CreatePermStateChangeCallback( { std::lock_guard lock(callbackMutex_); if (callbackMap_.size() == MAX_CALLBACK_MAP_SIZE) { - ACCESSTOKEN_LOG_ERROR(LABEL, "The maximum number of callback has been reached"); + LOGE(ATM_DOMAIN, ATM_TAG, "The maximum number of callback has been reached"); return AccessTokenError::ERR_CALLBACKS_EXCEED_LIMITATION; } auto goalCallback = callbackMap_.find(customizedCb); if (goalCallback != callbackMap_.end()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Already has the same callback"); + LOGE(ATM_DOMAIN, ATM_TAG, "Already has the same callback"); return AccessTokenError::ERR_CALLBACK_ALREADY_EXIST; } else { callback = new (std::nothrow) PermissionStateChangeCallback(customizedCb); if (!callback) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Memory allocation for callback failed!"); + LOGE(ATM_DOMAIN, ATM_TAG, "Memory allocation for callback failed!"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } } @@ -338,7 +335,7 @@ int32_t AccessTokenManagerClient::RegisterPermStateChangeCallback( const std::shared_ptr& customizedCb, RegisterPermChangeType type) { if (customizedCb == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "CustomizedCb is nullptr"); + LOGE(ATM_DOMAIN, ATM_TAG, "CustomizedCb is nullptr"); return AccessTokenError::ERR_PARAM_INVALID; } @@ -349,7 +346,7 @@ int32_t AccessTokenManagerClient::RegisterPermStateChangeCallback( } auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } @@ -357,18 +354,18 @@ int32_t AccessTokenManagerClient::RegisterPermStateChangeCallback( customizedCb->GetScope(scopeParcel.scope); if (scopeParcel.scope.permList.size() > PERMS_LIST_SIZE_MAX) { - ACCESSTOKEN_LOG_ERROR(LABEL, "PermList scope oversize"); + LOGE(ATM_DOMAIN, ATM_TAG, "PermList scope oversize"); return AccessTokenError::ERR_PARAM_INVALID; } if (type == SYSTEM_REGISTER_TYPE) { if (scopeParcel.scope.tokenIDs.size() > TOKENIDS_LIST_SIZE_MAX) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenIDs scope oversize"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenIDs scope oversize"); return AccessTokenError::ERR_PARAM_INVALID; } result = proxy->RegisterPermStateChangeCallback(scopeParcel, callback->AsObject()); } else { if (scopeParcel.scope.tokenIDs.size() != 1) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenIDs scope invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenIDs scope invalid"); return AccessTokenError::ERR_PARAM_INVALID; } result = proxy->RegisterSelfPermStateChangeCallback(scopeParcel, callback->AsObject()); @@ -385,14 +382,14 @@ int32_t AccessTokenManagerClient::UnRegisterPermStateChangeCallback( { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } std::lock_guard lock(callbackMutex_); auto goalCallback = callbackMap_.find(customizedCb); if (goalCallback == callbackMap_.end()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GoalCallback already is not exist"); + LOGE(ATM_DOMAIN, ATM_TAG, "GoalCallback already is not exist"); return AccessTokenError::ERR_INTERFACE_NOT_USED_TOGETHER; } int32_t result; @@ -412,7 +409,7 @@ AccessTokenIDEx AccessTokenManagerClient::AllocHapToken(const HapInfoParams& inf AccessTokenIDEx tokenIdEx = { 0 }; auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return tokenIdEx; } HapInfoParcel hapInfoParcel; @@ -428,7 +425,7 @@ int32_t AccessTokenManagerClient::InitHapToken(const HapInfoParams& info, HapPol { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null."); return AccessTokenError::ERR_SERVICE_ABNORMAL; } HapInfoParcel hapInfoParcel; @@ -443,7 +440,7 @@ int AccessTokenManagerClient::DeleteToken(AccessTokenID tokenID) { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->DeleteToken(tokenID); @@ -453,7 +450,7 @@ ATokenTypeEnum AccessTokenManagerClient::GetTokenType(AccessTokenID tokenID) { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return TOKEN_INVALID; } return static_cast(proxy->GetTokenType(tokenID)); @@ -465,7 +462,7 @@ AccessTokenIDEx AccessTokenManagerClient::GetHapTokenID( AccessTokenIDEx result = {0}; auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return result; } return proxy->GetHapTokenID(userID, bundleName, instIndex); @@ -476,7 +473,7 @@ AccessTokenID AccessTokenManagerClient::AllocLocalTokenID( { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return INVALID_TOKENID; } return proxy->AllocLocalTokenID(remoteDeviceID, remoteTokenID); @@ -487,7 +484,7 @@ int32_t AccessTokenManagerClient::UpdateHapToken(AccessTokenIDEx& tokenIdEx, con { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } HapPolicyParcel hapPolicyParcel; @@ -499,7 +496,7 @@ int32_t AccessTokenManagerClient::GetTokenIDByUserID(int32_t userID, std::unorde { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->GetTokenIDByUserID(userID, tokenIdList); @@ -509,7 +506,7 @@ int AccessTokenManagerClient::GetHapTokenInfo(AccessTokenID tokenID, HapTokenInf { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } HapTokenInfoParcel hapTokenInfoParcel; @@ -523,7 +520,7 @@ int AccessTokenManagerClient::GetNativeTokenInfo(AccessTokenID tokenID, NativeTo { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } NativeTokenInfoParcel nativeTokenInfoParcel; @@ -537,7 +534,7 @@ int32_t AccessTokenManagerClient::ReloadNativeTokenInfo() { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->ReloadNativeTokenInfo(); @@ -548,7 +545,7 @@ int AccessTokenManagerClient::GetHapTokenInfoExtension(AccessTokenID tokenID, Ha { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null."); return AccessTokenError::ERR_SERVICE_ABNORMAL; } @@ -562,7 +559,7 @@ AccessTokenID AccessTokenManagerClient::GetNativeTokenId(const std::string& proc { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return INVALID_TOKENID; } return proxy->GetNativeTokenId(processName); @@ -573,7 +570,7 @@ int AccessTokenManagerClient::GetHapTokenInfoFromRemote(AccessTokenID tokenID, H { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } @@ -587,7 +584,7 @@ int AccessTokenManagerClient::SetRemoteHapTokenInfo(const std::string& deviceID, { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } @@ -602,7 +599,7 @@ int AccessTokenManagerClient::DeleteRemoteToken(const std::string& deviceID, Acc { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } @@ -614,7 +611,7 @@ AccessTokenID AccessTokenManagerClient::GetRemoteNativeTokenID(const std::string { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return INVALID_TOKENID; } @@ -626,7 +623,7 @@ int AccessTokenManagerClient::DeleteRemoteDeviceTokens(const std::string& device { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } @@ -639,12 +636,12 @@ int32_t AccessTokenManagerClient::RegisterTokenSyncCallback( { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null."); return AccessTokenError::ERR_SERVICE_ABNORMAL; } if (syncCallback == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Input callback is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Input callback is null."); return AccessTokenError::ERR_PARAM_INVALID; } @@ -663,7 +660,7 @@ int32_t AccessTokenManagerClient::UnRegisterTokenSyncCallback() { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null."); return AccessTokenError::ERR_SERVICE_ABNORMAL; } std::lock_guard lock(tokenSyncCallbackMutex_); @@ -680,7 +677,7 @@ void AccessTokenManagerClient::DumpTokenInfo(const AtmToolsParamInfo& info, std: { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return; } @@ -693,7 +690,7 @@ int32_t AccessTokenManagerClient::GetVersion(uint32_t& version) { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null."); return AccessTokenError::ERR_SERVICE_ABNORMAL; } @@ -705,13 +702,13 @@ void AccessTokenManagerClient::InitProxy() if (proxy_ == nullptr || proxy_->AsObject() == nullptr || proxy_->AsObject()->IsObjectDead()) { auto sam = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sam == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetSystemAbilityManager is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "GetSystemAbilityManager is null"); return; } sptr accesstokenSa = sam->GetSystemAbility(IAccessTokenManager::SA_ID_ACCESSTOKEN_MANAGER_SERVICE); if (accesstokenSa == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "GetSystemAbility %{public}d is null", + LOGE(ATM_DOMAIN, ATM_TAG, "GetSystemAbility %{public}d is null", IAccessTokenManager::SA_ID_ACCESSTOKEN_MANAGER_SERVICE); return; } @@ -722,7 +719,7 @@ void AccessTokenManagerClient::InitProxy() } proxy_ = new AccessTokenManagerProxy(accesstokenSa); if (proxy_ == nullptr || proxy_->AsObject() == nullptr || proxy_->AsObject()->IsObjectDead()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Iface_cast get null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Iface_cast get null"); } } } @@ -755,7 +752,7 @@ int32_t AccessTokenManagerClient::SetPermDialogCap(const HapBaseInfo& hapBaseInf { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } HapBaseInfoParcel hapBaseInfoParcel; @@ -767,7 +764,7 @@ void AccessTokenManagerClient::GetPermissionManagerInfo(PermissionGrantInfo& inf { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return; } PermissionGrantInfoParcel infoParcel; @@ -780,7 +777,7 @@ int32_t AccessTokenManagerClient::InitUserPolicy( { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->InitUserPolicy(userList, permList); @@ -790,7 +787,7 @@ int32_t AccessTokenManagerClient::ClearUserPolicy() { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->ClearUserPolicy(); @@ -800,7 +797,7 @@ int32_t AccessTokenManagerClient::UpdateUserPolicy(const std::vector& { auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return AccessTokenError::ERR_SERVICE_ABNORMAL; } return proxy->UpdateUserPolicy(userList); diff --git a/interfaces/innerkits/accesstoken/src/tokenid_kit.cpp b/interfaces/innerkits/accesstoken/src/tokenid_kit.cpp index a28015b43..5c2864384 100644 --- a/interfaces/innerkits/accesstoken/src/tokenid_kit.cpp +++ b/interfaces/innerkits/accesstoken/src/tokenid_kit.cpp @@ -17,21 +17,20 @@ #include -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "access_token.h" namespace OHOS { namespace Security { namespace AccessToken { namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "TokenIdKit"}; static const uint64_t SYSTEM_APP_MASK = (static_cast(1) << 32); static const uint64_t TOKEN_ID_LOWMASK = 0xffffffff; } bool TokenIdKit::IsSystemAppByFullTokenID(uint64_t tokenId) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Called, tokenId=%{public}" PRId64, tokenId); + LOGD(ATM_DOMAIN, ATM_TAG, "Called, tokenId=%{public}" PRId64, tokenId); return (tokenId & SYSTEM_APP_MASK) == SYSTEM_APP_MASK; } @@ -39,7 +38,7 @@ uint64_t TokenIdKit::GetRenderTokenID(uint64_t tokenId) { AccessTokenID id = tokenId & TOKEN_ID_LOWMASK; if (id == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); + LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return tokenId; } AccessTokenIDInner *idInner = reinterpret_cast(&id); diff --git a/interfaces/innerkits/privacy/src/state_change_callback.cpp b/interfaces/innerkits/privacy/src/state_change_callback.cpp index 9ed950d57..4b7e4ae00 100644 --- a/interfaces/innerkits/privacy/src/state_change_callback.cpp +++ b/interfaces/innerkits/privacy/src/state_change_callback.cpp @@ -13,15 +13,12 @@ * limitations under the License. */ -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "state_change_callback.h" namespace OHOS { namespace Security { namespace AccessToken { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { - LOG_CORE, SECURITY_DOMAIN_PRIVACY, "StateChangeCallback" -}; StateChangeCallback::StateChangeCallback( const std::shared_ptr &customizedCallback) : customizedCallback_(customizedCallback) @@ -33,7 +30,7 @@ StateChangeCallback::~StateChangeCallback() void StateChangeCallback::StateChangeNotify(AccessTokenID tokenId, bool isShowing) { if (customizedCallback_ == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "CustomizedCallback_ is nullptr"); + LOGE(PRI_DOMAIN, PRI_TAG, "CustomizedCallback_ is nullptr"); return; } diff --git a/interfaces/innerkits/privacy/src/state_change_callback_stub.cpp b/interfaces/innerkits/privacy/src/state_change_callback_stub.cpp index 2ebdb770e..df54d9b35 100644 --- a/interfaces/innerkits/privacy/src/state_change_callback_stub.cpp +++ b/interfaces/innerkits/privacy/src/state_change_callback_stub.cpp @@ -15,7 +15,7 @@ #include "state_change_callback_stub.h" -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "privacy_error.h" #include "perm_active_response_parcel.h" #include "string_ex.h" @@ -23,19 +23,13 @@ namespace OHOS { namespace Security { namespace AccessToken { -namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { - LOG_CORE, SECURITY_DOMAIN_PRIVACY, "StateChangeCallbackStub" -}; -} - int32_t StateChangeCallbackStub::OnRemoteRequest( uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Entry, code: 0x%{public}x", code); + LOGE(PRI_DOMAIN, PRI_TAG, "Entry, code: 0x%{public}x", code); std::u16string descriptor = data.ReadInterfaceToken(); if (descriptor != IStateChangeCallback::GetDescriptor()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str()); + LOGD(PRI_DOMAIN, PRI_TAG, "Get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str()); return ERROR_IPC_REQUEST_FAIL; } diff --git a/interfaces/innerkits/token_callback/src/token_callback_stub.cpp b/interfaces/innerkits/token_callback/src/token_callback_stub.cpp index e8d380ea8..67e273d41 100644 --- a/interfaces/innerkits/token_callback/src/token_callback_stub.cpp +++ b/interfaces/innerkits/token_callback/src/token_callback_stub.cpp @@ -16,16 +16,13 @@ #include "token_callback_stub.h" #include "access_token_error.h" -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "string_ex.h" namespace OHOS { namespace Security { namespace AccessToken { namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { - LOG_CORE, SECURITY_DOMAIN_PRIVACY, "TokenCallbackStub" -}; static const int32_t LIST_SIZE_MAX = 200; static const int32_t FAILED = -1; } @@ -38,10 +35,10 @@ static std::string to_utf8(std::u16string str16) int32_t TokenCallbackStub::OnRemoteRequest( uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Entry, code: 0x%{public}x", code); + LOGD(ATM_DOMAIN, ATM_TAG, "Entry, code: 0x%{public}x", code); std::u16string descriptor = data.ReadInterfaceToken(); if (descriptor != ITokenCallback::GetDescriptor()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str()); + LOGE(ATM_DOMAIN, ATM_TAG, "Get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str()); return ERROR_IPC_REQUEST_FAIL; } @@ -49,7 +46,7 @@ int32_t TokenCallbackStub::OnRemoteRequest( if (msgCode == ITokenCallback::GRANT_RESULT_CALLBACK) { uint32_t permListSize = data.ReadUint32(); if (permListSize > LIST_SIZE_MAX) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Read permListSize fail %{public}u", permListSize); + LOGE(ATM_DOMAIN, ATM_TAG, "Read permListSize fail %{public}u", permListSize); return FAILED; } std::vector permList; @@ -61,7 +58,7 @@ int32_t TokenCallbackStub::OnRemoteRequest( uint32_t statusListSize = data.ReadUint32(); if (statusListSize != permListSize) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Read statusListSize fail %{public}u", statusListSize); + LOGE(ATM_DOMAIN, ATM_TAG, "Read statusListSize fail %{public}u", statusListSize); return FAILED; } std::vector grantResults; diff --git a/interfaces/innerkits/tokensync/src/token_sync_kit.cpp b/interfaces/innerkits/tokensync/src/token_sync_kit.cpp index f66f2dd1c..e3c6321ae 100644 --- a/interfaces/innerkits/tokensync/src/token_sync_kit.cpp +++ b/interfaces/innerkits/tokensync/src/token_sync_kit.cpp @@ -18,7 +18,7 @@ #include #include -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "constant_common.h" #include "token_sync_manager_client.h" @@ -27,26 +27,22 @@ namespace Security { namespace AccessToken { using namespace std; -namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "TokenSyncKit"}; -} // namespace - int TokenSyncKit::GetRemoteHapTokenInfo(const std::string& deviceID, AccessTokenID tokenID) { - ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, deviceID=%{public}s tokenID=%{public}d", + LOGI(ATM_DOMAIN, ATM_TAG, "%{public}s called, deviceID=%{public}s tokenID=%{public}d", __func__, ConstantCommon::EncryptDevId(deviceID).c_str(), tokenID); return TokenSyncManagerClient::GetInstance().GetRemoteHapTokenInfo(deviceID, tokenID); } int TokenSyncKit::DeleteRemoteHapTokenInfo(AccessTokenID tokenID) { - ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, tokenID=%{public}d", __func__, tokenID); + LOGI(ATM_DOMAIN, ATM_TAG, "%{public}s called, tokenID=%{public}d", __func__, tokenID); return TokenSyncManagerClient::GetInstance().DeleteRemoteHapTokenInfo(tokenID); } int TokenSyncKit::UpdateRemoteHapTokenInfo(const HapTokenInfoForSync& tokenInfo) { - ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called tokenID=%{public}d", __func__, tokenInfo.baseInfo.tokenID); + LOGI(ATM_DOMAIN, ATM_TAG, "%{public}s called tokenID=%{public}d", __func__, tokenInfo.baseInfo.tokenID); return TokenSyncManagerClient::GetInstance().UpdateRemoteHapTokenInfo(tokenInfo); } } // namespace AccessToken diff --git a/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp b/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp index bc7133304..3df4841c8 100644 --- a/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp +++ b/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp @@ -15,7 +15,7 @@ #include "token_sync_manager_client.h" -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "hap_token_info_for_sync_parcel.h" #include "iservice_registry.h" #include "token_sync_manager_proxy.h" @@ -24,7 +24,6 @@ namespace OHOS { namespace Security { namespace AccessToken { namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "TokenSyncManagerClient"}; std::recursive_mutex g_instanceMutex; } // namespace @@ -46,15 +45,15 @@ TokenSyncManagerClient::TokenSyncManagerClient() TokenSyncManagerClient::~TokenSyncManagerClient() { - ACCESSTOKEN_LOG_ERROR(LABEL, "~TokenSyncManagerClient"); + LOGE(ATM_DOMAIN, ATM_TAG, "~TokenSyncManagerClient"); } int TokenSyncManagerClient::GetRemoteHapTokenInfo(const std::string& deviceID, AccessTokenID tokenID) const { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Called"); + LOGD(ATM_DOMAIN, ATM_TAG, "Called"); auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return TOKEN_SYNC_IPC_ERROR; } return proxy->GetRemoteHapTokenInfo(deviceID, tokenID); @@ -62,10 +61,10 @@ int TokenSyncManagerClient::GetRemoteHapTokenInfo(const std::string& deviceID, A int TokenSyncManagerClient::DeleteRemoteHapTokenInfo(AccessTokenID tokenID) const { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Called"); + LOGD(ATM_DOMAIN, ATM_TAG, "Called"); auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return TOKEN_SYNC_IPC_ERROR; } return proxy->DeleteRemoteHapTokenInfo(tokenID); @@ -73,10 +72,10 @@ int TokenSyncManagerClient::DeleteRemoteHapTokenInfo(AccessTokenID tokenID) cons int TokenSyncManagerClient::UpdateRemoteHapTokenInfo(const HapTokenInfoForSync& tokenInfo) const { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Called"); + LOGD(ATM_DOMAIN, ATM_TAG, "Called"); auto proxy = GetProxy(); if (proxy == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Proxy is null"); + LOGE(ATM_DOMAIN, ATM_TAG, "Proxy is null"); return TOKEN_SYNC_IPC_ERROR; } return proxy->UpdateRemoteHapTokenInfo(tokenInfo); @@ -86,20 +85,20 @@ sptr TokenSyncManagerClient::GetProxy() const { auto sam = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sam == nullptr) { - ACCESSTOKEN_LOG_WARN(LABEL, "GetSystemAbilityManager is null"); + LOGW(ATM_DOMAIN, ATM_TAG, "GetSystemAbilityManager is null"); return nullptr; } auto tokensyncSa = sam->GetSystemAbility(ITokenSyncManager::SA_ID_TOKENSYNC_MANAGER_SERVICE); if (tokensyncSa == nullptr) { - ACCESSTOKEN_LOG_WARN(LABEL, "GetSystemAbility %{public}d is null", + LOGW(ATM_DOMAIN, ATM_TAG, "GetSystemAbility %{public}d is null", ITokenSyncManager::SA_ID_TOKENSYNC_MANAGER_SERVICE); return nullptr; } auto proxy = new TokenSyncManagerProxy(tokensyncSa); if (proxy == nullptr) { - ACCESSTOKEN_LOG_WARN(LABEL, "Iface_cast get null"); + LOGW(ATM_DOMAIN, ATM_TAG, "Iface_cast get null"); return nullptr; } return proxy; diff --git a/interfaces/innerkits/tokensync/src/token_sync_manager_proxy.cpp b/interfaces/innerkits/tokensync/src/token_sync_manager_proxy.cpp index 8876c2372..7c9168a04 100644 --- a/interfaces/innerkits/tokensync/src/token_sync_manager_proxy.cpp +++ b/interfaces/innerkits/tokensync/src/token_sync_manager_proxy.cpp @@ -15,17 +15,13 @@ #include "token_sync_manager_proxy.h" -#include "accesstoken_log.h" +#include "accesstoken_common_log.h" #include "parcel.h" #include "string_ex.h" namespace OHOS { namespace Security { namespace AccessToken { -namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "TokenSyncManagerProxy"}; -} - TokenSyncManagerProxy::TokenSyncManagerProxy(const sptr& impl) : IRemoteProxy(impl) {} @@ -37,11 +33,11 @@ int TokenSyncManagerProxy::GetRemoteHapTokenInfo(const std::string& deviceID, Ac MessageParcel data; data.WriteInterfaceToken(ITokenSyncManager::GetDescriptor()); if (!data.WriteString(deviceID)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write deviceID"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to write deviceID"); return TOKEN_SYNC_PARAMS_INVALID; } if (!data.WriteUint32(tokenID)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write tokenID"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to write tokenID"); return TOKEN_SYNC_PARAMS_INVALID; } @@ -49,18 +45,18 @@ int TokenSyncManagerProxy::GetRemoteHapTokenInfo(const std::string& deviceID, Ac MessageOption option(MessageOption::TF_SYNC); sptr remote = Remote(); if (remote == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Remote service null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Remote service null."); return TOKEN_SYNC_IPC_ERROR; } int32_t requestResult = remote->SendRequest(static_cast( TokenSyncInterfaceCode::GET_REMOTE_HAP_TOKEN_INFO), data, reply, option); if (requestResult != NO_ERROR) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Send request fail, result: %{public}d", requestResult); + LOGE(ATM_DOMAIN, ATM_TAG, "Send request fail, result: %{public}d", requestResult); return TOKEN_SYNC_IPC_ERROR; } int32_t result = reply.ReadInt32(); - ACCESSTOKEN_LOG_DEBUG(LABEL, "Get result from server data = %{public}d", result); + LOGD(ATM_DOMAIN, ATM_TAG, "Get result from server data = %{public}d", result); return result; } @@ -69,7 +65,7 @@ int TokenSyncManagerProxy::DeleteRemoteHapTokenInfo(AccessTokenID tokenID) MessageParcel data; data.WriteInterfaceToken(ITokenSyncManager::GetDescriptor()); if (!data.WriteUint32(tokenID)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write tokenID"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to write tokenID"); return TOKEN_SYNC_PARAMS_INVALID; } @@ -77,18 +73,18 @@ int TokenSyncManagerProxy::DeleteRemoteHapTokenInfo(AccessTokenID tokenID) MessageOption option(MessageOption::TF_SYNC); sptr remote = Remote(); if (remote == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Remote service null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Remote service null."); return TOKEN_SYNC_IPC_ERROR; } int32_t requestResult = remote->SendRequest(static_cast( TokenSyncInterfaceCode::DELETE_REMOTE_HAP_TOKEN_INFO), data, reply, option); if (requestResult != NO_ERROR) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Send request fail, result: %{public}d", requestResult); + LOGE(ATM_DOMAIN, ATM_TAG, "Send request fail, result: %{public}d", requestResult); return TOKEN_SYNC_IPC_ERROR; } int32_t result = reply.ReadInt32(); - ACCESSTOKEN_LOG_DEBUG(LABEL, "Get result from server data = %{public}d", result); + LOGD(ATM_DOMAIN, ATM_TAG, "Get result from server data = %{public}d", result); return result; } @@ -101,7 +97,7 @@ int TokenSyncManagerProxy::UpdateRemoteHapTokenInfo(const HapTokenInfoForSync& t tokenInfoParcel.hapTokenInfoForSyncParams = tokenInfo; if (!data.WriteParcelable(&tokenInfoParcel)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write tokenInfo"); + LOGE(ATM_DOMAIN, ATM_TAG, "Failed to write tokenInfo"); return TOKEN_SYNC_PARAMS_INVALID; } @@ -109,18 +105,18 @@ int TokenSyncManagerProxy::UpdateRemoteHapTokenInfo(const HapTokenInfoForSync& t MessageOption option(MessageOption::TF_SYNC); sptr remote = Remote(); if (remote == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Remote service null."); + LOGE(ATM_DOMAIN, ATM_TAG, "Remote service null."); return TOKEN_SYNC_IPC_ERROR; } int32_t requestResult = remote->SendRequest(static_cast( TokenSyncInterfaceCode::UPDATE_REMOTE_HAP_TOKEN_INFO), data, reply, option); if (requestResult != NO_ERROR) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Send request fail, result: %{public}d", requestResult); + LOGE(ATM_DOMAIN, ATM_TAG, "Send request fail, result: %{public}d", requestResult); return TOKEN_SYNC_IPC_ERROR; } int32_t result = reply.ReadInt32(); - ACCESSTOKEN_LOG_DEBUG(LABEL, "Get result from server data = %{public}d", result); + LOGD(ATM_DOMAIN, ATM_TAG, "Get result from server data = %{public}d", result); return result; } } // namespace AccessToken -- Gitee