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

!1661 modify system/app dir mount point

Browse Source 
Merge pull request !1661 from wangfenging/master
This commit is contained in:
openharmony_ci 2024-11-06 09:45:11 +00:00 committed by Gitee
commit 734cdb2a01
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
appdata-sandbox-app.json
View File

@ -24,8 +24,11 @@
"src-path" : "/module_update",
"sandbox-path" : "/module_update"
}, {
"src-path" : "/system/app",
"sandbox-path" : "/system/app"
"src-path" : "/system/app/appServiceFwk",
"sandbox-path" : "/system/app/appServiceFwk"
}, {
"src-path" : "/system/app/shared_bundles",
"sandbox-path" : "/system/app/shared_bundles"
}, {
"src-path" : "/system/fonts",
"sandbox-path" : "/system/fonts"
@ -389,8 +392,14 @@
}, {
"src-path" : "/data/app/el1/bundle/<currentUserId>/hnp/<PackageName>",
"sandbox-path" : "/data/app"
}
]}],
}]
}, {
"name": "PREINSTALLED_HAP",
"mount-paths": [{
"src-path": "/system/app",
"sandbox-path": "/system/app"
}]
}],
"package-name": [{
"name": "com.ohos.medialibrary.medialibrarydata",
"mount-paths" : [{

17
appdata-sandbox.json
View File

@ -29,8 +29,13 @@
"sandbox-flags" : [ "bind", "rec" ],
"check-action-status": "false"
}, {
"src-path" : "/system/app",
"sandbox-path" : "/system/app",
"src-path" : "/system/app/appServiceFwk",
"sandbox-path" : "/system/app/appServiceFwk",
"sandbox-flags" : [ "bind", "rec" ],
"check-action-status": "false"
}, {
"src-path" : "/system/app/shared_bundles",
"sandbox-path" : "/system/app/shared_bundles",
"sandbox-flags" : [ "bind", "rec" ],
"check-action-status": "false"
}, {
@ -386,6 +391,14 @@
"sandbox-flags" : [ "bind", "rec" ],
"check-action-status": "false"
}
]}, {
"flags": "PREINSTALLED_HAP",
"mount-paths": [{
"src-path": "/system/app",
"sandbox-path": "/system/app",
"sandbox-flags": [ "bind", "rec" ],
"check-action-status": "false"
}
]}
],
"symbol-links" : [

1
interfaces/innerkits/include/appspawn.h
View File

@ -183,6 +183,7 @@ typedef enum {
APP_FLAGS_ISOLATED_NETWORK,
APP_FLAGS_ISOLATED_DATAGROUP,
APP_FLAGS_TEMP_JIT = 28,
APP_FLAGS_PRE_INSTALLED_HAP = 29,
MAX_FLAGS_INDEX = 63,
} AppFlagsIndex;

19
modules/common/appspawn_common.c
View File

@ -62,6 +62,7 @@
#define BITLEN32 32
#define PID_NS_INIT_UID 100000 // reserved for pid_ns_init process, avoid app, render proc, etc.
#define PID_NS_INIT_GID 100000
#define PREINSTALLED_HAP_FLAG 0x01 // hapFlags 0x01: SELINUX_HAP_RESTORECON_PREINSTALLED_APP in selinux
static int SetProcessName(const AppSpawnMgr *content, const AppSpawningCtx *property)
{
@ -353,6 +354,21 @@ static int32_t WaitForDebugger(const AppSpawningCtx *property)
return 0;
}
static int SpawnSetPreInstalledFlag(AppSpawningCtx *property)
{
AppSpawnMsgDomainInfo *msgDomainInfo = (AppSpawnMsgDomainInfo *)GetAppProperty(property, TLV_DOMAIN_INFO);
APPSPAWN_CHECK(msgDomainInfo != NULL, return APPSPAWN_TLV_NONE, "No domain info in req from %{public}s",
GetProcessName(property));
if ((msgDomainInfo->hapFlags & PREINSTALLED_HAP_FLAG) != 0) {
int ret = SetAppSpawnMsgFlag(property->message, TLV_MSG_FLAGS, APP_FLAGS_PRE_INSTALLED_HAP);
if (ret != 0) {
APPSPAWN_LOGE("Set appspawn msg flag failed");
return ret;
}
}
return 0;
}
static int SpawnInitSpawningEnv(AppSpawnMgr *content, AppSpawningCtx *property)
{
APPSPAWN_LOGV("Spawning: clear env");
@ -365,6 +381,9 @@ static int SpawnInitSpawningEnv(AppSpawnMgr *content, AppSpawningCtx *property)
ret = SetAppAccessToken(content, property);
APPSPAWN_CHECK_ONLY_EXPER(ret == 0, return ret);
ret = SpawnSetPreInstalledFlag(property);
APPSPAWN_CHECK_ONLY_EXPER(ret == 0, return ret);
return 0;
}

3
modules/sandbox/sandbox_load.c
View File

@ -45,7 +45,8 @@ static const SandboxFlagInfo FLAGE_POINT_MAP[] = {
{"0", 0},
{"START_FLAGS_BACKUP", (unsigned long)APP_FLAGS_BACKUP_EXTENSION},
{"DLP_MANAGER", (unsigned long)APP_FLAGS_DLP_MANAGER},
{"DEVELOPER_MODE", (unsigned long)APP_FLAGS_DEVELOPER_MODE}
{"DEVELOPER_MODE", (unsigned long)APP_FLAGS_DEVELOPER_MODE},
{"PREINSTALLED_HAP", (unsigned long)APP_FLAGS_PRE_INSTALLED_HAP}
};
static const SandboxFlagInfo MOUNT_MODE_MAP[] = {

3
modules/sandbox/sandbox_utils.cpp
View File

@ -706,7 +706,8 @@ static uint32_t ConvertFlagStr(const std::string &flagStr)
{
const std::map<std::string, int> flagsMap = {{"0", 0}, {"START_FLAGS_BACKUP", 1},
{"DLP_MANAGER", 2},
{"DEVELOPER_MODE", 17}};
{"DEVELOPER_MODE", 17},
{"PREINSTALLED_HAP", 29}};
if (flagsMap.count(flagStr)) {
return 1 << flagsMap.at(flagStr);