2012-04-13 10:38:12 +00:00
|
|
|
mw = mw or {}
|
|
|
|
|
Added more Lua environment features
Package library:
* Added a simulation of the Lua 5.1 package library.
* Removed mw.import(), replaced it with a package loader. Packages can be
retrieved from the wiki, using require('Module:Foo'), or from files
distributed with Scribunto, using require('foo'). The "Module:" prefix allows
for source compatibility with existing Lua code.
* Added a couple of libraries from LuaForge: luabit and stringtools.
* Made fetchModuleFromParser() return null on error instead of throwing an
exception, to more easily support the desired behaviour of the package loader,
which needs to return null on error.
* Renamed mw.setupEnvironment() to mw.setup() since it is setting up things
other than the environment now.
* In MWServer:handleRegisterLibrary(), remove the feature which interprets dots
in library names, since LuaSandbox doesn't support this.
Improved module isolation and related refactoring:
* Expose restricted versions of getfenv() and setfenv() to user Lua code.
Requires luasandbox r114952.
* Don't cache the export list returned by module execution for later function
calls. This breaks isolation of #invoke calls, since the local variables are
persistent.
* Removed ScribuntoFunctionBase and its children, since it doesn't really have
a purpose if it can't cache anything. Instead, invoke functions using a module
method called invoke().
* Removed Module::initialize(), replaced it with a validate() function. This is
a more elegant interface and works better with the new module caching scheme.
* Use a Status object for the return value of Engine::validate() instead of an
array. Use the formatting facilities of the Status class.
Other:
* Removed "too many returns" error, doesn't fit in with Lua conventions.
* Use the standalone engine by default, so that the extension will work without
configuration for more people.
* Added an accessor for $engine->interpreter
* Fix mw.clone() to correctly clone metatables
* If the standalone interpreter exits due to an error, there are some contexts
where the initial error will be caught and ignored, and the user will see the
error from checkValid() instead. In this case, rethrow the original error for
a more informative message.
* Load mw.lua into the initial standalone environment, to reduce code
duplication between mw.lua and MWServer.lua.
* Fixed a bug in Scribunto_LuaStandaloneInterpreter::handleCall() for functions
that return no results.
* Fixed a bug in encodeLuaVar() for strings with "\r". Added test case.
* In MWServer.lua, don't call error() for internal errors, instead just print
the error and exit. This avoids a protocol violation when an error is
encountered from within handleCall().
* Added lots of documentation. Lua doc comments are in LuaDoc format.
Change-Id: Ie2fd572c362bedf02f45d3fa5352a5280e034740
2012-04-18 03:46:18 +00:00
|
|
|
local packageCache
|
|
|
|
local packageModuleFunc
|
|
|
|
local internal
|
|
|
|
|
|
|
|
--- Put an isolation-friendly package module into the specified environment
|
|
|
|
-- table. The package module will have an empty cache, because caching of
|
|
|
|
-- module functions from other cloned environments would break module isolation.
|
|
|
|
--
|
|
|
|
-- @param env The cloned environment
|
|
|
|
local function makePackageModule( env )
|
|
|
|
-- Create the package globals in the given environment
|
|
|
|
setfenv( packageModuleFunc, env )()
|
|
|
|
|
|
|
|
-- Make a loader function
|
|
|
|
local function loadPackage( modName )
|
|
|
|
local init
|
|
|
|
if packageCache[modName] == 'missing' then
|
|
|
|
return nil
|
|
|
|
elseif packageCache[modName] == nil then
|
|
|
|
init = internal.loadPackage( modName )
|
|
|
|
if init == nil then
|
|
|
|
packageCache[modName] = 'missing'
|
|
|
|
return nil
|
|
|
|
end
|
|
|
|
packageCache[modName] = init
|
|
|
|
else
|
|
|
|
init = packageCache[modName]
|
|
|
|
end
|
|
|
|
|
|
|
|
setfenv( init, env )
|
|
|
|
return init
|
|
|
|
end
|
|
|
|
|
|
|
|
table.insert( env.package.loaders, loadPackage )
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Set up the base environment. The PHP host calls this function after any
|
|
|
|
-- necessary host-side initialisation has been done.
|
|
|
|
function mw.setup()
|
|
|
|
-- Don't allow getmetatable() on a non-table, since if you can get the metatable,
|
|
|
|
-- you can set values in it, breaking isolation
|
|
|
|
local old_getmetatable = getmetatable
|
|
|
|
function getmetatable(obj)
|
|
|
|
if type(obj) == 'table' then
|
|
|
|
return old_getmetatable(obj)
|
|
|
|
else
|
|
|
|
return nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Make mw_internal private
|
|
|
|
--
|
|
|
|
-- mw_internal.loadPackage() returns function values with their environment
|
|
|
|
-- set to the base environment, which would violate module isolation if they
|
|
|
|
-- were run from a cloned environment. We can only allow access to
|
|
|
|
-- mw_internal.loadPackage via our environment-setting wrapper.
|
|
|
|
--
|
|
|
|
internal = mw_internal
|
|
|
|
mw_internal = nil
|
|
|
|
|
|
|
|
setfenv, getfenv = mw.makeProtectedEnvFuncs( {[_G] = true}, {} )
|
|
|
|
packageModuleFunc = internal.loadPackage( 'package' )
|
|
|
|
packageCache = {}
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Do a "deep copy" of a table or other value.
|
2012-04-13 10:38:12 +00:00
|
|
|
function mw.clone( val )
|
|
|
|
local tableRefs = {}
|
|
|
|
local function recursiveClone( val )
|
|
|
|
if type( val ) == 'table' then
|
|
|
|
-- Encode circular references correctly
|
|
|
|
if tableRefs[val] ~= nil then
|
|
|
|
return tableRefs[val]
|
|
|
|
end
|
|
|
|
|
|
|
|
local retVal
|
|
|
|
retVal = {}
|
|
|
|
tableRefs[val] = retVal
|
Added more Lua environment features
Package library:
* Added a simulation of the Lua 5.1 package library.
* Removed mw.import(), replaced it with a package loader. Packages can be
retrieved from the wiki, using require('Module:Foo'), or from files
distributed with Scribunto, using require('foo'). The "Module:" prefix allows
for source compatibility with existing Lua code.
* Added a couple of libraries from LuaForge: luabit and stringtools.
* Made fetchModuleFromParser() return null on error instead of throwing an
exception, to more easily support the desired behaviour of the package loader,
which needs to return null on error.
* Renamed mw.setupEnvironment() to mw.setup() since it is setting up things
other than the environment now.
* In MWServer:handleRegisterLibrary(), remove the feature which interprets dots
in library names, since LuaSandbox doesn't support this.
Improved module isolation and related refactoring:
* Expose restricted versions of getfenv() and setfenv() to user Lua code.
Requires luasandbox r114952.
* Don't cache the export list returned by module execution for later function
calls. This breaks isolation of #invoke calls, since the local variables are
persistent.
* Removed ScribuntoFunctionBase and its children, since it doesn't really have
a purpose if it can't cache anything. Instead, invoke functions using a module
method called invoke().
* Removed Module::initialize(), replaced it with a validate() function. This is
a more elegant interface and works better with the new module caching scheme.
* Use a Status object for the return value of Engine::validate() instead of an
array. Use the formatting facilities of the Status class.
Other:
* Removed "too many returns" error, doesn't fit in with Lua conventions.
* Use the standalone engine by default, so that the extension will work without
configuration for more people.
* Added an accessor for $engine->interpreter
* Fix mw.clone() to correctly clone metatables
* If the standalone interpreter exits due to an error, there are some contexts
where the initial error will be caught and ignored, and the user will see the
error from checkValid() instead. In this case, rethrow the original error for
a more informative message.
* Load mw.lua into the initial standalone environment, to reduce code
duplication between mw.lua and MWServer.lua.
* Fixed a bug in Scribunto_LuaStandaloneInterpreter::handleCall() for functions
that return no results.
* Fixed a bug in encodeLuaVar() for strings with "\r". Added test case.
* In MWServer.lua, don't call error() for internal errors, instead just print
the error and exit. This avoids a protocol violation when an error is
encountered from within handleCall().
* Added lots of documentation. Lua doc comments are in LuaDoc format.
Change-Id: Ie2fd572c362bedf02f45d3fa5352a5280e034740
2012-04-18 03:46:18 +00:00
|
|
|
|
|
|
|
-- Copy metatable
|
|
|
|
if getmetatable( val ) then
|
|
|
|
setmetatable( val, recursiveClone( getmetatable( val ) ) )
|
|
|
|
end
|
|
|
|
|
2012-04-13 10:38:12 +00:00
|
|
|
for key, elt in pairs( val ) do
|
|
|
|
retVal[key] = recursiveClone( elt )
|
|
|
|
end
|
|
|
|
return retVal
|
|
|
|
else
|
|
|
|
return val
|
|
|
|
end
|
|
|
|
end
|
|
|
|
return recursiveClone( val )
|
|
|
|
end
|
|
|
|
|
Added more Lua environment features
Package library:
* Added a simulation of the Lua 5.1 package library.
* Removed mw.import(), replaced it with a package loader. Packages can be
retrieved from the wiki, using require('Module:Foo'), or from files
distributed with Scribunto, using require('foo'). The "Module:" prefix allows
for source compatibility with existing Lua code.
* Added a couple of libraries from LuaForge: luabit and stringtools.
* Made fetchModuleFromParser() return null on error instead of throwing an
exception, to more easily support the desired behaviour of the package loader,
which needs to return null on error.
* Renamed mw.setupEnvironment() to mw.setup() since it is setting up things
other than the environment now.
* In MWServer:handleRegisterLibrary(), remove the feature which interprets dots
in library names, since LuaSandbox doesn't support this.
Improved module isolation and related refactoring:
* Expose restricted versions of getfenv() and setfenv() to user Lua code.
Requires luasandbox r114952.
* Don't cache the export list returned by module execution for later function
calls. This breaks isolation of #invoke calls, since the local variables are
persistent.
* Removed ScribuntoFunctionBase and its children, since it doesn't really have
a purpose if it can't cache anything. Instead, invoke functions using a module
method called invoke().
* Removed Module::initialize(), replaced it with a validate() function. This is
a more elegant interface and works better with the new module caching scheme.
* Use a Status object for the return value of Engine::validate() instead of an
array. Use the formatting facilities of the Status class.
Other:
* Removed "too many returns" error, doesn't fit in with Lua conventions.
* Use the standalone engine by default, so that the extension will work without
configuration for more people.
* Added an accessor for $engine->interpreter
* Fix mw.clone() to correctly clone metatables
* If the standalone interpreter exits due to an error, there are some contexts
where the initial error will be caught and ignored, and the user will see the
error from checkValid() instead. In this case, rethrow the original error for
a more informative message.
* Load mw.lua into the initial standalone environment, to reduce code
duplication between mw.lua and MWServer.lua.
* Fixed a bug in Scribunto_LuaStandaloneInterpreter::handleCall() for functions
that return no results.
* Fixed a bug in encodeLuaVar() for strings with "\r". Added test case.
* In MWServer.lua, don't call error() for internal errors, instead just print
the error and exit. This avoids a protocol violation when an error is
encountered from within handleCall().
* Added lots of documentation. Lua doc comments are in LuaDoc format.
Change-Id: Ie2fd572c362bedf02f45d3fa5352a5280e034740
2012-04-18 03:46:18 +00:00
|
|
|
--- Set up a cloned environment for execution of a module chunk, then execute
|
|
|
|
-- the module in that environment. This is called by the host to implement
|
|
|
|
-- {{#invoke}}.
|
|
|
|
--
|
|
|
|
-- @param chunk The module chunk
|
2012-04-13 10:38:12 +00:00
|
|
|
function mw.executeModule( chunk )
|
|
|
|
local env = mw.clone( _G )
|
Added more Lua environment features
Package library:
* Added a simulation of the Lua 5.1 package library.
* Removed mw.import(), replaced it with a package loader. Packages can be
retrieved from the wiki, using require('Module:Foo'), or from files
distributed with Scribunto, using require('foo'). The "Module:" prefix allows
for source compatibility with existing Lua code.
* Added a couple of libraries from LuaForge: luabit and stringtools.
* Made fetchModuleFromParser() return null on error instead of throwing an
exception, to more easily support the desired behaviour of the package loader,
which needs to return null on error.
* Renamed mw.setupEnvironment() to mw.setup() since it is setting up things
other than the environment now.
* In MWServer:handleRegisterLibrary(), remove the feature which interprets dots
in library names, since LuaSandbox doesn't support this.
Improved module isolation and related refactoring:
* Expose restricted versions of getfenv() and setfenv() to user Lua code.
Requires luasandbox r114952.
* Don't cache the export list returned by module execution for later function
calls. This breaks isolation of #invoke calls, since the local variables are
persistent.
* Removed ScribuntoFunctionBase and its children, since it doesn't really have
a purpose if it can't cache anything. Instead, invoke functions using a module
method called invoke().
* Removed Module::initialize(), replaced it with a validate() function. This is
a more elegant interface and works better with the new module caching scheme.
* Use a Status object for the return value of Engine::validate() instead of an
array. Use the formatting facilities of the Status class.
Other:
* Removed "too many returns" error, doesn't fit in with Lua conventions.
* Use the standalone engine by default, so that the extension will work without
configuration for more people.
* Added an accessor for $engine->interpreter
* Fix mw.clone() to correctly clone metatables
* If the standalone interpreter exits due to an error, there are some contexts
where the initial error will be caught and ignored, and the user will see the
error from checkValid() instead. In this case, rethrow the original error for
a more informative message.
* Load mw.lua into the initial standalone environment, to reduce code
duplication between mw.lua and MWServer.lua.
* Fixed a bug in Scribunto_LuaStandaloneInterpreter::handleCall() for functions
that return no results.
* Fixed a bug in encodeLuaVar() for strings with "\r". Added test case.
* In MWServer.lua, don't call error() for internal errors, instead just print
the error and exit. This avoids a protocol violation when an error is
encountered from within handleCall().
* Added lots of documentation. Lua doc comments are in LuaDoc format.
Change-Id: Ie2fd572c362bedf02f45d3fa5352a5280e034740
2012-04-18 03:46:18 +00:00
|
|
|
makePackageModule( env )
|
2012-04-13 10:38:12 +00:00
|
|
|
setfenv( chunk, env )
|
|
|
|
return chunk()
|
|
|
|
end
|
|
|
|
|
Added more Lua environment features
Package library:
* Added a simulation of the Lua 5.1 package library.
* Removed mw.import(), replaced it with a package loader. Packages can be
retrieved from the wiki, using require('Module:Foo'), or from files
distributed with Scribunto, using require('foo'). The "Module:" prefix allows
for source compatibility with existing Lua code.
* Added a couple of libraries from LuaForge: luabit and stringtools.
* Made fetchModuleFromParser() return null on error instead of throwing an
exception, to more easily support the desired behaviour of the package loader,
which needs to return null on error.
* Renamed mw.setupEnvironment() to mw.setup() since it is setting up things
other than the environment now.
* In MWServer:handleRegisterLibrary(), remove the feature which interprets dots
in library names, since LuaSandbox doesn't support this.
Improved module isolation and related refactoring:
* Expose restricted versions of getfenv() and setfenv() to user Lua code.
Requires luasandbox r114952.
* Don't cache the export list returned by module execution for later function
calls. This breaks isolation of #invoke calls, since the local variables are
persistent.
* Removed ScribuntoFunctionBase and its children, since it doesn't really have
a purpose if it can't cache anything. Instead, invoke functions using a module
method called invoke().
* Removed Module::initialize(), replaced it with a validate() function. This is
a more elegant interface and works better with the new module caching scheme.
* Use a Status object for the return value of Engine::validate() instead of an
array. Use the formatting facilities of the Status class.
Other:
* Removed "too many returns" error, doesn't fit in with Lua conventions.
* Use the standalone engine by default, so that the extension will work without
configuration for more people.
* Added an accessor for $engine->interpreter
* Fix mw.clone() to correctly clone metatables
* If the standalone interpreter exits due to an error, there are some contexts
where the initial error will be caught and ignored, and the user will see the
error from checkValid() instead. In this case, rethrow the original error for
a more informative message.
* Load mw.lua into the initial standalone environment, to reduce code
duplication between mw.lua and MWServer.lua.
* Fixed a bug in Scribunto_LuaStandaloneInterpreter::handleCall() for functions
that return no results.
* Fixed a bug in encodeLuaVar() for strings with "\r". Added test case.
* In MWServer.lua, don't call error() for internal errors, instead just print
the error and exit. This avoids a protocol violation when an error is
encountered from within handleCall().
* Added lots of documentation. Lua doc comments are in LuaDoc format.
Change-Id: Ie2fd572c362bedf02f45d3fa5352a5280e034740
2012-04-18 03:46:18 +00:00
|
|
|
--- Make isolation-safe setfenv and getfenv functions
|
|
|
|
--
|
|
|
|
-- @param protectedEnvironments A table where the keys are protected environment
|
|
|
|
-- tables. These environments cannot be accessed with getfenv(), and
|
|
|
|
-- functions with these environments cannot be modified or accessed using
|
|
|
|
-- integer indexes to setfenv(). However, functions with these environments
|
|
|
|
-- can have their environment set with setfenv() with a function value
|
|
|
|
-- argument.
|
|
|
|
--
|
|
|
|
-- @param protectedFunctions A table where the keys are protected functions,
|
|
|
|
-- which cannot have their environments set by setfenv() with a function
|
|
|
|
-- value argument.
|
|
|
|
--
|
|
|
|
-- @return setfenv
|
|
|
|
-- @return getfenv
|
|
|
|
function mw.makeProtectedEnvFuncs( protectedEnvironments, protectedFunctions )
|
|
|
|
local old_setfenv = setfenv
|
|
|
|
local old_getfenv = getfenv
|
|
|
|
|
|
|
|
local function my_setfenv( func, newEnv )
|
|
|
|
if type( func ) == 'number' then
|
|
|
|
local stackIndex = math.floor( func )
|
|
|
|
if stackIndex <= 0 then
|
|
|
|
error( "'setfenv' cannot set the global environment, it is protected", 2 )
|
|
|
|
end
|
|
|
|
if stackIndex > 10 then
|
|
|
|
error( "'setfenv' cannot set the global environment at a level greater than 10", 2 )
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
-- Add one because we are still in Lua and 1 is right here
|
|
|
|
stackIndex = stackIndex + 1
|
|
|
|
|
|
|
|
local i
|
|
|
|
for i = 2, stackIndex do
|
|
|
|
if protectedEnvironments[ old_getfenv( i ) ] then
|
|
|
|
error( "'setfenv' cannot set the requested environment, it is protected", 2 )
|
|
|
|
end
|
|
|
|
end
|
|
|
|
func = old_setfenv( stackIndex, newEnv )
|
|
|
|
elseif type( func ) == 'function' then
|
|
|
|
if protectedFunctions[func] then
|
|
|
|
error( "'setfenv' cannot be called on a protected function", 2 )
|
|
|
|
end
|
|
|
|
old_setfenv( func, newEnv )
|
|
|
|
else
|
|
|
|
error( "'setfenv' can only be called with a function or integer as the first argument", 2 )
|
|
|
|
end
|
|
|
|
return func
|
|
|
|
end
|
|
|
|
|
|
|
|
local function my_getfenv( func )
|
|
|
|
local env = old_getfenv( func )
|
|
|
|
if protectedEnvironments[env] then
|
|
|
|
return nil
|
|
|
|
else
|
|
|
|
return env
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
return my_setfenv, my_getfenv
|
|
|
|
end
|
|
|
|
|
2012-04-13 10:38:12 +00:00
|
|
|
return mw
|