From 6de5a447acdd71196f22dd9cc44ed8e203b705cb Mon Sep 17 00:00:00 2001 From: cc_ggboy Date: Tue, 23 Aug 2022 10:25:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?tokentyp=E6=96=B0=E5=A2=9E=E8=BE=B9?= =?UTF-8?q?=E7=95=8C=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cc_ggboy --- interfaces/innerkits/accesstoken/include/access_token.h | 1 + .../main/cpp/src/token/accesstoken_remote_token_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h index 383cd6c73..6cc15595e 100644 --- a/interfaces/innerkits/accesstoken/include/access_token.h +++ b/interfaces/innerkits/accesstoken/include/access_token.h @@ -46,6 +46,7 @@ typedef enum TypeATokenTypeEnum { TOKEN_HAP = 0, TOKEN_NATIVE, TOKEN_SHELL, + TOKEN_TYPE_BUTT, } ATokenTypeEnum; typedef enum TypeATokenAplEnum { diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp index 19bf0a493..e819ba85b 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp @@ -48,7 +48,7 @@ AccessTokenID AccessTokenRemoteTokenManager::MapRemoteDeviceTokenToLocal(const s return 0; } ATokenTypeEnum tokeType = AccessTokenIDManager::GetInstance().GetTokenIdTypeEnum(remoteID); - if ((tokeType < TOKEN_HAP) || (tokeType > TOKEN_SHELL)) { + if ((tokeType < TOKEN_INVALID) || (tokeType > TOKEN_TYPE_BUTT)) { ACCESSTOKEN_LOG_ERROR( LABEL, "token %{public}x type is invalid.", remoteID); return 0; -- Gitee From a5856627313406b21e9ed6323198200a7cc7859d Mon Sep 17 00:00:00 2001 From: cc_ggboy Date: Tue, 23 Aug 2022 10:35:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?tokentyp=E6=96=B0=E5=A2=9E=E8=BE=B9?= =?UTF-8?q?=E7=95=8C=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cc_ggboy --- .../main/cpp/src/token/accesstoken_remote_token_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp index e819ba85b..1dc737bcd 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp @@ -48,7 +48,7 @@ AccessTokenID AccessTokenRemoteTokenManager::MapRemoteDeviceTokenToLocal(const s return 0; } ATokenTypeEnum tokeType = AccessTokenIDManager::GetInstance().GetTokenIdTypeEnum(remoteID); - if ((tokeType < TOKEN_INVALID) || (tokeType > TOKEN_TYPE_BUTT)) { + if ((tokeType <= TOKEN_INVALID) || (tokeType >= TOKEN_TYPE_BUTT)) { ACCESSTOKEN_LOG_ERROR( LABEL, "token %{public}x type is invalid.", remoteID); return 0; -- Gitee