Fix potential security issue(s), documentation on minetest.deserialize() (#9369)

Also adds an unittest
This commit is contained in:
sfan5
2020-03-05 22:03:04 +01:00
committed by GitHub
parent ef09e8a4d6
commit 8d6a0b917c
3 changed files with 39 additions and 11 deletions

View File

@@ -177,13 +177,16 @@ end
-- Deserialization
local env = {
loadstring = loadstring,
}
local function safe_loadstring(...)
local func, err = loadstring(...)
if func then
setfenv(func, {})
return func
end
return nil, err
end
local safe_env = {
loadstring = function() end,
}
local function dummy_func() end
function core.deserialize(str, safe)
if type(str) ~= "string" then
@@ -195,7 +198,10 @@ function core.deserialize(str, safe)
end
local f, err = loadstring(str)
if not f then return nil, err end
setfenv(f, safe and safe_env or env)
-- The environment is recreated every time so deseralized code cannot
-- pollute it with permanent references.
setfenv(f, {loadstring = safe and dummy_func or safe_loadstring})
local good, data = pcall(f)
if good then

View File

@@ -1,6 +1,6 @@
_G.core = {}
_G.setfenv = function() end
_G.setfenv = require 'busted.compatibility'.setfenv
dofile("builtin/common/serialize.lua")
@@ -25,4 +25,20 @@ describe("serialize", function()
local test_out = core.deserialize(core.serialize(test_in))
assert.same(test_in, test_out)
end)
it("strips functions in safe mode", function()
local test_in = {
func = function(a, b)
error("test")
end,
foo = "bar"
}
local str = core.serialize(test_in)
assert.not_nil(str:find("loadstring"))
local test_out = core.deserialize(str, true)
assert.is_nil(test_out.func)
assert.equals(test_out.foo, "bar")
end)
end)