Rim/h2-mod
Rim/h2-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make lua vms safer

Browse Source
This commit is contained in:
fed 2023-02-16 19:09:44 +01:00
parent 16d04d41dc
commit 5b67a53e9c
3 changed files with 76 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/component/filesystem.hpp
View File

@ -17,4 +17,15 @@ namespace filesystem
std::string get_safe_path(const std::filesystem::path& path);
bool safe_write_file(const std::string& file, const std::string& data, bool append = false);
template <typename R>
std::function<R(const std::string& str)>
safe_io_func(const std::function<R(const std::string& str)>& func)
{
return [func](const std::string& path)
{
const auto safe_path = filesystem::get_safe_path(path);
return func(safe_path);
};
}
}

53
src/client/component/ui_scripting.cpp
View File

@ -142,17 +142,6 @@ namespace ui_scripting
}
}
template <typename R>
std::function<R(const std::string& str)>
safe_io_func(const std::function<R(const std::string& str)>& func)
{
return [func](const std::string& path)
{
const auto safe_path = filesystem::get_safe_path(path);
return func(safe_path);
};
}
script_value json_to_lua(const nlohmann::json& json)
{
if (json.is_object())
@ -231,16 +220,17 @@ namespace ui_scripting
{
const auto lua = get_globals();
lua["io"]["fileexists"] = safe_io_func<bool>(utils::io::file_exists);
lua["io"] = table();
lua["io"]["fileexists"] = filesystem::safe_io_func<bool>(utils::io::file_exists);
lua["io"]["writefile"] = filesystem::safe_write_file;
lua["io"]["filesize"] = safe_io_func<size_t>(utils::io::file_size);
lua["io"]["createdirectory"] = safe_io_func<bool>(utils::io::create_directory);
lua["io"]["directoryexists"] = safe_io_func<bool>(utils::io::directory_exists);
lua["io"]["directoryisempty"] = safe_io_func<bool>(utils::io::directory_is_empty);
lua["io"]["listfiles"] = safe_io_func<std::vector<std::string>>(utils::io::list_files);
lua["io"]["removefile"] = safe_io_func<bool>(utils::io::remove_file);
lua["io"]["removedirectory"] = safe_io_func<bool>(utils::io::remove_directory);
lua["io"]["readfile"] = safe_io_func<std::string>(
lua["io"]["filesize"] = filesystem::safe_io_func<size_t>(utils::io::file_size);
lua["io"]["createdirectory"] = filesystem::safe_io_func<bool>(utils::io::create_directory);
lua["io"]["directoryexists"] = filesystem::safe_io_func<bool>(utils::io::directory_exists);
lua["io"]["directoryisempty"] = filesystem::safe_io_func<bool>(utils::io::directory_is_empty);
lua["io"]["listfiles"] = filesystem::safe_io_func<std::vector<std::string>>(utils::io::list_files);
lua["io"]["removefile"] = filesystem::safe_io_func<bool>(utils::io::remove_file);
lua["io"]["removedirectory"] = filesystem::safe_io_func<bool>(utils::io::remove_directory);
lua["io"]["readfile"] = filesystem::safe_io_func<std::string>(
static_cast<std::string(*)(const std::string&)>(utils::io::read_file));
using game = table;
@ -683,6 +673,29 @@ namespace ui_scripting
hks_package_require_hook.create(0x1402B4DA0, hks_package_require_stub);
hks_start_hook.create(0x140328BE0, hks_start_stub);
hks_shutdown_hook.create(0x1403203B0, hks_shutdown_stub);
// remove unsafe functions
utils::hook::nop(0x1402D885A, 1);
utils::hook::jump(0x14031E700, 0x1402D86E0);
utils::hook::jump(0x1402BFCC0, removed_function_stub); // io
utils::hook::jump(0x14017EE60, removed_function_stub); // profile
utils::hook::jump(0x1402C0150, removed_function_stub); // os
utils::hook::jump(0x14017F730, removed_function_stub); // serialize
utils::hook::jump(0x1402C0FF0, removed_function_stub); // hks
utils::hook::jump(0x14017EC60, removed_function_stub); // debug
utils::hook::nop(0x1402BFC48, 5); // coroutine
utils::hook::jump(0x1402B7FD0, removed_function_stub);
utils::hook::jump(0x1402B7C40, removed_function_stub);
utils::hook::jump(0x1402BAC30, removed_function_stub);
utils::hook::jump(0x1402B5480, removed_function_stub);
utils::hook::jump(0x1402C2030, removed_function_stub);
utils::hook::jump(0x1402C2180, removed_function_stub);
utils::hook::jump(0x1402B6F70, removed_function_stub);
utils::hook::jump(0x1402BD890, removed_function_stub);
}
};
}

