tour/minetest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only give necessary permissions to new pause menu env

Browse Source
This commit is contained in:
grorp 2025-01-01 21:52:42 +01:00
parent 2dcb58c996
commit 5304767bdc
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/script/scripting_mainmenu.h
View File

@ -40,8 +40,7 @@ public:
protected:
bool checkPathInternal(const std::string &abs_path, bool write_required,
bool *write_allowed) override
{
bool *write_allowed) override {
return checkPathAccess(abs_path, write_required, write_allowed);
}

14
src/script/scripting_pause_menu.cpp
View File

@ -50,6 +50,18 @@ void PauseMenuScripting::initializeModApi(lua_State *L, int top)
void PauseMenuScripting::loadBuiltin()
{
loadScript(porting::path_share + DIR_DELIM + "builtin" + DIR_DELIM + "init.lua");
loadScript(porting::path_share + DIR_DELIM "builtin" DIR_DELIM "init.lua");
checkSetByBuiltin();
}
bool PauseMenuScripting::checkPathInternal(const std::string &abs_path, bool write_required,
bool *write_allowed)
{
// NOTE: The pause menu env is on the same level of trust as the mainmenu env.
// However, since it doesn't need anything else at the moment, there's no
// reason to give it access to anything else.
std::string path_share = fs::AbsolutePathPartial(porting::path_share);
return !write_required &&
fs::PathStartsWith(abs_path, path_share + DIR_DELIM "builtin");
}

6
src/script/scripting_pause_menu.h
View File

@ -8,7 +8,6 @@
#include "cpp_api/s_client_common.h"
#include "cpp_api/s_pause_menu.h"
#include "cpp_api/s_security.h"
#include "scripting_mainmenu.h"
class PauseMenuScripting:
virtual public ScriptApiBase,
@ -22,10 +21,7 @@ public:
protected:
bool checkPathInternal(const std::string &abs_path, bool write_required,
bool *write_allowed) override
{
return MainMenuScripting::checkPathAccess(abs_path, write_required, write_allowed);
}
bool *write_allowed) override;
private:
void initializeModApi(lua_State *L, int top);