QingdaoU/Judger
1
0
Fork 0
mirror of https://github.com/QingdaoU/Judger.git synced 2024-12-29 16:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

增加部分参数检查

Browse Source
This commit is contained in:
virusdefender 2016-03-18 12:42:46 +08:00
parent 78cfd92740
commit e54f95b3de
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
runner.c
View File

@ -36,6 +36,7 @@ void run(struct config *config, struct result *result) {
int signal; int signal;
int i; int i;
struct passwd *passwd = getpwnam("nobody"); struct passwd *passwd = getpwnam("nobody");
FILE *in_file, *out_file;
int syscalls_whitelist[] = {SCMP_SYS(read), SCMP_SYS(fstat), int syscalls_whitelist[] = {SCMP_SYS(read), SCMP_SYS(fstat),
SCMP_SYS(mmap), SCMP_SYS(mprotect), SCMP_SYS(mmap), SCMP_SYS(mprotect),
SCMP_SYS(munmap), SCMP_SYS(open), SCMP_SYS(munmap), SCMP_SYS(open),
@ -54,6 +55,25 @@ void run(struct config *config, struct result *result) {
gettimeofday(&start, NULL); gettimeofday(&start, NULL);
if(config->max_memory < 1) {
LOG_FATAL("memory can not be less than 1");
result->flag = SYSTEM_ERROR;
return;
}
if(config->max_cpu_time < 1) {
LOG_FATAL("cpu time can not be less than 1");
result->flag = SYSTEM_ERROR;
return;
}
in_file = fopen(config->in_file, "r");
out_file = fopen(config->out_file, "w");
if(in_file == NULL || out_file == NULL) {
LOG_FATAL("failed to open in/out redirect file");
result->flag = SYSTEM_ERROR;
return;
}
memory_limit.rlim_cur = memory_limit.rlim_max = (rlim_t) (config->max_memory) * 2; memory_limit.rlim_cur = memory_limit.rlim_max = (rlim_t) (config->max_memory) * 2;
pid_t pid = fork(); pid_t pid = fork();
@ -84,14 +104,13 @@ void run(struct config *config, struct result *result) {
if(result->cpu_time == 0) { if(result->cpu_time == 0) {
result->cpu_time = 1; result->cpu_time = 1;
} }
result->memory = resource_usage.ru_maxrss;
// osx: ru_maxrss the maximum resident set size utilized (in bytes). // osx: ru_maxrss the maximum resident set size utilized (in bytes).
// linux: ru_maxrss (since Linux 2.6.32)This is the maximum resident set size used (in kilobytes). // linux: ru_maxrss (since Linux 2.6.32)This is the maximum resident set size used (in kilobytes).
// For RUSAGE_CHILDREN, this is the resident set size of the largest child, // For RUSAGE_CHILDREN, this is the resident set size of the largest child,
// not the maximum resident set size of the processtree. // not the maximum resident set size of the processtree.
result->memory = resource_usage.ru_maxrss * 1024;
result->memory = result->memory * 1024;
result->signal = 0; result->signal = 0;
result->flag = SUCCESS; result->flag = SUCCESS;
@ -154,12 +173,12 @@ void run(struct config *config, struct result *result) {
// read stdin from in file // read stdin from in file
// On success, these system calls return the new descriptor. // On success, these system calls return the new descriptor.
// On error, -1 is returned, and errno is set appropriately. // On error, -1 is returned, and errno is set appropriately.
if (dup2(fileno(fopen(config->in_file, "r")), 0) == -1) { if (dup2(fileno(in_file), 0) == -1) {
LOG_FATAL("dup2 stdin failed, errno: %d", errno); LOG_FATAL("dup2 stdin failed, errno: %d", errno);
ERROR(DUP2_FAILED); ERROR(DUP2_FAILED);
} }
// write stdout to out file // write stdout to out file
if (dup2(fileno(fopen(config->out_file, "w")), 1) == -1) { if (dup2(fileno(out_file), 1) == -1) {
LOG_FATAL("dup2 stdout failed, errno: %d", errno); LOG_FATAL("dup2 stdout failed, errno: %d", errno);
ERROR(DUP2_FAILED); ERROR(DUP2_FAILED);
} }
@ -169,22 +188,22 @@ void run(struct config *config, struct result *result) {
ERROR(DUP2_FAILED); ERROR(DUP2_FAILED);
} }
if (config->use_nobody) { if (config->use_nobody != 0) {
if(passwd == NULL) { if(passwd == NULL) {
LOG_FATAL("get nobody user info failed, errno: %d", errno); LOG_FATAL("get nobody user info failed, errno: %d", errno);
ERROR(SET_UID_FAILED); ERROR(SET_UID_FAILED);
} }
if (setgid(65534) == -1) { if (setgid(passwd->pw_gid) == -1) {
LOG_FATAL("setgid failed, errno: %d", errno); LOG_FATAL("setgid failed, errno: %d", errno);
ERROR(SET_GID_FAILED); ERROR(SET_GID_FAILED);
} }
if (setuid(65534) == -1) { if (setuid(passwd->pw_uid) == -1) {
LOG_FATAL("setuid failed, errno: %d", errno); LOG_FATAL("setuid failed, errno: %d", errno);
ERROR(SET_UID_FAILED); ERROR(SET_UID_FAILED);
} }
} }
if (config->use_sandbox) { if (config->use_sandbox != 0) {
// load seccomp rules // load seccomp rules
ctx = seccomp_init(SCMP_ACT_KILL); ctx = seccomp_init(SCMP_ACT_KILL);
if (!ctx) { if (!ctx) {

4
tests/test.py
View File

@ -45,9 +45,9 @@ class JudgerTest(TestCase):
self.assertEqual(result["signal"], run_result["signal"]) self.assertEqual(result["signal"], run_result["signal"])
self.assertEqual(open(os.path.join(test_dir, "out")).read(), self.assertEqual(open(os.path.join(test_dir, "out")).read(),
open(os.path.join(self.tmp_path, str(i) + ".out")).read()) open(os.path.join(self.tmp_path, str(i) + ".out")).read())
self._args_check() self._user_args_check()
def _args_check(self): def _user_args_check(self):
os.setuid(pwd.getpwnam("nobody").pw_uid) os.setuid(pwd.getpwnam("nobody").pw_uid)
with self.assertRaisesRegexp(ValueError, "root user is required when using nobody"): with self.assertRaisesRegexp(ValueError, "root user is required when using nobody"):
judger.run(path="/bin/ls", judger.run(path="/bin/ls",