Minor improvements to Lua sandbox

[minetest.git] / src / script / cpp_api / s_security.h

diff --git a/src/script/cpp_api/s_security.h b/src/script/cpp_api/s_security.h
index 73e763548ea93a668c41499b8d99eed59eedf19c..880ce1638b7765045193605f40606496c4e4781d 100644 (file)
--- a/src/script/cpp_api/s_security.h
+++ b/src/script/cpp_api/s_security.h
@@ -40,11 +40,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class ScriptApiSecurity : virtual public ScriptApiBase
 {
 public:
-       int getThread(lua_State *L);
-       // creates an empty Lua environment
-       void createEmptyEnv(lua_State *L);
-       // sets the enviroment to the table thats on top of the stack
-       void setLuaEnv(lua_State *L, int thread);
        // Sets up security on the ScriptApi's Lua state
        void initializeSecurity();
        void initializeSecurityClient();
@@ -57,8 +52,17 @@ class ScriptApiSecurity : virtual public ScriptApiBase
        // Checks if mods are allowed to read (and optionally write) to the path
        static bool checkPath(lua_State *L, const char *path, bool write_required,
                        bool *write_allowed=NULL);
+       // Check if mod is whitelisted in the given setting
+       // This additionally checks that the mod's main file scope is executing.
+       static bool checkWhitelisted(lua_State *L, const std::string &setting);
 
 private:
+       int getThread(lua_State *L);
+       // sets the enviroment to the table thats on top of the stack
+       void setLuaEnv(lua_State *L, int thread);
+       // creates an empty Lua environment
+       void createEmptyEnv(lua_State *L);
+
        // Syntax: "sl_" <Library name or 'g' (global)> '_' <Function name>
        // (sl stands for Secure Lua)
 
@@ -75,4 +79,5 @@ class ScriptApiSecurity : virtual public ScriptApiBase
 
        static int sl_os_rename(lua_State *L);
        static int sl_os_remove(lua_State *L);
+       static int sl_os_setlocale(lua_State *L);
 };