X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fweb%2Fluasrc%2Fdispatcher.lua;h=28c460858d65be9d54a90f084bf53bac75656b99;hp=01cc109219cbac9596246d75d999a673f458dccc;hb=39578a6b72782d8d39b0450346bf0fa1bbb909a1;hpb=a77f1b91aeb9d6770a2fa5bc83a6100119e825d1 diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua index 01cc10921..28c460858 100644 --- a/libs/web/luasrc/dispatcher.lua +++ b/libs/web/luasrc/dispatcher.lua @@ -34,6 +34,9 @@ local nixio = require "nixio", require "nixio.util" module("luci.dispatcher", package.seeall) context = util.threadlocal() +uci = require "luci.model.uci" +i18n = require "luci.i18n" +_M.fs = fs authenticator = {} @@ -49,11 +52,25 @@ local fi -- @return Relative URL function build_url(...) local path = {...} - local sn = http.getenv("SCRIPT_NAME") or "" + local url = { http.getenv("SCRIPT_NAME") or "" } + + local k, v for k, v in pairs(context.urltoken) do - sn = sn .. "/;" .. k .. "=" .. http.urlencode(v) + url[#url+1] = "/;" + url[#url+1] = http.urlencode(k) + url[#url+1] = "=" + url[#url+1] = http.urlencode(v) + end + + local p + for _, p in ipairs(path) do + if p:match("^[a-zA-Z0-9_%-%.%%/,;]+$") then + url[#url+1] = "/" + url[#url+1] = p + end end - return sn .. ((#path > 0) and "/" .. table.concat(path, "/") or "") + + return table.concat(url, "") end --- Send a 404 error code and render the "error404" template if available. @@ -108,13 +125,21 @@ end --- Dispatch an HTTP request. -- @param request LuCI HTTP Request object -function httpdispatch(request) +function httpdispatch(request, prefix) luci.http.context.request = request - context.request = {} + + local r = {} + context.request = r local pathinfo = http.urldecode(request:getenv("PATH_INFO") or "", true) + if prefix then + for _, node in ipairs(prefix) do + r[#r+1] = node + end + end + for node in pathinfo:gmatch("[^/]+") do - table.insert(context.request, node) + r[#r+1] = node end local stat, err = util.coxpcall(function() @@ -138,7 +163,7 @@ function dispatch(request) assert(conf.main, "/etc/config/luci seems to be corrupt, unable to find section 'main'") - local lang = conf.main.lang + local lang = conf.main.lang or "auto" if lang == "auto" then local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or "" for lpat in aclang:gmatch("[%w-]+") do @@ -148,7 +173,7 @@ function dispatch(request) break end end - end + end require "luci.i18n".setlanguage(lang) local c = ctx.tree @@ -170,7 +195,7 @@ function dispatch(request) for i, s in ipairs(request) do local tkey, tval if t then - tkey, tval = s:match(";(%w+)=(.*)") + tkey, tval = s:match(";(%w+)=([a-fA-F0-9]*)") end if tkey then @@ -200,7 +225,7 @@ function dispatch(request) end end - ctx.requestpath = freq + ctx.requestpath = ctx.requestpath or freq ctx.path = preq if track.i18n then @@ -211,8 +236,7 @@ function dispatch(request) if (c and c.index) or not track.notemplate then local tpl = require("luci.template") local media = track.mediaurlbase or luci.config.main.mediaurlbase - if not tpl.Template("themes/%s/header" % fs.basename(media)) then - --if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then + 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, @@ -227,7 +251,9 @@ function dispatch(request) write = luci.http.write; include = function(name) tpl.Template(name):render(getfenv(2)) end; translate = function(...) return require("luci.i18n").translate(...) end; + export = function(k, v) if tpl.context.viewns[k] == nil then tpl.context.viewns[k] = v end end; striptags = util.striptags; + pcdata = util.pcdata; media = media; theme = fs.basename(media); resource = luci.config.main.resourcebase @@ -299,6 +325,7 @@ function dispatch(request) end luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url()) ctx.authsession = sid + ctx.authuser = user end else luci.http.status(403, "Forbidden") @@ -306,6 +333,7 @@ function dispatch(request) end else ctx.authsession = sess + ctx.authuser = user end end @@ -429,16 +457,16 @@ function createindex_plain(path, suffixes) index = {} for i,c in ipairs(controllers) do - local module = "luci.controller." .. c:sub(#path+1, #c):gsub("/", ".") + local modname = "luci.controller." .. c:sub(#path+1, #c):gsub("/", ".") for _, suffix in ipairs(suffixes) do - module = module:gsub(suffix.."$", "") + modname = modname:gsub(suffix.."$", "") end - local mod = require(module) + local mod = require(modname) local idx = mod.index if type(idx) == "function" then - index[module] = idx + index[modname] = idx end end @@ -465,7 +493,7 @@ function createtree() ctx.modifiers = modi -- Load default translation - require "luci.i18n".loadc("default") + require "luci.i18n".loadc("base") local scope = setmetatable({}, {__index = luci.dispatcher}) @@ -690,19 +718,60 @@ local function _cbi(self, ...) end end - local pageaction = true http.header("X-CBI-State", state or 0) + if not config.noheader then tpl.render("cbi/header", {state = state}) end + + local redirect + local messages + local applymap = false + local pageaction = true + local parsechain = { } + for i, res in ipairs(maps) do - res:render() + if res.apply_needed and res.parsechain then + local c + for _, c in ipairs(res.parsechain) do + parsechain[#parsechain+1] = c + end + applymap = true + end + + if res.redirect then + redirect = redirect or res.redirect + end + if res.pageaction == false then pageaction = false end + + if res.message then + messages = messages or { } + messages[#messages+1] = res.message + end + end + + for i, res in ipairs(maps) do + res:render({ + firstmap = (i == 1), + applymap = applymap, + redirect = redirect, + messages = messages, + pageaction = pageaction, + parsechain = parsechain + }) end + if not config.nofooter then - tpl.render("cbi/footer", {flow = config, pageaction=pageaction, state = state, autoapply = config.autoapply}) + tpl.render("cbi/footer", { + flow = config, + pageaction = pageaction, + redirect = redirect, + state = state, + autoapply = config.autoapply + }) end end