Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-17 04:53:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve modules and sandbox system

Browse Source
This commit is contained in:
Eduardo Bart
2012-07-23 21:22:38 -03:00
parent 61d64c7417
commit 1c3e630237
12 changed files with 238 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/framework/luaengine/luainterface.cpp
View File

@@ -47,6 +47,12 @@ void LuaInterface::init()
{
createLuaState();
// store global environment reference
pushThread();
getEnv();
m_globalEnv = ref();
pop();
// check if demangle_type is working as expected
assert(stdext::demangle_type<LuaObject>() == "LuaObject");
@@ -297,7 +303,7 @@ bool LuaInterface::safeRunScript(const std::string& fileName)
try {
runScript(fileName);
return true;
} catch(LuaException& e) {
} catch(stdext::exception& e) {
g_logger.error(stdext::format("Failed to load script '%s': %s", fileName, e.what()));
return false;
}
@@ -322,13 +328,9 @@ void LuaInterface::loadScript(const std::string& fileName)
if(!boost::starts_with(fileName, "/"))
filePath = getCurrentSourcePath() + "/" + filePath;
try {
std::string buffer = g_resources.loadFile(fileName);
std::string source = "@" + filePath;
loadBuffer(buffer, source);
} catch(stdext::exception& e) {
throw LuaException(e.what());
}
std::string buffer = g_resources.loadFile(fileName);
std::string source = "@" + filePath;
loadBuffer(buffer, source);
}
void LuaInterface::loadFunction(const std::string& buffer, const std::string& source)
@@ -515,7 +517,7 @@ int LuaInterface::signalCall(int numArgs, int numRets)
else {
throw LuaException("attempt to call a non function value", 0);
}
} catch(LuaException &e) {
} catch(stdext::exception& e) {
g_logger.error(stdext::format("protected lua call failed: %s", e.what()));
}
@@ -529,16 +531,16 @@ int LuaInterface::signalCall(int numArgs, int numRets)
return rets;
}
void LuaInterface::newEnvironment()
int LuaInterface::newSandboxEnv()
{
newTable(); // pushes the new environment table
newTable(); // pushes the new environment metatable
getGlobalEnvironment(); // pushes the global environment
getRef(getGlobalEnvironment()); // pushes the global environment
setField("__index"); // sets metatable __index to the global environment
setMetatable(); // assigns environment metatable
return ref(); // return a reference to the environment table
}
///////////////////////////////////////////////////////////////////////////////
// lua C functions
@@ -550,13 +552,13 @@ int LuaInterface::luaScriptLoader(lua_State* L)
try {
g_lua.loadScript(fileName);
return 1;
} catch(LuaException& e) {
g_logger.error(stdext::format("failed to load script file '%s': %s", fileName, e.what()));
return 0;
} catch(stdext::exception& e) {
g_lua.pushString(stdext::mkstr("\n\t", e.what()));
return 1;
}
}
int LuaInterface::luaScriptRunner(lua_State* L)
int LuaInterface::lua_dofile(lua_State* L)
{
std::string fileName = g_lua.popString();
if(!boost::ends_with(fileName, ".lua"))
@@ -566,13 +568,14 @@ int LuaInterface::luaScriptRunner(lua_State* L)
g_lua.loadScript(fileName);
g_lua.call(0, LUA_MULTRET);
return g_lua.stackSize();
} catch(LuaException& e) {
g_logger.error(stdext::format("failed to load script file '%s': %s", fileName, e.what()));
} catch(stdext::exception& e) {
g_lua.pushString(e.what());
g_lua.error();
return 0;
}
}
int LuaInterface::luaScriptsRunner(lua_State* L)
int LuaInterface::lua_dofiles(lua_State* L)
{
std::string directory = g_lua.popString();
@@ -583,13 +586,31 @@ int LuaInterface::luaScriptsRunner(lua_State* L)
try {
g_lua.loadScript(directory + "/" + fileName);
g_lua.call(0, 0);
} catch(LuaException& e) {
g_logger.error(stdext::format("failed to load script file '%s': %s", fileName, e.what()));
} catch(stdext::exception& e) {
g_lua.pushString(e.what());
g_lua.error();
}
}
return 0;
}
int LuaInterface::lua_loadfile(lua_State* L)
{
std::string fileName = g_lua.popString();
if(!boost::ends_with(fileName, ".lua"))
fileName += ".lua";
try {
g_lua.loadScript(fileName);
return 1;
} catch(stdext::exception& e) {
g_lua.pushNil();
g_lua.pushString(e.what());
g_lua.error();
return 2;
}
}
int LuaInterface::luaErrorHandler(lua_State* L)
{
// pops the error message
@@ -618,12 +639,13 @@ int LuaInterface::luaCppFunctionCallback(lua_State* L)
numRets = (*(funcPtr->get()))(&g_lua);
g_lua.m_cppCallbackDepth--;
assert(numRets == g_lua.stackSize());
} catch(stdext::exception &e) {
} catch(stdext::exception& e) {
// cleanup stack
while(g_lua.stackSize() > 0)
g_lua.pop();
numRets = 0;
g_logger.error(stdext::format("C++ call failed: %s", g_lua.traceback(e.what())));
g_lua.pushString(stdext::format("C++ call failed: %s", g_lua.traceback(e.what())));
g_lua.error();
}
return numRets;
@@ -670,13 +692,24 @@ void LuaInterface::createLuaState()
rawSeti(5);
pop(2);
// replace loadfile
getGlobal("package");
getField("loaders");
pushCFunction(&LuaInterface::luaScriptLoader);
rawSeti(5);
pop(2);
// replace dofile
pushCFunction(&LuaInterface::luaScriptRunner);
pushCFunction(&LuaInterface::lua_dofile);
setGlobal("dofile");
// dofiles
pushCFunction(&LuaInterface::luaScriptsRunner);
pushCFunction(&LuaInterface::lua_dofiles);
setGlobal("dofiles");
// replace loadfile
pushCFunction(&LuaInterface::lua_loadfile);
setGlobal("loadfile");
}
void LuaInterface::closeLuaState()
@@ -833,18 +866,13 @@ void LuaInterface::getWeakRef(int weakRef)
remove(-2);
}
void LuaInterface::getGlobalEnvironment()
void LuaInterface::setGlobalEnvironment(int env)
{
pushThread();
getEnv();
remove(-2);
}
void LuaInterface::setGlobalEnvironment()
{
pushThread();
insert(-2);
getRef(env);
assert(isTable());
setEnv();
pop();
}
void LuaInterface::setMetatable(int index)
@@ -899,6 +927,24 @@ void LuaInterface::setTable(int index)
lua_settable(L, index);
}
void LuaInterface::clearTable(int index)
{
assert(hasIndex(index) && isTable(index));
pushNil();
bool stop = false;
while(!stop && next(index-1)) {
pop();
pushValue();
if(next(index-2))
pop();
else
stop = true;
insert(-2);
pushNil();
rawSet(index-3);
}
}
void LuaInterface::getGlobal(const std::string& key)
{
lua_getglobal(L, key.c_str());

15
src/framework/luaengine/luainterface.h
View File

@@ -186,7 +186,7 @@ public:
/// The new environment table is redirected to the global environment (aka _G),
/// this allows to access global variables from _G in the new environment and
/// prevents new variables in this new environment to be set on the global environment
void newEnvironment();
int newSandboxEnv();
template<typename... T>
int callGlobalField(const std::string& global, const std::string& field, const T&... args);
@@ -200,9 +200,11 @@ private:
/// Load scripts requested by lua 'require'
static int luaScriptLoader(lua_State* L);
/// Run scripts requested by lua 'dofile'
static int luaScriptRunner(lua_State* L);
static int lua_dofile(lua_State* L);
/// Run scripts requested by lua 'dofiles'
static int luaScriptsRunner(lua_State* L);
static int lua_dofiles(lua_State* L);
/// Run scripts requested by lua 'dofiles'
static int lua_loadfile(lua_State* L);
/// Handle lua errors from safeCall
static int luaErrorHandler(lua_State* L);
/// Handle bound cpp functions callbacks
@@ -240,8 +242,9 @@ public:
void getRef(int ref);
void getWeakRef(int weakRef);
void getGlobalEnvironment();
void setGlobalEnvironment();
int getGlobalEnvironment() { return m_globalEnv; }
void setGlobalEnvironment(int env);
void resetGlobalEnvironment() { setGlobalEnvironment(m_globalEnv); }
void setMetatable(int index = -2);
void getMetatable(int index = -1);
@@ -253,6 +256,7 @@ public:
void getTable(int index = -2);
void setTable(int index = -3);
void clearTable(int index = -1);
void getEnv(int index = -1);
void setEnv(int index = -2);
@@ -334,6 +338,7 @@ private:
int m_cppCallbackDepth;
int m_totalObjRefs;
int m_totalFuncRefs;
int m_globalEnv;
};
extern LuaInterface g_lua;