From 77a2145e7a266c443fc1377fbb8f9918dbfba7ae Mon Sep 17 00:00:00 2001 From: l00520400 Date: Tue, 25 Jan 2022 20:42:50 +0800 Subject: [PATCH 1/4] update test Signed-off-by: l00520400 Change-Id: I817210f2232dbd6c8cf974ab35f832e81831e03f --- .../unittest/src/nativetoken_kit_test.cpp | 42 ++----------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp index 3320426c3..74b986ccf 100644 --- a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp +++ b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp @@ -34,7 +34,6 @@ void TokenLibKitTest::TearDownTestCase() void TokenLibKitTest::SetUp() { g_isNativeTokenInited = 0; - (void)remove(TOKEN_ID_CFG_FILE_PATH); } void TokenLibKitTest::TearDown() @@ -221,15 +220,11 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId005, TestSize.Level1) HWTEST_F(TokenLibKitTest, GetAccessTokenId006, TestSize.Level1) { uint64_t tokenID; - NativeAtIdEx *tokenIdEx = (NativeAtIdEx *)(&tokenID); tokenID = Start("GetAccessTokenId006"); - - int ret = strcmp("GetAccessTokenId006", g_tokenListHead->next->processName); - ASSERT_EQ(ret, 0); - ASSERT_EQ(tokenIdEx->tokenId, g_tokenListHead->next->tokenId); + ASSERT_NE(tokenID, 0); char *fileBuff = nullptr; - ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); + int ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); ASSERT_EQ(ret, ATRET_SUCCESS); string s = "GetAccessTokenId006"; char *pos = strstr(fileBuff, s.c_str()); @@ -271,33 +266,6 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId007, TestSize.Level1) */ HWTEST_F(TokenLibKitTest, GetAccessTokenId008, TestSize.Level1) { - char *fileBuff = nullptr; - int ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); - ASSERT_EQ(ret, 0); - if (fileBuff != nullptr) { - char *pos = strstr(fileBuff, "process1"); - ASSERT_EQ(pos, nullptr); - pos = strstr(fileBuff, "process2"); - ASSERT_EQ(pos, nullptr); - pos = strstr(fileBuff, "process3"); - ASSERT_EQ(pos, nullptr); - pos = strstr(fileBuff, "process4"); - ASSERT_EQ(pos, nullptr); - pos = strstr(fileBuff, "process5"); - ASSERT_EQ(pos, nullptr); - pos = strstr(fileBuff, "process6"); - ASSERT_EQ(pos, nullptr); - pos = strstr(fileBuff, "process7"); - ASSERT_EQ(pos, nullptr); - pos = strstr(fileBuff, "process8"); - ASSERT_EQ(pos, nullptr); - pos = strstr(fileBuff, "process9"); - ASSERT_EQ(pos, nullptr); - pos = strstr(fileBuff, "foundation"); - ASSERT_EQ(pos, nullptr); - free(fileBuff); - } - Start("process1"); Start("process2"); Start("process3"); @@ -315,9 +283,9 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId008, TestSize.Level1) Start("process18"); Start("process19"); - ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); + char *fileBuff = nullptr; + int ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); ASSERT_EQ(ret, 0); - GTEST_LOG_(INFO) << "fileBuff" << fileBuff; char *pos = strstr(fileBuff, "process1"); ASSERT_NE(pos, nullptr); pos = strstr(fileBuff, "process2"); @@ -336,7 +304,5 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId008, TestSize.Level1) ASSERT_NE(pos, nullptr); pos = strstr(fileBuff, "process9"); ASSERT_NE(pos, nullptr); - pos = strstr(fileBuff, "foundation"); - ASSERT_NE(pos, nullptr); free(fileBuff); } -- Gitee From cb0bd87f83263baf1364fa6da4b6f0714fadc066 Mon Sep 17 00:00:00 2001 From: l00520400 Date: Wed, 26 Jan 2022 11:57:37 +0800 Subject: [PATCH 2/4] update firstcaller Signed-off-by: l00520400 Change-Id: I5e25ebe92d71fd932766a06b7c6cc560af9562f3 Signed-off-by: l00520400 --- interfaces/innerkits/accesstoken/include/access_token.h | 1 + interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h index bd69ff1d3..d4b050ed7 100644 --- a/interfaces/innerkits/accesstoken/include/access_token.h +++ b/interfaces/innerkits/accesstoken/include/access_token.h @@ -23,6 +23,7 @@ typedef unsigned int AccessTokenID; typedef unsigned int AccessTokenAttr; static const int DEFAULT_TOKEN_VERSION = 1; static const int DEFAULT_PERMISSION_FLAGS = 0; +static const int FIRSTCALLER_TOKENID_DEFAULT = 0; enum AccessTokenKitRet { RET_FAILED = -1, diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp index 336687a94..2fa8408f3 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp @@ -147,7 +147,14 @@ int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::string& int AccessTokenKit::VerifyAccessToken( AccessTokenID callerTokenID, AccessTokenID firstTokenID, const std::string& permissionName) { - return PERMISSION_DENIED; + int ret = AccessTokenKit::VerifyAccessToken(callerTokenID, permissionName); + if (ret != PERMISSION_GRANTED) { + return ret; + } + if (firstTokenID == FIRSTCALLER_TOKENID_DEFAULT) { + return ret; + } + return AccessTokenKit::VerifyAccessToken(firstTokenID, permissionName); } int AccessTokenKit::GetDefPermission(const std::string& permissionName, PermissionDef& permissionDefResult) -- Gitee From cb06aab95358c75fa5ca0fc242d2493f17b058cf Mon Sep 17 00:00:00 2001 From: chennian Date: Thu, 27 Jan 2022 07:15:01 +0000 Subject: [PATCH 3/4] Signed-off-by:chennian --- .../src/main/ets/dynamic/common/components/dialog.ets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets index 8834e2d31..4e2b9c282 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets @@ -130,8 +130,7 @@ export struct privacyDialog { featureAbility.getWant((err, want) => { this.reqPerms = want.parameters['ohos.user.grant.permission'] this.accessTokenId = want.parameters['ohos.aafwk.param.callToken'] - console.log("GrantAbility request permission=" + JSON.stringify(this.reqPerms) + " tokenId = " - + this.accessTokenId + "want.parameters = " + JSON.stringify(want.parameters)) + console.log("GrantAbility request permission=" + JSON.stringify(this.reqPerms) + " tokenId = " + this.accessTokenId)) this.reqPerms.forEach(item => { var group = getPermissionGroup(item) if(!group) { -- Gitee From fd61ada2d5b5ece138bb731385d33e268d1bcc70 Mon Sep 17 00:00:00 2001 From: jiang-xiaofeng Date: Thu, 27 Jan 2022 23:48:54 +0800 Subject: [PATCH 4/4] fix compile error Signed-off-by:jiang-xiaofeng Signed-off-by: jiang-xiaofeng --- .../permissionmanager/src/main/config.json | 3 +-- .../src/main/ets/dynamic/common/components/dialog.ets | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json index eb73d812e..ae7cebf54 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json @@ -25,7 +25,6 @@ { "visible": true, "name": "com.ohos.permissionmanager.GrantAbility", - "icon": "$media:icon", "description": "$string:grantability_description", "label": "$string:permissionmanager_GrantAbility", "type": "page", @@ -64,4 +63,4 @@ } ] } -} \ No newline at end of file +} diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets index 4e2b9c282..677a4a5d6 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets @@ -130,7 +130,7 @@ export struct privacyDialog { featureAbility.getWant((err, want) => { this.reqPerms = want.parameters['ohos.user.grant.permission'] this.accessTokenId = want.parameters['ohos.aafwk.param.callToken'] - console.log("GrantAbility request permission=" + JSON.stringify(this.reqPerms) + " tokenId = " + this.accessTokenId)) + console.log("GrantAbility request permission=" + JSON.stringify(this.reqPerms) + " tokenId = " + this.accessTokenId) this.reqPerms.forEach(item => { var group = getPermissionGroup(item) if(!group) { -- Gitee