From 2efeeb962073f58750cf391836dd38645df67f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8F=AF?= <like115@huawei.com>
Date: Sun, 26 Jan 2025 03:40:13 +0000
Subject: [PATCH] add
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 李可 <like115@huawei.com>
---
 modules/common/appspawn_adapter.cpp        | 106 ++++++++++-----------
 modules/nweb_adapter/nwebspawn_adapter.cpp |  24 ++---
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/modules/common/appspawn_adapter.cpp b/modules/common/appspawn_adapter.cpp
index 7f4d0395..8234a1d6 100644
--- a/modules/common/appspawn_adapter.cpp
+++ b/modules/common/appspawn_adapter.cpp
@@ -150,64 +150,64 @@ int SetSelinuxCon(const AppSpawnMgr *content, const AppSpawningCtx *property)
 
 int SetUidGidFilter(const AppSpawnMgr *content)
 {
-#ifdef WITH_SECCOMP
-    bool ret = false;
-    if (IsNWebSpawnMode(content)) {
-        if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
-            APPSPAWN_LOGE("Failed to set no new privs");
-        }
-        ret = SetSeccompPolicyWithName(INDIVIDUAL, NWEBSPAWN_NAME);
-    } else {
-#ifdef SECCOMP_PRIVILEGE
-        if (IsDeveloperModeOpen()) {
-            return 0;
-        }
-#endif
-        ret = SetSeccompPolicyWithName(INDIVIDUAL, APPSPAWN_NAME);
-    }
-    if (!ret) {
-        APPSPAWN_LOGE("Failed to set APPSPAWN seccomp filter and exit");
-        _exit(0x7f);
-    }
-    APPSPAWN_LOGV("SetUidGidFilter success");
-#endif
+// #ifdef WITH_SECCOMP
+//     bool ret = false;
+//     if (IsNWebSpawnMode(content)) {
+//         if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
+//             APPSPAWN_LOGE("Failed to set no new privs");
+//         }
+//         ret = SetSeccompPolicyWithName(INDIVIDUAL, NWEBSPAWN_NAME);
+//     } else {
+// #ifdef SECCOMP_PRIVILEGE
+//         if (IsDeveloperModeOpen()) {
+//             return 0;
+//         }
+// #endif
+//         ret = SetSeccompPolicyWithName(INDIVIDUAL, APPSPAWN_NAME);
+//     }
+//     if (!ret) {
+//         APPSPAWN_LOGE("Failed to set APPSPAWN seccomp filter and exit");
+//         _exit(0x7f);
+//     }
+//     APPSPAWN_LOGV("SetUidGidFilter success");
+// #endif
     return 0;
 }
 
 int SetSeccompFilter(const AppSpawnMgr *content, const AppSpawningCtx *property)
 {
-#ifdef WITH_SECCOMP
-    APPSPAWN_CHECK(property != nullptr, return 0, "property is NULL");
-    const char *appName = APP_NAME;
-    SeccompFilterType type = APP;
-
-    if (IsNWebSpawnMode(content)) {
-        uint32_t len = 0;
-        std::string processType =
-            reinterpret_cast<char *>(GetAppPropertyExt(property, MSG_EXT_NAME_PROCESS_TYPE, &len));
-        if (processType == "render") {
-            return 0;
-        }
-    }
-
-#ifdef SECCOMP_PRIVILEGE
-    if (IsDeveloperModeOpen()) {
-        if (CheckAppMsgFlagsSet(property, APP_FLAGS_GET_ALL_PROCESSES) != 0) {
-            appName = APP_PRIVILEGE;
-        }
-    }
-#endif
-
-    if (CheckAppMsgFlagsSet(property, APP_FLAGS_ISOLATED_SANDBOX) != 0) {
-        appName = IMF_EXTENTOIN_NAME;
-    }
-
-    if (!SetSeccompPolicyWithName(type, appName)) {
-        APPSPAWN_LOGE("Failed to set %{public}s seccomp filter and exit %{public}d", appName, errno);
-        return -EINVAL;
-    }
-    APPSPAWN_LOGV("SetSeccompFilter success for %{public}s", GetProcessName(property));
-#endif
+// #ifdef WITH_SECCOMP
+//     APPSPAWN_CHECK(property != nullptr, return 0, "property is NULL");
+//     const char *appName = APP_NAME;
+//     SeccompFilterType type = APP;
+// 
+//     if (IsNWebSpawnMode(content)) {
+//         uint32_t len = 0;
+//         std::string processType =
+//             reinterpret_cast<char *>(GetAppPropertyExt(property, MSG_EXT_NAME_PROCESS_TYPE, &len));
+//         if (processType == "render") {
+//             return 0;
+//         }
+//     }
+// 
+// #ifdef SECCOMP_PRIVILEGE
+//     if (IsDeveloperModeOpen()) {
+//         if (CheckAppMsgFlagsSet(property, APP_FLAGS_GET_ALL_PROCESSES) != 0) {
+//             appName = APP_PRIVILEGE;
+//         }
+//     }
+// #endif
+// 
+//     if (CheckAppMsgFlagsSet(property, APP_FLAGS_ISOLATED_SANDBOX) != 0) {
+//         appName = IMF_EXTENTOIN_NAME;
+//     }
+// 
+//     if (!SetSeccompPolicyWithName(type, appName)) {
+//         APPSPAWN_LOGE("Failed to set %{public}s seccomp filter and exit %{public}d", appName, errno);
+//         return -EINVAL;
+//     }
+//     APPSPAWN_LOGV("SetSeccompFilter success for %{public}s", GetProcessName(property));
+// #endif
     return 0;
 }
 
diff --git a/modules/nweb_adapter/nwebspawn_adapter.cpp b/modules/nweb_adapter/nwebspawn_adapter.cpp
index f3af3945..61d72b8d 100644
--- a/modules/nweb_adapter/nwebspawn_adapter.cpp
+++ b/modules/nweb_adapter/nwebspawn_adapter.cpp
@@ -59,18 +59,18 @@ namespace {
 
 APPSPAWN_STATIC bool SetSeccompPolicyForRenderer(void *nwebRenderHandle)
 {
-#ifdef WITH_SECCOMP
-    if (IsEnableSeccomp()) {
-        using SeccompFuncType = bool (*)(void);
-        SeccompFuncType funcSetRendererSeccompPolicy =
-                reinterpret_cast<SeccompFuncType>(dlsym(nwebRenderHandle, "SetRendererSeccompPolicy"));
-        if (funcSetRendererSeccompPolicy != nullptr && funcSetRendererSeccompPolicy()) {
-            return true;
-        }
-        APPSPAWN_LOGE("SetRendererSeccompPolicy dlsym errno: %{public}d", errno);
-        return false;
-    }
-#endif
+// #ifdef WITH_SECCOMP
+//     if (IsEnableSeccomp()) {
+//         using SeccompFuncType = bool (*)(void);
+//         SeccompFuncType funcSetRendererSeccompPolicy =
+//                 reinterpret_cast<SeccompFuncType>(dlsym(nwebRenderHandle, "SetRendererSeccompPolicy"));
+//         if (funcSetRendererSeccompPolicy != nullptr && funcSetRendererSeccompPolicy()) {
+//             return true;
+//         }
+//         APPSPAWN_LOGE("SetRendererSeccompPolicy dlsym errno: %{public}d", errno);
+//         return false;
+//     }
+// #endif
     return true;
 }
 
-- 
Gitee