From 6ff5001987cf6a98481014786915ab9067bd7794 Mon Sep 17 00:00:00 2001 From: dy_study Date: Mon, 16 May 2022 15:37:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?IssueNo:#I57IWN=20Description:ability=5Fbas?= =?UTF-8?q?e=E7=9B=AE=E5=BD=95=E6=95=B4=E6=94=B9=E5=8F=8A=E5=91=A8?= =?UTF-8?q?=E8=BE=B9=E5=AD=90=E7=B3=BB=E7=BB=9F=E4=BE=9D=E8=B5=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=20Sig:SIG=5FApplicationFramework=20Feature?= =?UTF-8?q?=20or=20Bugfix:Feature=20Binary=20Source:=20No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dy_study Change-Id: Ic30cdecec9ba53abd276c395c22204874a900f92 --- .../tokensyncmanager/test/unittest/token_sync_service/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn index f82e50b60..420f832ec 100644 --- a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn +++ b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn @@ -75,7 +75,6 @@ ohos_unittest("libtoken_sync_service_sdk_test") { "//base/security/access_token/frameworks/common:accesstoken_common_cxx", "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//third_party/zlib:libz", "//utils/native/base:utils", -- Gitee From 807271ad49fc03f27bf5ce5c7ee208c9630a694a Mon Sep 17 00:00:00 2001 From: lsq Date: Wed, 18 May 2022 16:35:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=AB=98=E6=9D=83=E9=99=90=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lsq Change-Id: I973fdebc01678f52d65dc7b1a43d6091bae0c6d8 --- services/accesstokenmanager/access_token.cfg | 6 +++--- services/accesstokenmanager/access_token.rc | 4 ++-- .../main/cpp/include/database/sqlite_storage.h | 2 +- services/tokensyncmanager/token_sync.cfg | 4 ++-- services/tokensyncmanager/token_sync.rc | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/services/accesstokenmanager/access_token.cfg b/services/accesstokenmanager/access_token.cfg index 14bcdaa1e..fc617a465 100644 --- a/services/accesstokenmanager/access_token.cfg +++ b/services/accesstokenmanager/access_token.cfg @@ -2,7 +2,7 @@ "jobs" : [{ "name" : "pre-init", "cmds" : [ - "mkdir /data/service/el0/access_token 0750 root system", + "mkdir /data/service/el0/access_token 0750 root access_token", "load_access_token_id " ] } @@ -11,8 +11,8 @@ "name" : "accesstoken_service", "path" : ["/system/bin/sa_main", "/system/profile/accesstoken_service.xml"], "importance" : -20, - "uid" : "system", - "gid" : ["system"], + "uid" : "access_token", + "gid" : ["access_token"], "secon" : "u:r:accesstoken_service:s0" } ] diff --git a/services/accesstokenmanager/access_token.rc b/services/accesstokenmanager/access_token.rc index 2194d40d5..15ff9d773 100644 --- a/services/accesstokenmanager/access_token.rc +++ b/services/accesstokenmanager/access_token.rc @@ -17,6 +17,6 @@ on late-fs service accesstoken_service /system/bin/sa_main /system/profile/accesstoken_service.xml class accesstoken_service priority -20 - user system - group system + user access_token + group access_token seclabel u:r:accesstoken_service:s0 diff --git a/services/accesstokenmanager/main/cpp/include/database/sqlite_storage.h b/services/accesstokenmanager/main/cpp/include/database/sqlite_storage.h index 95a04ab61..1cb890402 100644 --- a/services/accesstokenmanager/main/cpp/include/database/sqlite_storage.h +++ b/services/accesstokenmanager/main/cpp/include/database/sqlite_storage.h @@ -78,7 +78,7 @@ private: inline static const std::string PERMISSION_DEF_TABLE = "permission_definition_table"; inline static const std::string PERMISSION_STATE_TABLE = "permission_state_table"; inline static const std::string DATABASE_NAME = "access_token.db"; - inline static const std::string DATABASE_PATH = "/data/system/"; + inline static const std::string DATABASE_PATH = "/data/system/access_token/"; static const int DATABASE_VERSION = 1; }; } // namespace AccessToken diff --git a/services/tokensyncmanager/token_sync.cfg b/services/tokensyncmanager/token_sync.cfg index e61f7e5a9..4407547a1 100644 --- a/services/tokensyncmanager/token_sync.cfg +++ b/services/tokensyncmanager/token_sync.cfg @@ -10,8 +10,8 @@ "name" : "token_sync_service", "path" : ["/system/bin/sa_main", "/system/profile/token_sync_service.xml"], "importance" : -20, - "uid" : "system", - "gid" : ["system"], + "uid" : "access_token", + "gid" : ["access_token"], "secon" : "u:r:token_sync_service:s0" } ] diff --git a/services/tokensyncmanager/token_sync.rc b/services/tokensyncmanager/token_sync.rc index 28f9b0a06..ceb0cd61e 100644 --- a/services/tokensyncmanager/token_sync.rc +++ b/services/tokensyncmanager/token_sync.rc @@ -17,6 +17,6 @@ on late-fs service token_sync_service /system/bin/sa_main /system/profile/token_sync_service.xml class token_sync_service priority -20 - user system - group system + user access_token + group access_token seclabel u:r:token_sync_service:s0 -- Gitee