Changeset 993

Timestamp:

01/22/09 01:32:19 (3 years ago)

Author:

strat.cristian@…

Message:

Experimental Python Support

This is highly experimental, potentially unsafe. I only enabled it for admins until it's stable.

• Bash script to compile and link static binaries from Python scripts.
• Additional unit tests for jrun. (Added several Python test cases.)
• UI changes for admins only.

Location:

trunk

Files:

• common/job.php (modified) (3 diffs)
• common/user.php (modified) (1 diff)
• eval/classic_grader.php (modified) (2 diffs)
• eval/utilities.php (modified) (4 diffs)
• jrun/bad_syscalls (modified) (1 diff)
• jrun/run-tests.php (modified) (6 diffs)
• jrun/tests/do_math.py (added)
• jrun/tests/eval_fork.py (added)
• jrun/tests/exception.py (added)
• jrun/tests/file.py (added)
• jrun/tests/fork_bomb.py (added)
• jrun/tests/mem_limit_huge.py (added)
• jrun/tests/missing_import.py (added)
• jrun/tests/network.py (added)
• jrun/tests/time_limit.py (added)
• scripts/pybin.sh (added)
• www/macros/macro_tasksubmit.php (modified) (1 diff)
• www/static/js/submit.js (modified) (1 diff)
• www/views/submit.php (modified) (1 diff)

trunk/common/job.php

@@ -10 +10 @@
 //      round_id: Round to submit for. Optional, if missing the job is sent
 //              to all parent rounds.
-//      compiler_id: c, cpp or fpc.
+//      compiler_id: c, cpp, fpc, or py.
 //      solution: A string with the file to submit.
 //
@@ -38 +38 @@
 
     // Validate compiler id
-    $valid_compilers = array('c', 'cpp', 'fpc');
+    $valid_compilers = array('c', 'cpp', 'fpc', 'py');
     if (!array_key_exists('compiler_id', $args)) {
         $errors['compiler_id'] = "Lipseste compilatorul.";
     } else if (array_search($args['compiler_id'], $valid_compilers) === false) {
         $errors['compiler_id'] = "Compilator invalid.";
+    }
+    // HACK: For the moment, only admin`s are allowed to submit Python jobs.
+    // TODO: Remove this once Python support is stable.
+    if ('py' == $args['compiler_id'] && !user_is_admin($user)) {
+        $errors['compiler_id'] = 'Deocamdata, numai administratorii pot '
+                .'trimite surse Python.';
     }
 
@@ -56 +62 @@
 
     // Check task submit security
-    if (!security_query($user, 'task-submit', $task)) {
+    if ($task && !security_query($user, 'task-submit', $task)) {
         $errors[] = "Nu ai voie sa trimiti la acest task.";
     }
-    if ($round != null && !security_query($round, 'task-submit', $round)) {
+    if ($round && !security_query($round, 'task-submit', $round)) {
         $errors[] = "Nu poti sa trimiti la aceasta runda.";
     }

trunk/common/user.php

@@ -107 +107 @@
 }
 
+function user_is_admin($user) {
+    if (!$user) {
+        return false;
+    }
+    log_assert_valid(user_validate($user));
+    return $user['security_level'] === 'admin';
+}
+
 ?>

trunk/eval/classic_grader.php

@@ -56 +56 @@
     }
 
+    // HACK: Capture run-time stderr for Python jobs.
+    //
+    // WARNING! This is a security hole! Users may dump input tests
+    // on stderr and see them in the monitor page. Currently, only
+    // admins are allowed to submit Python.
+    //
+    // TODO: Come up with a safe way of reporting run-time errors
+    // for Python scripts.
+    $capture_std = ('py' == $job['compiler_id']);
+
     // Running tests.
     $test_score = array();
@@ -101 +111 @@
 
             // Run user program.
-            $jrunres = jail_run($userfile, $jaildir, $tparams['timelimit'] * 1000, $tparams['memlimit']);
+            $jrunres = jail_run($userfile, $jaildir, $tparams['timelimit'] * 1000,
+                        $tparams['memlimit'], $capture_std);
             log_assert($jrunres['result'] != 'ERROR', "Error in jrun.");
             if ($jrunres['result'] == 'FAIL') {
                 log_print("Test $testno: User program failed: {$jrunres['message']} ".
                         "{$jrunres['time']}ms {$jrunres['memory']}kb");
+                if ($capture_std) {
+                    // TODO: Come up with a safe way of reporting run-time
+                    // errors for Python scripts.
+                    $job_message = $jrunres['message'].": "
+                            .substr($jrunres['stderr'],
+                                    -min(100, strlen($jrunres['stderr'])));
+                } else {
+                    $job_message = $jrunres['message'];
+                }
                 job_test_update($job['id'], $testno, $group_idx, $jrunres['time'], $jrunres['memory'], 
-                        null, null, 0, $jrunres['message']);
+                        null, null, 0, $job_message);
                 // User program failed on this test. Bye bye.
                 continue;

trunk/eval/utilities.php

@@ -25 +25 @@
 // Returns success value, and a friendly error message in $compiler_message.
 //
-// Can currently handle C, C++ and FreePascal
+// Can currently handle C, C++, FreePascal, and Python.
 function compile_file($input_file_name, $output_file_name, &$compiler_message)
 {
@@ -35 +35 @@
             'pas' => 'fpc -O2 -Xs %file_name%',
             'fpc' => 'fpc -O2 -Xs %file_name%',
+            'py' => IA_JUDGE_PY_COMPILER.' %file_name% %exe_name%',
     );
