library-mirrors/sandbox.lua
1
0
Fork 0
mirror of https://github.com/kikito/lua-sandbox.git synced 2024-12-18 03:04:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a fix for the quota workaround

Browse Source
This commit is contained in:
PeAd 2022-04-25 16:52:05 +02:00
parent e04ddbe3ae
commit 161ad488da
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sandbox.lua
View File

@ -153,19 +153,33 @@ function sandbox.protect(code, options)
return function(...) return function(...)
local queryInvoker = function(...) local tmp = table.pack(pcall(f, ...)); cleanup(); return tmp end;
if quota and quota_supported then if quota and quota_supported then
local timeout = function() local timeout = function()
cleanup() if(type(debug) == 'table' and type(debug.sethook) == 'function') then
error('Quota exceeded: ' .. tostring(quota)) -- If the function were to be using pcall, it may capture the error accidentally or intentionally.
-- This allows us to repeatedly invoke the hook on every instruction and only stop if the function
-- which is currently getting executed is our invoker.
-- This will NOT work properly if for whatever reason the sandbox got access to the sandbox.protect
-- as the function sets a new hook and never sets it back to the last one.
sethook( function()
local fn = debug.getinfo(2 , 'f').func;
if( fn ~= queryInvoker and fn ~= cleanup and not (fn == table.pack and debug.getinfo(3 , 'f').func == queryInvoker) ) then
error('Quota exceeded: ' .. tostring(quota))
else
cleanup();
end
end, "", 1)
end
error('Quota exceeded: ' .. tostring(quota));
end end
sethook(timeout, "", quota) sethook(timeout, "", quota)
end end
string.rep = nil -- luacheck: no global string.rep = nil -- luacheck: no global
local t = table.pack(pcall(f, ...)) local t = queryInvoker(...);
cleanup()
if not t[1] then error(t[2]) end if not t[1] then error(t[2]) end