izaya/OC-PsychOS2
1
0
Fork 4
Code Issues Pull Requests Releases Wiki Activity

address RPC loop issues as described in https://github.com/ShadowKatStudios/OC-Minitel/pull/40 plus implement ACLs like the OpenOS version of the RPC library

Browse Source
This commit is contained in:
Izaya 2023-09-20 00:01:21 +10:00
parent 026f2524e6
commit a7708b9e47
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/rpc.lua
View File

@ -5,19 +5,34 @@ local rpc = {}
_G.rpcf = {} _G.rpcf = {}
rpc.port = 111 rpc.port = 111
local function rpcexec(_, from, port, data) local function setacl(self, fname, host)
if port == rpc.port then self[fname] = self[fname] or {}
local rpcrq = serial.unserialize(data) self[fname][host] = true
local rpcn, rpcid = table.remove(rpcrq,1), table.remove(rpcrq,1) end
if rpcf[rpcn] then rpc.allow = setmetatable({},{__call=setacl})
local rt = {pcall(rpcf[rpcn],table.unpack(rpcrq))} rpc.deny = setmetatable({},{__call=setacl})
if rt[1] == true then
table.remove(rt,1) local function isPermitted(host,fn)
end if rpc.allow[fn] then
minitel.send(from,port,serial.serialize({rpcid,table.unpack(rt)})) return rpc.allow[fn][host] or false
else
end
end end
if rpc.deny[fn] and rpc.deny[fn][host] then
return false
end
return true
end
local function rpcexec(_, from, port, data)
os.spawn(function()
if port == rpc.port then
local rpcrq = serial.unserialize(data) or {}
if rpcf[rpcrq[1]] and isPermitted(from,rpcrq[1]) then
minitel.send(from,port,serial.serialize({rpcrq[2],pcall(rpcf[rpcrq[1]],table.unpack(rpcrq,3))}))
elseif type(rpcrq[2]) == "string" then
minitel.send(from,port,serial.serialize({rpcrq[2],false,"function unavailable"}))
end
end
end,"rpc worker for "..tostring(from))
end end
function rpcf.list() function rpcf.list()
local rt = {} local rt = {}
@ -39,10 +54,13 @@ function rpc.call(hostname,fn,...) -- string string -- boolean -- Calls exported
local _, from, port, data = event.pull(30, "net_msg", hostname, rpc.port) local _, from, port, data = event.pull(30, "net_msg", hostname, rpc.port)
rt = serial.unserialize(tostring(data)) or {} rt = serial.unserialize(tostring(data)) or {}
until (type(rt) == "table" and rt[1] == rv) or computer.uptime() > st + 30 until (type(rt) == "table" and rt[1] == rv) or computer.uptime() > st + 30
if table.remove(rt,1) == rv then if rt[1] == rv then
return table.unpack(rt) if rt[2] then
return table.unpack(rt,3)
end
error(rt[3])
end end
return false error("timed out")
end end
function rpc.proxy(hostname,filter) -- string string -- table -- Returns a component.proxy()-like table from the functions on *hostname* with names matching *filter*. function rpc.proxy(hostname,filter) -- string string -- table -- Returns a component.proxy()-like table from the functions on *hostname* with names matching *filter*.
filter=(filter or "").."(.+)" filter=(filter or "").."(.+)"
@ -69,7 +87,7 @@ function rpc.register(name,fn) -- string function -- -- Registers a function to
if not rpcrunning then if not rpcrunning then
os.spawn(function() os.spawn(function()
while true do while true do
rpcexec(event.pull("net_msg")) pcall(rpcexec,event.pull("net_msg"))
end end
end,"rpc daemon") end,"rpc daemon")
end end