Match-id-3fc3884a61d46bf22bd7083038de1f333f68d7d8

This commit is contained in:
BianTanggui
2021-07-08 11:33:14 +08:00
parent eec42515d8
commit 1ff5a5f6f4
8 changed files with 143 additions and 219 deletions

View File

@@ -49,8 +49,7 @@ static bool DevicesCmdArgParser(struct CmdArgs *args, const char *arg)
{
errno_t err = strcpy_s(args->devices, BUF_SIZE, arg);
if (err != EOK) {
char msg[] = "failed to get devices from cmd args.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to get devices from cmd args.", LEVEL_ERROR);
return false;
}
@@ -62,17 +61,15 @@ static bool PidCmdArgParser(struct CmdArgs *args, const char *arg)
errno = 0;
args->pid = strtol(optarg, NULL, DECIMAL);
if (errno != 0) {
int iLength = 0;
char* str = FormatLogMessage("failed to convert pid string from cmd args, pid string: %s.", &iLength, arg);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("failed to convert pid string from cmd args, pid string: %s.", arg);
Logger(str, LEVEL_ERROR);
free(str);
return false;
}
if (args->pid <= 0) {
int iLength = 0;
char* str = FormatLogMessage("invalid pid %d.", &iLength, args->pid);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("invalid pid %d.", args->pid);
Logger(str, LEVEL_ERROR);
free(str);
return false;
}
@@ -84,8 +81,7 @@ static bool RootfsCmdArgParser(struct CmdArgs *args, const char *arg)
{
errno_t err = strcpy_s(args->rootfs, BUF_SIZE, arg);
if (err != EOK) {
char msg[] = "failed to get rootfs path from cmd args";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to get rootfs path from cmd args", LEVEL_ERROR);
return false;
}
@@ -96,8 +92,7 @@ static bool OptionsCmdArgParser(struct CmdArgs *args, const char *arg)
{
errno_t err = strcpy_s(args->options, BUF_SIZE, arg);
if (err != EOK) {
char msg[] = "failed to get options string from cmd args";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to get options string from cmd args", LEVEL_ERROR);
return false;
}
@@ -107,9 +102,8 @@ static bool OptionsCmdArgParser(struct CmdArgs *args, const char *arg)
static bool MountFileCmdArgParser(struct CmdArgs *args, const char *arg)
{
if (args->files.count == MAX_MOUNT_NR) {
int iLength = 0;
char* str = FormatLogMessage("too many files to mount, max number is %u", &iLength, MAX_MOUNT_NR);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("too many files to mount, max number is %u", MAX_MOUNT_NR);
Logger(str, LEVEL_ERROR);
free(str);
return -1;
}
@@ -117,9 +111,8 @@ static bool MountFileCmdArgParser(struct CmdArgs *args, const char *arg)
char *dst = &args->files.list[args->files.count++][0];
errno_t err = strcpy_s(dst, PATH_MAX, arg);
if (err != EOK) {
int iLength = 0;
char* str = FormatLogMessage("failed to copy mount file path: %s", &iLength, arg);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("failed to copy mount file path: %s", arg);
Logger(str, LEVEL_ERROR);
free(str);
return false;
}
@@ -130,9 +123,8 @@ static bool MountFileCmdArgParser(struct CmdArgs *args, const char *arg)
static bool MountDirCmdArgParser(struct CmdArgs *args, const char *arg)
{
if (args->dirs.count == MAX_MOUNT_NR) {
int iLength = 0;
char* str = FormatLogMessage("too many directories to mount, max number is %u", &iLength, MAX_MOUNT_NR);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("too many directories to mount, max number is %u", MAX_MOUNT_NR);
Logger(str, LEVEL_ERROR);
free(str);
return -1;
}
@@ -140,9 +132,8 @@ static bool MountDirCmdArgParser(struct CmdArgs *args, const char *arg)
char *dst = &args->dirs.list[args->dirs.count++][0];
errno_t err = strcpy_s(dst, PATH_MAX, arg);
if (err != EOK) {
int iLength = 0;
char* str = FormatLogMessage("error: failed to copy mount directory path: %s", &iLength, arg);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("error: failed to copy mount directory path: %s", arg);
Logger(str, LEVEL_ERROR);
free(str);
return false;
}
@@ -174,18 +165,15 @@ static int ParseOneCmdArg(struct CmdArgs *args, char indicator, const char *valu
}
if (i == NUM_OF_CMD_ARGS) {
int iLength = 0;
char* str = FormatLogMessage("unrecognized cmd arg: indicate char: %c, value: %s.", &iLength, indicator, value);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("unrecognized cmd arg: indicate char: %c, value: %s.", indicator, value);
Logger(str, LEVEL_ERROR);
free(str);
return -1;
}
bool isOK = g_cmdArgParsers[i].parser(args, value);
if (!isOK) {
int iLength = 0;
char* str = FormatLogMessage("failed while parsing cmd arg, indicate char: %c, value: %s.",
&iLength, indicator, value);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("failed while parsing cmd arg, indicate char: %c, value: %s.", indicator, value);
Logger(str, LEVEL_ERROR);
free(str);
return -1;
}
@@ -207,10 +195,8 @@ static int ParseDeviceIDs(unsigned int *idList, size_t *idListSize, char *device
token = strtok_s(devices, sep, &context);
while (token != NULL) {
if (idx >= *idListSize) {
int iLength = 0;
char* str = FormatLogMessage("too many devices(%u), support %u devices maximally",
&iLength, idx, *idListSize);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("too many devices(%u), support %u devices maximally", idx, *idListSize);
Logger(str, LEVEL_ERROR);
free(str);
return -1;
}
@@ -218,9 +204,8 @@ static int ParseDeviceIDs(unsigned int *idList, size_t *idListSize, char *device
errno = 0;
idList[idx] = strtoul((const char *)token, NULL, DECIMAL);
if (errno != 0) {
int iLength = 0;
char* str = FormatLogMessage("failed to convert device id (%s) from cmd args", &iLength, token);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("failed to convert device id (%s) from cmd args", token);
Logger(str, LEVEL_ERROR);
free(str);
return -1;
}
@@ -240,47 +225,41 @@ int DoPrepare(const struct CmdArgs *args, struct ParsedConfig *config)
err = strcpy_s(config->rootfs, BUF_SIZE, args->rootfs);
if (err != EOK) {
char msg[] = "failed to copy rootfs path to parsed config.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to copy rootfs path to parsed config.", LEVEL_ERROR);
return -1;
}
ret = ParseDeviceIDs(config->devices, &config->devicesNr, (char *)args->devices);
if (ret < 0) {
char msg[] = "failed to parse device ids from cmdline argument";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to parse device ids from cmdline argument", LEVEL_ERROR);
return -1;
}
ret = GetNsPath(args->pid, "mnt", config->containerNsPath, BUF_SIZE);
if (ret < 0) {
int iLength = 0;
char* str = FormatLogMessage("failed to get container mnt ns path: pid(%d).", &iLength, args->pid);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("failed to get container mnt ns path: pid(%d).", args->pid);
Logger(str, LEVEL_ERROR);
free(str);
return -1;
}
ret = GetCgroupPath(args->pid, config->cgroupPath, BUF_SIZE);
if (ret < 0) {
char msg[] = "failed to get cgroup path.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to get cgroup path.", LEVEL_ERROR);
return -1;
}
char originNsPath[BUF_SIZE] = {0};
ret = GetSelfNsPath("mnt", originNsPath, BUF_SIZE);
if (ret < 0) {
char msg[] = "failed to get self ns path.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to get self ns path.", LEVEL_ERROR);
return -1;
}
config->originNsFd = open((const char *)originNsPath, O_RDONLY); // proc接口非外部输入
if (config->originNsFd < 0) {
int iLength = 0;
char* str = FormatLogMessage("failed to get self ns fd: %s.", &iLength, originNsPath);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("failed to get self ns fd: %s.", originNsPath);
Logger(str, LEVEL_ERROR);
free(str);
return -1;
}
@@ -298,45 +277,43 @@ int SetupContainer(struct CmdArgs *args)
InitParsedConfig(&config);
Logger("prepare necessary config", LEVEL_INFO);
ret = DoPrepare(args, &config);
if (ret < 0) {
char msg[] = "failed to prepare nesessary config.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to prepare nesessary config.", LEVEL_ERROR);
return -1;
}
// enter container's mount namespace
Logger("enter container's mount namespace", LEVEL_INFO);
ret = EnterNsByPath((const char *)config.containerNsPath, CLONE_NEWNS);
if (ret < 0) {
int iLength = 0;
char* str = FormatLogMessage("failed to set to container ns: %s.", &iLength, config.containerNsPath);
Logger(str, LEVEL_ERROR, iLength);
char* str = FormatLogMessage("failed to set to container ns: %s.", config.containerNsPath);
Logger(str, LEVEL_ERROR);
free(str);
close(config.originNsFd);
return -1;
}
Logger("do mounting", LEVEL_INFO);
ret = DoMounting(&config);
if (ret < 0) {
char msg[] = "failed to do mounting.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to do mounting.", LEVEL_ERROR);
close(config.originNsFd);
return -1;
}
Logger("setup up cgroup", LEVEL_INFO);
ret = SetupCgroup(&config);
if (ret < 0) {
char msg[] = "failed to set up cgroup.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to set up cgroup.", LEVEL_ERROR);
close(config.originNsFd);
return -1;
}
// back to original namespace
Logger("back to original namespace", LEVEL_INFO);
ret = EnterNsByFd(config.originNsFd, CLONE_NEWNS);
if (ret < 0) {
char msg[] = "failed to set ns back.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to set ns back.", LEVEL_ERROR);
close(config.originNsFd);
return -1;
}
@@ -352,35 +329,28 @@ int Process(int argc, char **argv)
int optionIndex;
struct CmdArgs args = {0};
char startMsg[] = "runc start prestart-hook ...";
Logger(startMsg, LEVEL_INFO, sizeof(startMsg) / sizeof(char));
Logger("runc start prestart-hook ...", LEVEL_INFO);
while ((c = getopt_long(argc, argv, "d:p:r:o:f:i", g_cmdOpts, &optionIndex)) != -1) {
ret = ParseOneCmdArg(&args, (char)c, optarg);
if (ret < 0) {
char msg[] = "failed to parse cmd args.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to parse cmd args.", LEVEL_ERROR);
return -1;
}
}
char parametersMsg[] = "verify parameters valid and parse runtime options";
Logger(parametersMsg, LEVEL_INFO, sizeof(parametersMsg) / sizeof(char));
Logger("verify parameters valid and parse runtime options", LEVEL_INFO);
if (!IsCmdArgsValid(&args)) {
char msg[] = "information not completed or valid.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("information not completed or valid.", LEVEL_ERROR);
return -1;
}
ParseRuntimeOptions(args.options);
char containerMsg[] = "setup container config";
Logger(containerMsg, LEVEL_INFO, sizeof(containerMsg) / sizeof(char));
Logger("setup container config ...", LEVEL_INFO);
ret = SetupContainer(&args);
if (ret < 0) {
char msg[] = "failed to setup container.";
Logger(msg, LEVEL_ERROR, sizeof(msg) / sizeof(char));
Logger("failed to setup container.", LEVEL_ERROR);
return ret;
}
char successMsg[] = "prestart-hook setup container successful.";
Logger(successMsg, LEVEL_INFO, sizeof(successMsg) / sizeof(char));
Logger("prestart-hook setup container successful.", LEVEL_INFO);
return 0;
}