Changeset 993 for trunk/common

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/common

Files:

• job.php (modified) (3 diffs)
• user.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';
+}
+
 ?>