@@ -83,7 +83,13 @@ class CompilerGenericGNU { * @return string */ public function get_exec_string() { - + if (!empty (config::$chroot_dir)) { + $chroot = realpath (config::$chroot_dir); + $output = realpath ($this->output_exec); + assert (substr ($output, 0, strlen ($chroot)) + == $chroot); + return substr ($output, strlen($chroot)); + } return $this->output_exec; } backend/programs/compiler/CompilerGenericGNU.inc @@ -40,7 +40,10 @@ class CompilerGenericInterpreter public function compile($pathtocode) { $this->pathtocode = tempnam (config::$compile_temp_directory, "a"); + assert (is_file ($pathtocode)); copy ($pathtocode, $this->pathtocode); + assert (is_file ($this->pathtocode)); + chmod ($this->pathtocode, 0755); return true; } @@ -53,8 +56,11 @@ class CompilerGenericInterpreter { $prefix = ""; if (!empty (config::$chroot_dir)) $prefix = config::$chroot_dir; - return "$prefix/usr/bin/env " . $this->interpreter - . " " .$this->pathtocode ; + + assert (substr ($this->pathtocode, 0, strlen ($prefix)) == $prefix); + $relpath = substr ($this->pathtocode, strlen ($prefix)); + return "/usr/bin/env " . $this->interpreter + . " " .$relpath ; } public function get_exec_dir() backend/programs/compiler/CompilerGenericInterpreter.inc @@ -257,12 +257,6 @@ int subprocess (int argc, char* argv[]) fprintf (stderr, "debug: not redirecting stderr on purpose.\n"); } - if (chrootdir) { - argv[0] = argv[0] + strlen(chrootdir) - 1 ; - argv[0][0] = '/' ; - fprintf(stderr, "The exec is at %s relative to %s\n", argv[0], chrootdir); - } - commands = (char**) malloc (sizeof (char*)*(argc + 1)); for (i = 0; i < argc; i++) commands [i] = argv[i]; @@ -286,11 +280,6 @@ int main (int argc, char* argv[]) if (limit_timehard < 1 + (int) ceil (limit_time)) limit_timehard = 1 + (int) ceil (limit_time); - if (chrootdir && strncmp(chrootdir, argv[cmd_start_index], strlen(chrootdir)) != 0 ) { - fprintf(stderr, "The executable file must be on the chroot directory"); - exit (1); - } - /* close inherited file descriptors. Is there a better way? */ for (i = 3; i < (1<<16); i++) close (i); backend/programs/runner.c d60624a303ea3c3d986cd75da806f120d61f9fb1 Arnold Noronha arnstein87@gmail.com http://github.com/tdrhq/opc/commit/916abfb9ac3a8c5db89f10d0510d767c34b4a85d 916abfb9ac3a8c5db89f10d0510d767c34b4a85d 2009-10-15T07:33:09-07:00 2009-10-15T07:33:09-07:00 make the runner code not do the filename replacement to the chroot dir, since arguments then become hard to send. Instead, make the compiler code do that. 58318352f9cf6b503c5bfabf3eab0ab4d45aaf1a Arnold Noronha arnstein87@gmail.com