Sandbox, starting bios

src/lua/core/boot.lua

@@ -17,11 +17,16 @@ function boot.boot()
     error("No bootcode")
   end
     ---PASS SANDBOX!!!!!!
-  local f, reason = load(code, "=BIOS")
+  local f, reason = load(code, "=BIOS", nil, modules.sandbox)
   if not f then
     print(reason)
   else
-    f()
+    local e, reason = pcall(f)
+    if not e then
+      print("ERROR")
+      print(reason)
+      --TODO: Make fancy bsod here
+    end
     print("System quit, Panic")
   end
 end

src/lua/core/init.lua

@@ -35,15 +35,19 @@ local function loadModule(name)
 end
 
 --Load modules
+--Utils
 loadModule("random")
 loadModule("color")
 
+--Core
 loadModule("component")
 loadModule("computer")
 
+--Components
 loadModule("eeprom")
 loadModule("textgpu")
 
+--Userspace
 loadModule("sandbox")
 loadModule("boot")
 

src/lua/core/sandbox.lua

@@ -1 +1,166 @@
+local sandbox
+sandbox = {
+  assert = assert,
+  dofile = nil,
+  error = error,
+  _G = nil,
+  getmetatable = function(t)
+    if type(t) == "string" then -- don't allow messing with the string mt
+      return nil
+    end
+    local result = getmetatable(t)
+    return result
+  end,
+  ipairs = ipairs,
+  load = function(ld, source, mode, env)
+    --Should we allow bytecode?
+    return load(ld, source, mode, env or sandbox)
+  end,
+  loadfile = nil,
+  next = next,
+  pairs = pairs,
+  pcall = pcall,
+  print = nil,
+  rawequal = rawequal,
+  rawget = rawget,
+  rawlen = rawlen,
+  rawset = rawset,
+  select = select,
+  setmetatable = setmetatable,
+  tonumber = tonumber,
+  tostring = tostring,
+  type = type,
+  _VERSION = _VERSION,
+  xpcall = xpcall,
+  coroutine = {
+    create = coroutine.create,
+    resume = coroutine.resume,
+    running = coroutine.running,
+    status = coroutine.status,
+    wrap = coroutine.wrap,
+    yield = coroutine.yield,
+    isyieldable = coroutine.isyieldable
+  },
+  string = {
+    byte = string.byte,
+    char = string.char,
+    dump = string.dump,
+    find = string.find,
+    format = string.format,
+    gmatch = string.gmatch,
+    gsub = string.gsub,
+    len = string.len,
+    lower = string.lower,
+    match = string.match,
+    rep = string.rep,
+    reverse = string.reverse,
+    sub = string.sub,
+    upper = string.upper,
+    -- Lua 5.3.
+    pack = string.pack,
+    unpack = string.unpack,
+    packsize = string.packsize
+  },
+  table = {
+    concat = table.concat,
+    insert = table.insert,
+    pack = table.pack,
+    remove = table.remove,
+    sort = table.sort,
+    unpack = table.unpack,
+    -- Lua 5.3.
+    move = table.move
+  },
+  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,
+    max = math.max,
+    min = math.min,
+    modf = math.modf,
+    pi = math.pi,
+    pow = math.pow,
+    rad = math.rad,
+    random = math.random,
+    randomseed = math.randomseed,
+    sin = math.sin,
+    sinh = math.sinh,
+    sqrt = math.sqrt,
+    tan = math.tan,
+    tanh = math.tanh,
+    -- Lua 5.3.
+    maxinteger = math.maxinteger,
+    mininteger = math.mininteger,
+    tointeger = math.tointeger,
+    type = math.type,
+    ult = math.ult
+  },
+  io = nil,
 
+  os = {
+    clock = os.clock,
+    date = os.date,
+    difftime = function(t2, t1)
+      return t2 - t1
+    end,
+    execute = nil,
+    exit = nil,
+    remove = nil,
+    rename = nil,
+    time = function(table)
+      checkArg(1, table, "table", "nil")
+      return os.time(table)
+    end,
+    tmpname = nil,
+  },
+  debug = { --TODO: Consider expanding
+    getinfo = function(...)
+      local result = debug.getinfo(...)
+      if result then
+        return {
+          source = result.source,
+          short_src = result.short_src,
+          linedefined = result.linedefined,
+          lastlinedefined = result.lastlinedefined,
+          what = result.what,
+          currentline = result.currentline,
+          nups = result.nups,
+          nparams = result.nparams,
+          isvararg = result.isvararg,
+          name = result.name,
+          namewhat = result.namewhat,
+          istailcall = result.istailcall
+        }
+      end
+    end,
+    traceback = debug.traceback
+  },
+  utf8 = {
+    char = utf8.char,
+    charpattern = utf8.charpattern,
+    codes = utf8.codes,
+    codepoint = utf8.codepoint,
+    len = utf8.len,
+    offset = utf8.offset
+  },
+  checkArg = checkArg
+}
+
+sandbox._G = sandbox
+sandbox.component = modules.component.api or error("No component API")
+sandbox.computer = modules.computer.api or error("No computer API")
+
+return sandbox