openharmony/startup_appspawn
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_appspawn synced 2024-11-27 01:00:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!780 移除el2目录

Browse Source 
Merge pull request !780 from wangpggg/master
This commit is contained in:
openharmony_ci 2023-09-20 02:21:34 +00:00 committed by Gitee
commit 850bd7ca74
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 0 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/unittest/app_spawn_standard_test/app_spawn_sandbox_test.cpp
View File

@ -1051,42 +1051,6 @@ HWTEST(AppSpawnSandboxTest, App_Spawn_Sandbox_32, TestSize.Level0)
OHOS::AppSpawn::SandboxUtils::DoSandboxChmod(j_config1, sandboxRoot);
}
HWTEST(AppSpawnSandboxTest, App_Spawn_Sandbox_33, TestSize.Level0)
{
GTEST_LOG_(INFO) << "App_Spawn_Sandbox_33 start";
ClientSocket::AppProperty *m_appProperty = GetAppProperty();
m_appProperty->uid = 1000;
m_appProperty->gid = 1000;
std::string path = "/data/app/el1";
OHOS::AppSpawn::SandboxUtils::CheckAndPrepareSrcPath(m_appProperty, path);
std::string path1 = "/data/app/el2/100/base/ohos.test.bundle1";
OHOS::AppSpawn::SandboxUtils::CheckAndPrepareSrcPath(m_appProperty, path1);
std::string path2 = "/data/app/el2/100/database/ohos.test.bundle2";
OHOS::AppSpawn::SandboxUtils::CheckAndPrepareSrcPath(m_appProperty, path2);
std::string path3 = "/data/app/el2/100/test123/ohos.test.bundle3";
OHOS::AppSpawn::SandboxUtils::CheckAndPrepareSrcPath(m_appProperty, path3);
std::string path4 = "/data/serivce/el2/100/hmdfs/account/data/ohos.test.bundle4";
OHOS::AppSpawn::SandboxUtils::CheckAndPrepareSrcPath(m_appProperty, path4);
std::string path5 = "/data/serivce/el2/100/hmdfs/non_account/data/ohos.test.bundle5";
OHOS::AppSpawn::SandboxUtils::CheckAndPrepareSrcPath(m_appProperty, path5);
std::string path6 = "/data/serivce/el2/100/hmdfs/non_account/test/ohos.test.bundle6";
OHOS::AppSpawn::SandboxUtils::CheckAndPrepareSrcPath(m_appProperty, path6);
std::string path7 = "/data/app/el2/100/group/091a68a9-2cc9-4279-8849-28631b598975";
OHOS::AppSpawn::SandboxUtils::CheckAndPrepareSrcPath(m_appProperty, path7);
std::string path8 = "/data/app/el2/100/group/ce876162-fe69-45d3-aa8e-411a047af564";
OHOS::AppSpawn::SandboxUtils::CheckAndPrepareSrcPath(m_appProperty, path8);
SUCCEED();
}
HWTEST(AppSpawnSandboxTest, App_Spawn_Sandbox_34, TestSize.Level0)
{
GTEST_LOG_(INFO) << "App_Spawn_Sandbox_34 start";

1
util/include/sandbox_utils.h
View File

@ -69,7 +69,6 @@ private:
static int DoAllSymlinkPointslink(const ClientSocket::AppProperty *appProperty, nlohmann::json &appConfig);
static std::string ConvertToRealPath(const ClientSocket::AppProperty *appProperty, std::string sandboxRoot);
static std::string GetSbxPathByConfig(const ClientSocket::AppProperty *appProperty, nlohmann::json &config);
static void CheckAndPrepareSrcPath(const ClientSocket::AppProperty *appProperty, const std::string &srcPath);
static bool CheckTotalSandboxSwitchStatus(const ClientSocket::AppProperty *appProperty);
static bool CheckAppSandboxSwitchStatus(const ClientSocket::AppProperty *appProperty);
static bool CheckBundleNameForPrivate(const std::string &bundleName);

79
util/src/sandbox_utils.cpp
View File

@ -47,15 +47,10 @@ namespace {
constexpr int32_t UID_BASE = 200000;
constexpr int32_t FUSE_OPTIONS_MAX_LEN = 128;
constexpr int32_t DLP_FUSE_FD = 1000;
constexpr int32_t DATABASE_DIR_GID = 3012;
constexpr int32_t DFS_GID = 1009;
constexpr static mode_t FILE_MODE = 0711;
constexpr static mode_t BASE_FOLDER_FILE_MODE = 0700;
constexpr static mode_t DATABASE_FOLDER_FILE_MODE = S_IRWXU | S_IRWXG;
constexpr static mode_t BASIC_MOUNT_FLAGS = MS_REC | MS_BIND;
constexpr std::string_view APL_SYSTEM_CORE("system_core");
constexpr std::string_view APL_SYSTEM_BASIC("system_basic");
const std::string g_packageItems[] = {{"cache"}, {"files"}, {"temp"}, {"preferences"}, {"haps"}};
const std::string g_physicalAppInstallPath = "/data/app/el1/bundle/public/";
const std::string g_sandboxGroupPath = "/data/storage/el2/group/";
const std::string g_sandboxHspInstallPath = "/data/storage/el1/bundle/";
@ -80,16 +75,11 @@ namespace {
const std::string OVERLAY_SOCKET_TYPE = "|Overlay|";
const std::string DATA_GROUP_SOCKET_TYPE = "|DataGroup|";
const char *g_actionStatuc = "check-action-status";
const char *g_accountPrefix = "/account/data/";
const char *g_accountNonPrefix = "/non_account/data/";
const char *g_appBase = "app-base";
const char *g_appResources = "app-resources";
const char *g_appAplName = "app-apl-name";
const char *g_basePrefix = "/base";
const char *g_commonPrefix = "common";
const char *g_databasePrefix = "/database";
const char *g_destMode = "dest-mode";
const char *g_el2Prefix = "/data/app/el2";
const char *g_fsType = "fs-type";
const char *g_linkName = "link-name";
const char *g_mountPrefix = "mount-paths";
@ -101,7 +91,6 @@ namespace {
const char *g_sandBoxFlags = "sandbox-flags";
const char *g_sandBoxShared = "sandbox-shared";
const char *g_sandBoxSwitchPrefix = "sandbox-switch";
const char *g_serviceEl2Prefix = "/data/serivce/el2";
const char *g_symlinkPrefix = "symbol-links";
const char *g_sandboxRootPrefix = "sandbox-root";
const char *g_topSandBoxSwitchPrefix = "top-sandbox-switch";
@ -174,12 +163,6 @@ uint32_t SandboxUtils::GetNamespaceFlagsFromConfig(const char *bundleName)
return cloneFlags;
}
static void MkdirAndChown(const std::string &srcPath, mode_t filemode, uint32_t uid, uint32_t gid)
{
mkdir(srcPath.c_str(), filemode);
chown(srcPath.c_str(), uid, gid);
}
static void MakeDirRecursive(const std::string &path, mode_t mode)
{
size_t size = path.size();
@ -446,66 +429,6 @@ static uint32_t ConvertFlagStr(const std::string &flagStr)
return 0;
}
static void SetSelinuxCondition(const std::string &srcPath, const ClientSocket::AppProperty *appProperty)
{
#ifndef APPSPAWN_TEST
#ifdef WITH_SELINUX
HapContext hapContext;
HapFileInfo hapFileInfo;
hapFileInfo.pathNameOrig.emplace_back(srcPath);
hapFileInfo.apl = appProperty->apl;
hapFileInfo.packageName = appProperty->bundleName;
hapFileInfo.flags = SELINUX_HAP_RESTORECON_RECURSE;
hapFileInfo.hapFlags = appProperty->hapFlags;
hapContext.HapFileRestorecon(hapFileInfo);
#endif
#endif
}
/* Check and Create physical /data/app/el2 path when BMS failed to create related package folder */
void SandboxUtils::CheckAndPrepareSrcPath(const ClientSocket::AppProperty *appProperty, const std::string &srcPath)
{
if (access(srcPath.c_str(), F_OK) == 0) {
return;
}
if (srcPath.find(g_el2Prefix) != std::string::npos) {
if (srcPath.find(g_basePrefix) != std::string::npos) {
MakeDirRecursive(srcPath.c_str(), BASE_FOLDER_FILE_MODE);
chown(srcPath.c_str(), appProperty->uid, appProperty->gid);
for (const std::string &packageItem : g_packageItems) {
const std::string newPath = srcPath + "/" + packageItem;
MkdirAndChown(newPath, BASE_FOLDER_FILE_MODE, appProperty->uid, appProperty->gid);
}
SetSelinuxCondition(srcPath, appProperty);
} else if (srcPath.find(g_databasePrefix) != std::string::npos) {
MakeDirRecursive(srcPath.c_str(), DATABASE_FOLDER_FILE_MODE);
/* Add S_ISGID mode and change group owner to DATABASE */
chmod(srcPath.c_str(), DATABASE_FOLDER_FILE_MODE | S_ISGID);
chown(srcPath.c_str(), appProperty->uid, DATABASE_DIR_GID);
SetSelinuxCondition(srcPath, appProperty);
} else {
APPSPAWN_LOGI("failed to access path: %{public}s", srcPath.c_str());
}
}
if (srcPath.find(g_serviceEl2Prefix) != std::string::npos) {
if (srcPath.find(g_accountPrefix) != std::string::npos) {
MakeDirRecursive(srcPath.c_str(), DATABASE_FOLDER_FILE_MODE);
chmod(srcPath.c_str(), DATABASE_FOLDER_FILE_MODE | S_ISGID);
chown(srcPath.c_str(), appProperty->uid, appProperty->gid);
} else if (srcPath.find(g_accountNonPrefix) != std::string::npos) {
MakeDirRecursive(srcPath.c_str(), DATABASE_FOLDER_FILE_MODE);
/* Add S_ISGID mode and change group owner to DFS */
chmod(srcPath.c_str(), DATABASE_FOLDER_FILE_MODE | S_ISGID);
chown(srcPath.c_str(), appProperty->uid, DFS_GID);
} else {
APPSPAWN_LOGI("failed to access path: %{public}s", srcPath.c_str());
}
}
}
int SandboxUtils::DoAllMntPointsMount(const ClientSocket::AppProperty *appProperty,
nlohmann::json &appConfig, const std::string &section)
{
@ -543,8 +466,6 @@ int SandboxUtils::DoAllMntPointsMount(const ClientSocket::AppProperty *appProper
const char* fsTypePoint = fsType.empty() ? nullptr : fsType.c_str();
mode_t mountSharedFlag = (mntPoint.find(g_mountSharedFlag) != mntPoint.end()) ? MS_SHARED : MS_SLAVE;
/* check and prepare /data/app/el2 base and database package path to avoid BMS failed to create this folder */
CheckAndPrepareSrcPath(appProperty, srcPath);
/* if app mount failed for special strategy, we need deal with common mount config */
int ret = HandleSpecialAppMount(appProperty, srcPath, sandboxPath, fsType, mountFlags);
if (ret < 0) {