From e5ab14057e8646769e417ac1b2580bb22cd50605 Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Fri, 14 Jan 2022 17:58:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AE=BE=E7=BD=AEtoken=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- BUILD.gn | 1 + interfaces/innerkits/include/client_socket.h | 1 + src/appspawn_server.cpp | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index d0e4d285..168fc053 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -64,6 +64,7 @@ ohos_static_library("appspawn_server") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "access_token:accesstoken_build_module", ] subsystem_name = "${subsystem_name}" diff --git a/interfaces/innerkits/include/client_socket.h b/interfaces/innerkits/include/client_socket.h index 2706a7c3..aeaa79f8 100644 --- a/interfaces/innerkits/include/client_socket.h +++ b/interfaces/innerkits/include/client_socket.h @@ -95,6 +95,7 @@ public: uint32_t gidCount; // the size of gidTable char processName[LEN_PROC_NAME]; // process name char soPath[LEN_SO_PATH]; // so lib path + uint32_t tokenId; }; private: diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 38ccf1e4..e138c2b2 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -27,6 +27,7 @@ #include "hilog/log.h" #include "main_thread.h" #include "securec.h" +#include "token_setproc.h" #include #include @@ -426,6 +427,11 @@ bool AppSpawnServer::SetAppProcProperty(int connectFd, const ClientSocket::AppPr return false; } + ret = SetSelfTokenID(appProperty->tokenId); + if(ret != 0) { + HiLog::Error(LABEL, "AppSpawnServer::Failed to set access token id, errno = %{public}d", errno); + } + #ifdef GRAPHIC_PERMISSION_CHECK ret = SetUidGid(appProperty->uid, appProperty->gid, appProperty->gidTable, appProperty->gidCount); if (FAILED(ret)) { -- Gitee From 20b8585cfdd3c22ed704b77df123ce1e7bbe0aed Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Fri, 14 Jan 2022 18:59:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=BE=E7=BD=AEtoken=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- src/appspawn_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index e138c2b2..92f5aa24 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -428,7 +428,7 @@ bool AppSpawnServer::SetAppProcProperty(int connectFd, const ClientSocket::AppPr } ret = SetSelfTokenID(appProperty->tokenId); - if(ret != 0) { + if (ret != 0) { HiLog::Error(LABEL, "AppSpawnServer::Failed to set access token id, errno = %{public}d", errno); } -- Gitee From 6563c07c2e63aa460f3e387c87e399158c661709 Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Mon, 17 Jan 2022 16:23:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- BUILD.gn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 168fc053..a42e27e7 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -33,13 +33,17 @@ config("appspawn_config") { "${aafwk_path}/frameworks/kits/ability/native/include", "${aafwk_path}/services/abilitymgr/include", "${distributedschedule_path}/services/dtbschedmgr/include", + "//base/security/access_token/interfaces/innerkits/token_setproc/include", ] } ohos_executable("appspawn") { sources = [ "${appspawn_path}/src/main.cpp" ] configs = [ ":appspawn_config" ] - deps = [ "${appspawn_path}:appspawn_server" ] + deps = [ + "${appspawn_path}:appspawn_server", + "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", + ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] install_enable = true @@ -64,7 +68,6 @@ ohos_static_library("appspawn_server") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "access_token:accesstoken_build_module", ] subsystem_name = "${subsystem_name}" -- Gitee From 8719c60886dcee48a8e164c7a8f5c7fce8c87577 Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Tue, 18 Jan 2022 10:53:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index a42e27e7..53f7bdc1 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -42,7 +42,7 @@ ohos_executable("appspawn") { configs = [ ":appspawn_config" ] deps = [ "${appspawn_path}:appspawn_server", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", + "//base/security/access_token/interfaces/innerkits/token_setproc:libtokensync_sdk", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] -- Gitee From a9f707aec645ca78004e442f3e90a2e57e1248ee Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Tue, 18 Jan 2022 15:24:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 53f7bdc1..a42e27e7 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -42,7 +42,7 @@ ohos_executable("appspawn") { configs = [ ":appspawn_config" ] deps = [ "${appspawn_path}:appspawn_server", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtokensync_sdk", + "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] -- Gitee From 5820e4fd62cbf5851510b8a5cd88123109bc0523 Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Tue, 18 Jan 2022 16:06:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index a42e27e7..a4d51824 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -33,13 +33,13 @@ config("appspawn_config") { "${aafwk_path}/frameworks/kits/ability/native/include", "${aafwk_path}/services/abilitymgr/include", "${distributedschedule_path}/services/dtbschedmgr/include", - "//base/security/access_token/interfaces/innerkits/token_setproc/include", ] } ohos_executable("appspawn") { sources = [ "${appspawn_path}/src/main.cpp" ] configs = [ ":appspawn_config" ] + include_dirs = [ "//base/security/access_token/interfaces/innerkits/token_setproc/include" ] deps = [ "${appspawn_path}:appspawn_server", "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", -- Gitee