From 710e6fc557cbd85fde11f6e083ab6e87b2e6b403 Mon Sep 17 00:00:00 2001 From: nianyuu Date: Tue, 25 Feb 2025 20:29:15 +0800 Subject: [PATCH] fix diff and sync code Signed-off-by: nianyuu --- appdata-sandbox-asan.json | 2 +- appdata-sandbox64.json | 4 ++-- modules/sandbox/appspawn_sandbox.c | 1 - modules/sandbox/sandbox_utils.cpp | 4 ++-- standard/BUILD.gn | 18 ++---------------- standard/appspawn_service.c | 2 -- .../app_spawn_service_test.cpp | 2 +- 7 files changed, 8 insertions(+), 25 deletions(-) diff --git a/appdata-sandbox-asan.json b/appdata-sandbox-asan.json index 06c592a4..0fb704fa 100755 --- a/appdata-sandbox-asan.json +++ b/appdata-sandbox-asan.json @@ -2,7 +2,7 @@ "common" : [{ "top-sandbox-switch": "ON", "app-base" : [{ - "sandbox-root" : "/mnt/sandbox/", + "sandbox-root" : "/mnt/sandbox//", "sandbox-ns-flags" : [], "mount-paths" : [ { "src-path" : "/system/asan/lib", diff --git a/appdata-sandbox64.json b/appdata-sandbox64.json index 1167b464..2633f72f 100644 --- a/appdata-sandbox64.json +++ b/appdata-sandbox64.json @@ -2,7 +2,7 @@ "common" : [{ "top-sandbox-switch": "ON", "app-base" : [{ - "sandbox-root" : "/mnt/sandbox/", + "sandbox-root" : "/mnt/sandbox//", "sandbox-ns-flags" : [ "net" ], "mount-paths" : [{ "src-path" : "/system/lib64", @@ -39,7 +39,7 @@ ] }], "app-resources" : [{ - "sandbox-root" : "/mnt/sandbox/", + "sandbox-root" : "/mnt/sandbox//", "mount-paths" : [], "flags-point" : [], "symbol-links" : [] diff --git a/modules/sandbox/appspawn_sandbox.c b/modules/sandbox/appspawn_sandbox.c index 1b5dfd02..7f98cb61 100644 --- a/modules/sandbox/appspawn_sandbox.c +++ b/modules/sandbox/appspawn_sandbox.c @@ -227,7 +227,6 @@ static int InitSandboxContext(SandboxContext *context, } context->message = property->message; context->sandboxNsFlags = CLONE_NEWNS; - if (NeedNetworkIsolated(context, property)) { context->sandboxNsFlags |= sandbox->sandboxNsFlags & CLONE_NEWNET ? CLONE_NEWNET : 0; } diff --git a/modules/sandbox/sandbox_utils.cpp b/modules/sandbox/sandbox_utils.cpp index 1a6bb911..605eceb9 100644 --- a/modules/sandbox/sandbox_utils.cpp +++ b/modules/sandbox/sandbox_utils.cpp @@ -322,7 +322,7 @@ int32_t SandboxUtils::DoAppSandboxMountOnce(const char *originPath, const char * if (originPath == nullptr || destinationPath == nullptr || originPath[0] == '\0' || destinationPath[0] == '\0') { return 0; } - if (originPath != nullptr && strstr(originPath, "system/etc/hosts") != nullptr) { + if (strstr(originPath, "system/etc/hosts") != nullptr) { CheckAndCreatFile(destinationPath); } else { MakeDirRecursive(destinationPath, FILE_MODE); @@ -333,7 +333,7 @@ int32_t SandboxUtils::DoAppSandboxMountOnce(const char *originPath, const char * struct timespec mountStart = {0}; clock_gettime(CLOCK_MONOTONIC_COARSE, &mountStart); APPSPAWN_LOGV("Bind mount %{public}s to %{public}s '%{public}s' '%{public}lu' '%{public}s' '%{public}u'", - originPath, destinationPath, fsType, mountFlags, options, mountSharedFlag); + originPath, destinationPath, fsType, mountFlags, options, mountSharedFlag); ret = mount(originPath, destinationPath, fsType, mountFlags, options); struct timespec mountEnd = {0}; clock_gettime(CLOCK_MONOTONIC_COARSE, &mountEnd); diff --git a/standard/BUILD.gn b/standard/BUILD.gn index 06e35539..ae540d4d 100644 --- a/standard/BUILD.gn +++ b/standard/BUILD.gn @@ -195,14 +195,7 @@ ohos_executable("cjappspawn") { "hitrace:hitrace_meter", "init:libbegetutil", ] - if (appspawn_report_event) { - defines += [ "APPSPAWN_HISYSEVENT" ] - external_deps += [ "hisysevent:libhisysevent" ] - sources += [ - "${appspawn_path}/modules/sysevent/appspawn_hisysevent.cpp", - "${appspawn_path}/modules/sysevent/hisysevent_adapter.cpp", - ] - } + if (build_selinux) { defines += [ "WITH_SELINUX" ] external_deps += [ @@ -270,14 +263,7 @@ ohos_executable("nativespawn") { "hitrace:hitrace_meter", "init:libbegetutil", ] - if (appspawn_report_event) { - defines += [ "APPSPAWN_HISYSEVENT" ] - external_deps += [ "hisysevent:libhisysevent" ] - sources += [ - "${appspawn_path}/modules/sysevent/appspawn_hisysevent.cpp", - "${appspawn_path}/modules/sysevent/hisysevent_adapter.cpp", - ] - } + if (build_selinux) { defines += [ "WITH_SELINUX" ] external_deps += [ diff --git a/standard/appspawn_service.c b/standard/appspawn_service.c index 3401316c..aae3dd26 100644 --- a/standard/appspawn_service.c +++ b/standard/appspawn_service.c @@ -1084,7 +1084,6 @@ static void ProcessChildResponse(const WatcherHandle taskHandle, int fd, uint32_ } #endif clock_gettime(CLOCK_MONOTONIC, &appInfo->spawnEnd); - // add max info #ifdef APPSPAWN_HISYSEVENT //add process spawn duration into hisysevent,(ms) @@ -1671,7 +1670,6 @@ APPSPAWN_STATIC int AppspawnDevicedebugDeal(const char* op, int pid, cJSON *args if (strcmp(op, "kill") == 0) { return AppspawpnDevicedebugKill(pid, args); } - APPSPAWN_LOGE("appspawn devicedebug op:%{public}s invaild", op); return -1; diff --git a/test/unittest/app_spawn_standard_test/app_spawn_service_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_service_test.cpp index 18b4a860..84e41d9d 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_service_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_service_test.cpp @@ -790,7 +790,7 @@ HWTEST_F(AppSpawnServiceTest, App_Spawn_InitCommonEnv_001, TestSize.Level0) env = getenv("PATH"); EXPECT_NE(env, nullptr); if (env != nullptr) { - EXPECT_NE((uint64_t)strstr(env, "/data/app/bin:/data/service/hnp/bin"), 0); + EXPECT_NE(strstr(env, "/data/app/bin:/data/service/hnp/bin"), nullptr); } } env = getenv("HOME"); -- Gitee