fix memory

add tests

Author: virusdefender

CMakeLists.txt

@@ -2,16 +2,16 @@ cmake_minimum_required(VERSION 2.5)
 project(judger C)
 
 #set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output)
-
-set(BASE_CMAKE_C_FLAGS "-Wall -Werror -O3 -std=c99")
-set(CMAKE_C_FLAGS "${BASE_CMAKE_C_FLAGS}")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output)
 
+set(CMAKE_C_FLAGS "-g -Wall -Werror -O3 -std=c99 -pie -fPIC")
 
 # make judger lib
 file(GLOB SOURCE "src/*.c" "src/rules/*.c")
-add_library(judger SHARED ${SOURCE})
-target_link_libraries(judger pthread seccomp)
+add_executable(libjudger.so ${SOURCE})
+target_link_libraries(libjudger.so pthread seccomp)
 
 
-install(DIRECTORY output/ DESTINATION /usr/lib/judger)
+install(FILES output/libjudger.so
+    PERMISSIONS OWNER_EXECUTE OWNER_READ
+    DESTINATION /usr/lib/judger)

bindings/Python/_judger.c

@@ -0,0 +1,83 @@
+import json
+import subprocess
+
+UNLIMITED = -1
+VERSION = 0x020100
+
+RESULT_SUCCESS = 0
+RESULT_WRONG_ANSWER = -1
+RESULT_CPU_TIME_LIMIT_EXCEEDED = 1
+RESULT_REAL_TIME_LIMIT_EXCEEDED = 2
+RESULT_MEMORY_LIMIT_EXCEEDED = 3
+RESULT_RUNTIME_ERROR = 4
+RESULT_SYSTEM_ERROR = 5
+
+ERROR_INVALID_CONFIG = -1
+ERROR_FORK_FAILED = -2
+ERROR_PTHREAD_FAILED = -3
+ERROR_WAIT_FAILED = -4
+ERROR_ROOT_REQUIRED = -5
+ERROR_LOAD_SECCOMP_FAILED = -6
+ERROR_SETRLIMIT_FAILED = -7
+ERROR_DUP2_FAILED = -8
+ERROR_SETUID_FAILED = -9
+ERROR_EXECVE_FAILED = -10
+ERROR_SPJ_ERROR = -11
+
+
+def run(max_cpu_time,
+        max_real_time,
+        max_memory,
+        max_stack,
+        max_output_size,
+        max_process_number,
+        exe_path,
+        input_path,
+        output_path,
+        error_path,
+        args,
+        env,
+        log_path,
+        seccomp_rule_name,
+        uid,
+        gid):
+    str_list_vars = ["args", "env"]
+    int_vars = ["max_cpu_time", "max_real_time",
+                "max_memory", "max_stack", "max_output_size",
+                "max_process_number", "uid", "gid"]
+    str_vars = ["exe_path", "input_path", "output_path", "error_path", "log_path"]
+
+    proc_args = ["/usr/lib/judger/libjudger.so"]
+
+    for var in str_list_vars:
+        value = vars()[var]
+        if not isinstance(value, list):
+            raise ValueError("{} must be a list".format(var))
+        for item in value:
+            if not isinstance(item, str):
+                raise ValueError("{} item must be a string".format(var))
+            proc_args.append("--{}={}".format(var, item))
+
+    for var in int_vars:
+        value = vars()[var]
+        if not isinstance(value, int):
+            raise ValueError("{} must be a int".format(var))
+        if value != UNLIMITED:
+            proc_args.append("--{}={}".format(var, value))
+
+    for var in str_vars:
+        value = vars()[var]
+        if not isinstance(value, str):
+            raise ValueError("{} must be a string".format(var))
+        proc_args.append("--{}={}".format(var, value))
+
+    if not isinstance(seccomp_rule_name, str) and seccomp_rule_name is not None:
+        raise ValueError("seccomp_rule_name must be a string or None")
+    if seccomp_rule_name:
+        proc_args.append("--seccomp_rule={}".format(seccomp_rule_name))
+
+    proc = subprocess.Popen(proc_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    out, err = proc.communicate()
+    if err:
+        raise ValueError("Error occurred while calling judger: {}".format(err))
+    return json.loads(out.decode("utf-8"))

bindings/Python/_judger/__init__.py

@@ -1,9 +1,6 @@
 # coding=utf-8
-import platform
 from distutils.core import setup, Extension
 
 setup(name='_judger',
       version='2.1',
-      ext_modules=[Extension('_judger', 
-                             sources=['_judger.c'], 
-                             extra_link_args=["-L", "/usr/lib/judger", "-l", "judger", "-Wl,-rpath=/usr/lib/judger"])])
+      packages=["_judger"])