openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-12-04 09:14:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!38 Gitee Review - hmf06101

Browse Source 
Merge pull request !38 from 熊磊/hmf06101
This commit is contained in:
openharmony_ci 2021-06-10 16:10:00 +08:00 committed by Gitee
commit 2a43725c10
3 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/include/init_service.h
View File

@ -43,7 +43,8 @@ extern "C" {
typedef struct { typedef struct {
uid_t uID; uid_t uID;
gid_t gID; gid_t *gIDs;
unsigned int gidsCnt;
unsigned int *caps; unsigned int *caps;
unsigned int capsCnt; unsigned int capsCnt;
} Perms; } Perms;

49
services/src/init_read_cfg.c
View File

@ -135,7 +135,12 @@ static void ReleaseServiceMem(Service* curServ)
free(curServ->servPerm.caps); free(curServ->servPerm.caps);
curServ->servPerm.caps = NULL; curServ->servPerm.caps = NULL;
} }
if (curServ->servPerm.gIDs != NULL) {
free(curServ->servPerm.gIDs);
curServ->servPerm.gIDs = NULL;
}
curServ->servPerm.capsCnt = 0; curServ->servPerm.capsCnt = 0;
curServ->servPerm.gidsCnt = 0;
} }
static int GetServiceName(const cJSON* curArrItem, Service* curServ) static int GetServiceName(const cJSON* curArrItem, Service* curServ)
@ -220,8 +225,6 @@ static int GetServiceNumber(const cJSON* curArrItem, Service* curServ, const cha
if (strncmp(targetField, UID_STR_IN_CFG, strlen(UID_STR_IN_CFG)) == 0) { if (strncmp(targetField, UID_STR_IN_CFG, strlen(UID_STR_IN_CFG)) == 0) {
curServ->servPerm.uID = value; curServ->servPerm.uID = value;
} else if (strncmp(targetField, GID_STR_IN_CFG, strlen(GID_STR_IN_CFG)) == 0) {
curServ->servPerm.gID = value;
} else if (strncmp(targetField, ONCE_STR_IN_CFG, strlen(ONCE_STR_IN_CFG)) == 0) { } else if (strncmp(targetField, ONCE_STR_IN_CFG, strlen(ONCE_STR_IN_CFG)) == 0) {
if (value != 0) { if (value != 0) {
curServ->attribute |= SERVICE_ATTR_ONCE; curServ->attribute |= SERVICE_ATTR_ONCE;
@ -279,6 +282,46 @@ static int GetServiceCaps(const cJSON* curArrItem, Service* curServ)
return SERVICE_SUCCESS; return SERVICE_SUCCESS;
} }
static int GetServiceGids(const cJSON* curArrItem, Service* curServ)
{
curServ->servPerm.gidsCnt = 0;
curServ->servPerm.gIDs = NULL;
int gidsCnt;
cJSON* filedJ = cJSON_GetObjectItem(curArrItem, "gid");
if (cJSON_IsArray(filedJ)) {
gidsCnt = cJSON_GetArraySize(filedJ);
if (gidsCnt <= 0) {
// gids array does not exist, means do not need any group
return SERVICE_SUCCESS;
}
curServ->servPerm.gIDs = (unsigned int*)malloc(sizeof(unsigned int) * gidsCnt);
if (curServ->servPerm.gIDs == NULL) {
return SERVICE_FAILURE;
}
for (int i = 0; i < gidsCnt; ++i) {
cJSON* gidJ = cJSON_GetArrayItem(filedJ, i);
if (!cJSON_IsNumber(gidJ) || cJSON_GetNumberValue(gidJ) < 0) {
// resources will be released by function: ReleaseServiceMem
return SERVICE_FAILURE;
}
curServ->servPerm.gIDs[i] = (unsigned int)cJSON_GetNumberValue(gidJ);
}
} else {
int value = (int)cJSON_GetNumberValue(filedJ);
if (value < 0) {
return SERVICE_FAILURE;
}
gidsCnt = 1;
curServ->servPerm.gIDs = (unsigned int*)malloc(sizeof(unsigned int));
if (curServ->servPerm.gIDs == NULL) {
return SERVICE_FAILURE;
}
curServ->servPerm.gIDs[0] = (unsigned int)value;
}
curServ->servPerm.gidsCnt = gidsCnt;
return SERVICE_SUCCESS;
}
static void ParseAllServices(const cJSON* fileRoot) static void ParseAllServices(const cJSON* fileRoot)
{ {
int servArrSize = 0; int servArrSize = 0;
@ -311,7 +354,7 @@ static void ParseAllServices(const cJSON* fileRoot)
if (GetServiceName(curItem, &retServices[i]) != SERVICE_SUCCESS || if (GetServiceName(curItem, &retServices[i]) != SERVICE_SUCCESS ||
GetServicePathAndArgs(curItem, &retServices[i]) != SERVICE_SUCCESS || GetServicePathAndArgs(curItem, &retServices[i]) != SERVICE_SUCCESS ||
GetServiceNumber(curItem, &retServices[i], UID_STR_IN_CFG) != SERVICE_SUCCESS || GetServiceNumber(curItem, &retServices[i], UID_STR_IN_CFG) != SERVICE_SUCCESS ||
GetServiceNumber(curItem, &retServices[i], GID_STR_IN_CFG) != SERVICE_SUCCESS || GetServiceGids(curItem, &retServices[i]) != SERVICE_SUCCESS ||
GetServiceNumber(curItem, &retServices[i], ONCE_STR_IN_CFG) != SERVICE_SUCCESS || GetServiceNumber(curItem, &retServices[i], ONCE_STR_IN_CFG) != SERVICE_SUCCESS ||
GetServiceNumber(curItem, &retServices[i], IMPORTANT_STR_IN_CFG) != SERVICE_SUCCESS || GetServiceNumber(curItem, &retServices[i], IMPORTANT_STR_IN_CFG) != SERVICE_SUCCESS ||
GetServiceCaps(curItem, &retServices[i]) != SERVICE_SUCCESS) { GetServiceCaps(curItem, &retServices[i]) != SERVICE_SUCCESS) {

3
services/src/init_service.c
View File

@ -48,8 +48,7 @@ static int SetPerms(const Service *service)
if (KeepCapability() != 0) { if (KeepCapability() != 0) {
return SERVICE_FAILURE; return SERVICE_FAILURE;
} }
if (setgroups(service->servPerm.gidsCnt, service->servPerm.gIDs) != 0) {
if (setgid(service->servPerm.gID) != 0) {
return SERVICE_FAILURE; return SERVICE_FAILURE;
} }