-    if (!preg_match("/^(.*)\.(c|cpp|pas|fpc)$/i", $input_file_name, $matches)) {
+    if (!preg_match("/^(.*)\.(c|cpp|pas|fpc|py)$/i", $input_file_name, $matches)) {
         $compiler_message = "Nu am putut sa determin compilatorul ".
                 "pentru '$input_file_name'.";
@@ -53 +54 @@
 
     // Running compiler
-    $compiler_message = shell_exec("$cmdline 2>&1 | head -n 25");
+    $compiler_message = shell_exec("$cmdline 2>&1 | head -n 50");
 
     // This is the BEST way to fail on compilation errors.
@@ -168 +169 @@
     }
 
-    if ($result['result'] == 'OK' && $capture_std) {
+    if ($capture_std) {
         $result['stdout'] = @file_get_contents($jaildir.'jailed_stdout');
         if ($result['stdout'] === false) {

trunk/jrun/bad_syscalls

@@ -34 +34 @@
 mount
 umount
+accept
+bind
+connect
+getsockname
+getsockopt
+listen
+recv
+recvfrom
+send
+setsockopt
+socket
+socketpair

trunk/jrun/run-tests.php

@@ -3 +3 @@
 
 require_once(dirname($argv[0]) . "/../config.php");
+require_once(IA_ROOT_DIR . 'eval/config.php');
 require_once(IA_ROOT_DIR . 'common/log.php');
 
@@ -8 +9 @@
 $jail_dir = "jail";
 $exe_name = "prog";
-$extra_args = "--block-syscalls-file=bad_syscalls --chroot --verbose";
+$extra_args = "--block-syscalls-file=bad_syscalls --verbose";
 //$extra_args = "--nice -5 --block-syscalls-file=bad_syscalls --verbose";
-//$extra_args = "--uid 65534 --gid 65534 --block-syscalls-file=bad_syscalls --verbose";
+//$extra_args = "--uid 65534 --gid 65534 --block-syscalls-file=bad_syscalls --chroot";
 //$extra_args = "--uid 65534 --gid 65534 --block-syscalls-file=bad_syscalls";
+
+// In order to run python tests, download a python distribution, configure,
+// make, make install, then specify the top level directory here.
+$py_compiler = IA_ROOT_DIR."scripts/pybin.sh ".IA_JUDGE_PY_DISTRO
+        ." {$jail_dir}";
 
 // Parse a source file
@@ -20 +26 @@
     $test_args = $test_exp_res = null;
     foreach (file("$filename") as $line) {
-        if (preg_match("/\/\/ JRUN_ARGS =(.*)$/", $line, $matches)) {
+        if (preg_match("/(?:\/\/|#) JRUN_ARGS =(.*)$/", $line, $matches)) {
             $test_args = trim($matches[1]);
         }
-        if (preg_match("/\/\/ JRUN_RES =(.*)$/", $line, $matches)) {
+        if (preg_match("/(?:\/\/|#) JRUN_RES =(.*)$/", $line, $matches)) {
             $test_exp_res = trim($matches[1]);
         }
@@ -34 +40 @@
 function compile_source($source, $exe)
 {
+    global $py_compiler;
     if (strpos($source, ".cpp") === strlen($source) - 4) {
-        system("g++ -Wall -lm -O2 $source -o $exe", $ret);
+        system("g++ -Wall -lm -O2 $source --static -o $exe", $ret);
     } else if (strpos($source, ".c") === strlen($source) - 2) {
-        system("gcc -Wall -lm -O2 $source -o $exe", $ret);
+        system("gcc -Wall -lm -O2 $source --static -o $exe", $ret);
+    } else if (strpos($source, ".py") === strlen($source) - 3) {
+        system("{$py_compiler} $source $exe", $ret);
     } else {
         log_error("Can't compile $source, unknown file extension\n");
@@ -53 +62 @@
     global $jail_dir, $exe_name;
 
-    system("rm -rf jail");
+    system("rm -rf $jail_dir");
     system("mkdir -p $jail_dir");
     system("chmod 777 $jail_dir");
     compile_source($filename, "$jail_dir/$exe_name");
-
     $cmd = "./jrun --dir=$jail_dir --prog=$exe_name $args";
 
@@ -130 +138 @@
         print("Invalid arguments\n");
     }
-} while (true);
+} while (false);
 
 ?>

trunk/www/macros/macro_tasksubmit.php

@@ -60 +60 @@
             <option value="cpp">GNU C++</option>
             <option value="fpc">FreePascal</option>
+            <?php if (user_is_admin($identity_user)) { ?>
+                <option value="py">Python (FOARTE EXPERIMENTAL!)</option>
+            <?php } ?>
         </select>
     </li>

trunk/www/static/js/submit.js

@@ -43 +43 @@
     }
     var ext = f.value.substring(k + 1).toLowerCase();
-    if ('c' == ext || 'cpp' == ext || 'pas' == ext) {
+    if ('c' == ext || 'cpp' == ext || 'pas' == ext || 'py' == ext) {
         if ('pas' == ext) {
             // choose FreePascal compiler

trunk/www/views/submit.php

@@ -54 +54 @@
             <option value="cpp"<?= 'cpp' == fval('compiler_id') ? ' selected="selected"' : '' ?>>GNU C++</option>
             <option value="fpc"<?= 'fpc' == fval('compiler_id') ? ' selected="selected"' : '' ?>>FreePascal</option>
+            <?php if (user_is_admin($identity_user)) { ?>
+                <option value="py"<?= 'py' == fval('compiler_id') ? ' selected="selected"' : '' ?>>Python (FOARTE EXPERIMENTAL!)</option>
+            <?php } ?>
         </select>
         <?= ferr_span('compiler_id') ?>