Module sandboxing system

Sandboxing makes module scripts run inside an isolated lua environments,
making more easier and secure to script

Move and rework TextMessage using the new sandbox system
This commit is contained in:
Eduardo Bart
2012-07-19 06:12:17 -03:00
parent e2921c6407
commit f289db3a9e
17 changed files with 287 additions and 263 deletions

View File

@@ -306,13 +306,13 @@ bool LuaInterface::safeRunScript(const std::string& fileName)
void LuaInterface::runScript(const std::string& fileName)
{
loadScript(fileName);
safeCall();
safeCall(0, 0);
}
void LuaInterface::runBuffer(const std::string& buffer, const std::string& source)
{
loadBuffer(buffer, source);
safeCall();
safeCall(0, 0);
}
void LuaInterface::loadScript(const std::string& fileName)
@@ -425,7 +425,7 @@ std::string LuaInterface::getCurrentSourcePath(int level)
return path;
}
int LuaInterface::safeCall(int numArgs)
int LuaInterface::safeCall(int numArgs, int numRets)
{
assert(hasIndex(-numArgs-1));
@@ -446,22 +446,33 @@ int LuaInterface::safeCall(int numArgs)
if(ret != 0)
throw LuaException(popString());
int rets = (stackSize() + numArgs + 1) - previousStackSize;
while(numRets != -1 && rets != numRets) {
if(rets < numRets) {
pushNil();
rets++;
} else {
pop();
rets--;
}
}
// returns the number of results
return (stackSize() + numArgs + 1) - previousStackSize;
return rets;
}
int LuaInterface::signalCall(int numArgs, int requestedResults)
int LuaInterface::signalCall(int numArgs, int numRets)
{
int numRets = 0;
int rets = 0;
int funcIndex = -numArgs-1;
try {
// must be a function
if(isFunction(funcIndex)) {
numRets = safeCall(numArgs);
rets = safeCall(numArgs);
if(requestedResults != -1) {
if(numRets != requestedResults)
if(numRets != -1) {
if(rets != numRets)
throw LuaException("function call didn't return the expected number of results", 0);
}
}
@@ -491,8 +502,8 @@ int LuaInterface::signalCall(int numArgs, int requestedResults)
}
pop(numArgs + 1); // pops the table of function and arguments
if(requestedResults == 1) {
numRets = 1;
if(numRets == 1) {
rets = 1;
pushBoolean(done);
}
}
@@ -509,13 +520,13 @@ int LuaInterface::signalCall(int numArgs, int requestedResults)
}
// pushes nil values if needed
while(requestedResults != -1 && numRets < requestedResults) {
while(numRets != -1 && rets < numRets) {
pushNil();
numRets++;
rets++;
}
// returns the number of results on the stack
return numRets;
return rets;
}
void LuaInterface::newEnvironment()

View File

@@ -174,13 +174,13 @@ public:
/// results are pushed onto the stack.
/// @exception LuaException is thrown on any lua error
/// @return number of results
int safeCall(int numArgs = 0);
int safeCall(int numArgs = 0, int numRets = -1);
/// Same as safeCall but catches exceptions and can also calls a table of functions,
/// if any error occurs it will be reported to stdout and returns 0 results
/// @param requestedResults is the number of results requested to pushes onto the stack,
/// if supplied, the call will always pushes that number of results, even if it fails
int signalCall(int numArgs = 0, int requestedResults = -1);
int signalCall(int numArgs = 0, int numRets = -1);
/// @brief Creates a new environment table
/// The new environment table is redirected to the global environment (aka _G),