]]--
module("luci.dispatcher", package.seeall)
+require("luci.init")
require("luci.http")
require("luci.sys")
require("luci.fs")
--- Local dispatch database
-local tree = {nodes={}}
+context = luci.util.threadlocal()
-- Index table
-local index = {}
+local index = nil
--- Indexdump
-local indexcache = "/tmp/.luciindex"
-
--- Global request object
-request = {}
-
--- Active dispatched node
-dispatched = nil
-
--- Status fields
-built_index = false
-built_tree = false
+-- Fastindex
+local fi
-- Builds a URL
return luci.http.dispatcher() .. "/" .. table.concat(arg, "/")
end
+-- Prints an error message or renders the "error401" template if available
+function error401(message)
+ message = message or "Unauthorized"
+
+ require("luci.template")
+ if not luci.util.copcall(luci.template.render, "error401") then
+ luci.http.prepare_content("text/plain")
+ luci.http.write(message)
+ end
+ return false
+end
+
-- Sends a 404 error code and renders the "error404" template if available
function error404(message)
luci.http.status(404, "Not Found")
message = message or "Not Found"
require("luci.template")
- if not pcall(luci.template.render, "error404") then
+ if not luci.util.copcall(luci.template.render, "error404") then
luci.http.prepare_content("text/plain")
- print(message)
+ luci.http.write(message)
end
return false
end
luci.http.status(500, "Internal Server Error")
require("luci.template")
- if not pcall(luci.template.render, "error500", {message=message}) then
+ if not luci.util.copcall(luci.template.render, "error500", {message=message}) then
luci.http.prepare_content("text/plain")
- print(message)
+ luci.http.write(message)
end
return false
end
-- Creates a request object for dispatching
-function httpdispatch()
- local pathinfo = luci.http.env.PATH_INFO or ""
- local c = tree
+function httpdispatch(request)
+ luci.http.context.request = request
+ context.request = {}
+ local pathinfo = request:getenv("PATH_INFO") or ""
- for s in pathinfo:gmatch("([%w_]+)") do
- table.insert(request, s)
+ for node in pathinfo:gmatch("[^/]+") do
+ table.insert(context.request, node)
end
- dispatch()
+ dispatch(context.request)
+ luci.http.close()
end
-- Dispatches a request
-function dispatch()
- if not built_tree then
+function dispatch(request)
+ context.path = request
+
+ require("luci.i18n")
+ luci.i18n.setlanguage(require("luci.config").main.lang)
+
+ if not context.tree then
createtree()
end
-
- local c = tree
+
+ local c = context.tree
local track = {}
for i, s in ipairs(request) do
c = c.nodes[s]
- if not c then
+ if not c or c.leaf then
break
end
end
end
+ if track.sysauth then
+ local accs = track.sysauth
+ accs = (type(accs) == "string") and {accs} or accs
+
+ --[[
+ local function sysauth(user, password)
+ return (luci.util.contains(accs, user)
+ and luci.sys.user.checkpasswd(user, password))
+ end
+
+ if not luci.http.basic_auth(sysauth) then
+ error401()
+ return
+ end
+ ]]--
+ end
if track.i18n then
require("luci.i18n").loadc(track.i18n)
-- Init template engine
local tpl = require("luci.template")
- tpl.viewns.translate = function(...) return require("luci.i18n").translate(...) end
- tpl.viewns.controller = luci.http.dispatcher()
- tpl.viewns.uploadctrl = luci.http.dispatcher_upload()
- tpl.viewns.media = luci.config.main.mediaurlbase
- tpl.viewns.resource = luci.config.main.resourcebase
-
- -- Load default translation
- require("luci.i18n").loadc("default")
+ local viewns = {}
+ tpl.context.viewns = viewns
+ viewns.write = luci.http.write
+ viewns.translate = function(...) return require("luci.i18n").translate(...) end
+ viewns.controller = luci.http.getenv("SCRIPT_NAME")
+ viewns.media = luci.config.main.mediaurlbase
+ viewns.resource = luci.config.main.resourcebase
+ viewns.REQUEST_URI = luci.http.getenv("SCRIPT_NAME") .. (luci.http.getenv("PATH_INFO") or "")
if c and type(c.target) == "function" then
- dispatched = c
- stat, mod = pcall(require, c.module)
+ context.dispatched = c
+ stat, mod = luci.util.copcall(require, c.module)
if stat then
luci.util.updfenv(c.target, mod)
end
- stat, err = pcall(c.target)
+ stat, err = luci.util.copcall(c.target)
if not stat then
error500(err)
end
-- Generates the dispatching tree
function createindex()
- index = {}
local path = luci.sys.libpath() .. "/controller/"
local suff = ".lua"
- if pcall(require, "fastindex") then
+ if luci.util.copcall(require, "luci.fastindex") then
createindex_fastindex(path, suff)
else
createindex_plain(path, suff)
end
-
- built_index = true
end
-- Uses fastindex to create the dispatching tree
-function createindex_fastindex(path, suffix)
- local fi = fastindex.new("index")
- fi.add(path .. "*" .. suffix)
- fi.add(path .. "*/*" .. suffix)
+function createindex_fastindex(path, suffix)
+ index = {}
+
+ if not fi then
+ fi = luci.fastindex.new("index")
+ fi.add(path .. "*" .. suffix)
+ fi.add(path .. "*/*" .. suffix)
+ end
fi.scan()
for k, v in pairs(fi.indexes) do
end
-- Calls the index function of all available controllers
+-- Fallback for transition purposes / Leave it in as long as it works otherwise throw it away
function createindex_plain(path, suffix)
- local cachetime = nil
+ index = {}
+
+ local cache = nil
local controllers = luci.util.combine(
luci.fs.glob(path .. "*" .. suffix) or {},
)
if indexcache then
- cachetime = luci.fs.mtime(indexcache)
+ cache = luci.fs.mtime(indexcache)
- if not cachetime then
+ if not cache then
luci.fs.mkdir(indexcache)
luci.fs.chmod(indexcache, "a=,u=rwx")
+ cache = luci.fs.mtime(indexcache)
end
end
- if not cachetime then
- for i,c in ipairs(controllers) do
- c = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".")
- stat, mod = pcall(require, c)
+ for i,c in ipairs(controllers) do
+ local module = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".")
+ local cachefile
+ local stime
+ local ctime
+
+ if cache then
+ cachefile = indexcache .. "/" .. module
+ stime = luci.fs.mtime(c) or 0
+ ctime = luci.fs.mtime(cachefile) or 0
+ end
+
+ if not cache or stime > ctime then
+ stat, mod = luci.util.copcall(require, module)
if stat and mod and type(mod.index) == "function" then
- index[c] = mod.index
+ index[module] = mod.index
- if indexcache then
- luci.fs.writefile(indexcache .. "/" .. c, string.dump(mod.index))
+ if cache then
+ luci.fs.writefile(cachefile, luci.util.dump(mod.index))
end
end
- end
- else
- for i,c in ipairs(luci.fs.dir(indexcache)) do
- if c:sub(1) ~= "." then
- index[c] = loadfile(indexcache .. "/" .. c)
- end
+ else
+ index[module] = loadfile(cachefile)
end
end
end
-- Creates the dispatching tree from the index
function createtree()
- if not built_index then
+ if not index then
createindex()
end
+
+ context.tree = {nodes={}}
+ require("luci.i18n")
+
+ -- Load default translation
+ luci.i18n.loadc("default")
+
+ local scope = luci.util.clone(_G)
+ for k,v in pairs(luci.dispatcher) do
+ if type(v) == "function" then
+ scope[k] = v
+ end
+ end
for k, v in pairs(index) do
- luci.util.updfenv(v, _M)
- luci.util.extfenv(v, "_NAME", k)
- pcall(v)
+ scope._NAME = k
+ setfenv(v, scope)
+
+ local stat, err = luci.util.copcall(v)
+ if not stat then
+ error500("createtree failed: " .. k .. ": " .. err)
+ os.exit(1)
+ end
+ end
+end
+
+-- Reassigns a node to another position
+function assign(path, clone, title, order)
+ local obj = node(path)
+ obj.nodes = nil
+ obj.module = nil
+
+ obj.title = title
+ obj.order = order
+
+ local c = context.tree
+ for k, v in ipairs(clone) do
+ if not c.nodes[v] then
+ c.nodes[v] = {nodes={}}
+ end
+
+ c = c.nodes[v]
end
- built_tree = true
+ setmetatable(obj, {__index = c})
+
+ return obj
end
-- Shortcut for creating a dispatching node
-function entry(path, target, title, order, add)
- add = add or {}
-
+function entry(path, target, title, order)
local c = node(path)
+
c.target = target
c.title = title
c.order = order
c.module = getfenv(2)._NAME
- for k,v in pairs(add) do
- c[k] = v
- end
-
return c
end
-- Fetch a dispatching node
function node(...)
- local c = tree
-
- if arg[1] and type(arg[1]) == "table" then
- arg = arg[1]
+ local c = context.tree
+ arg.n = nil
+ if arg[1] then
+ if type(arg[1]) == "table" then
+ arg = arg[1]
+ end
end
for k,v in ipairs(arg) do
if not c.nodes[v] then
- c.nodes[v] = {nodes={}, module=getfenv(2)._NAME}
+ c.nodes[v] = {nodes={}}
end
c = c.nodes[v]
end
+ c.module = getfenv(2)._NAME
+ c.path = arg
+
return c
end
function alias(...)
local req = arg
return function()
- request = req
+ dispatch(req)
+ end
+end
+
+function rewrite(n, ...)
+ local req = arg
+ return function()
+ for i=1,n do
+ table.remove(context.path, 1)
+ end
+
+ for i,r in ipairs(req) do
+ table.insert(context.path, i, r)
+ end
+
dispatch()
end
end
-function call(name)
- return function() getfenv()[name]() end
+function call(name, ...)
+ local argv = {...}
+ return function() return getfenv()[name](unpack(argv)) end
end
function template(name)
require("luci.template")
return function()
- local stat, res = pcall(luci.cbi.load, model)
+ local stat, res = luci.util.copcall(luci.cbi.load, model)
if not stat then
error500(res)
return true
end
- local stat, err = pcall(res.parse, res)
+ local stat, err = luci.util.copcall(res.parse, res)
if not stat then
error500(err)
return true
projects / project / luci.git / blobdiff