Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add all safe helper function from lua_api.txt #507

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 31 additions & 39 deletions mesecons_luacontroller/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,16 @@ local function safe_string_find(...)
return string.find(...)
end

-- do not allow pattern matching in string.split (see string.find for details)
local function safe_string_split(...)
if select(5, ...) then
debug.sethook() -- Clear hook
error("string.split: 'sep_is_pattern' (fifth parameter) may not be used in a Luacontroller")
end

return string.split(...)
end

local function remove_functions(x)
local tp = type(x)
if tp == "function" then
Expand Down Expand Up @@ -463,51 +473,34 @@ local function create_environment(pos, mem, event, itbl, send_warning)
reverse = string.reverse,
sub = string.sub,
find = safe_string_find,
split = safe_string_split,
},
math = {
abs = math.abs,
acos = math.acos,
asin = math.asin,
atan = math.atan,
atan2 = math.atan2,
ceil = math.ceil,
cos = math.cos,
cosh = math.cosh,
deg = math.deg,
exp = math.exp,
floor = math.floor,
fmod = math.fmod,
frexp = math.frexp,
huge = math.huge,
ldexp = math.ldexp,
log = math.log,
log10 = math.log10,
max = math.max,
min = math.min,
modf = math.modf,
pi = math.pi,
pow = math.pow,
rad = math.rad,
random = math.random,
sin = math.sin,
sinh = math.sinh,
sqrt = math.sqrt,
tan = math.tan,
tanh = math.tanh,
},
table = {
concat = table.concat,
insert = table.insert,
maxn = table.maxn,
remove = table.remove,
sort = table.sort,
},
math = table.copy(math),
table = table.copy(table),
os = {
clock = os.clock,
difftime = os.difftime,
time = os.time,
datetable = safe_date,
},
dump2 = dump2,
dump = dump,
minetest = {
--wrap_text = minetest.wrap_text,
pos_to_string = minetest.pos_to_string,
string_to_pos = minetest.string_to_pos,
string_to_area = minetest.string_to_area,
formspec_escape = minetest.formspec_escape,
is_yes = minetest.is_yes,
is_nan = minetest.is_nan,
get_us_time = minetest.get_us_time,
parse_json = minetest.parse_json,
write_json = minetest.write_json,
rgba = minetest.rgba,
encode_base64 = minetest.encode_base64,
decode_base64 = minetest.decode_base64,
},
vector = table.copy(vector),
}
env._G = env

Expand Down Expand Up @@ -901,4 +894,3 @@ minetest.register_craft({
{'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable', ''},
}
})