melody sfProcess timeouts are now configurable via config.php

Author: staabm

config.php.dist

@@ -12,4 +12,7 @@ return array(
     // the code entered by the user is evaluated. any variables and classes
     // defined here will be accessible by the eval'd code
     'bootstrap' => null,
+
+    // maximun execution time for melody scripts
+    'melody-timeout' => 600,    
 );

index.php

@@ -12,6 +12,9 @@
     // the code entered by the user is evaluated. any variables and classes
     // defined here will be accessible by the eval'd code
     'bootstrap' => null,
+
+    // maximun execution time for melody scripts
+    'melody-timeout' => 60,
 );
 
 if (file_exists(__DIR__.'/config.php')) {
@@ -88,6 +91,7 @@ function runCode($__source_code, $__bootstrap_file)
     $start = microtime(true);
 
     $melodyPlugin = new MelodyPlugin();
+    $melodyPlugin->setTimeout($options['melody-timeout']);
     if ($melodyPlugin->isMelodyScript($code)) {
         if ($melodyPlugin->isScriptingSupported()) {
             // make sure krumo class is available in the melody script

lib/MelodyPlugin.php

@@ -14,6 +14,8 @@
  * @see https://github.com/sensiolabs/melody
  */
 class MelodyPlugin {
+    private $timeout = 60;
+
     public function isMelodyScript($source) {
         return preg_match(ResourceParser::MELODY_PATTERN, $source);
     }
@@ -47,6 +49,7 @@ public function runScript($__source_code, $__bootstrap_file)
                 // we only have one output channel to the browser, just echo "all the things"
                 echo $text;
             };
+            $process->setTimeout($this->timeout);
             $process->run($callback);
         };
 
@@ -64,4 +67,8 @@ public function runScript($__source_code, $__bootstrap_file)
         file_put_contents($tmpFile, $__source_code);
         $melody->run($tmpFile, array(), $runConfiguration, $userConfiguration, $executor);
     }
+
+    public function setTimeout($timeout) {
+        $this->timeout = $timeout;
+    }
 }