mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto
synced 2024-11-24 00:05:00 +00:00
b0f00103e2
* Added unit tests for the two Lua interpreter classes * Fixed a bug in checkType() * Have Scribunto_LuaSandboxInterpreter throw an exception on construct when the extension doesn't exist, to match the standalone behaviour. * In Scribunto_LuaSandboxInterpreter, removed debugging statements accidentally left in. * Convert LuaSandboxTimeoutError to the appropriate common error message. * Moved the option munging from the sandbox engine to the interpreter, so that the interpreter can be unit tested separately. * Use /bin/sh instead of bash for lua_ulimit.sh, since dash is smaller and still supports ulimit. * Use exec to run the lua binary, so that the vsize of the shell doesn't add to the memory limit. * Added a quit function to the standalone interpreter. Unused at present. * Don't add a comma after the last element of a table in a Lua expression. * Make the SIGXCPU detection work: proc_open() runs the command via a shell, which reports signals in the child via the exit status, so proc_get_status() will never return a valid termsig element. * In MWServer:call(), fixed a bug causing the return values to be wrapped in an array. * Fixed a misunderstanding of what select() does. * In MWServer:getStatus(), fixed indexes so that vsize will be correct. Removed RSS, since it wasn't used anyway and turns out to be measured in multiples of the page size, and I couldn't be bothered trying to fetch that from getconf. Return the PID and vsize as numbers rather than strings. * Added a simple table dump feature to MWServer:debug(). * Fixed brackets in MWServer:tostring(). * Added missing Linux 32-bit binary. Change-Id: Ibf5f4656b1c0a9f81287d363184c3fe9d2abdafd
86 lines
2.3 KiB
PHP
86 lines
2.3 KiB
PHP
<?php
|
|
|
|
class Scribunto_LuaSandboxEngine extends Scribunto_LuaEngine {
|
|
public $options, $loaded = false;
|
|
|
|
public function getLimitReport() {
|
|
$this->load();
|
|
$usage = $this->interpreter->getMemoryUsage();
|
|
$lang = Language::factory( 'en' );
|
|
$usageStr = $lang->formatSize( $usage );
|
|
return "Lua memory usage: {$usageStr}\n";
|
|
}
|
|
|
|
function newInterpreter() {
|
|
return new Scribunto_LuaSandboxInterpreter( $this, $this->options );
|
|
}
|
|
}
|
|
|
|
class Scribunto_LuaSandboxInterpreter extends Scribunto_LuaInterpreter {
|
|
var $engine, $sandbox, $libraries;
|
|
|
|
function __construct( $engine, $options ) {
|
|
if ( !extension_loaded( 'luasandbox' ) ) {
|
|
throw new MWException( 'The luasandbox extension is not present, ' .
|
|
'this engine cannot be used.' );
|
|
}
|
|
$this->engine = $engine;
|
|
$this->sandbox = new LuaSandbox;
|
|
$this->sandbox->setMemoryLimit( $options['memoryLimit'] );
|
|
$this->sandbox->setCPULimit( $options['cpuLimit'] );
|
|
}
|
|
|
|
public function loadString( $text, $chunkName ) {
|
|
try {
|
|
return $this->sandbox->loadString( $text, $chunkName );
|
|
} catch ( LuaSandboxError $e ) {
|
|
throw new Scribunto_LuaError( $e->getMessage() );
|
|
}
|
|
}
|
|
|
|
public function registerLibrary( $name, $functions ) {
|
|
$realLibrary = array();
|
|
foreach ( $functions as $funcName => $callback ) {
|
|
$realLibrary[$funcName] = array(
|
|
new Scribunto_LuaSandboxCallback( $callback ),
|
|
'call' );
|
|
}
|
|
$this->sandbox->registerLibrary( $name, $realLibrary );
|
|
|
|
# TODO: replace this with
|
|
#$this->sandbox->registerVirtualLibrary(
|
|
# $name, array( $this, 'callback' ), $functions );
|
|
}
|
|
|
|
public function callFunction( $func /*, ... */ ) {
|
|
$args = func_get_args();
|
|
$func = array_shift( $args );
|
|
try {
|
|
return call_user_func_array( array( $func, 'call' ), $args );
|
|
} catch ( LuaSandboxTimeoutError $e ) {
|
|
throw new ScribuntoException( 'scribunto-common-timeout' );
|
|
} catch ( LuaSandboxError $e ) {
|
|
throw new Scribunto_LuaError( $e->getMessage() );
|
|
}
|
|
}
|
|
|
|
public function getMemoryUsage() {
|
|
return $this->sandbox->getMemoryUsage();
|
|
}
|
|
}
|
|
|
|
class Scribunto_LuaSandboxCallback {
|
|
function __construct( $callback ) {
|
|
$this->callback = $callback;
|
|
}
|
|
|
|
function call( /*...*/ ) {
|
|
$args = func_get_args();
|
|
try {
|
|
return call_user_func_array( $this->callback, $args );
|
|
} catch ( Scribunto_LuaError $e ) {
|
|
throw new LuaSandboxRuntimeError( $e->getLuaMessage() );
|
|
}
|
|
}
|
|
}
|