X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fweb%2Fluasrc%2Fdispatcher.lua;h=fe5f656ba869266f60c2daee494526b9552f62cd;hp=7692dd2262d158725fd5da263ee0b02d5c647715;hb=be090ec9a7a5579836a879f70a1a30281548d301;hpb=cac36db0805f0238f374db15408c6820ab08eb60 diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua index 7692dd226..fe5f656ba 100644 --- a/libs/web/luasrc/dispatcher.lua +++ b/libs/web/luasrc/dispatcher.lua @@ -82,17 +82,17 @@ end function authenticator.htmlauth(validator, accs, default) local user = luci.http.formvalue("username") local pass = luci.http.formvalue("password") - + if user and validator(user, pass) then return user end - + require("luci.i18n") require("luci.template") context.path = {} luci.template.render("sysauth", {duser=default, fuser=user}) return false - + end --- Dispatch an HTTP request. @@ -108,26 +108,30 @@ function httpdispatch(request) local stat, err = util.copcall(dispatch, context.request) if not stat then + luci.util.perror(err) error500(err) end - + luci.http.close() + + --context._disable_memtrace() end --- Dispatches a LuCI virtual path. -- @param request Virtual path function dispatch(request) + --context._disable_memtrace = require "luci.debug".trap_memtrace() local ctx = context ctx.path = request - + require "luci.i18n".setlanguage(require "luci.config".main.lang) - + local c = ctx.tree local stat if not c then c = createtree() end - + local track = {} local args = {} context.args = args @@ -141,7 +145,7 @@ function dispatch(request) end util.update(track, c) - + if c.leaf then break end @@ -156,36 +160,51 @@ function dispatch(request) if track.i18n then require("luci.i18n").loadc(track.i18n) end - + -- Init template engine - if not track.notemplate then + if (c and c.index) or not track.notemplate then local tpl = require("luci.template") - local viewns = {} + local media = track.mediaurlbase or luci.config.main.mediaurlbase + if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then + media = nil + for name, theme in pairs(luci.config.themes) do + if name:sub(1,1) ~= "." and pcall(tpl.Template, + "themes/%s/header" % fs.basename(theme)) then + media = theme + end + end + assert(media, "No valid theme found") + end + + local viewns = setmetatable({}, {__index=_G}) tpl.context.viewns = viewns viewns.write = luci.http.write + viewns.include = function(name) tpl.Template(name):render(getfenv(2)) end viewns.translate = function(...) return require("luci.i18n").translate(...) end viewns.striptags = util.striptags viewns.controller = luci.http.getenv("SCRIPT_NAME") - viewns.media = luci.config.main.mediaurlbase + viewns.media = media + viewns.theme = fs.basename(media) viewns.resource = luci.config.main.resourcebase viewns.REQUEST_URI = (luci.http.getenv("SCRIPT_NAME") or "") .. (luci.http.getenv("PATH_INFO") or "") end - + + track.dependent = (track.dependent ~= false) assert(not track.dependent or not track.auto, "Access Violation") - + if track.sysauth then local sauth = require "luci.sauth" - + local authen = type(track.sysauth_authenticator) == "function" and track.sysauth_authenticator or authenticator[track.sysauth_authenticator] - + local def = (type(track.sysauth) == "string") and track.sysauth local accs = def and {track.sysauth} or track.sysauth - local sess = luci.http.getcookie("sysauth") + local sess = ctx.authsession or luci.http.getcookie("sysauth") sess = sess and sess:match("^[A-F0-9]+$") local user = sauth.read(sess) - + if not util.contains(accs, user) then if authen then local user, sess = authen(luci.sys.user.checkpasswd, accs, def) @@ -197,6 +216,7 @@ function dispatch(request) if not sess then sauth.write(sid, user) end + ctx.authsession = sid end else luci.http.status(403, "Forbidden") @@ -213,13 +233,32 @@ function dispatch(request) luci.sys.process.setuser(track.setuser) end + if c and (c.index or type(c.target) == "function") then + ctx.dispatched = c + ctx.requested = ctx.requested or ctx.dispatched + end + + if c and c.index then + local tpl = require "luci.template" + + if util.copcall(tpl.render, "indexer", {}) then + return true + end + end + if c and type(c.target) == "function" then - context.dispatched = c - util.copcall(function() - util.updfenv(c.target, require(c.module)) + local oldenv = getfenv(c.target) + local module = require(c.module) + local env = setmetatable({}, {__index= + + function(tbl, key) + return rawget(tbl, key) or module[key] or oldenv[key] + end}) + + setfenv(c.target, env) end) - + c.target(unpack(args)) else error404() @@ -230,7 +269,7 @@ end function createindex() local path = luci.util.libpath() .. "/controller/" local suff = ".lua" - + if luci.util.copcall(require, "luci.fastindex") then createindex_fastindex(path, suff) else @@ -243,14 +282,14 @@ end -- @param suffix Controller file 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 index[v[2]] = v[1] end @@ -272,9 +311,9 @@ function createindex_plain(path, suffix) index = loadfile(indexcache)() return index - end + end end - + index = {} local controllers = util.combine( @@ -286,12 +325,12 @@ function createindex_plain(path, suffix) local module = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".") local mod = require(module) local idx = mod.index - + if type(idx) == "function" then index[module] = idx end end - + if indexcache then fs.writefile(indexcache, util.get_bytecode(index)) fs.chmod(indexcache, "a-rwx,u+rw") @@ -304,29 +343,24 @@ function createtree() if not index then createindex() end - + local ctx = context local tree = {nodes={}} - + ctx.treecache = setmetatable({}, {__mode="v"}) ctx.tree = tree - + -- Load default translation require "luci.i18n".loadc("default") - - local scope = setmetatable({}, {__index = _G}) - for k,v in pairs(luci.dispatcher) do - if type(v) == "function" then - scope[k] = v - end - end + + local scope = setmetatable({}, {__index = luci.dispatcher}) for k, v in pairs(index) do scope._NAME = k setfenv(v, scope) v() end - + return tree end @@ -340,33 +374,24 @@ function assign(path, clone, title, order) local obj = node(unpack(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 - - setmetatable(obj, {__index = c}) - + setmetatable(obj, {__index = _create_node(clone)}) + return obj end --- Create a new dispatching node and define common parameters. -- @param path Virtual path --- @param target Target function to call when dispatched. +-- @param target Target function to call when dispatched. -- @param title Destination node title -- @param order Destination node order value (optional) -- @return Dispatching tree node function entry(path, target, title, order) local c = node(unpack(path)) - + c.target = target c.title = title c.order = order @@ -379,7 +404,7 @@ end -- @param ... Virtual path -- @return Dispatching tree node function node(...) - local c = _create_node(arg) + local c = _create_node({...}) c.module = getfenv(2)._NAME c.path = arg @@ -392,19 +417,19 @@ function _create_node(path, cache) if #path == 0 then return context.tree end - + cache = cache or context.treecache local name = table.concat(path, ".") local c = cache[name] - + if not c then local last = table.remove(path) c = _create_node(path, cache) - + local new = {nodes={}, auto=true} c.nodes[last] = new cache[name] = new - + return new else return c @@ -416,8 +441,12 @@ end --- Create a redirect to another dispatching node. -- @param ... Virtual path destination function alias(...) - local req = arg - return function() + local req = {...} + return function(...) + for _, r in ipairs({...}) do + req[#req+1] = r + end + dispatch(req) end end @@ -426,26 +455,38 @@ end -- @param n Number of path values to replace -- @param ... Virtual path to replace removed path values with function rewrite(n, ...) - local req = arg - return function() - for i=1,n do - table.remove(context.path, 1) + local req = {...} + return function(...) + local dispatched = util.clone(context.dispatched) + + for i=1,n do + table.remove(dispatched, 1) end - - for i,r in ipairs(req) do - table.insert(context.path, i, r) + + for i, r in ipairs(req) do + table.insert(dispatched, i, r) + end + + for _, r in ipairs({...}) do + dispatched[#dispatched+1] = r end - - dispatch() + + dispatch(dispatched) end end --- Create a function-call dispatching target. --- @param name Target function of local controller +-- @param name Target function of local controller -- @param ... Additional parameters passed to the function function call(name, ...) local argv = {...} - return function() return getfenv()[name](unpack(argv)) end + return function(...) + if #argv > 0 then + return getfenv()[name](unpack(argv), ...) + else + return getfenv()[name](...) + end + end end --- Create a template render dispatching target. @@ -459,22 +500,33 @@ end --- Create a CBI model dispatching target. -- @param model CBI model tpo be rendered -function cbi(model) +function cbi(model, config) + config = config or {} return function(...) require("luci.cbi") require("luci.template") + local http = require "luci.http" maps = luci.cbi.load(model, ...) + local state = nil + for i, res in ipairs(maps) do - res:parse() + if config.autoapply then + res.autoapply = config.autoapply + end + local cstate = res:parse() + if not state or cstate < state then + state = cstate + end end - luci.template.render("cbi/header") + http.header("X-CBI-State", state or 0) + luci.template.render("cbi/header", {state = state}) for i, res in ipairs(maps) do res:render() end - luci.template.render("cbi/footer") + luci.template.render("cbi/footer", {state = state, autoapply = config.autoapply}) end end @@ -484,13 +536,20 @@ function form(model) return function(...) require("luci.cbi") require("luci.template") + local http = require "luci.http" maps = luci.cbi.load(model, ...) + local state = nil + for i, res in ipairs(maps) do - res:parse() + local cstate = res:parse() + if not state or cstate < state then + state = cstate + end end + http.header("X-CBI-State", state or 0) luci.template.render("header") for i, res in ipairs(maps) do res:render()