openharmony/startup_appspawn
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_appspawn synced 2024-11-30 10:40:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sandbox secure check and code clean

Browse Source 
Signed-off-by: wangxutao <wangxutao5@huawei.com>
This commit is contained in:
wangxutao 2023-07-19 14:28:31 +08:00
parent abad58894a
commit d14912a9a3
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
adapter/appspawn_nweb.cpp
View File

@ -131,25 +131,14 @@ void LoadExtendLibNweb(AppSpawnContent *content)
{
const std::string loadLibDir = GetNWebHapLibsPath();
APPSPAWN_LOGI("get nweb hap lib path success, path = %{public}s", loadLibDir.c_str());
int repeatCount = 0;
#ifdef __MUSL__
Dl_namespace dlns;
dlns_init(&dlns, "nweb_ns");
dlns_create(&dlns, loadLibDir.c_str());
#if defined(webview_x86_64)
void *handle = dlopen_ns(&dlns, "libweb_engine.so", RTLD_NOW | RTLD_GLOBAL);
while (handle == nullptr && repeatCount < DLOPEN_REPEAT_TIMES) {
sleep(1);
handle = dlopen_ns(&dlns, "libweb_engine.so", RTLD_NOW | RTLD_GLOBAL);
++repeatCount;
}
#else
void *handle = LoadWithRelroFile("libweb_engine.so", "nweb_ns", loadLibDir);
while (handle == nullptr && repeatCount < DLOPEN_REPEAT_TIMES) {
sleep(1);
handle = LoadWithRelroFile("libweb_engine.so", "nweb_ns", loadLibDir);
++repeatCount;
}
if (handle == nullptr) {
APPSPAWN_LOGE("dlopen_ns_ext failed, fallback to dlopen_ns");
handle = dlopen_ns(&dlns, "libweb_engine.so", RTLD_NOW | RTLD_GLOBAL);
@ -158,33 +147,17 @@ void LoadExtendLibNweb(AppSpawnContent *content)
#else
const std::string engineLibDir = loadLibDir + "/libweb_engine.so";
void *handle = dlopen(engineLibDir.c_str(), RTLD_NOW | RTLD_GLOBAL);
while (handle == nullptr && repeatCount < DLOPEN_REPEAT_TIMES) {
sleep(1);
handle = dlopen(engineLibDir.c_str(), RTLD_NOW | RTLD_GLOBAL);
++repeatCount;
}
#endif
if (handle == nullptr) {
APPSPAWN_LOGE("Fail to dlopen libweb_engine.so, [%{public}s]", dlerror());
} else {
APPSPAWN_LOGI("Success to dlopen libweb_engine.so");
}
repeatCount = 0;
#ifdef __MUSL__
g_nwebHandle = dlopen_ns(&dlns, "libnweb_render.so", RTLD_NOW | RTLD_GLOBAL);
while (g_nwebHandle == nullptr && repeatCount < DLOPEN_REPEAT_TIMES) {
sleep(1);
handle = dlopen_ns(&dlns, "libnweb_render.so", RTLD_NOW | RTLD_GLOBAL);
++repeatCount;
}
#else
const std::string renderLibDir = loadLibDir + "/libnweb_render.so";
g_nwebHandle = dlopen(renderLibDir.c_str(), RTLD_NOW | RTLD_GLOBAL);
while (g_nwebHandle == nullptr && repeatCount < DLOPEN_REPEAT_TIMES) {
sleep(1);
handle = dlopen(renderLibDir.c_str(), RTLD_NOW | RTLD_GLOBAL);
++repeatCount;
}
#endif
if (g_nwebHandle == nullptr) {
APPSPAWN_LOGE("Fail to dlopen libnweb_render.so, [%{public}s]", dlerror());

1
util/src/sandbox_utils.cpp
View File

@ -996,7 +996,6 @@ int32_t SandboxUtils::MountAllGroup(const ClientSocket::AppProperty *appProperty
APPSPAWN_CHECK(dataGroupIds[i].is_string() && gids[i].is_string() && dirs[i].is_string(),
return -1, "MountAllGroup: element type error");
std::string gid = gids[i];
std::string libPhysicalPath = dirs[i];
APPSPAWN_CHECK(!CheckPath(libPhysicalPath), return -1, "MountAllGroup: path error");