42
src/client/game/scripting/lua/context.cpp
View File

@ -12,9 +12,12 @@
#include "component/mods.hpp"
#include "component/localized_strings.hpp"
#include "component/scheduler.hpp"
#include "component/filesystem.hpp"
#include "game/ui_scripting/execution.hpp"
#include "lualib.h"
#include <xsk/gsc/types.hpp>
#include <xsk/resolver.hpp>
@ -39,6 +42,22 @@ namespace scripting::lua
);
}
void remove_unsafe_functions(sol::state& state)
{
state["package"]["searchers"][3] = sol::lua_value{state, sol::lua_nil};
state["package"]["searchers"][4] = sol::lua_value{state, sol::lua_nil};
state["os"]["execute"] = sol::lua_value{state, sol::lua_nil};
state["os"]["exit"] = sol::lua_value{state, sol::lua_nil};
state["os"]["getenv"] = sol::lua_value{state, sol::lua_nil};
state["os"]["remove"] = sol::lua_value{state, sol::lua_nil};
state["os"]["rename"] = sol::lua_value{state, sol::lua_nil};
state["os"]["setlocale"] = sol::lua_value{state, sol::lua_nil};
state["os"]["tmpname"] = sol::lua_value{state, sol::lua_nil};
state["package"]["loadlib"] = sol::lua_value{state, sol::lua_nil};
}
void setup_json(sol::state& state)
{
const auto json = state.safe_script(json_script, &sol::script_pass_on_error);
@ -48,15 +67,18 @@ namespace scripting::lua
void setup_io(sol::state& state)
{
state["io"]["fileexists"] = utils::io::file_exists;
state["io"]["writefile"] = utils::io::write_file;
state["io"]["filesize"] = utils::io::file_size;
state["io"]["createdirectory"] = utils::io::create_directory;
state["io"]["directoryexists"] = utils::io::directory_exists;
state["io"]["directoryisempty"] = utils::io::directory_is_empty;
state["io"]["listfiles"] = utils::io::list_files;
state["io"]["copyfolder"] = utils::io::copy_folder;
state["io"]["readfile"] = static_cast<std::string(*)(const std::string&)>(utils::io::read_file);
state["io"] = sol::table::create(state.lua_state());
state["io"]["fileexists"] = filesystem::safe_io_func<bool>(utils::io::file_exists);
state["io"]["writefile"] = filesystem::safe_write_file;
state["io"]["filesize"] = filesystem::safe_io_func<size_t>(utils::io::file_size);
state["io"]["createdirectory"] = filesystem::safe_io_func<bool>(utils::io::create_directory);
state["io"]["directoryexists"] = filesystem::safe_io_func<bool>(utils::io::directory_exists);
state["io"]["directoryisempty"] = filesystem::safe_io_func<bool>(utils::io::directory_is_empty);
state["io"]["listfiles"] = filesystem::safe_io_func<std::vector<std::string>>(utils::io::list_files);
state["io"]["removefile"] = filesystem::safe_io_func<bool>(utils::io::remove_file);
state["io"]["removedirectory"] = filesystem::safe_io_func<bool>(utils::io::remove_directory);
state["io"]["readfile"] = filesystem::safe_io_func<std::string>(
static_cast<std::string(*)(const std::string&)>(utils::io::read_file));
}
void setup_vector_type(sol::state& state)
@ -807,7 +829,6 @@ namespace scripting::lua
{
this->state_.open_libraries(sol::lib::base,
sol::lib::package,
sol::lib::io,
sol::lib::string,
sol::lib::os,
sol::lib::math,
@ -830,6 +851,7 @@ namespace scripting::lua
return this->folder_;
};
remove_unsafe_functions(this->state_);
setup_io(this->state_);
setup_json(this->state_);
setup_vector_type(this->state_);