mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 14:11:15 +02:00
Code Issues Projects Releases Wiki Activity

- added second round of security sandboxing for lua scripts (disable a number of other potentially dangerous functions)

Browse Source
This commit is contained in:
Mark Vejvoda
2012-10-11 06:10:21 +00:00
parent e3e3832070
commit 6b324cbb4e
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/game/script_manager.cpp
View File

@@ -1404,7 +1404,7 @@ Vec2i ScriptManager::getUnitPosition(int unitId) {
ScriptManager_STREFLOP_Wrapper streflopWrapper; ScriptManager_STREFLOP_Wrapper streflopWrapper;
Vec2i result = world->getUnitPosition(unitId); Vec2i result = world->getUnitPosition(unitId);
printf("In [%s] unitId = %d, pos [%s]\n",__FUNCTION__,unitId,result.getString().c_str()); if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s] unitId = %d, pos [%s]\n",__FUNCTION__,unitId,result.getString().c_str());
return result; return result;
} }

27
source/shared_lib/sources/lua/lua_script.cpp
View File

@@ -74,6 +74,33 @@ LuaScript::LuaScript() {
lua_setfield(luaState, -2, "remove"); lua_setfield(luaState, -2, "remove");
lua_pushnil(luaState); lua_pushnil(luaState);
lua_setfield(luaState, -2, "exit"); lua_setfield(luaState, -2, "exit");
lua_pushnil(luaState);
lua_setglobal(luaState, "loadfile");
lua_pushnil(luaState);
lua_setglobal(luaState, "dofile");
lua_pushnil(luaState);
lua_setglobal(luaState, "getfenv");
lua_pushnil(luaState);
lua_setglobal(luaState, "getmetatable");
lua_pushnil(luaState);
lua_setglobal(luaState, "load");
lua_pushnil(luaState);
lua_setglobal(luaState, "loadfile");
lua_pushnil(luaState);
lua_setglobal(luaState, "loadstring");
lua_pushnil(luaState);
lua_setglobal(luaState, "rawequal");
lua_pushnil(luaState);
lua_setglobal(luaState, "rawget");
lua_pushnil(luaState);
lua_setglobal(luaState, "rawset");
lua_pushnil(luaState);
lua_setglobal(luaState, "setfenv");
lua_pushnil(luaState);
lua_setglobal(luaState, "setmetatable");
lua_pop(luaState, 1); lua_pop(luaState, 1);
} }
} }